You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@archiva.apache.org by mb...@apache.org on 2010/04/14 03:02:20 UTC
svn commit: r933824 - in
/archiva/trunk/archiva-modules/archiva-web/archiva-webapp-test/src/test/testng/org/apache/archiva/web/test:
LoginTest.java UserRolesTest.java VirtualRepositoryTest.java
parent/AbstractArtifactManagementTest.java
Author: mbaclay
Date: Wed Apr 14 01:02:19 2010
New Revision: 933824
URL: http://svn.apache.org/viewvc?rev=933824&view=rev
Log:
[MRM-1276] Selenium tests need a clean up
- removed the unnecessary commented out lines
- modified LoginTest to use the methods in abstract class
Modified:
archiva/trunk/archiva-modules/archiva-web/archiva-webapp-test/src/test/testng/org/apache/archiva/web/test/LoginTest.java
archiva/trunk/archiva-modules/archiva-web/archiva-webapp-test/src/test/testng/org/apache/archiva/web/test/UserRolesTest.java
archiva/trunk/archiva-modules/archiva-web/archiva-webapp-test/src/test/testng/org/apache/archiva/web/test/VirtualRepositoryTest.java
archiva/trunk/archiva-modules/archiva-web/archiva-webapp-test/src/test/testng/org/apache/archiva/web/test/parent/AbstractArtifactManagementTest.java
Modified: archiva/trunk/archiva-modules/archiva-web/archiva-webapp-test/src/test/testng/org/apache/archiva/web/test/LoginTest.java
URL: http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-web/archiva-webapp-test/src/test/testng/org/apache/archiva/web/test/LoginTest.java?rev=933824&r1=933823&r2=933824&view=diff
==============================================================================
--- archiva/trunk/archiva-modules/archiva-web/archiva-webapp-test/src/test/testng/org/apache/archiva/web/test/LoginTest.java (original)
+++ archiva/trunk/archiva-modules/archiva-web/archiva-webapp-test/src/test/testng/org/apache/archiva/web/test/LoginTest.java Wed Apr 14 01:02:19 2010
@@ -43,8 +43,8 @@ public class LoginTest
public void testWithBadUsername()
{
goToLoginPage();
- getSelenium().type( "loginForm_username", "badUsername" );
- getSelenium().click( "loginForm__login" );
+ setFieldValue( "loginForm_username", "badUsername" );
+ clickButtonWithValue( "Login" );
getSelenium().waitForPageToLoad( maxWaitTimeInMs );
assertTextPresent( "You have entered an incorrect username and/or password" );
}
@@ -53,8 +53,8 @@ public class LoginTest
public void testWithBadPassword()
{
goToLoginPage();
- getSelenium().type( "loginForm_username", getProperty( "ADMIN_USERNAME" ) );
- getSelenium().type( "loginForm_password", "badPassword" );
+ setFieldValue( "loginForm_username", getProperty( "ADMIN_USERNAME" ) );
+ setFieldValue( "loginForm_password", "badPassword" );
getSelenium().click( "loginForm__login" );
getSelenium().waitForPageToLoad( maxWaitTimeInMs );
assertTextPresent( "You have entered an incorrect username and/or password" );
@@ -64,8 +64,8 @@ public class LoginTest
public void testWithEmptyUsername()
{
goToLoginPage();
- getSelenium().type( "loginForm_password", "password" );
- getSelenium().click( "loginForm__login" );
+ setFieldValue( "loginForm_password", "password" );
+ clickButtonWithValue( "Login" );
getSelenium().waitForPageToLoad( maxWaitTimeInMs );
assertTextPresent( "User Name is required" );
}
@@ -74,8 +74,8 @@ public class LoginTest
public void testWithEmptyPassword()
{
goToLoginPage();
- getSelenium().type( "loginForm_username", getProperty( "ADMIN_USERNAME" ) );
- getSelenium().click( "loginForm__login" );
+ setFieldValue( "loginForm_username", getProperty( "ADMIN_USERNAME" ) );
+ clickButtonWithValue( "Login" );
getSelenium().waitForPageToLoad( maxWaitTimeInMs );
assertTextPresent( "You have entered an incorrect username and/or password" );
}
@@ -84,9 +84,9 @@ public class LoginTest
public void testWithCorrectUsernamePassword()
{
goToLoginPage();
- getSelenium().type( "loginForm_username", getProperty( "ADMIN_USERNAME" ) );
- getSelenium().type( "loginForm_password", getProperty( "ADMIN_PASSWORD" ) );
- getSelenium().click( "loginForm__login" );
+ setFieldValue( "loginForm_username", getProperty( "ADMIN_USERNAME" ) );
+ setFieldValue( "loginForm_password", getProperty( "ADMIN_PASSWORD" ) );
+ clickButtonWithValue( "Login" );
getSelenium().waitForPageToLoad( maxWaitTimeInMs );
assertTextPresent( "Edit Details" );
assertTextPresent( "Logout" );
Modified: archiva/trunk/archiva-modules/archiva-web/archiva-webapp-test/src/test/testng/org/apache/archiva/web/test/UserRolesTest.java
URL: http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-web/archiva-webapp-test/src/test/testng/org/apache/archiva/web/test/UserRolesTest.java?rev=933824&r1=933823&r2=933824&view=diff
==============================================================================
--- archiva/trunk/archiva-modules/archiva-web/archiva-webapp-test/src/test/testng/org/apache/archiva/web/test/UserRolesTest.java (original)
+++ archiva/trunk/archiva-modules/archiva-web/archiva-webapp-test/src/test/testng/org/apache/archiva/web/test/UserRolesTest.java Wed Apr 14 01:02:19 2010
@@ -53,13 +53,7 @@ public class UserRolesTest
logout();
login( username, getUserRolePassword() );
changePassword( getUserRolePassword(), getUserRoleNewPassword() );
-
- // this section will be removed if issue from redback after changing password will be fixed.
- getSelenium().goBack();
- logout();
- // assertTextPresent("You are already logged in.");
-
- login( username, getUserRoleNewPassword() );
+ assertTextPresent( "Password successfully changed" );
assertLeftNavMenuWithRole( fullname );
logout();
login( getAdminUsername(), getAdminPassword() );
@@ -80,13 +74,7 @@ public class UserRolesTest
logout();
login( username, getUserRolePassword() );
changePassword( getUserRolePassword(), getUserRoleNewPassword() );
-
- // this section will be removed if issue from redback after changing password will be fixed.
- getSelenium().goBack();
- logout();
- // assertTextPresent("You are already logged in.");
-
- login( username, getUserRoleNewPassword() );
+ assertTextPresent( "Password successfully changed" );
assertLeftNavMenuWithRole( fullname );
logout();
login( getAdminUsername(), getAdminPassword() );
@@ -107,13 +95,7 @@ public class UserRolesTest
logout();
login( username, getUserRolePassword() );
changePassword( getUserRolePassword(), getUserRoleNewPassword() );
-
- // this section will be removed if issue from redback after changing password will be fixed.
- getSelenium().goBack();
- logout();
- // assertTextPresent("You are already logged in.");
-
- login( username, getUserRoleNewPassword() );
+ assertTextPresent( "Password successfully changed" );
assertLeftNavMenuWithRole( fullname );
logout();
login( getAdminUsername(), getAdminPassword() );
@@ -134,13 +116,7 @@ public class UserRolesTest
logout();
login( username, getUserRolePassword() );
changePassword( getUserRolePassword(), getUserRoleNewPassword() );
-
- // this section will be removed if issue from redback after changing password will be fixed.
- getSelenium().goBack();
- logout();
- // assertTextPresent("You are already logged in.");
-
- login( username, getUserRoleNewPassword() );
+ assertTextPresent( "Password successfully changed" );
assertLeftNavMenuWithRole( fullname );
logout();
login( getAdminUsername(), getAdminPassword() );
@@ -161,13 +137,7 @@ public class UserRolesTest
logout();
login( username, getUserRolePassword() );
changePassword( getUserRolePassword(), getUserRoleNewPassword() );
-
- // this section will be removed if issue from redback after changing password will be fixed.
- getSelenium().goBack();
- logout();
- // assertTextPresent("You are already logged in.");
-
- login( username, getUserRoleNewPassword() );
+ assertTextPresent( "Password successfully changed" );
assertLeftNavMenuWithRole( fullname );
logout();
login( getAdminUsername(), getAdminPassword() );
@@ -188,13 +158,7 @@ public class UserRolesTest
logout();
login( username, getUserRolePassword() );
changePassword( getUserRolePassword(), getUserRoleNewPassword() );
-
- // this section will be removed if issue from redback after changing password will be fixed.
- getSelenium().goBack();
- logout();
- // assertTextPresent("You are already logged in.");
-
- login( username, getUserRoleNewPassword() );
+ assertTextPresent( "Password successfully changed" );
assertLeftNavMenuWithRole( fullname );
logout();
login( getAdminUsername(), getAdminPassword() );
@@ -215,13 +179,7 @@ public class UserRolesTest
logout();
login( username, getUserRolePassword() );
changePassword( getUserRolePassword(), getUserRoleNewPassword() );
-
- // this section will be removed if issue from redback after changing password will be fixed.
- getSelenium().goBack();
- logout();
- // assertTextPresent("You are already logged in.");
-
- login( username, getUserRoleNewPassword() );
+ assertTextPresent( "Password successfully changed" );
assertLeftNavMenuWithRole( fullname );
logout();
login( getAdminUsername(), getAdminPassword() );
Modified: archiva/trunk/archiva-modules/archiva-web/archiva-webapp-test/src/test/testng/org/apache/archiva/web/test/VirtualRepositoryTest.java
URL: http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-web/archiva-webapp-test/src/test/testng/org/apache/archiva/web/test/VirtualRepositoryTest.java?rev=933824&r1=933823&r2=933824&view=diff
==============================================================================
--- archiva/trunk/archiva-modules/archiva-web/archiva-webapp-test/src/test/testng/org/apache/archiva/web/test/VirtualRepositoryTest.java (original)
+++ archiva/trunk/archiva-modules/archiva-web/archiva-webapp-test/src/test/testng/org/apache/archiva/web/test/VirtualRepositoryTest.java Wed Apr 14 01:02:19 2010
@@ -37,7 +37,6 @@ public class VirtualRepositoryTest
public void testAddRepositoryGroupValidValue()
{
addRepositoryGroup( "testing" );
- // assertAddedRepositoryLink( "testing" );
Assert.assertEquals( getSelenium().getText( "//div[@id='contentArea']/div[2]/div/div[1]/p[1]" ), "testing" );
}
@@ -47,8 +46,6 @@ public class VirtualRepositoryTest
addRepositoryToRepositoryGroup( "testing", "internal" );
Assert.assertEquals( getSelenium().getText( "//div[@id='contentArea']/div[2]/div/div[3]/div[2]/p[1]" ),
"internal" );
- // clickLinkWithXPath( "/html/body/div[4]/div/div/div[2]/div/div/p[2]/a" );
- // getSelenium().goBack();
}
@Test( dependsOnMethods = { "testAddRepositoryToRepositoryGroup" } )
@@ -68,8 +65,4 @@ public class VirtualRepositoryTest
assertTextPresent( "No Repository Groups Defined." );
}
- /*
- * @Test(dependsOnMethods = { "testAddRepositoryToRepositoryGroup" } ) public void testCheckRepositoryGroup() {
- * clickLinkWithXPath( "/html/body/div[4]/div/div/div[2]/div/div/p[2]/a" ); getSelenium().goBack(); }
- */
}
\ No newline at end of file
Modified: archiva/trunk/archiva-modules/archiva-web/archiva-webapp-test/src/test/testng/org/apache/archiva/web/test/parent/AbstractArtifactManagementTest.java
URL: http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-web/archiva-webapp-test/src/test/testng/org/apache/archiva/web/test/parent/AbstractArtifactManagementTest.java?rev=933824&r1=933823&r2=933824&view=diff
==============================================================================
--- archiva/trunk/archiva-modules/archiva-web/archiva-webapp-test/src/test/testng/org/apache/archiva/web/test/parent/AbstractArtifactManagementTest.java (original)
+++ archiva/trunk/archiva-modules/archiva-web/archiva-webapp-test/src/test/testng/org/apache/archiva/web/test/parent/AbstractArtifactManagementTest.java Wed Apr 14 01:02:19 2010
@@ -130,4 +130,4 @@ public abstract class AbstractArtifactMa
assertElementPresent( arrayelement );
assertButtonWithValuePresent( "Add Legacy Artifact Path" );
}
-}
+}
\ No newline at end of file