Author: bentmann Date: Tue Dec 2 09:34:48 2008 New Revision: 722536 URL: http://svn.apache.org/viewvc?rev=722536&view=rev Log: o Refactored code
Modified: maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3873MultipleExecutionGoalsTest.java Modified: maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3873MultipleExecutionGoalsTest.java URL: http://svn.apache.org/viewvc/maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3873MultipleExecutionGoalsTest.java?rev=722536&r1=722535&r2=722536&view=diff ============================================================================== --- maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3873MultipleExecutionGoalsTest.java (original) +++ maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3873MultipleExecutionGoalsTest.java Tue Dec 2 09:34:48 2008 @@ -46,21 +46,7 @@ public void testitWithoutPluginManagement() throws Exception { - File testDir = ResourceExtractor.simpleExtractResources( getClass(), "/mng-3873" ); - - Verifier verifier = new Verifier( new File( testDir, "test-1" ).getAbsolutePath() ); - verifier.setAutoclean( false ); - verifier.deleteDirectory( "target" ); - verifier.executeGoal( "validate" ); - verifier.verifyErrorFreeLog(); - verifier.resetStreams(); - - /* - * NOTE: We deliberately don't check the exact order here, that's another issue. - */ - List lines = verifier.loadLines( "target/it.log", "UTF-8" ); - assertTrue( lines.toString(), lines.contains( "test" ) ); - assertTrue( lines.toString(), lines.contains( "----" ) ); + testitMNG3873( "test-1" ); } /** @@ -70,9 +56,15 @@ public void testitWithPluginManagement() throws Exception { + testitMNG3873( "test-2" ); + } + + private void testitMNG3873( String project ) + throws Exception + { File testDir = ResourceExtractor.simpleExtractResources( getClass(), "/mng-3873" ); - Verifier verifier = new Verifier( new File( testDir, "test-2" ).getAbsolutePath() ); + Verifier verifier = new Verifier( new File( testDir, project ).getAbsolutePath() ); verifier.setAutoclean( false ); verifier.deleteDirectory( "target" ); verifier.executeGoal( "validate" );