You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@continuum.apache.org by br...@apache.org on 2012/10/02 06:13:02 UTC

svn commit: r1392730 - in /continuum/trunk/continuum-webapp-test/src/test/testng/org/apache/continuum/web/test: DistributedReleaseTest.java ReleaseTest.java

Author: brett
Date: Tue Oct  2 04:13:01 2012
New Revision: 1392730

URL: http://svn.apache.org/viewvc?rev=1392730&view=rev
Log:
[CONTINUUM-2687] verify that the release is removed after performed

Modified:
    continuum/trunk/continuum-webapp-test/src/test/testng/org/apache/continuum/web/test/DistributedReleaseTest.java
    continuum/trunk/continuum-webapp-test/src/test/testng/org/apache/continuum/web/test/ReleaseTest.java

Modified: continuum/trunk/continuum-webapp-test/src/test/testng/org/apache/continuum/web/test/DistributedReleaseTest.java
URL: http://svn.apache.org/viewvc/continuum/trunk/continuum-webapp-test/src/test/testng/org/apache/continuum/web/test/DistributedReleaseTest.java?rev=1392730&r1=1392729&r2=1392730&view=diff
==============================================================================
--- continuum/trunk/continuum-webapp-test/src/test/testng/org/apache/continuum/web/test/DistributedReleaseTest.java (original)
+++ continuum/trunk/continuum-webapp-test/src/test/testng/org/apache/continuum/web/test/DistributedReleaseTest.java Tue Oct  2 04:13:01 2012
@@ -165,7 +165,7 @@ public class DistributedReleaseTest
         // check that 1.2 is selected by default
         Assert.assertEquals( getSelenium().getSelectedLabel( "preparedReleaseId" ), "1.2" );
 
-        // test perform on 1.1
+        // test perform on 1.2
         selectPerformAndSubmit();
 
         setFieldValue( "goals", "clean validate" );
@@ -174,6 +174,15 @@ public class DistributedReleaseTest
         waitForRelease();
 
         assertReleasePhaseSuccess();
+        clickButtonWithValue( "Done" );
+
+        // verify that it is removed from the list again
+        showProjectGroup( projectGroupName, projectGroupId, "" );
+        clickButtonWithValue( RELEASE_BUTTON_TEXT );
+        assertReleaseChoicePage();
+        Assert.assertEquals( Arrays.asList( getSelenium().getSelectOptions( "preparedReleaseId" ) ), Arrays.asList(
+            "1.1", PROVIDE_RELEASE_PARAMETERS_TEXT ) );
+        Assert.assertEquals( getSelenium().getSelectedLabel( "preparedReleaseId" ), "1.1" );
     }
 
     public void testReleasePrepareWhenAgentGoesDown()

Modified: continuum/trunk/continuum-webapp-test/src/test/testng/org/apache/continuum/web/test/ReleaseTest.java
URL: http://svn.apache.org/viewvc/continuum/trunk/continuum-webapp-test/src/test/testng/org/apache/continuum/web/test/ReleaseTest.java?rev=1392730&r1=1392729&r2=1392730&view=diff
==============================================================================
--- continuum/trunk/continuum-webapp-test/src/test/testng/org/apache/continuum/web/test/ReleaseTest.java (original)
+++ continuum/trunk/continuum-webapp-test/src/test/testng/org/apache/continuum/web/test/ReleaseTest.java Tue Oct  2 04:13:01 2012
@@ -154,10 +154,10 @@ public class ReleaseTest
         Assert.assertEquals( Arrays.asList( getSelenium().getSelectOptions( "preparedReleaseId" ) ), Arrays.asList(
             "10.0", "10.1", "10.2", PROVIDE_RELEASE_PARAMETERS_TEXT ) );
 
-        // check that 1.2 is selected by default
+        // check that 10.2 is selected by default
         Assert.assertEquals( getSelenium().getSelectedLabel( "preparedReleaseId" ), "10.2" );
 
-        // test perform on 1.1
+        // test perform on 10.2
         selectPerformAndSubmit();
 
         setFieldValue( "goals", "clean validate" );
@@ -166,6 +166,15 @@ public class ReleaseTest
         waitForRelease();
 
         assertReleasePhaseSuccess();
+        clickButtonWithValue( "Done" );
+
+        // verify that it is removed from the list again
+        showProjectGroup( projectGroupName, projectGroupId, "" );
+        clickButtonWithValue( RELEASE_BUTTON_TEXT );
+        assertReleaseChoicePage();
+        Assert.assertEquals( Arrays.asList( getSelenium().getSelectOptions( "preparedReleaseId" ) ), Arrays.asList(
+            "10.0", "10.1", PROVIDE_RELEASE_PARAMETERS_TEXT ) );
+        Assert.assertEquals( getSelenium().getSelectedLabel( "preparedReleaseId" ), "10.1" );
     }
 
 }