svn commit: r899055 - in /archiva/trunk/archiva-modules/archiva-web/archiva-webapp-test/src/test/testng/org/apache/archiva/web/test/parent: AbstractSearchTest.java AbstractSeleniumTest.java

[brett]

Author: brett
Date: Thu Jan 14 04:27:07 2010
New Revision: 899055

URL: http://svn.apache.org/viewvc?rev=899055&view=rev
Log:
fix the search test

Modified:
    
archiva/trunk/archiva-modules/archiva-web/archiva-webapp-test/src/test/testng/org/apache/archiva/web/test/parent/AbstractSearchTest.java
    
archiva/trunk/archiva-modules/archiva-web/archiva-webapp-test/src/test/testng/org/apache/archiva/web/test/parent/AbstractSeleniumTest.java

Modified: 
archiva/trunk/archiva-modules/archiva-web/archiva-webapp-test/src/test/testng/org/apache/archiva/web/test/parent/AbstractSearchTest.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/AbstractSearchTest.java?rev=899055&r1=899054&r2=899055&view=diff
==============================================================================
--- 
archiva/trunk/archiva-modules/archiva-web/archiva-webapp-test/src/test/testng/org/apache/archiva/web/test/parent/AbstractSearchTest.java
 (original)
+++ 
archiva/trunk/archiva-modules/archiva-web/archiva-webapp-test/src/test/testng/org/apache/archiva/web/test/parent/AbstractSearchTest.java
 Thu Jan 14 04:27:07 2010
@@ -25,7 +25,7 @@
        //Search
        public void goToSearchPage()
        {
-        if ( !"Apache Archiva \\ Quick Search".equals( 
getSelenium().getTitle() ) )
+        if ( !"Apache Archiva \\ Quick Search".equals( getTitle() ) )
         {
             clickLinkWithText( "Search" );
             getSelenium().waitForPageToLoad( maxWaitTimeInMs );
@@ -109,4 +109,4 @@
 
         clickSubmitWithLocator( "filteredSearch_0" );
     }
-}
\ 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/AbstractSeleniumTest.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/AbstractSeleniumTest.java?rev=899055&r1=899054&r2=899055&view=diff
==============================================================================
--- 
archiva/trunk/archiva-modules/archiva-web/archiva-webapp-test/src/test/testng/org/apache/archiva/web/test/parent/AbstractSeleniumTest.java
 (original)
+++ 
archiva/trunk/archiva-modules/archiva-web/archiva-webapp-test/src/test/testng/org/apache/archiva/web/test/parent/AbstractSeleniumTest.java
 Thu Jan 14 04:27:07 2010
@@ -140,14 +140,13 @@
        
     public void assertPage( String title )
     {
-        // Collapse spaces
-        String actualTitle = getSelenium().getTitle().replaceAll( "[ \n\r]+", 
" " );
-        Assert.assertEquals( actualTitle, title );
+        Assert.assertEquals( getTitle(), title );
     }
        
        public String getTitle()
        {
-           return getSelenium().getTitle();
+            // Collapse spaces
+            return getSelenium().getTitle().replaceAll( "[ \n\r]+", " " );
        }
        
        public String getHtmlContent()