You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by ol...@apache.org on 2013/03/05 22:11:57 UTC
git commit: [MNG-5445] Missing PathTranslator @Requirement in
org.apache.maven.project.interpolation.StringSearchModelInterpolator
Submitted by Stuart McCulloch.
Updated Branches:
refs/heads/master 810d80ea5 -> f8ec519b7
[MNG-5445] Missing PathTranslator @Requirement in org.apache.maven.project.interpolation.StringSearchModelInterpolator
Submitted by Stuart McCulloch.
Project: http://git-wip-us.apache.org/repos/asf/maven-integration-testing/repo
Commit: http://git-wip-us.apache.org/repos/asf/maven-integration-testing/commit/f8ec519b
Tree: http://git-wip-us.apache.org/repos/asf/maven-integration-testing/tree/f8ec519b
Diff: http://git-wip-us.apache.org/repos/asf/maven-integration-testing/diff/f8ec519b
Branch: refs/heads/master
Commit: f8ec519b71ca513a261bfefdbded5ff6983f2ef6
Parents: 810d80e
Author: olivier lamy <ol...@apache.org>
Authored: Tue Mar 5 22:11:43 2013 +0100
Committer: olivier lamy <ol...@apache.org>
Committed: Tue Mar 5 22:11:43 2013 +0100
----------------------------------------------------------------------
.../org/apache/maven/it/IntegrationTestSuite.java | 1 +
...445LegacyStringSearchModelInterpolatorTest.java | 55 +++++++++++++++
core-it-suite/src/test/resources/mng-5445/pom.xml | 48 +++++++++++++
3 files changed, 104 insertions(+), 0 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/maven-integration-testing/blob/f8ec519b/core-it-suite/src/test/java/org/apache/maven/it/IntegrationTestSuite.java
----------------------------------------------------------------------
diff --git a/core-it-suite/src/test/java/org/apache/maven/it/IntegrationTestSuite.java b/core-it-suite/src/test/java/org/apache/maven/it/IntegrationTestSuite.java
index 391d0f2..87fe9c1 100644
--- a/core-it-suite/src/test/java/org/apache/maven/it/IntegrationTestSuite.java
+++ b/core-it-suite/src/test/java/org/apache/maven/it/IntegrationTestSuite.java
@@ -107,6 +107,7 @@ public class IntegrationTestSuite
// suite.addTestSuite( MavenIT0108SnapshotUpdateTest.class ); -- MNG-3137
//suite.addTestSuite( MavenITmng5208EventSpyParallelTest.class );
+ suite.addTestSuite( MavenITmng5445LegacyStringSearchModelInterpolatorTest.class );
suite.addTestSuite( MavenITmng5387ArtifactReplacementPlugin.class );
suite.addTestSuite( MavenITmng5382Jsr330Plugin.class );
suite.addTestSuite( MavenITmng5338FileOptionToDirectory.class );
http://git-wip-us.apache.org/repos/asf/maven-integration-testing/blob/f8ec519b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5445LegacyStringSearchModelInterpolatorTest.java
----------------------------------------------------------------------
diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5445LegacyStringSearchModelInterpolatorTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5445LegacyStringSearchModelInterpolatorTest.java
new file mode 100644
index 0000000..b55d97d
--- /dev/null
+++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5445LegacyStringSearchModelInterpolatorTest.java
@@ -0,0 +1,55 @@
+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.util.ResourceExtractor;
+
+import java.io.File;
+import java.util.Properties;
+
+/**
+ * This is a test set for <a href="http://jira.codehaus.org/browse/MNG-5445">MNG-5445</a>.
+ */
+public class MavenITmng5445LegacyStringSearchModelInterpolatorTest
+ extends AbstractMavenIntegrationTestCase
+{
+
+ public MavenITmng5445LegacyStringSearchModelInterpolatorTest()
+ {
+ super( ALL_MAVEN_VERSIONS );
+ }
+
+ /**
+ * Verify that the legacy StringSearchModelInterpolator has its PathTranslator injected.
+ */
+ public void testit()
+ throws Exception
+ {
+ File testDir = ResourceExtractor.simpleExtractResources( getClass(), "/mng-5445" );
+
+ Verifier verifier = newVerifier( testDir.getAbsolutePath() );
+ verifier.setAutoclean( false );
+ verifier.deleteDirectory( "target" );
+ verifier.executeGoal( "validate" );
+ verifier.verifyErrorFreeLog();
+ verifier.resetStreams();
+ }
+
+}
http://git-wip-us.apache.org/repos/asf/maven-integration-testing/blob/f8ec519b/core-it-suite/src/test/resources/mng-5445/pom.xml
----------------------------------------------------------------------
diff --git a/core-it-suite/src/test/resources/mng-5445/pom.xml b/core-it-suite/src/test/resources/mng-5445/pom.xml
new file mode 100644
index 0000000..f05e533
--- /dev/null
+++ b/core-it-suite/src/test/resources/mng-5445/pom.xml
@@ -0,0 +1,48 @@
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+ <modelVersion>4.0.0</modelVersion>
+
+ <groupId>org.apache.maven.its.mng5445</groupId>
+ <artifactId>mng5445-it</artifactId>
+ <version>0.0.1-SNAPSHOT</version>
+
+ <name>Test legacy StringSearchModelInterpolator</name>
+ <url>http://maven.apache.org</url>
+
+ <properties>
+ <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+ </properties>
+
+ <prerequisites>
+ <maven>2.2.1</maven>
+ </prerequisites>
+
+ <build>
+ <sourceDirectory>src</sourceDirectory>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-surefire-plugin</artifactId>
+ <version>0.1-stub-SNAPSHOT</version>
+ <configuration>
+ <testSourceDirectory>${project.build.sourceDirectory}</testSourceDirectory>
+ <testClassesDirectory>${project.build.outputDirectory}</testClassesDirectory>
+ </configuration>
+ </plugin>
+ <plugin>
+ <groupId>org.codehaus.mojo</groupId>
+ <artifactId>versions-maven-plugin</artifactId>
+ <version>2.0</version>
+ <executions>
+ <execution>
+ <id>test-display-plugin-updates</id>
+ <phase>validate</phase>
+ <goals>
+ <goal>display-plugin-updates</goal>
+ </goals>
+ </execution>
+ </executions>
+ </plugin>
+ </plugins>
+ </build>
+</project>