svn commit: r1137817 - in /archiva/trunk/archiva-modules/archiva-web/archiva-webapp-test/src/test/testng/org/apache/archiva/web/test: LoginTest.java parent/AbstractArchivaTest.java

[olamy]

Author: olamy
Date: Mon Jun 20 23:03:37 2011
New Revision: 1137817

URL: http://svn.apache.org/viewvc?rev=1137817&view=rev
Log:
satrt fixing some selenium to not be locale dependant only use id

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/parent/AbstractArchivaTest.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=1137817&r1=1137816&r2=1137817&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
 Mon Jun 20 23:03:37 2011
@@ -40,6 +40,7 @@ import org.testng.annotations.Test;
 public class LoginTest
     extends AbstractArchivaTest
 {
+    @Test
     public void testWithBadUsername()
     {
         goToLoginPage();
@@ -55,9 +56,12 @@ public class LoginTest
         goToLoginPage();
         setFieldValue( "loginForm_username", getProperty( "ADMIN_USERNAME" ) );
         setFieldValue( "loginForm_password", "badPassword" );
-        getSelenium().click( "loginForm__login" );
+        getSelenium().click( "loginSubmit" );
         getSelenium().waitForPageToLoad( maxWaitTimeInMs );
-        assertTextPresent( "You have entered an incorrect username and/or 
password" );
+        //assertTextPresent( "You have entered an incorrect username and/or 
password" );
+        // <ul class="errorMessage">
+
+        assertElementPresent( "//ul[@class=\'errorMessage\']" );
     }
 
     @Test( dependsOnMethods = { "testWithBadPassword" }, alwaysRun = true )

Modified: 
archiva/trunk/archiva-modules/archiva-web/archiva-webapp-test/src/test/testng/org/apache/archiva/web/test/parent/AbstractArchivaTest.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/AbstractArchivaTest.java?rev=1137817&r1=1137816&r2=1137817&view=diff
==============================================================================
--- 
archiva/trunk/archiva-modules/archiva-web/archiva-webapp-test/src/test/testng/org/apache/archiva/web/test/parent/AbstractArchivaTest.java
 (original)
+++ 
archiva/trunk/archiva-modules/archiva-web/archiva-webapp-test/src/test/testng/org/apache/archiva/web/test/parent/AbstractArchivaTest.java
 Mon Jun 20 23:03:37 2011
@@ -131,19 +131,25 @@ public abstract class AbstractArchivaTes
 
     public void assertLoginPage()
     {
-        assertPage( "Apache Archiva \\ Login Page" );
-        assertTextPresent( "Login" );
-        assertTextPresent( "Register" );
-        assertTextPresent( "Username" );
+        //assertPage( "Apache Archiva \\ Login Page" );
+        //assertTextPresent( "Login" );
+        assertElementPresent( "loginForm" );
+        //assertTextPresent( "Register" );
+        assertElementPresent( "registerLink" );
+        //assertTextPresent( "Username" );
         assertElementPresent( "username" );
-        assertTextPresent( "Password" );
+        //assertTextPresent( "Password" );
         assertElementPresent( "password" );
-        assertTextPresent( "Remember Me" );
+        //assertTextPresent( "Remember Me" );
         assertElementPresent( "rememberMe" );
-        assertButtonWithValuePresent( "Login" );
-        assertButtonWithValuePresent( "Cancel" );
-        assertTextPresent( "Need an Account? Register!" );
-        assertTextPresent( "Forgot your Password? Request a password reset." );
+        //assertButtonWithValuePresent( "Login" );
+        assertButtonWithIdPresent( "loginSubmit" );
+        //assertButtonWithValuePresent( "Cancel" );
+        assertButtonWithIdPresent( "loginCancel" );
+        //assertTextPresent( "Need an Account? Register!" );
+        //assertTextPresent( "Forgot your Password? Request a password reset." 
);
+        assertElementPresent( "registerLinkLoginPage" );
+        assertElementPresent( "forgottenPasswordLink" );
     }
 
     // User Management