continuum-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From br...@apache.org
Subject svn commit: r899285 - in /continuum/branches/continuum-1.3.x/continuum-webapp-test/src/test/testng/org/apache/continuum/web/test: QueueTest.java parent/AbstractBuildQueueTest.java parent/AbstractSeleniumTest.java
Date Thu, 14 Jan 2010 16:44:03 GMT
Author: brett
Date: Thu Jan 14 16:44:03 2010
New Revision: 899285

URL: http://svn.apache.org/viewvc?rev=899285&view=rev
Log:
make the queue test more robust

Modified:
    continuum/branches/continuum-1.3.x/continuum-webapp-test/src/test/testng/org/apache/continuum/web/test/QueueTest.java
    continuum/branches/continuum-1.3.x/continuum-webapp-test/src/test/testng/org/apache/continuum/web/test/parent/AbstractBuildQueueTest.java
    continuum/branches/continuum-1.3.x/continuum-webapp-test/src/test/testng/org/apache/continuum/web/test/parent/AbstractSeleniumTest.java

Modified: continuum/branches/continuum-1.3.x/continuum-webapp-test/src/test/testng/org/apache/continuum/web/test/QueueTest.java
URL: http://svn.apache.org/viewvc/continuum/branches/continuum-1.3.x/continuum-webapp-test/src/test/testng/org/apache/continuum/web/test/QueueTest.java?rev=899285&r1=899284&r2=899285&view=diff
==============================================================================
--- continuum/branches/continuum-1.3.x/continuum-webapp-test/src/test/testng/org/apache/continuum/web/test/QueueTest.java
(original)
+++ continuum/branches/continuum-1.3.x/continuum-webapp-test/src/test/testng/org/apache/continuum/web/test/QueueTest.java
Thu Jan 14 16:44:03 2010
@@ -131,6 +131,7 @@
         String M2_PROJ_GRP_ID = getProperty( "M2_PROJ_GRP_ID" );
         String M2_PROJ_GRP_DESCRIPTION = getProperty( "M2_PROJ_GRP_DESCRIPTION" );
         buildProjectForQueuePageTest( M2_PROJ_GRP_NAME, M2_PROJ_GRP_ID, M2_PROJ_GRP_DESCRIPTION,
M2_PROJ_GRP_NAME );
+        String location = getSelenium().getLocation();
 
         //check queue page while building
     	clickAndWait( "link=Queues" );
@@ -143,11 +144,9 @@
 	    assertTextPresent( "Prepare Build Queue" );
 	    assertElementPresent("//table[@id='ec_table']/tbody/tr/td[4]");
 	    assertTextPresent( M2_PROJ_GRP_NAME );
-	    getSelenium().goBack();
-	    getSelenium().refresh();
+	    getSelenium().open( location );
         waitPage();
 	    waitForElementPresent( "//img[@alt='Success']" );
-	    Thread.sleep( 10000 );
     }
 
  }

Modified: continuum/branches/continuum-1.3.x/continuum-webapp-test/src/test/testng/org/apache/continuum/web/test/parent/AbstractBuildQueueTest.java
URL: http://svn.apache.org/viewvc/continuum/branches/continuum-1.3.x/continuum-webapp-test/src/test/testng/org/apache/continuum/web/test/parent/AbstractBuildQueueTest.java?rev=899285&r1=899284&r2=899285&view=diff
==============================================================================
--- continuum/branches/continuum-1.3.x/continuum-webapp-test/src/test/testng/org/apache/continuum/web/test/parent/AbstractBuildQueueTest.java
(original)
+++ continuum/branches/continuum-1.3.x/continuum-webapp-test/src/test/testng/org/apache/continuum/web/test/parent/AbstractBuildQueueTest.java
Thu Jan 14 16:44:03 2010
@@ -91,8 +91,6 @@
         showProjectGroup( projectGroupName, groupId, description );
         clickButtonWithValue( "Build all projects" );
         waitForElementPresent( "//img[@alt='Building']" );
-        Thread.sleep( 10000 );
-               	
      }
 	    
 	    

Modified: continuum/branches/continuum-1.3.x/continuum-webapp-test/src/test/testng/org/apache/continuum/web/test/parent/AbstractSeleniumTest.java
URL: http://svn.apache.org/viewvc/continuum/branches/continuum-1.3.x/continuum-webapp-test/src/test/testng/org/apache/continuum/web/test/parent/AbstractSeleniumTest.java?rev=899285&r1=899284&r2=899285&view=diff
==============================================================================
--- continuum/branches/continuum-1.3.x/continuum-webapp-test/src/test/testng/org/apache/continuum/web/test/parent/AbstractSeleniumTest.java
(original)
+++ continuum/branches/continuum-1.3.x/continuum-webapp-test/src/test/testng/org/apache/continuum/web/test/parent/AbstractSeleniumTest.java
Thu Jan 14 16:44:03 2010
@@ -408,7 +408,6 @@
     public void waitForElementPresent( String locator )
         throws InterruptedException
     {
-        getSelenium().waitForPageToLoad( maxWaitTimeInMs );
         for ( int second = 0;; second++ )
         {
             if ( second >= 60 )
@@ -422,6 +421,7 @@
             {
             }
             Thread.sleep( 1000 );
+            getSelenium().refresh();
         }
     }
 



Mime
View raw message