satrt fixing some selenium to not be locale dependant only use id

git-svn-id: https://svn.apache.org/repos/asf/archiva/trunk@1137817 13f79535-47bb-0310-9956-ffa450edef68

2 files changed, 22 insertions, 12 deletions

diff --git a/archiva-modules/archiva-web/archiva-webapp-test/src/test/testng/org/apache/archiva/web/test/LoginTest.java b/archiva-modules/archiva-web/archiva-webapp-test/src/test/testng/org/apache/archiva/web/test/LoginTest.java
index 86cd81a7d..54f501973 100644
--- a/archiva-modules/archiva-web/archiva-webapp-test/src/test/testng/org/apache/archiva/web/test/LoginTest.java
+++ b/archiva-modules/archiva-web/archiva-webapp-test/src/test/testng/org/apache/archiva/web/test/LoginTest.java
@@ -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 )
diff --git a/archiva-modules/archiva-web/archiva-webapp-test/src/test/testng/org/apache/archiva/web/test/parent/AbstractArchivaTest.java b/archiva-modules/archiva-web/archiva-webapp-test/src/test/testng/org/apache/archiva/web/test/parent/AbstractArchivaTest.java
index 95c499717..8cef498e9 100644
--- a/archiva-modules/archiva-web/archiva-webapp-test/src/test/testng/org/apache/archiva/web/test/parent/AbstractArchivaTest.java
+++ b/archiva-modules/archiva-web/archiva-webapp-test/src/test/testng/org/apache/archiva/web/test/parent/AbstractArchivaTest.java
@@ -131,19 +131,25 @@ public abstract class AbstractArchivaTest
 
     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