diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/IntegrationTestSuite.java b/its/core-it-suite/src/test/java/org/apache/maven/it/IntegrationTestSuite.java index 8429defd01..07ee74a815 100644 --- a/its/core-it-suite/src/test/java/org/apache/maven/it/IntegrationTestSuite.java +++ b/its/core-it-suite/src/test/java/org/apache/maven/it/IntegrationTestSuite.java @@ -317,7 +317,6 @@ public class IntegrationTestSuite suite.addTestSuite( MavenIT0007Test.class ); suite.addTestSuite( MavenIT0005Test.class ); suite.addTestSuite( MavenIT0004Test.class ); - suite.addTestSuite( MavenIT0003Test.class ); /* * Add tests in reverse alpha order above. diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0003Test.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0003Test.java deleted file mode 100644 index c3f38b2d8a..0000000000 --- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0003Test.java +++ /dev/null @@ -1,52 +0,0 @@ -package org.apache.maven.it; - -/* - * Licensed to the Apache Software Foundation (ASF) under one - * or more contributor license agreements. See the NOTICE file - * distributed with this work for additional information - * regarding copyright ownership. The ASF licenses this file - * to you under the Apache License, Version 2.0 (the - * "License"); you may not use this file except in compliance - * with the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, - * software distributed under the License is distributed on an - * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY - * KIND, either express or implied. See the License for the - * specific language governing permissions and limitations - * under the License. - */ - -import org.apache.maven.it.Verifier; -import org.apache.maven.it.util.ResourceExtractor; - -import java.io.File; - -public class MavenIT0003Test - extends AbstractMavenIntegrationTestCase -{ - - /** - * Builds upon it0001: we add a jar installation step. We delete the JAR - * from the local repository to make sure it is there post build. - */ - public void testit0003() - throws Exception - { - File testDir = ResourceExtractor.simpleExtractResources( getClass(), "/it0003" ); - Verifier verifier = new Verifier( testDir.getAbsolutePath() ); - verifier.deleteArtifact( "org.apache.maven", "maven-it-it0003", "1.0", "jar" ); - verifier.executeGoal( "install" ); - verifier.assertFilePresent( "target/classes/org/apache/maven/it0003/Person.class" ); - verifier.assertFilePresent( "target/test-classes/org/apache/maven/it0003/PersonTest.class" ); - verifier.assertFilePresent( "target/maven-it-it0003-1.0.jar" ); - verifier.assertFilePresent( "target/maven-it-it0003-1.0.jar!/it0003.properties" ); - verifier.assertArtifactPresent( "org.apache.maven.its.it0003", "maven-it-it0003", "1.0", "jar" ); - verifier.verifyErrorFreeLog(); - verifier.resetStreams(); - - } -} - diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3892ReleaseDeploymentTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3892ReleaseDeploymentTest.java index 7513a19b05..eb04391af8 100644 --- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3892ReleaseDeploymentTest.java +++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3892ReleaseDeploymentTest.java @@ -49,10 +49,27 @@ public class MavenITmng3892ReleaseDeploymentTest Verifier verifier = new Verifier( testDir.getAbsolutePath() ); verifier.setAutoclean( false ); + verifier.deleteDirectory( "repo" ); verifier.deleteArtifacts( "org.apache.maven.its.mng3892" ); verifier.executeGoal( "validate" ); verifier.verifyErrorFreeLog(); verifier.resetStreams(); + + verifier.assertArtifactPresent( "org.apache.maven.its.mng3892", "test", "1.0", "pom" ); + verifier.assertArtifactPresent( "org.apache.maven.its.mng3892", "test", "1.0", "jar" ); + + verifier.assertFilePresent( "repo/org/apache/maven/its/mng3892/test/maven-metadata.xml" ); + verifier.assertFilePresent( "repo/org/apache/maven/its/mng3892/test/maven-metadata.xml.md5" ); + verifier.assertFilePresent( "repo/org/apache/maven/its/mng3892/test/maven-metadata.xml.sha1" ); + verifier.assertFilePresent( "repo/org/apache/maven/its/mng3892/test/1.0/test-1.0.pom" ); + verifier.assertFilePresent( "repo/org/apache/maven/its/mng3892/test/1.0/test-1.0.pom.md5" ); + verifier.assertFilePresent( "repo/org/apache/maven/its/mng3892/test/1.0/test-1.0.pom.sha1" ); + verifier.assertFilePresent( "repo/org/apache/maven/its/mng3892/test/1.0/test-1.0.jar" ); + verifier.assertFilePresent( "repo/org/apache/maven/its/mng3892/test/1.0/test-1.0.jar.md5" ); + verifier.assertFilePresent( "repo/org/apache/maven/its/mng3892/test/1.0/test-1.0.jar.sha1" ); + verifier.assertFilePresent( "repo/org/apache/maven/its/mng3892/test/1.0/test-1.0-it.jar" ); + verifier.assertFilePresent( "repo/org/apache/maven/its/mng3892/test/1.0/test-1.0-it.jar.md5" ); + verifier.assertFilePresent( "repo/org/apache/maven/its/mng3892/test/1.0/test-1.0-it.jar.sha1" ); } } diff --git a/its/core-it-suite/src/test/resources/it0003/pom.xml b/its/core-it-suite/src/test/resources/it0003/pom.xml deleted file mode 100644 index 2875e167c5..0000000000 --- a/its/core-it-suite/src/test/resources/it0003/pom.xml +++ /dev/null @@ -1,20 +0,0 @@ - - 4.0.0 - Maven Integration Test :: it0003 - org.apache.maven.its.it0003 - maven-it-it0003 - Builds upon it0001: we add a jar installation step. We delete the JAR - from the local repository to make sure it is there post build. - - jar - 1.0 - - - junit - junit - 3.8.1 - jar - test - - - diff --git a/its/core-it-suite/src/test/resources/it0003/src/main/java/org/apache/maven/it0003/Person.java b/its/core-it-suite/src/test/resources/it0003/src/main/java/org/apache/maven/it0003/Person.java deleted file mode 100644 index 976117e5f7..0000000000 --- a/its/core-it-suite/src/test/resources/it0003/src/main/java/org/apache/maven/it0003/Person.java +++ /dev/null @@ -1,16 +0,0 @@ -package org.apache.maven.it0003; - -public class Person -{ - private String name; - - public void setName( String name ) - { - this.name = name; - } - - public String getName() - { - return name; - } -} diff --git a/its/core-it-suite/src/test/resources/it0003/src/main/resources/it0003.properties b/its/core-it-suite/src/test/resources/it0003/src/main/resources/it0003.properties deleted file mode 100644 index f54f8ab106..0000000000 --- a/its/core-it-suite/src/test/resources/it0003/src/main/resources/it0003.properties +++ /dev/null @@ -1 +0,0 @@ -name = jason diff --git a/its/core-it-suite/src/test/resources/it0003/src/test/java/org/apache/maven/it0003/PersonTest.java b/its/core-it-suite/src/test/resources/it0003/src/test/java/org/apache/maven/it0003/PersonTest.java deleted file mode 100644 index 82af36a9a0..0000000000 --- a/its/core-it-suite/src/test/resources/it0003/src/test/java/org/apache/maven/it0003/PersonTest.java +++ /dev/null @@ -1,16 +0,0 @@ -package org.apache.maven.it0003; - -import junit.framework.TestCase; - -public class PersonTest - extends TestCase -{ - public void testPerson() - { - Person person = new Person(); - - person.setName( "foo" ); - - assertEquals( "foo", person.getName() ); - } -} diff --git a/its/core-it-suite/src/test/resources/mng-3892/pom.xml b/its/core-it-suite/src/test/resources/mng-3892/pom.xml index f120231183..61ff40c7b9 100644 --- a/its/core-it-suite/src/test/resources/mng-3892/pom.xml +++ b/its/core-it-suite/src/test/resources/mng-3892/pom.xml @@ -62,6 +62,7 @@ under the License. set attach attach-pom + release install deploy