Refactor as per suggested by professional code auditor

zanata · Jul 15, 2013 · 82b30b2 · 82b30b2
1 parent a7cc1e3
commit 82b30b2
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 9 deletions.
diff --git a/functional-test/src/main/java/org/zanata/page/administration/ManageUserAccountPage.java b/functional-test/src/main/java/org/zanata/page/administration/ManageUserAccountPage.java
@@ -66,22 +66,25 @@ public ManageUserAccountPage(WebDriver driver)
       roleMap.put("user", "4");
    }
 
-   public void clearAndEnterUsername(String username)
+   public ManageUserAccountPage clearAndEnterUsername(String username)
    {
       usernameField.clear();
       usernameField.sendKeys(username);
+      return new ManageUserAccountPage(getDriver());
    }
 
-   public void clearAndEnterPassword(String password)
+   public ManageUserAccountPage clearAndEnterPassword(String password)
    {
       passwordField.clear();
       passwordField.sendKeys(password);
+      return new ManageUserAccountPage(getDriver());
    }
 
-   public void clearAndEnterConfirmPassword(String confirmPassword)
+   public ManageUserAccountPage clearAndEnterConfirmPassword(String confirmPassword)
    {
       passwordConfirmField.clear();
       passwordConfirmField.sendKeys(confirmPassword);
+      return new ManageUserAccountPage(getDriver());
    }
 
    public void clickEnabled()

diff --git a/functional-test/src/test/java/org/zanata/feature/administration/ManageUsersDetailedTest.java b/functional-test/src/test/java/org/zanata/feature/administration/ManageUsersDetailedTest.java
@@ -49,9 +49,9 @@ public void changeAUsersUsername()
    {
       String username = "administratornamechange";
       ManageUserPage manageUserPage = homePage.goToAdministration().goToManageUserPage();
+
       ManageUserAccountPage manageUserAccountPage = manageUserPage.editUserAccount("admin");
-      manageUserAccountPage.clearAndEnterUsername(username);
-      manageUserAccountPage.saveUser();
+      manageUserPage = manageUserAccountPage.clearAndEnterUsername(username).saveUser();
       assertThat("Administrator is displayed", manageUserPage.getUserList(), Matchers.hasItem(username));
    }
 

diff --git a/functional-test/src/test/java/org/zanata/feature/administration/ManageUsersTest.java b/functional-test/src/test/java/org/zanata/feature/administration/ManageUsersTest.java
@@ -63,10 +63,10 @@ public ManageUserAccountPage editUserAccount(ManageUserPage manageUserPage, Stri
 
    public ManageUserPage changeUsernameAndPassword(ManageUserAccountPage manageUserAccount, String newUsername, String newPassword)
    {
-      manageUserAccount.clearAndEnterUsername(newUsername);
-      manageUserAccount.clearAndEnterPassword(newPassword);
-      manageUserAccount.clearAndEnterConfirmPassword(newPassword);
-      ManageUserPage page = manageUserAccount.saveUser();
+      ManageUserPage page = manageUserAccount.clearAndEnterUsername(newUsername)
+      .clearAndEnterPassword(newPassword)
+      .clearAndEnterConfirmPassword(newPassword)
+      .saveUser();
 
       return page;
    }