Skip to content

Commit e0e87a8

Browse files
anhtesteranhtester
committed
Update version 1.5.0
1 parent acf2667 commit e0e87a8

8 files changed

Lines changed: 102 additions & 109 deletions

File tree

‎src/test/java/anhtester/com/projects/website/crm/pages/Clients/ClientPage.java‎

Lines changed: 21 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -20,23 +20,23 @@ public void openClientTabPage() {
2020
WebUI.verifyElementTextEquals(ObjectUtils.getObject("labelOnClientPage"), pageText, FailureHandling.STOP_ON_FAILURE);
2121
//WebUI.verifyPageUrl(pageUrl);
2222
WebUI.sleep(1);
23-
WebUI.clickElement(ObjectUtils.getObject("clientTab"));
23+
WebUI.clickElement(ObjectUtils.getObject("tabClient"));
2424
}
2525

2626
public void addClient(Hashtable<String, String> data) {
27-
WebUI.clickElement(ObjectUtils.getObject("addClientBtn"));
28-
WebUI.setText(ObjectUtils.getObject("companyNameInput"), data.get(ClientModel.getCompanyName()));
29-
WebUI.clickElement(ObjectUtils.getObject("ownerSelect"));
30-
WebUI.setText(ObjectUtils.getObject("ownerSearchInput"), data.get(ClientModel.getOwner()));
31-
WebUI.clickElement(ObjectUtils.getObject("ownerFirstItemSelect"));
32-
WebUI.setText(ObjectUtils.getObject("addressInput"), data.get(ClientModel.getAddress()));
33-
WebUI.setText(ObjectUtils.getObject("cityInput"), data.get(ClientModel.getCity()));
34-
WebUI.setText(ObjectUtils.getObject("stateInput"), data.get(ClientModel.getState()));
35-
WebUI.setText(ObjectUtils.getObject("zipInput"), data.get(ClientModel.getZip()));
36-
WebUI.setText(ObjectUtils.getObject("countryInput"), data.get(ClientModel.getCountry()));
37-
WebUI.setText(ObjectUtils.getObject("phoneInput"), data.get(ClientModel.getPhone()));
38-
WebUI.clickElement(ObjectUtils.getObject("saveDialogBtn"));
39-
WebUI.setText(ObjectUtils.getObject("searchInput"), data.get(ClientModel.getCompanyName()));
27+
WebUI.clickElement(ObjectUtils.getObject("buttonAddClient"));
28+
WebUI.setText(ObjectUtils.getObject("inputCompanyName"), data.get(ClientModel.getCompanyName()));
29+
WebUI.clickElement(ObjectUtils.getObject("selectOwner"));
30+
WebUI.setText(ObjectUtils.getObject("inputSearchOwner"), data.get(ClientModel.getOwner()));
31+
WebUI.clickElement(ObjectUtils.getObject("selectFirstItemOwner"));
32+
WebUI.setText(ObjectUtils.getObject("inputAddress"), data.get(ClientModel.getAddress()));
33+
WebUI.setText(ObjectUtils.getObject("inputCity"), data.get(ClientModel.getCity()));
34+
WebUI.setText(ObjectUtils.getObject("inputState"), data.get(ClientModel.getState()));
35+
WebUI.setText(ObjectUtils.getObject("inputZip"), data.get(ClientModel.getZip()));
36+
WebUI.setText(ObjectUtils.getObject("inputCountry"), data.get(ClientModel.getCountry()));
37+
WebUI.setText(ObjectUtils.getObject("inputPhone"), data.get(ClientModel.getPhone()));
38+
WebUI.clickElement(ObjectUtils.getObject("buttonSaveOnDialog"));
39+
WebUI.setText(ObjectUtils.getObject("inputSearch"), data.get(ClientModel.getCompanyName()));
4040
WebUI.checkContainsSearchTableByColumn(2, data.get(ClientModel.getCompanyName()));
4141
checkClientDetail(data);
4242
}
@@ -45,20 +45,20 @@ public void checkClientDetail(Hashtable<String, String> data) {
4545
WebUI.clickElement(ObjectUtils.getObject("itemClientFirstRow"));
4646
WebUI.clickElement(ObjectUtils.getObject("tabClientInfo"));
4747

48-
WebUI.verifyElementAttributeValue(ObjectUtils.getObject("companyNameInput"), "value", data.get(ClientModel.getCompanyName()));
48+
WebUI.verifyElementAttributeValue(ObjectUtils.getObject("inputCompanyName"), "value", data.get(ClientModel.getCompanyName()));
4949
WebUI.verifyElementTextEquals(ObjectUtils.getObject("ownerDetail"), data.get(ClientModel.getOwner()), FailureHandling.CONTINUE_ON_FAILURE);
50-
WebUI.verifyElementTextEquals(ObjectUtils.getObject("addressInput"), data.get(ClientModel.getAddress()), FailureHandling.CONTINUE_ON_FAILURE);
51-
WebUI.verifyElementAttributeValue(ObjectUtils.getObject("cityInput"), "value", data.get(ClientModel.getCity()));
52-
WebUI.verifyElementAttributeValue(ObjectUtils.getObject("stateInput"), "value", data.get(ClientModel.getState()));
50+
WebUI.verifyElementTextEquals(ObjectUtils.getObject("inputAddress"), data.get(ClientModel.getAddress()), FailureHandling.CONTINUE_ON_FAILURE);
51+
WebUI.verifyElementAttributeValue(ObjectUtils.getObject("inputCity"), "value", data.get(ClientModel.getCity()));
52+
WebUI.verifyElementAttributeValue(ObjectUtils.getObject("inputState"), "value", data.get(ClientModel.getState()));
5353
//Còn vài cái nữa là làm biếng code quá =))
5454

5555
}
5656

5757
public void enterDataSearchClient(String value) {
5858
WebUI.sleep(1);
59-
WebUI.moveToElement(ObjectUtils.getObject("searchInput"));
60-
WebUI.clearText(ObjectUtils.getObject("searchInput"));
61-
WebUI.setText(ObjectUtils.getObject("searchInput"), value);
59+
WebUI.moveToElement(ObjectUtils.getObject("inputSearch"));
60+
WebUI.clearText(ObjectUtils.getObject("inputSearch"));
61+
WebUI.setText(ObjectUtils.getObject("inputSearch"), value);
6262
}
6363

6464
}

‎src/test/java/anhtester/com/projects/website/crm/pages/Dashboard/DashboardPage.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,13 +14,13 @@ public DashboardPage() {
1414
public String pageUrl = "/dashboard";
1515

1616
public ClientPage openClientPage() {
17-
WebUI.clickElement(ObjectUtils.getObject("clientMenu"));
17+
WebUI.clickElement(ObjectUtils.getObject("menuClients"));
1818

1919
return new ClientPage();
2020
}
2121

2222
public ProjectPage openProjectPage() {
23-
WebUI.clickElement(ObjectUtils.getObject("projectMenu"));
23+
WebUI.clickElement(ObjectUtils.getObject("menuProjects"));
2424

2525
return new ProjectPage();
2626
}

‎src/test/java/anhtester/com/projects/website/crm/pages/SignIn/SignInPage.java‎

Lines changed: 19 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -26,11 +26,11 @@ public DashboardPage signInWithAdminRole() {
2626
WebUI.getToUrl(FrameworkConstants.BASE_URL);
2727
Assert.assertTrue(WebUI.verifyPageUrl(pageUrl), "The url of sign in page not match.");
2828
Assert.assertTrue(WebUI.verifyPageTitle(pageTitle), "The title of sign in page not match.");
29-
WebUI.setText(ObjectUtils.getObject("SigninPage.email"), ExcelHelpers.getCellData(1, SignInModel.getEmail()));
30-
WebUI.setText(ObjectUtils.getObject("SigninPage.passwordInput"), DecodeUtils.decrypt(ExcelHelpers.getCellData(1, SignInModel.getPassword())));
31-
WebUI.clickElement(ObjectUtils.getObject("SigninPage.signInBtn"));
29+
WebUI.setText(ObjectUtils.getObject("inputEmail"), ExcelHelpers.getCellData(1, SignInModel.getEmail()));
30+
WebUI.setText(ObjectUtils.getObject("inputPassword"), DecodeUtils.decrypt(ExcelHelpers.getCellData(1, SignInModel.getPassword())));
31+
WebUI.clickElement(ObjectUtils.getObject("buttonSignIn"));
3232
WebUI.waitForPageLoaded();
33-
Assert.assertTrue(WebUI.verifyPageUrl(dashboardPageURL),"Sign in failed. Can not redirect to Dashboard page.");
33+
Assert.assertTrue(WebUI.verifyPageUrl(dashboardPageURL), "Sign in failed. Can not redirect to Dashboard page.");
3434
WebUI.waitForPageLoaded();
3535

3636
return new DashboardPage();
@@ -41,11 +41,11 @@ public DashboardPage signInWithTeamLeaderRole() {
4141
WebUI.getToUrl(FrameworkConstants.BASE_URL);
4242
Assert.assertTrue(WebUI.verifyPageUrl(pageUrl), "The url of sign in page not match.");
4343
Assert.assertTrue(WebUI.verifyPageTitle(pageTitle), "The title of sign in page not match.");
44-
WebUI.setText(ObjectUtils.getObject("SigninPage.email"), ExcelHelpers.getCellData(2, SignInModel.getEmail()));
45-
WebUI.setText(ObjectUtils.getObject("SigninPage.passwordInput"), DecodeUtils.decrypt(ExcelHelpers.getCellData(2, SignInModel.getPassword())));
46-
WebUI.clickElement(ObjectUtils.getObject("SigninPage.signInBtn"));
44+
WebUI.setText(ObjectUtils.getObject("inputEmail"), ExcelHelpers.getCellData(2, SignInModel.getEmail()));
45+
WebUI.setText(ObjectUtils.getObject("inputPassword"), DecodeUtils.decrypt(ExcelHelpers.getCellData(2, SignInModel.getPassword())));
46+
WebUI.clickElement(ObjectUtils.getObject("buttonSignIn"));
4747
WebUI.waitForPageLoaded();
48-
Assert.assertTrue(WebUI.verifyPageUrl(dashboardPageURL),"Sign in failed. Can not redirect to Dashboard page.");
48+
Assert.assertTrue(WebUI.verifyPageUrl(dashboardPageURL), "Sign in failed. Can not redirect to Dashboard page.");
4949
WebUI.waitForPageLoaded();
5050

5151
return new DashboardPage();
@@ -56,11 +56,11 @@ public DashboardPage signInWithTeamMemberRole() {
5656
WebUI.getToUrl(FrameworkConstants.BASE_URL);
5757
Assert.assertTrue(WebUI.verifyPageUrl(pageUrl), "The url of sign in page not match.");
5858
Assert.assertTrue(WebUI.verifyPageTitle(pageTitle), "The title of sign in page not match.");
59-
WebUI.setText(ObjectUtils.getObject("SigninPage.email"), ExcelHelpers.getCellData(3, SignInModel.getEmail()));
60-
WebUI.setText(ObjectUtils.getObject("SigninPage.passwordInput"), DecodeUtils.decrypt(ExcelHelpers.getCellData(3, SignInModel.getPassword())));
61-
WebUI.clickElement(ObjectUtils.getObject("SigninPage.signInBtn"));
59+
WebUI.setText(ObjectUtils.getObject("inputEmail"), ExcelHelpers.getCellData(3, SignInModel.getEmail()));
60+
WebUI.setText(ObjectUtils.getObject("inputPassword"), DecodeUtils.decrypt(ExcelHelpers.getCellData(3, SignInModel.getPassword())));
61+
WebUI.clickElement(ObjectUtils.getObject("buttonSignIn"));
6262
WebUI.waitForPageLoaded();
63-
Assert.assertTrue(WebUI.verifyPageUrl(dashboardPageURL),"Sign in failed. Can not redirect to Dashboard page.");
63+
Assert.assertTrue(WebUI.verifyPageUrl(dashboardPageURL), "Sign in failed. Can not redirect to Dashboard page.");
6464
WebUI.waitForPageLoaded();
6565

6666
return new DashboardPage();
@@ -71,9 +71,9 @@ public DashboardPage signIn(String email, String password) {
7171
Assert.assertTrue(WebUI.verifyPageUrl(pageUrl), "The url of Sign in page not match.");
7272
Assert.assertTrue(WebUI.verifyPageTitle(pageTitle), "Tiêu đề trang sign in chưa đúng");
7373
WebUI.sleep(1);
74-
WebUI.setText(ObjectUtils.getObject("SigninPage.email"), email);
75-
WebUI.setText(ObjectUtils.getObject("SigninPage.passwordInput"), password);
76-
WebUI.clickElement(ObjectUtils.getObject("SigninPage.signInBtn"));
74+
WebUI.setText(ObjectUtils.getObject("inputEmail"), email);
75+
WebUI.setText(ObjectUtils.getObject("inputPassword"), password);
76+
WebUI.clickElement(ObjectUtils.getObject("buttonSignIn"));
7777
WebUI.waitForPageLoaded();
7878

7979
return new DashboardPage();
@@ -83,11 +83,11 @@ public DashboardPage signIn(Hashtable<String, String> data) {
8383
WebUI.getToUrl(FrameworkConstants.BASE_URL);
8484
Assert.assertTrue(WebUI.verifyPageUrl(pageUrl), "The url of sign in page not match.");
8585
Assert.assertTrue(WebUI.verifyPageTitle(pageTitle), "The title of sign in page not match.");
86-
WebUI.setText(ObjectUtils.getObject("SigninPage.email"), data.get(SignInModel.getEmail()));
87-
WebUI.setText(ObjectUtils.getObject("SigninPage.passwordInput"), DecodeUtils.decrypt(data.get(SignInModel.getPassword())));
88-
WebUI.clickElement(ObjectUtils.getObject("SigninPage.signInBtn"));
86+
WebUI.setText(ObjectUtils.getObject("inputEmail"), data.get(SignInModel.getEmail()));
87+
WebUI.setText(ObjectUtils.getObject("inputPassword"), DecodeUtils.decrypt(data.get(SignInModel.getPassword())));
88+
WebUI.clickElement(ObjectUtils.getObject("buttonSignIn"));
8989
WebUI.waitForPageLoaded();
90-
Assert.assertTrue(WebUI.verifyPageUrl(dashboardPageURL),"Sign in failed. Can not redirect to Dashboard page.");
90+
Assert.assertTrue(WebUI.verifyPageUrl(dashboardPageURL), "Sign in failed. Can not redirect to Dashboard page.");
9191
WebUI.waitForPageLoaded();
9292

9393
return new DashboardPage();

‎src/test/java/anhtester/com/projects/website/crm/testcases/ClientTest.java‎

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@
2727
import java.util.Hashtable;
2828

2929
@Epic("Regression Test CRM")
30-
@Feature("ClientModel Test")
30+
@Feature("Clients Test")
3131
public class ClientTest extends BaseTest {
3232

3333
public SignInPage signInPage;
@@ -40,8 +40,7 @@ public ClientTest() {
4040

4141
@FrameworkAnnotation(author = {AuthorType.ANHTESTER, AuthorType.VOTHAIAN},
4242
category = {CategoryType.SANITY, CategoryType.REGRESSION})
43-
@Test(priority = 1, description = "Add new Client", dataProvider = "getClientDataHashTable",
44-
dataProviderClass = DataProviderManager.class)
43+
@Test(priority = 1, dataProvider = "getClientDataHashTable", dataProviderClass = DataProviderManager.class)
4544
@Step("Add new Client")
4645
public void testAddClient(Hashtable<String, String> data) {
4746
dashboardPage = signInPage.signInWithAdminRole();
@@ -52,7 +51,7 @@ public void testAddClient(Hashtable<String, String> data) {
5251

5352
@FrameworkAnnotation(author = {AuthorType.ANHTESTER, AuthorType.AUTOMATION},
5453
category = {CategoryType.SANITY, CategoryType.REGRESSION})
55-
@Test(priority = 2, description = "Search Client")
54+
@Test(priority = 2)
5655
@Step("Search Client")
5756
public void testSearchClient() {
5857
dashboardPage = signInPage.signInWithAdminRole();

‎src/test/java/anhtester/com/projects/website/crm/testcases/SignInTest.java‎

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -37,13 +37,11 @@ public void SignInTestDataProviderHashtable(Hashtable<String, String> data) {
3737
signInPage.signIn(data);
3838
}
3939

40-
@Test(priority = 2, description = "Test Invalid Page Title")
40+
@Test(priority = 2)
4141
@Step("Test Invalid Page Title")
4242
public void testInvalidPageTitle() {
4343
dashboardPage = signInPage.signInWithTeamLeaderRole();
44-
4544
Assert.assertEquals(WebUI.getPageTitle(), "AnhTester");
46-
4745
}
4846

4947
}

‎src/test/java/anhtester/com/projects/website/crm/testcases/TestHandle.java‎

Lines changed: 9 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,6 @@
1212
import anhtester.com.projects.website.crm.pages.Dashboard.DashboardPage;
1313
import anhtester.com.projects.website.crm.pages.Projects.ProjectPage;
1414
import anhtester.com.projects.website.crm.pages.SignIn.SignInPage;
15-
import anhtester.com.helpers.DatabaseHelpers;
1615
import anhtester.com.utils.LocalStorageUtils;
1716
import anhtester.com.utils.ObjectUtils;
1817
import anhtester.com.utils.WebUI;
@@ -39,32 +38,32 @@ public class TestHandle {
3938

4039
@BeforeMethod
4140
public void Setup() {
42-
driver = new BaseTest().createBrowser("chrome"); //Cách khởi tạo thứ 1
43-
// new BaseTest().createDriver("chrome"); //Cách khởi tạo thứ 2
44-
// driver = DriverManager.getDriver(); //Get WebDriver global in ThreadLocal
41+
driver = new BaseTest().createBrowser("chrome"); //Initialization method 1
42+
// new BaseTest().createDriver("chrome"); //Initialization method 2
43+
// driver = DriverManager.getDriver(); //Get WebDriver from global in ThreadLocal
4544
}
4645

4746
@Test
48-
public void testLocalStorage(){
47+
public void testLocalStorage() {
4948
WebUI.getToUrl(FrameworkConstants.BASE_URL);
5049
WebUI.sleep(1);
5150

5251
//Set key=value in Sign in page
5352
LocalStorageUtils.setItem("email", "admin02@mailinator.com");
5453
LocalStorageUtils.setItem("password", "123456");
5554

56-
WebUI.setText(ObjectUtils.getObject("SigninPage.email"), LocalStorageUtils.getItem("email"));
57-
WebUI.setText(ObjectUtils.getObject("SigninPage.passwordInput"), LocalStorageUtils.getItem("password"));
58-
WebUI.clickElement(ObjectUtils.getObject("SigninPage.signInBtn"));
55+
WebUI.setText(ObjectUtils.getObject("inputEmail"), LocalStorageUtils.getItem("email"));
56+
WebUI.setText(ObjectUtils.getObject("inputPassword"), LocalStorageUtils.getItem("password"));
57+
WebUI.clickElement(ObjectUtils.getObject("buttonSignIn"));
5958
WebUI.waitForPageLoaded();
6059

6160
//Get value in Project page
62-
WebUI.clickElement(ObjectUtils.getObject("projectMenu"));
61+
WebUI.clickElement(ObjectUtils.getObject("menuProjects"));
6362
WebUI.logConsole(LocalStorageUtils.getItem("email"));
6463
WebUI.waitForPageLoaded();
6564
WebUI.sleep(1);
6665
//Get value in ClientModel page
67-
WebUI.clickElement(ObjectUtils.getObject("clientMenu"));
66+
WebUI.clickElement(ObjectUtils.getObject("menuClients"));
6867
WebUI.logConsole(LocalStorageUtils.getItem("password"));
6968

7069
//=> You can get value by key everywhere before closing the browser

0 commit comments

Comments
 (0)