diff --git a/its/core-integration-tests/src/test/java/org/apache/maven/integrationtests/IntegrationTestSuite.java b/its/core-integration-tests/src/test/java/org/apache/maven/integrationtests/IntegrationTestSuite.java index ca8031a2b8..efa9ab388e 100644 --- a/its/core-integration-tests/src/test/java/org/apache/maven/integrationtests/IntegrationTestSuite.java +++ b/its/core-integration-tests/src/test/java/org/apache/maven/integrationtests/IntegrationTestSuite.java @@ -160,7 +160,6 @@ MavenITmng3645POMSyntaxErrorTest suite.addTestSuite( MavenIT0110PluginDependenciesComeFromPluginReposTest.class ); suite.addTestSuite( MavenIT0107Test.class ); suite.addTestSuite( MavenIT0106Test.class ); - suite.addTestSuite( MavenIT0105Test.class ); suite.addTestSuite( MavenIT0104Test.class ); suite.addTestSuite( MavenIT0103Test.class ); suite.addTestSuite( MavenIT0102Test.class ); diff --git a/its/core-integration-tests/src/test/java/org/apache/maven/integrationtests/MavenIT0105Test.java b/its/core-integration-tests/src/test/java/org/apache/maven/integrationtests/MavenIT0105Test.java deleted file mode 100644 index 9f8025bcca..0000000000 --- a/its/core-integration-tests/src/test/java/org/apache/maven/integrationtests/MavenIT0105Test.java +++ /dev/null @@ -1,32 +0,0 @@ -package org.apache.maven.integrationtests; - -import org.apache.maven.it.Verifier; -import org.apache.maven.it.util.ResourceExtractor; - -import java.io.File; -import java.util.ArrayList; -import java.util.List; - -public class MavenIT0105Test - extends AbstractMavenIntegrationTestCase -{ - - /** - * MRESOURCES-18 - */ - public void testit0105() - throws Exception - { - File testDir = ResourceExtractor.simpleExtractResources( getClass(), "/it0105" ); - Verifier verifier = new Verifier( testDir.getAbsolutePath() ); - List cliOptions = new ArrayList(); - cliOptions.add( "-Dparam=PARAM" ); - verifier.setCliOptions( cliOptions ); - verifier.executeGoal( "test" ); - verifier.assertFilePresent( "target/classes/test.properties" ); - verifier.verifyErrorFreeLog(); - verifier.resetStreams(); - - } -} - diff --git a/its/core-integration-tests/src/test/resources/it0105/filter.properties b/its/core-integration-tests/src/test/resources/it0105/filter.properties deleted file mode 100644 index e69de29bb2..0000000000 diff --git a/its/core-integration-tests/src/test/resources/it0105/pom.xml b/its/core-integration-tests/src/test/resources/it0105/pom.xml deleted file mode 100644 index 61985dbb0a..0000000000 --- a/its/core-integration-tests/src/test/resources/it0105/pom.xml +++ /dev/null @@ -1,36 +0,0 @@ - - 4.0.0 - Maven Integration Test :: it0105 - org.apache.maven.its.it0105 - maven-it-it0105 - MRESOURCES-18 - 1.0 - - - junit - junit - 3.8.1 - jar - test - - - - - - - - src/main/resources - true - - - - - - foo - - diff --git a/its/core-integration-tests/src/test/resources/it0105/src/main/resources/test.properties b/its/core-integration-tests/src/test/resources/it0105/src/main/resources/test.properties deleted file mode 100644 index 79c6bf306e..0000000000 --- a/its/core-integration-tests/src/test/resources/it0105/src/main/resources/test.properties +++ /dev/null @@ -1,3 +0,0 @@ -systemProperty=${java.version} -param=${param} -pom.property=${my.property} diff --git a/its/core-integration-tests/src/test/resources/it0105/src/test/java/org/apache/maven/it0105/FilterTest.java b/its/core-integration-tests/src/test/resources/it0105/src/test/java/org/apache/maven/it0105/FilterTest.java deleted file mode 100644 index 398fb8dd1f..0000000000 --- a/its/core-integration-tests/src/test/resources/it0105/src/test/java/org/apache/maven/it0105/FilterTest.java +++ /dev/null @@ -1,49 +0,0 @@ -package org.apache.maven.it0105; - -import junit.framework.TestCase; - -import java.util.Properties; -import java.io.File; -import java.io.FileInputStream; -import java.io.IOException; - -public class FilterTest - extends TestCase -{ - private String basedir; - - private Properties properties; - - protected void setUp() - throws Exception - { - basedir = System.getProperty( "basedir" ); - - properties = new Properties(); - - File testPropertiesFile = new File( basedir, "target/classes/test.properties" ); - - assertTrue( testPropertiesFile.exists() ); - - properties.load( new FileInputStream( testPropertiesFile ) ); - } - - public void testSystemPropertyInterpolation() - throws IOException - { - assertEquals( "System property", System.getProperty( "java.version" ), properties.getProperty( "systemProperty" ) ); - } - - public void testParameterInterpolation() - throws IOException - { - assertEquals( "Parameter", System.getProperty( "parameter" ), properties.getProperty( "parameter" ) ); - } - - public void testPomPropertyInterpolation() - throws IOException - { - assertEquals( "Pom Property", "foo", properties.getProperty( "pom.property" ) ); - } - -}