maven-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From bentm...@apache.org
Subject svn commit: r829779 - in /maven/core-integration-testing/trunk/core-it-suite/src/test: java/org/apache/maven/it/ resources/mng-3807/
Date Mon, 26 Oct 2009 12:57:47 GMT
Author: bentmann
Date: Mon Oct 26 12:57:47 2009
New Revision: 829779

URL: http://svn.apache.org/viewvc?rev=829779&view=rev
Log:
[MNG-3807] Maven is not interpolatin Properties at plugin configuration

o Added IT

Added:
    maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3807PluginConfigExpressionEvaluationTest.java
  (with props)
    maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-3807/
    maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-3807/pom.xml
  (with props)
Modified:
    maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/IntegrationTestSuite.java

Modified: maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/IntegrationTestSuite.java
URL: http://svn.apache.org/viewvc/maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/IntegrationTestSuite.java?rev=829779&r1=829778&r2=829779&view=diff
==============================================================================
--- maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/IntegrationTestSuite.java
(original)
+++ maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/IntegrationTestSuite.java
Mon Oct 26 12:57:47 2009
@@ -245,6 +245,7 @@
         suite.addTestSuite( MavenITmng3811ReportingPluginConfigurationInheritanceTest.class
);
         suite.addTestSuite( MavenITmng3810BadProfileActivationTest.class );
         suite.addTestSuite( MavenITmng3808ReportInheritenceOrderingTest.class );
+        suite.addTestSuite( MavenITmng3807PluginConfigExpressionEvaluationTest.class );
         suite.addTestSuite( MavenITmng3805ExtensionClassPathOrderingTest.class );
         suite.addTestSuite( MavenITmng3796ClassImportInconsistencyTest.class );
         suite.addTestSuite( MavenITmng3769ExclusionRelocatedTransdepsTest.class );

Added: maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3807PluginConfigExpressionEvaluationTest.java
URL: http://svn.apache.org/viewvc/maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3807PluginConfigExpressionEvaluationTest.java?rev=829779&view=auto
==============================================================================
--- maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3807PluginConfigExpressionEvaluationTest.java
(added)
+++ maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3807PluginConfigExpressionEvaluationTest.java
Mon Oct 26 12:57:47 2009
@@ -0,0 +1,79 @@
+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;
+import java.util.Properties;
+
+/**
+ * This is a test set for <a href="http://jira.codehaus.org/browse/MNG-3807">MNG-3807</a>.
+ * 
+ * @version $Id$
+ */
+public class MavenITmng3807PluginConfigExpressionEvaluationTest
+    extends AbstractMavenIntegrationTestCase
+{
+
+    public MavenITmng3807PluginConfigExpressionEvaluationTest()
+    {
+        super( "[3.0-alpha-3,)" );
+    }
+
+    /**
+     * Verify that plugin configurations are subject to the parameter expression evaluator,
in particular composite
+     * parameter types.
+     */
+    public void testit()
+        throws Exception
+    {
+        File testDir = ResourceExtractor.simpleExtractResources( getClass(), "/mng-3807"
);
+        Verifier verifier = new Verifier( testDir.getAbsolutePath() );
+        verifier.setAutoclean( false );
+        verifier.deleteDirectory( "target" );
+        verifier.executeGoal( "validate" );
+        verifier.verifyErrorFreeLog();
+        verifier.resetStreams();
+
+        Properties props = verifier.loadProperties( "target/config.properties" );
+
+        assertEvaluated( props.getProperty( "stringParams.0" ) );
+        assertEvaluated( props.getProperty( "stringParams.1" ) );
+
+        assertEvaluated( props.getProperty( "listParam.0" ) );
+        assertEvaluated( props.getProperty( "listParam.1" ) );
+
+        assertEvaluated( props.getProperty( "mapParam.test0" ) );
+        assertEvaluated( props.getProperty( "mapParam.test1" ) );
+
+        assertEvaluated( props.getProperty( "propertiesParam.test0" ) );
+        assertEvaluated( props.getProperty( "propertiesParam.test1" ) );
+    }
+
+    private void assertEvaluated( String value )
+    {
+        assertNotNull( value );
+        assertTrue( value.length() > 0 );
+        assertTrue( value, value.indexOf( "${" ) < 0 );
+    }
+
+}

Propchange: maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3807PluginConfigExpressionEvaluationTest.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3807PluginConfigExpressionEvaluationTest.java
------------------------------------------------------------------------------
    svn:keywords = Author Date Id Revision

Added: maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-3807/pom.xml
URL: http://svn.apache.org/viewvc/maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-3807/pom.xml?rev=829779&view=auto
==============================================================================
--- maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-3807/pom.xml
(added)
+++ maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-3807/pom.xml
Mon Oct 26 12:57:47 2009
@@ -0,0 +1,81 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<!--
+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.
+-->
+
+<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/maven-v4_0_0.xsd">
+  <modelVersion>4.0.0</modelVersion>
+
+  <groupId>org.apache.maven.its.mng3807</groupId>
+  <artifactId>test</artifactId>
+  <version>1.0-SNAPSHOT</version>
+  <packaging>jar</packaging>
+
+  <name>Maven Integration Test :: MNG-3807</name>
+  <description>
+    Verify that plugin configurations are subject to the parameter expression evaluator,
in particular composite
+    parameter types.
+  </description>
+
+  <build>
+    <plugins>
+      <plugin>
+        <groupId>org.apache.maven.its.plugins</groupId>
+        <artifactId>maven-it-plugin-configuration</artifactId>
+        <version>2.1-SNAPSHOT</version>
+        <configuration>
+          <propertiesFile>target/config.properties</propertiesFile>
+          <!--
+          NOTE: The expressions below have been specifically chosen to target the plugin
parameter expression
+          evaluator, i.e. they can't be resolved by the model interpolator.
+          -->
+          <stringParams>
+            <stringParam>${project.file.path}</stringParam>
+            <stringParam>${settings.localRepository}</stringParam>
+          </stringParams>
+          <listParam>
+            <listParam>${project.file.path}</listParam>
+            <listParam>${settings.localRepository}</listParam>
+          </listParam>
+          <mapParam>
+            <test0>${project.file.path}</test0>
+            <test1>${settings.localRepository}</test1>
+          </mapParam>
+          <propertiesParam>
+            <property>
+              <name>test0</name>
+              <value>${project.file.path}</value>
+            </property>
+            <property>
+              <name>test1</name>
+              <value>${settings.localRepository}</value>
+            </property>
+          </propertiesParam>
+        </configuration>
+        <executions>
+          <execution>
+            <goals>
+              <goal>config</goal>
+            </goals>
+          </execution>
+        </executions>
+      </plugin>
+    </plugins>
+  </build>
+</project>

Propchange: maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-3807/pom.xml
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-3807/pom.xml
------------------------------------------------------------------------------
    svn:keywords = Author Date Id Revision



Mime
View raw message