continuum-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From br...@apache.org
Subject svn commit: r1542938 - /continuum/branches/CONTINUUM-2713/continuum-webapp-test/src/test/testng/org/apache/continuum/web/test/MavenTwoProjectTest.java
Date Mon, 18 Nov 2013 07:41:45 GMT
Author: brett
Date: Mon Nov 18 07:41:44 2013
New Revision: 1542938

URL: http://svn.apache.org/r1542938
Log:
[CONTINUUM-2713] allow test to be re-run

Modified:
    continuum/branches/CONTINUUM-2713/continuum-webapp-test/src/test/testng/org/apache/continuum/web/test/MavenTwoProjectTest.java

Modified: continuum/branches/CONTINUUM-2713/continuum-webapp-test/src/test/testng/org/apache/continuum/web/test/MavenTwoProjectTest.java
URL: http://svn.apache.org/viewvc/continuum/branches/CONTINUUM-2713/continuum-webapp-test/src/test/testng/org/apache/continuum/web/test/MavenTwoProjectTest.java?rev=1542938&r1=1542937&r2=1542938&view=diff
==============================================================================
--- continuum/branches/CONTINUUM-2713/continuum-webapp-test/src/test/testng/org/apache/continuum/web/test/MavenTwoProjectTest.java
(original)
+++ continuum/branches/CONTINUUM-2713/continuum-webapp-test/src/test/testng/org/apache/continuum/web/test/MavenTwoProjectTest.java
Mon Nov 18 07:41:44 2013
@@ -135,15 +135,19 @@ public class MavenTwoProjectTest
         String targetGroupDescription = getProperty( "MAVEN2_MOVE_PROJECT_TARGET_PROJECT_GROUP_DESCRIPTION"
);
         addProjectGroup( targetGroupName, targetGroupId, targetGroupDescription, true );
 
-        // Move the project
-        moveProjectToProjectGroup( projectGroupName, projectGroupId, projectGroupDescription,
projectName,
-                                   targetGroupName );
-        showProjectGroup( targetGroupName, targetGroupId, targetGroupDescription );
-        assertTextPresent( "Member Projects" );
-        assertTextPresent( projectName );
-
-        showProjectGroup( projectGroupName, projectGroupId, projectGroupDescription );
-        assertTextNotPresent( "Member Projects" );
+        try {
+            // Move the project
+            moveProjectToProjectGroup( projectGroupName, projectGroupId, projectGroupDescription,
projectName,
+                                       targetGroupName );
+            showProjectGroup( targetGroupName, targetGroupId, targetGroupDescription );
+            assertTextPresent( "Member Projects" );
+            assertTextPresent( projectName );
+
+            showProjectGroup( projectGroupName, projectGroupId, projectGroupDescription );
+            assertTextNotPresent( "Member Projects" );
+        } finally {
+            removeProjectGroup( targetGroupName, false );
+        }
     }
 
     /**



Mime
View raw message