From 213553df7b3fcb7186477dabcc97672839986fae Mon Sep 17 00:00:00 2001 From: Benjamin Bentmann Date: Tue, 2 Dec 2008 17:34:48 +0000 Subject: [PATCH] o Refactored code git-svn-id: https://svn.apache.org/repos/asf/maven/core-integration-testing/trunk@722536 13f79535-47bb-0310-9956-ffa450edef68 --- ...enITmng3873MultipleExecutionGoalsTest.java | 24 +++++++------------ 1 file changed, 8 insertions(+), 16 deletions(-) diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3873MultipleExecutionGoalsTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3873MultipleExecutionGoalsTest.java index 45db004435..7a0ccbc648 100644 --- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3873MultipleExecutionGoalsTest.java +++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3873MultipleExecutionGoalsTest.java @@ -46,21 +46,7 @@ public class MavenITmng3873MultipleExecutionGoalsTest 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" ); } /** @@ -69,10 +55,16 @@ public class MavenITmng3873MultipleExecutionGoalsTest */ 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" );