You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by ma...@apache.org on 2007/06/19 18:22:12 UTC
svn commit: r548787 -
/maven/core-integration-testing/trunk/core-integration-tests/src/test/java/org/apache/maven/integrationtests/IntegrationTestSuite.java
Author: markh
Date: Tue Jun 19 09:22:11 2007
New Revision: 548787
URL: http://svn.apache.org/viewvc?view=rev&rev=548787
Log:
Ensure verifier resets streams if an exception is thrown when obtaining the Maven version, otherwise the error is consumed.
Modified:
maven/core-integration-testing/trunk/core-integration-tests/src/test/java/org/apache/maven/integrationtests/IntegrationTestSuite.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?view=diff&rev=548787&r1=548786&r2=548787
==============================================================================
--- 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 Tue Jun 19 09:22:11 2007
@@ -33,11 +33,23 @@
public static Test suite() throws VerificationException
{
- String mavenVersion = new Verifier( "" ).getMavenVersion();
+ Verifier verifier = null;
+ try
+ {
+ verifier = new Verifier( "" );
+ String mavenVersion = verifier.getMavenVersion();
- out.println( "Running integration tests for Maven " + mavenVersion );
+ out.println( "Running integration tests for Maven " + mavenVersion );
- System.setProperty( "maven.version", mavenVersion );
+ System.setProperty( "maven.version", mavenVersion );
+ }
+ finally
+ {
+ if ( verifier != null )
+ {
+ verifier.resetStreams();
+ }
+ }
TestSuite suite = new TestSuite();
suite.addTestSuite( MavenIT0000Test.class );