From 5d9809981037a18af6181b02dcf9f11c699d60e8 Mon Sep 17 00:00:00 2001 From: Benjamin Bentmann Date: Tue, 28 Oct 2008 21:51:20 +0000 Subject: [PATCH] o Stabilized ITs git-svn-id: https://svn.apache.org/repos/asf/maven/core-integration-testing/trunk@708689 13f79535-47bb-0310-9956-ffa450edef68 --- .../test/java/org/apache/maven/it/MavenIT0047Test.java | 1 + .../test/java/org/apache/maven/it/MavenIT0059Test.java | 1 + .../test/java/org/apache/maven/it/MavenIT0069Test.java | 3 ++- .../test/java/org/apache/maven/it/MavenIT0081Test.java | 1 + .../test/java/org/apache/maven/it/MavenIT0087Test.java | 1 + ...enIT0110PluginDependenciesComeFromPluginReposTest.java | 2 +- .../maven/it/MavenITmng2228ComponentInjectionTest.java | 1 + .../it/MavenITmng2695OfflinePluginSnapshotsTest.java | 1 + .../it/MavenITmng2749ExtensionAvailableToPluginTest.java | 1 + .../maven/it/MavenITmng2892HideCorePlexusUtilsTest.java | 2 ++ .../it/MavenITmng2994SnapshotRangeRepositoryTest.java | 1 + .../maven/it/MavenITmng3012CoreClassImportTest.java | 2 ++ .../maven/it/MavenITmng3314OfflineSnapshotsTest.java | 1 + .../it/MavenITmng3805ExtensionClassPathOrderingTest.java | 1 + its/core-it-suite/src/test/resources/it0069/pom.xml | 8 +++++++- 15 files changed, 24 insertions(+), 3 deletions(-) diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0047Test.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0047Test.java index cd9baf03d6..8648c0dc12 100644 --- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0047Test.java +++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0047Test.java @@ -40,6 +40,7 @@ public void testit0047() { File testDir = ResourceExtractor.simpleExtractResources( getClass(), "/it0047" ); Verifier verifier = new Verifier( testDir.getAbsolutePath() ); + verifier.deleteArtifacts( "org.apache.maven.its.it0047" ); Properties systemProperties = new Properties(); systemProperties.put( "depres.compileClassPath", new File( testDir, "target/compile.txt" ).getAbsolutePath() ); verifier.setSystemProperties( systemProperties ); diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0059Test.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0059Test.java index e6aa09a2ca..81cd78a5d4 100644 --- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0059Test.java +++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0059Test.java @@ -40,6 +40,7 @@ public void testit0059() { File testDir = ResourceExtractor.simpleExtractResources( getClass(), "/it0059" ); Verifier verifier = new Verifier( testDir.getAbsolutePath() ); + verifier.deleteArtifacts( "org.apache.maven.its.it0059" ); Properties verifierProperties = new Properties(); verifierProperties.put( "failOnErrorOutput", "false" ); verifier.setVerifierProperties( verifierProperties ); diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0069Test.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0069Test.java index 2e5e426050..ade3a3e389 100644 --- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0069Test.java +++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0069Test.java @@ -41,6 +41,7 @@ public void testit0069() { // phase 1: run build in online mode to fill local repo Verifier verifier = new Verifier( testDir.getAbsolutePath() ); + verifier.deleteArtifacts( "org.apache.maven.its.it0069" ); verifier.executeGoal( "org.apache.maven.its.plugins:maven-it-plugin-dependency-resolution:2.1-SNAPSHOT:compile" ); verifier.assertFilePresent( "target/compile.txt" ); verifier.verifyErrorFreeLog(); @@ -65,7 +66,7 @@ public void testit0069() { // phase 3: delete test artifact and run build in offline mode to check it fails now Verifier verifier = new Verifier( testDir.getAbsolutePath() ); - verifier.deleteArtifact( "org.apache.maven.its.it0069", "it", "1.0.3", "jar" ); + verifier.deleteArtifacts( "org.apache.maven.its.it0069" ); List cliOptions = new ArrayList(); cliOptions.add( "-o" ); verifier.setCliOptions( cliOptions ); diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0081Test.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0081Test.java index 059d7326ce..5d6e0d84c6 100644 --- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0081Test.java +++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0081Test.java @@ -39,6 +39,7 @@ public void testit0081() Verifier verifier = new Verifier( testDir.getAbsolutePath() ); verifier.setAutoclean( false ); verifier.deleteDirectory( "target" ); + verifier.deleteArtifacts( "org.apache.maven.its.it0081" ); verifier.executeGoal( "validate" ); verifier.verifyErrorFreeLog(); verifier.resetStreams(); diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0087Test.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0087Test.java index 6594ebe6bd..7569fa16f9 100644 --- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0087Test.java +++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0087Test.java @@ -40,6 +40,7 @@ public void testit0087() Verifier verifier = new Verifier( testDir.getAbsolutePath() ); verifier.setAutoclean( false ); verifier.deleteDirectory( "target" ); + verifier.deleteArtifacts( "org.apache.maven.its.it0087" ); verifier.executeGoal( "validate" ); verifier.verifyErrorFreeLog(); verifier.resetStreams(); diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0110PluginDependenciesComeFromPluginReposTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0110PluginDependenciesComeFromPluginReposTest.java index 9012bb6ee2..c01e3ffed5 100644 --- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0110PluginDependenciesComeFromPluginReposTest.java +++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0110PluginDependenciesComeFromPluginReposTest.java @@ -35,7 +35,7 @@ public void testit0110() File testDir = ResourceExtractor.simpleExtractResources( getClass(), "/it0110-pluginDependenciesComeFromPluginRepos" ); Verifier verifier = new Verifier( testDir.getAbsolutePath() ); - verifier.deleteArtifact( "org.apache.maven.it", "mail", "1.3.2", "jar" ); + verifier.deleteArtifact( "org.apache.maven.it", "mail", "1.3.2", "jar" ); verifier.executeGoal( "clean" ); verifier.verifyErrorFreeLog(); verifier.resetStreams(); diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2228ComponentInjectionTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2228ComponentInjectionTest.java index eb0f54b998..51823e8e8e 100644 --- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2228ComponentInjectionTest.java +++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2228ComponentInjectionTest.java @@ -46,6 +46,7 @@ public void testitMNG2228() Verifier verifier = new Verifier( testDir.getAbsolutePath() ); verifier.setAutoclean( false ); verifier.deleteDirectory( "target" ); + verifier.deleteArtifacts( "org.apache.maven.its.mng2228" ); verifier.executeGoal( "validate" ); verifier.verifyErrorFreeLog(); verifier.resetStreams(); diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2695OfflinePluginSnapshotsTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2695OfflinePluginSnapshotsTest.java index b3a93f8076..e0a8071e1c 100644 --- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2695OfflinePluginSnapshotsTest.java +++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2695OfflinePluginSnapshotsTest.java @@ -55,6 +55,7 @@ public void testitMNG2695() // phase 1: run build in online mode to fill local repo Verifier verifier = new Verifier( testDir.getAbsolutePath() ); verifier.deleteDirectory( "target" ); + verifier.deleteArtifacts( "org.apache.maven.its.mng2695" ); verifier.setAutoclean( false ); verifier.executeGoal( "validate" ); verifier.assertFilePresent( "target/a.txt" ); diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2749ExtensionAvailableToPluginTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2749ExtensionAvailableToPluginTest.java index 7ac8dd2f08..90244f5a9a 100644 --- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2749ExtensionAvailableToPluginTest.java +++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2749ExtensionAvailableToPluginTest.java @@ -50,6 +50,7 @@ public void testitMNG2749() Verifier verifier = new Verifier( testDir.getAbsolutePath() ); verifier.setAutoclean( false ); verifier.deleteDirectory( "target" ); + verifier.deleteArtifacts( "org.apache.maven.its.mng2749" ); verifier.executeGoal( "validate" ); verifier.verifyErrorFreeLog(); verifier.resetStreams(); diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2892HideCorePlexusUtilsTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2892HideCorePlexusUtilsTest.java index fb78b7f76e..641ff70950 100644 --- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2892HideCorePlexusUtilsTest.java +++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2892HideCorePlexusUtilsTest.java @@ -46,6 +46,8 @@ public void testitMNG2892() Verifier verifier = new Verifier( testDir.getAbsolutePath() ); verifier.setAutoclean( false ); verifier.deleteDirectory( "target" ); + verifier.deleteArtifact( "org.codehaus.plexus", "plexus-utils", "0.1-mng2892", "jar" ); + verifier.deleteArtifact( "org.codehaus.plexus", "plexus-utils", "0.1-mng2892", "pom" ); verifier.executeGoal( "validate" ); verifier.verifyErrorFreeLog(); verifier.resetStreams(); diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2994SnapshotRangeRepositoryTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2994SnapshotRangeRepositoryTest.java index 00eb5b76c9..af7bde0428 100644 --- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2994SnapshotRangeRepositoryTest.java +++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2994SnapshotRangeRepositoryTest.java @@ -41,6 +41,7 @@ public void testitMNG2994() { File testDir = ResourceExtractor.simpleExtractResources( getClass(), "/mng-2994" ); Verifier verifier = new Verifier( testDir.getAbsolutePath() ); + verifier.deleteArtifacts( "org.apache.maven.its.it0123" ); verifier.executeGoal( "compile" ); verifier.verifyErrorFreeLog(); verifier.resetStreams(); diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3012CoreClassImportTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3012CoreClassImportTest.java index d856b7d39d..162c26eeaf 100644 --- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3012CoreClassImportTest.java +++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3012CoreClassImportTest.java @@ -46,6 +46,8 @@ public void testitMNG3012() Verifier verifier = new Verifier( testDir.getAbsolutePath() ); verifier.setAutoclean( false ); verifier.deleteDirectory( "target" ); + verifier.deleteArtifact( "org.codehaus.plexus", "plexus-utils", "0.1-mng3012", "jar" ); + verifier.deleteArtifact( "org.codehaus.plexus", "plexus-utils", "0.1-mng3012", "pom" ); verifier.executeGoal( "validate" ); verifier.verifyErrorFreeLog(); verifier.resetStreams(); diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3314OfflineSnapshotsTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3314OfflineSnapshotsTest.java index 499654415e..0dd97b76e7 100644 --- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3314OfflineSnapshotsTest.java +++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3314OfflineSnapshotsTest.java @@ -55,6 +55,7 @@ public void testitMNG3314 () { // phase 1: run build in online mode to fill local repo Verifier verifier = new Verifier( testDir.getAbsolutePath() ); + verifier.deleteArtifacts( "org.apache.maven.its.mng3314" ); verifier.executeGoal( "validate" ); verifier.assertFilePresent( "target/compile.txt" ); verifier.verifyErrorFreeLog(); diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3805ExtensionClassPathOrderingTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3805ExtensionClassPathOrderingTest.java index aa124da15c..30649e8489 100644 --- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3805ExtensionClassPathOrderingTest.java +++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3805ExtensionClassPathOrderingTest.java @@ -51,6 +51,7 @@ public void testitMNG3805() Verifier verifier = new Verifier( testDir.getAbsolutePath() ); verifier.setAutoclean( false ); verifier.deleteDirectory( "target" ); + verifier.deleteArtifacts( "org.apache.maven.its.mng3805" ); verifier.executeGoal( "validate" ); verifier.verifyErrorFreeLog(); verifier.resetStreams(); diff --git a/its/core-it-suite/src/test/resources/it0069/pom.xml b/its/core-it-suite/src/test/resources/it0069/pom.xml index ef1cf753be..8ca49f572e 100644 --- a/its/core-it-suite/src/test/resources/it0069/pom.xml +++ b/its/core-it-suite/src/test/resources/it0069/pom.xml @@ -39,8 +39,14 @@ under the License. - it0018 + maven-core-it file:///${basedir}/repo + + ignore + + + ignore +