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

[olamy]

Author: olamy
Date: Mon Sep 19 12:40:46 2011
New Revision: 1172592

URL: http://svn.apache.org/viewvc?rev=1172592&view=rev
Log:
add a hack for selenium issue http://jira.openqa.org/browse/SRC-302

Modified:
    
archiva/trunk/archiva-modules/archiva-web/archiva-webapp-test/src/test/testng/org/apache/archiva/web/test/parent/AbstractArchivaTest.java
    
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/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=1172592&r1=1172591&r2=1172592&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 Sep 19 12:40:46 2011
@@ -587,7 +587,7 @@ public abstract class AbstractArchivaTes
     }
 
     public void addManagedRepository( String identifier, String name, String 
directory, String indexDirectory,
-                                      String type, String cron, String 
daysOlder, String retentionCount )
+                                      String type, String cron, String 
daysOlder, String retentionCount, boolean wait)
     {
         // goToRepositoriesPage();
         // clickLinkWithText( "Add" );
@@ -600,7 +600,7 @@ public abstract class AbstractArchivaTes
         setFieldValue( "repository.daysOlder", daysOlder );
         setFieldValue( "repository.retentionCount", retentionCount );
         // TODO
-        clickButtonWithValue( "Add Repository" );
+        clickButtonWithValue( "Add Repository", wait );
     }
 
     // artifact management

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=1172592&r1=1172591&r2=1172592&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
 Mon Sep 19 12:40:46 2011
@@ -29,7 +29,8 @@ public abstract class AbstractSearchTest
         if (!isElementPresent( "quickSearchBox" ) )
         {
             getSelenium().open( "/index.action");
-            getSelenium().waitForPageToLoad( maxWaitTimeInMs );
+            //getSelenium().waitForPageToLoad( maxWaitTimeInMs );
+            waitPage();
             assertElementPresent( "quickSearchSubmit" );
         }
     }

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=1172592&r1=1172591&r2=1172592&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
 Mon Sep 19 12:40:46 2011
@@ -237,7 +237,18 @@ public abstract class AbstractSeleniumTe
     public void waitPage()
     {
         // TODO define a smaller maxWaitTimeJsInMs for wait javascript 
response for browser side validation
-        getSelenium().waitForPageToLoad( maxWaitTimeInMs );
+        //getSelenium().waitForPageToLoad( maxWaitTimeInMs );
+        // http://jira.openqa.org/browse/SRC-302
+        getSelenium().waitForCondition( 
"selenium.isElementPresent('document.body');", maxWaitTimeInMs );
+        /*
+        try
+        {
+            Thread.sleep( 1000 );
+        }
+        catch ( InterruptedException e )
+        {
+            throw new RuntimeException( "issue on Thread.sleep : " + 
e.getMessage(), e );
+        }*/
     }
 
     public String getFieldValue( String fieldName )