From a50208645dd5da033c580a4af94148aef49ac397 Mon Sep 17 00:00:00 2001 From: Benjamin Bentmann Date: Tue, 23 Sep 2008 21:32:18 +0000 Subject: [PATCH] o Deleted IT thas has been migrated to the corresponding plugin project git-svn-id: https://svn.apache.org/repos/asf/maven/core-integration-testing/trunk@698362 13f79535-47bb-0310-9956-ffa450edef68 --- .../apache/maven/it/IntegrationTestSuite.java | 1 - .../org/apache/maven/it/MavenIT0054Test.java | 49 ------------------- .../src/test/resources/it0054/pom.xml | 29 ----------- .../src/main/filters/filters.properties | 2 - .../java/org/apache/maven/it0054/Person.java | 16 ------ .../src/main/resources/it0054.properties | 3 -- .../org/apache/maven/it0054/PersonTest.java | 24 --------- 7 files changed, 124 deletions(-) delete mode 100644 its/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0054Test.java delete mode 100644 its/core-it-suite/src/test/resources/it0054/pom.xml delete mode 100644 its/core-it-suite/src/test/resources/it0054/src/main/filters/filters.properties delete mode 100644 its/core-it-suite/src/test/resources/it0054/src/main/java/org/apache/maven/it0054/Person.java delete mode 100644 its/core-it-suite/src/test/resources/it0054/src/main/resources/it0054.properties delete mode 100644 its/core-it-suite/src/test/resources/it0054/src/test/java/org/apache/maven/it0054/PersonTest.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 3caf9fa49b..ab52a6577c 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 @@ -207,7 +207,6 @@ MavenITmng3645POMSyntaxErrorTest suite.addTestSuite( MavenIT0057Test.class ); suite.addTestSuite( MavenIT0056Test.class ); suite.addTestSuite( MavenIT0055Test.class ); - suite.addTestSuite( MavenIT0054Test.class ); suite.addTestSuite( MavenIT0053Test.class ); suite.addTestSuite( MavenIT0052Test.class ); suite.addTestSuite( MavenIT0051Test.class ); diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0054Test.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0054Test.java deleted file mode 100644 index c48f7e6734..0000000000 --- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0054Test.java +++ /dev/null @@ -1,49 +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 MavenIT0054Test - extends AbstractMavenIntegrationTestCase -{ - - /** - * Test resource filtering. - */ - public void testit0054() - throws Exception - { - File testDir = ResourceExtractor.simpleExtractResources( getClass(), "/it0054" ); - Verifier verifier = new Verifier( testDir.getAbsolutePath() ); - verifier.executeGoal( "package" ); - verifier.assertFilePresent( "target/classes/org/apache/maven/it0054/Person.class" ); - verifier.assertFilePresent( "target/test-classes/org/apache/maven/it0054/PersonTest.class" ); - verifier.assertFilePresent( "target/maven-it-it0054-1.0.jar" ); - verifier.assertFilePresent( "target/maven-it-it0054-1.0.jar!/it0054.properties" ); - verifier.verifyErrorFreeLog(); - verifier.resetStreams(); - - } -} - diff --git a/its/core-it-suite/src/test/resources/it0054/pom.xml b/its/core-it-suite/src/test/resources/it0054/pom.xml deleted file mode 100644 index c7b2b990a9..0000000000 --- a/its/core-it-suite/src/test/resources/it0054/pom.xml +++ /dev/null @@ -1,29 +0,0 @@ - - 4.0.0 - Maven Integration Test :: it0054 - org.apache.maven.its.it0054 - maven-it-it0054 - Test resource filtering. - jar - 1.0 - - - junit - junit - 3.8.1 - jar - test - - - - - src/main/filters/filters.properties - - - - src/main/resources - true - - - - diff --git a/its/core-it-suite/src/test/resources/it0054/src/main/filters/filters.properties b/its/core-it-suite/src/test/resources/it0054/src/main/filters/filters.properties deleted file mode 100644 index b1493898ed..0000000000 --- a/its/core-it-suite/src/test/resources/it0054/src/main/filters/filters.properties +++ /dev/null @@ -1,2 +0,0 @@ -surname = van zyl -country = Canada diff --git a/its/core-it-suite/src/test/resources/it0054/src/main/java/org/apache/maven/it0054/Person.java b/its/core-it-suite/src/test/resources/it0054/src/main/java/org/apache/maven/it0054/Person.java deleted file mode 100644 index aeea64e75e..0000000000 --- a/its/core-it-suite/src/test/resources/it0054/src/main/java/org/apache/maven/it0054/Person.java +++ /dev/null @@ -1,16 +0,0 @@ -package org.apache.maven.it0054; - -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/it0054/src/main/resources/it0054.properties b/its/core-it-suite/src/test/resources/it0054/src/main/resources/it0054.properties deleted file mode 100644 index 98cf1d43c7..0000000000 --- a/its/core-it-suite/src/test/resources/it0054/src/main/resources/it0054.properties +++ /dev/null @@ -1,3 +0,0 @@ -name = jason -surname = ${surname} -country = @country@ diff --git a/its/core-it-suite/src/test/resources/it0054/src/test/java/org/apache/maven/it0054/PersonTest.java b/its/core-it-suite/src/test/resources/it0054/src/test/java/org/apache/maven/it0054/PersonTest.java deleted file mode 100644 index af394f3652..0000000000 --- a/its/core-it-suite/src/test/resources/it0054/src/test/java/org/apache/maven/it0054/PersonTest.java +++ /dev/null @@ -1,24 +0,0 @@ -package org.apache.maven.it0054; - -import java.util.Properties; -import junit.framework.TestCase; - -public class PersonTest - extends TestCase -{ - public void testPerson() - throws Exception - { - Person person = new Person(); - - person.setName( "foo" ); - - assertEquals( "foo", person.getName() ); - - Properties p = new Properties(); - p.load( getClass().getResourceAsStream( "/it0054.properties" ) ); - assertEquals( "check name", "jason", p.getProperty( "name" ) ); - assertEquals( "check surname", "van zyl", p.getProperty( "surname" ) ); - assertEquals( "check country", "Canada", p.getProperty( "country" ) ); - } -}