svn commit: r642434 - in /maven/core-integration-testing/trunk/core-integration-tests/src/test/java/org/apache/maven/integrationtests: IntegrationTestSuite.java MavenITmng3221InfiniteForking.java

[jdcasey]

Author: jdcasey
Date: Fri Mar 28 16:38:08 2008
New Revision: 642434

URL: http://svn.apache.org/viewvc?rev=642434&view=rev
Log:
Enable the ITs for mng-2339 and some minor fixes to tests for mng-3221.

Modified:
    
maven/core-integration-testing/trunk/core-integration-tests/src/test/java/org/apache/maven/integrationtests/IntegrationTestSuite.java
    
maven/core-integration-testing/trunk/core-integration-tests/src/test/java/org/apache/maven/integrationtests/MavenITmng3221InfiniteForking.java

Modified: 
maven/core-integration-testing/trunk/core-integration-tests/src/test/java/org/apache/maven/integrationtests/IntegrationTestSuite.java
URL: 
http://svn.apache.org/viewvc/maven/core-integration-testing/trunk/core-integration-tests/src/test/java/org/apache/maven/integrationtests/IntegrationTestSuite.java?rev=642434&r1=642433&r2=642434&view=diff
==============================================================================
--- 
maven/core-integration-testing/trunk/core-integration-tests/src/test/java/org/apache/maven/integrationtests/IntegrationTestSuite.java
 (original)
+++ 
maven/core-integration-testing/trunk/core-integration-tests/src/test/java/org/apache/maven/integrationtests/IntegrationTestSuite.java
 Fri Mar 28 16:38:08 2008
@@ -85,6 +85,7 @@
         suite.addTestSuite( MavenITmng2972OverridePluginDependency.class );
         suite.addTestSuite( MavenITmng2861RelocationsAndRanges.class );
         suite.addTestSuite( MavenITmng2744checksumVerificationTest.class );
+        suite.addTestSuite( MavenITmng2339BadProjectInterpolationTest.class );
         suite.addTestSuite( 
MavenITmng2277AggregatorAndResolutionPluginsTest.class );
         suite.addTestSuite( MavenITmng2254PomEncodingTest.class );
         suite.addTestSuite( MavenITmng2234ActiveProfilesFromSettingsTest.class 
);

Modified: 
maven/core-integration-testing/trunk/core-integration-tests/src/test/java/org/apache/maven/integrationtests/MavenITmng3221InfiniteForking.java
URL: 
http://svn.apache.org/viewvc/maven/core-integration-testing/trunk/core-integration-tests/src/test/java/org/apache/maven/integrationtests/MavenITmng3221InfiniteForking.java?rev=642434&r1=642433&r2=642434&view=diff
==============================================================================
--- 
maven/core-integration-testing/trunk/core-integration-tests/src/test/java/org/apache/maven/integrationtests/MavenITmng3221InfiniteForking.java
 (original)
+++ 
maven/core-integration-testing/trunk/core-integration-tests/src/test/java/org/apache/maven/integrationtests/MavenITmng3221InfiniteForking.java
 Fri Mar 28 16:38:08 2008
@@ -23,18 +23,35 @@
         File reportDir = new File( testDir, "report" );
         File projectDir = new File( testDir, "user" );
 
-        Verifier verifier;
+        Verifier verifier = null;
 
-        verifier = new Verifier( reportDir.getAbsolutePath() );
-        verifier.executeGoal( "install" );
-        verifier.verifyErrorFreeLog();
-        verifier.resetStreams();
-
-        verifier = new Verifier( projectDir.getAbsolutePath() );
-        verifier.executeGoal( "site" );
-        verifier.verifyErrorFreeLog();
-        verifier.resetStreams();
-    }
+        try
+        {
+            verifier = new Verifier( reportDir.getAbsolutePath() );
+
+            verifier.deleteArtifact( "tests", "maven-forking-report-plugin", 
"1", "jar" );
+
+            verifier.executeGoal( "install" );
+            verifier.verifyErrorFreeLog();
+            verifier.resetStreams();
+
+            verifier = new Verifier( projectDir.getAbsolutePath() );
+            verifier.executeGoal( "site" );
+            verifier.verifyErrorFreeLog();
+        }
+        finally
+        {
+            if ( verifier != null )
+            {
+                verifier.resetStreams();
+            }
+
+            File logFile = new File( projectDir, "log.txt" );
+            File logFileBackup = new File( projectDir, "mng-3221-a-log.txt" );
+
+            logFile.renameTo( logFileBackup );
+        }
+   }
 
     public void testitMNG3221b()
         throws Exception
@@ -44,16 +61,33 @@
         File pluginDir = new File( testDir, "plugin" );
         File projectDir = new File( testDir, "user" );
 
-        Verifier verifier;
+        Verifier verifier = null;
 
-        verifier = new Verifier( pluginDir.getAbsolutePath() );
-        verifier.executeGoal( "install" );
-        verifier.verifyErrorFreeLog();
-        verifier.resetStreams();
-
-        verifier = new Verifier( projectDir.getAbsolutePath() );
-        verifier.executeGoal( "package" );
-        verifier.verifyErrorFreeLog();
-        verifier.resetStreams();
+        try
+        {
+            verifier = new Verifier( pluginDir.getAbsolutePath() );
+
+            verifier.deleteArtifact( "tests", "maven-forking-test-plugin", 
"1", "jar" );
+
+            verifier.executeGoal( "install" );
+            verifier.verifyErrorFreeLog();
+            verifier.resetStreams();
+
+            verifier = new Verifier( projectDir.getAbsolutePath() );
+            verifier.executeGoal( "package" );
+            verifier.verifyErrorFreeLog();
+        }
+        finally
+        {
+            if ( verifier != null )
+            {
+                verifier.resetStreams();
+            }
+
+            File logFile = new File( projectDir, "log.txt" );
+            File logFileBackup = new File( projectDir, "mng-3221-b-log.txt" );
+
+            logFile.renameTo( logFileBackup );
+        }
     }
 }