svn commit: r490628 - in /maven/shared/trunk/maven-web-ui-tests/src/main/java/org/apache/maven/shared/web/test: AbstractSeleniumTestCase.java XPathExpressionUtil.java

[brett]

Author: brett
Date: Wed Dec 27 18:18:58 2006
New Revision: 490628

URL: http://svn.apache.org/viewvc?view=rev&rev=490628
Log:
fix all continuum web tests

Modified:
    
maven/shared/trunk/maven-web-ui-tests/src/main/java/org/apache/maven/shared/web/test/AbstractSeleniumTestCase.java
    
maven/shared/trunk/maven-web-ui-tests/src/main/java/org/apache/maven/shared/web/test/XPathExpressionUtil.java

Modified: 
maven/shared/trunk/maven-web-ui-tests/src/main/java/org/apache/maven/shared/web/test/AbstractSeleniumTestCase.java
URL: 
http://svn.apache.org/viewvc/maven/shared/trunk/maven-web-ui-tests/src/main/java/org/apache/maven/shared/web/test/AbstractSeleniumTestCase.java?view=diff&rev=490628&r1=490627&r2=490628
==============================================================================
--- 
maven/shared/trunk/maven-web-ui-tests/src/main/java/org/apache/maven/shared/web/test/AbstractSeleniumTestCase.java
 (original)
+++ 
maven/shared/trunk/maven-web-ui-tests/src/main/java/org/apache/maven/shared/web/test/AbstractSeleniumTestCase.java
 Wed Dec 27 18:18:58 2006
@@ -67,6 +67,7 @@
     }
 
     public void tearDown()
+        throws Exception
     {
         sel.stop();
     }
@@ -380,9 +381,12 @@
 
     public void login( String username, String password, boolean valid, String 
assertReturnPage )
     {
-        goToLoginPage();
+        if ( isLinkPresent( "Login" ) )
+        {
+            goToLoginPage();
 
-        submitLoginPage( username, password, false, valid, assertReturnPage );
+            submitLoginPage( username, password, false, valid, 
assertReturnPage );
+        }
     }
 
     public void assertLoginPage()

Modified: 
maven/shared/trunk/maven-web-ui-tests/src/main/java/org/apache/maven/shared/web/test/XPathExpressionUtil.java
URL: 
http://svn.apache.org/viewvc/maven/shared/trunk/maven-web-ui-tests/src/main/java/org/apache/maven/shared/web/test/XPathExpressionUtil.java?view=diff&rev=490628&r1=490627&r2=490628
==============================================================================
--- 
maven/shared/trunk/maven-web-ui-tests/src/main/java/org/apache/maven/shared/web/test/XPathExpressionUtil.java
 (original)
+++ 
maven/shared/trunk/maven-web-ui-tests/src/main/java/org/apache/maven/shared/web/test/XPathExpressionUtil.java
 Wed Dec 27 18:18:58 2006
@@ -229,4 +229,17 @@
     {
         return new String( CONTAINS + "(" + axis + "," + "'" + matchedString + 
"')" );
     }
+
+    private static String equals( String parent, String element, String 
matchedString )
+    {
+        String finalElement = ( parent != null ) ? parent : "";
+        finalElement += element;
+
+        return equals( finalElement, matchedString );
+    }
+
+    private static String equals( String axis, String matchedString )
+    {
+        return new String( axis + "==" + "'" + matchedString + "'" );
+    }
 }