You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by jd...@apache.org on 2008/06/10 22:56:56 UTC

svn commit: r666323 - /maven/core-integration-testing/trunk/core-integration-tests/src/test/java/org/apache/maven/integrationtests/MavenITmng2339BadProjectInterpolationTest.java

Author: jdcasey
Date: Tue Jun 10 13:56:56 2008
New Revision: 666323

URL: http://svn.apache.org/viewvc?rev=666323&view=rev
Log:
Cleaning up the log.txt management in mng-2339.

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

Modified: maven/core-integration-testing/trunk/core-integration-tests/src/test/java/org/apache/maven/integrationtests/MavenITmng2339BadProjectInterpolationTest.java
URL: http://svn.apache.org/viewvc/maven/core-integration-testing/trunk/core-integration-tests/src/test/java/org/apache/maven/integrationtests/MavenITmng2339BadProjectInterpolationTest.java?rev=666323&r1=666322&r2=666323&view=diff
==============================================================================
--- maven/core-integration-testing/trunk/core-integration-tests/src/test/java/org/apache/maven/integrationtests/MavenITmng2339BadProjectInterpolationTest.java (original)
+++ maven/core-integration-testing/trunk/core-integration-tests/src/test/java/org/apache/maven/integrationtests/MavenITmng2339BadProjectInterpolationTest.java Tue Jun 10 13:56:56 2008
@@ -73,6 +73,9 @@
         verifier.verifyErrorFreeLog();
         verifier.resetStreams();
 
+        File logFile = new File( testDir, "log.txt" );
+        logFile.renameTo( new File( testDir, "log-pom-specified.txt" ) );
+
         verifier = new Verifier( testDir.getAbsolutePath() );
 
         List cliOptions = new ArrayList();
@@ -80,11 +83,13 @@
         verifier.setCliOptions( cliOptions );
         verifier.executeGoal( "initialize" );
 
-        assertTrue( "Touchfile using CLI-specified ${version} does not exist.",
-                    new File( testDir, "target/touch-2.txt" ).exists() );
-
         verifier.verifyErrorFreeLog();
         verifier.resetStreams();
+
+        logFile.renameTo( new File( testDir, "log-cli-specified.txt" ) );
+
+        assertTrue( "Touchfile using CLI-specified ${version} does not exist.",
+                    new File( testDir, "target/touch-2.txt" ).exists() );
     }
 
 }