From 630c279aa63ad517568424000ba6b9b3d5f71274 Mon Sep 17 00:00:00 2001 From: Benjamin Bentmann Date: Tue, 20 Jan 2009 21:29:09 +0000 Subject: [PATCH] o Deleted redundant IT for MNG-932 (we have core ITs for MNG-1021/MNG-2921 to check deployment/resolution of attached artifacts and a plugin IT for MJAR-75 to check the creation of the test JAR itself) git-svn-id: https://svn.apache.org/repos/asf/maven/core-integration-testing/trunk@736114 13f79535-47bb-0310-9956-ffa450edef68 --- .../apache/maven/it/IntegrationTestSuite.java | 1 - .../MavenITmng0932TestJarDeploymentTest.java | 51 ------------------- .../src/test/resources/mng-0932/pom.xml | 23 --------- .../src/test/resources/mng-0932/sub1/pom.xml | 33 ------------ .../java/org/apache/maven/it0077/Person.java | 16 ------ .../org/apache/maven/it0077/PersonTest.java | 16 ------ .../src/test/resources/mng-0932/sub2/pom.xml | 25 --------- .../apache/maven/it0077/PersonTwoTest.java | 8 --- 8 files changed, 173 deletions(-) delete mode 100644 its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng0932TestJarDeploymentTest.java delete mode 100644 its/core-it-suite/src/test/resources/mng-0932/pom.xml delete mode 100644 its/core-it-suite/src/test/resources/mng-0932/sub1/pom.xml delete mode 100644 its/core-it-suite/src/test/resources/mng-0932/sub1/src/main/java/org/apache/maven/it0077/Person.java delete mode 100644 its/core-it-suite/src/test/resources/mng-0932/sub1/src/test/java/org/apache/maven/it0077/PersonTest.java delete mode 100644 its/core-it-suite/src/test/resources/mng-0932/sub2/pom.xml delete mode 100644 its/core-it-suite/src/test/resources/mng-0932/sub2/src/test/java/org/apache/maven/it0077/PersonTwoTest.java 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 15ccb876d9..dd372727f4 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 @@ -247,7 +247,6 @@ public class IntegrationTestSuite suite.addTestSuite( MavenITmng1021EqualAttachmentBuildNumberTest.class ); suite.addTestSuite( MavenITmng0985NonExecutedPluginMngtGoalsTest.class ); suite.addTestSuite( MavenITmng0956ComponentInjectionViaProjectLevelPluginDepTest.class ); - suite.addTestSuite( MavenITmng0932TestJarDeploymentTest.class ); suite.addTestSuite( MavenITmng0870ReactorAwarePluginDiscoveryTest.class ); suite.addTestSuite( MavenITmng0866EvaluateDefaultValueTest.class ); suite.addTestSuite( MavenITmng0851CustomPomFilenameTest.class ); diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng0932TestJarDeploymentTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng0932TestJarDeploymentTest.java deleted file mode 100644 index 5aed1d2f84..0000000000 --- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng0932TestJarDeploymentTest.java +++ /dev/null @@ -1,51 +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; - -/** - * This is a test set for MNG-932. - * - * @author Brett Porter - * @version $Id$ - */ -public class MavenITmng0932TestJarDeploymentTest - extends AbstractMavenIntegrationTestCase -{ - /** - * Test test jar attachment. - */ - public void testitMNG0932() - throws Exception - { - File testDir = ResourceExtractor.simpleExtractResources( getClass(), "/mng-0932" ); - Verifier verifier = new Verifier( testDir.getAbsolutePath() ); - verifier.deleteArtifact( "org.apache.maven.its.it0077", "sub1", "1.0", "test-jar" ); - verifier.executeGoal( "install" ); - verifier.assertArtifactPresent( "org.apache.maven.its.it0077", "sub1", "1.0", "test-jar" ); - verifier.verifyErrorFreeLog(); - verifier.resetStreams(); - } -} - diff --git a/its/core-it-suite/src/test/resources/mng-0932/pom.xml b/its/core-it-suite/src/test/resources/mng-0932/pom.xml deleted file mode 100644 index 8d4e655af9..0000000000 --- a/its/core-it-suite/src/test/resources/mng-0932/pom.xml +++ /dev/null @@ -1,23 +0,0 @@ - - 4.0.0 - Maven Integration Test :: it0077 - org.apache.maven.its.it0077 - maven-it-it0077 - Test test jar attachment. - pom - 1.0 - - - junit - junit - 3.8.1 - jar - test - - - - - sub1 - sub2 - - diff --git a/its/core-it-suite/src/test/resources/mng-0932/sub1/pom.xml b/its/core-it-suite/src/test/resources/mng-0932/sub1/pom.xml deleted file mode 100644 index 79c4f10b6d..0000000000 --- a/its/core-it-suite/src/test/resources/mng-0932/sub1/pom.xml +++ /dev/null @@ -1,33 +0,0 @@ - - 4.0.0 - - org.apache.maven.its.it0077 - maven-it-it0077 - 1.0 - - sub1 - 1.0 - - - commons-lang - commons-lang - 2.0 - test - - - - - - org.apache.maven.plugins - maven-jar-plugin - - - - test-jar - - - - - - - diff --git a/its/core-it-suite/src/test/resources/mng-0932/sub1/src/main/java/org/apache/maven/it0077/Person.java b/its/core-it-suite/src/test/resources/mng-0932/sub1/src/main/java/org/apache/maven/it0077/Person.java deleted file mode 100644 index 14c3784427..0000000000 --- a/its/core-it-suite/src/test/resources/mng-0932/sub1/src/main/java/org/apache/maven/it0077/Person.java +++ /dev/null @@ -1,16 +0,0 @@ -package org.apache.maven.it0077; - -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/mng-0932/sub1/src/test/java/org/apache/maven/it0077/PersonTest.java b/its/core-it-suite/src/test/resources/mng-0932/sub1/src/test/java/org/apache/maven/it0077/PersonTest.java deleted file mode 100644 index f3a40ca096..0000000000 --- a/its/core-it-suite/src/test/resources/mng-0932/sub1/src/test/java/org/apache/maven/it0077/PersonTest.java +++ /dev/null @@ -1,16 +0,0 @@ -package org.apache.maven.it0077; - -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-0932/sub2/pom.xml b/its/core-it-suite/src/test/resources/mng-0932/sub2/pom.xml deleted file mode 100644 index 60014615b9..0000000000 --- a/its/core-it-suite/src/test/resources/mng-0932/sub2/pom.xml +++ /dev/null @@ -1,25 +0,0 @@ - - 4.0.0 - - org.apache.maven.its.it0077 - maven-it-it0077 - 1.0 - - sub2 - 1.0 - - - org.apache.maven.its.it0077 - sub1 - 1.0 - test - - - org.apache.maven.its.it0077 - sub1 - test-jar - 1.0 - test - - - diff --git a/its/core-it-suite/src/test/resources/mng-0932/sub2/src/test/java/org/apache/maven/it0077/PersonTwoTest.java b/its/core-it-suite/src/test/resources/mng-0932/sub2/src/test/java/org/apache/maven/it0077/PersonTwoTest.java deleted file mode 100644 index a81618e7ea..0000000000 --- a/its/core-it-suite/src/test/resources/mng-0932/sub2/src/test/java/org/apache/maven/it0077/PersonTwoTest.java +++ /dev/null @@ -1,8 +0,0 @@ -package org.apache.maven.it0077; - -import junit.framework.TestCase; - -public class PersonTwoTest - extends PersonTest -{ -}