You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by jd...@apache.org on 2009/02/18 23:22:27 UTC
svn commit: r745676 - in
/maven/core-integration-testing/trunk/core-it-suite/src/test:
java/org/apache/maven/it/ resources/mng-3057/ resources/mng-3057/level2/
resources/mng-3057/level2/level3/ resources/mng-3057/level2/level3/src/
resources/mng-3057/l...
Author: jdcasey
Date: Wed Feb 18 22:22:26 2009
New Revision: 745676
URL: http://svn.apache.org/viewvc?rev=745676&view=rev
Log:
[MNG-3057] integration test to check that POM/POM-parent versions are resolved...other versions (dependencies, plugins, report plugins) are also interpolated, but these are verified in a series of unit tests...if the ones in this IT are working, all should work fine.
Added:
maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3057VersionExprTransformations.java (with props)
maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-3057/
maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-3057/level2/
maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-3057/level2/level3/
maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-3057/level2/level3/pom.xml (with props)
maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-3057/level2/level3/src/
maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-3057/level2/level3/src/main/
maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-3057/level2/level3/src/main/java/
maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-3057/level2/level3/src/main/java/org/
maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-3057/level2/level3/src/main/java/org/apache/
maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-3057/level2/level3/src/main/java/org/apache/maven/
maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-3057/level2/level3/src/main/java/org/apache/maven/its/
maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-3057/level2/level3/src/main/java/org/apache/maven/its/mng3057/
maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-3057/level2/level3/src/main/java/org/apache/maven/its/mng3057/App.java (with props)
maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-3057/level2/level3/src/test/
maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-3057/level2/level3/src/test/java/
maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-3057/level2/level3/src/test/java/org/
maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-3057/level2/level3/src/test/java/org/apache/
maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-3057/level2/level3/src/test/java/org/apache/maven/
maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-3057/level2/level3/src/test/java/org/apache/maven/its/
maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-3057/level2/level3/src/test/java/org/apache/maven/its/mng3057/
maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-3057/level2/level3/src/test/java/org/apache/maven/its/mng3057/AppTest.java (with props)
maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-3057/level2/pom.xml (with props)
maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-3057/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=745676&r1=745675&r2=745676&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 Wed Feb 18 22:22:26 2009
@@ -214,6 +214,7 @@
suite.addTestSuite( MavenITmng3217InterPluginDependencyTest.class );
suite.addTestSuite( MavenITmng3106ProfileMultipleActivatorsTest.class );
suite.addTestSuite( MavenITmng3099SettingsProfilesWithNoPomTest.class );
+ suite.addTestSuite( MavenITmng3057VersionExprTransformations.class );
suite.addTestSuite( MavenITmng3052DepRepoAggregationTest.class );
suite.addTestSuite( MavenITmng3023ReactorDependencyResolutionTest.class );
suite.addTestSuite( MavenITmng3012CoreClassImportTest.class );
Added: maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3057VersionExprTransformations.java
URL: http://svn.apache.org/viewvc/maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3057VersionExprTransformations.java?rev=745676&view=auto
==============================================================================
--- maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3057VersionExprTransformations.java (added)
+++ maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3057VersionExprTransformations.java Wed Feb 18 22:22:26 2009
@@ -0,0 +1,146 @@
+/*
+ * 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.
+ */
+
+package org.apache.maven.it;
+
+import java.io.File;
+import java.io.FileInputStream;
+import java.io.IOException;
+import java.io.InputStream;
+import java.util.ArrayList;
+import java.util.Iterator;
+import java.util.List;
+import java.util.Properties;
+
+import org.apache.maven.artifact.versioning.InvalidVersionSpecificationException;
+import org.apache.maven.it.Verifier;
+import org.apache.maven.it.util.IOUtil;
+import org.apache.maven.it.util.ResourceExtractor;
+import org.apache.maven.it.util.StringUtils;
+
+/**
+ * This is a test set for <a href="http://jira.codehaus.org/browse/MNG-3057">MNG-3057</a>.
+ *
+ * @todo Fill in a better description of what this test verifies!
+ *
+ * @author <a href="mailto:brianf@apache.org">Brian Fox</a>
+ * @author jdcasey
+ *
+ */
+public class MavenITmng3057VersionExprTransformations
+ extends AbstractMavenIntegrationTestCase
+{
+
+ private static final List VERIFICATION_EXPRESSIONS;
+
+ static
+ {
+ List exprs = new ArrayList();
+
+ exprs.add( "project.parent.version" );
+ exprs.add( "project.version" );
+
+ VERIFICATION_EXPRESSIONS = exprs;
+ }
+
+ public MavenITmng3057VersionExprTransformations()
+ throws InvalidVersionSpecificationException
+ {
+ super( "(2.1.0-M1,2.99.99)" ); // only test in 2.0.9+
+ }
+
+ public void testitMNG3057 ()
+ throws Exception
+ {
+ File testDir = ResourceExtractor.simpleExtractResources( getClass(), "/mng-3057" );
+
+ File localRepo = new File( testDir, "target/local" );
+ String remoteRepo = new File( testDir, "target/deployment" ).toURL().toExternalForm();
+
+ Verifier verifier = new Verifier( testDir.getAbsolutePath() );
+ verifier.deleteArtifact( "org.apache.maven.its.mng3057", "mng-3057", "1", "pom" );
+ verifier.deleteArtifact( "org.apache.maven.its.mng3057", "level2", "1", "pom" );
+ verifier.deleteArtifact( "org.apache.maven.its.mng3057", "level3", "1", "pom" );
+ verifier.deleteArtifact( "org.apache.maven.its.mng3057", "level3", "1", "jar" );
+
+ Properties properties = verifier.newDefaultFilterProperties();
+ properties.setProperty( "deployTo", remoteRepo );
+
+ verifier.filterFile( "pom.xml", "pom.xml", "UTF-8", properties );
+
+ List cliOptions = new ArrayList();
+ cliOptions.add( "-DtestVersion=1" );
+ cliOptions.add( "-Dmaven.repo.local=" + localRepo.getAbsolutePath() );
+
+ verifier.setCliOptions( cliOptions );
+ verifier.executeGoal( "deploy" );
+ verifier.verifyErrorFreeLog();
+ verifier.resetStreams();
+
+ assertVersionExpressions( new File( localRepo, "org/apache/maven/its/mng3057/mng-3057/1/mng-3057-1.pom" ) );
+ assertVersionExpressions( new File( localRepo, "org/apache/maven/its/mng3057/level2/1/level2-1.pom" ) );
+ assertVersionExpressions( new File( localRepo, "org/apache/maven/its/mng3057/level3/1/level3-1.pom" ) );
+
+ assertVersionExpressions( new File( remoteRepo, "org/apache/maven/its/mng3057/mng-3057/1/mng-3057-1.pom" ) );
+ assertVersionExpressions( new File( remoteRepo, "org/apache/maven/its/mng3057/level2/1/level2-1.pom" ) );
+ assertVersionExpressions( new File( remoteRepo, "org/apache/maven/its/mng3057/level3/1/level3-1.pom" ) );
+ }
+
+ private void assertVersionExpressions( File pomFile )
+ throws VerificationException, IOException
+ {
+ Verifier verifier = new Verifier( pomFile.getParentFile().getAbsolutePath() );
+
+ List cliOptions = new ArrayList();
+ cliOptions.add( "-f" );
+ cliOptions.add( "-Dexpression.outputFile=expressions.properties" );
+ cliOptions.add( "-Dexpression.expressions=" + StringUtils.join( VERIFICATION_EXPRESSIONS.iterator(), "," ) );
+ cliOptions.add( pomFile.getName() );
+
+ verifier.setCliOptions( cliOptions );
+
+ verifier.executeGoal( "org.apache.maven.its.plugins:maven-it-plugin-expression:eval" );
+ verifier.verifyErrorFreeLog();
+ verifier.resetStreams();
+
+ File propsFile = new File( pomFile.getParentFile(), "expressions.properties" );
+ InputStream is = null;
+ Properties props = new Properties();
+ try
+ {
+ is = new FileInputStream( propsFile );
+ props.load( is );
+ }
+ finally
+ {
+ IOUtil.close( is );
+ }
+
+ for ( Iterator it = VERIFICATION_EXPRESSIONS.iterator(); it.hasNext(); )
+ {
+ String expr = (String ) it.next();
+ String value = props.getProperty( expr );
+ if ( value != null )
+ {
+ assertEquals( "POM expression not interpolated: '" + expr + "'\nin: '" + pomFile + "'.", "1", value );
+ }
+ }
+ }
+
+}
Propchange: maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3057VersionExprTransformations.java
------------------------------------------------------------------------------
svn:eol-style = native
Added: maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-3057/level2/level3/pom.xml
URL: http://svn.apache.org/viewvc/maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-3057/level2/level3/pom.xml?rev=745676&view=auto
==============================================================================
--- maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-3057/level2/level3/pom.xml (added)
+++ maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-3057/level2/level3/pom.xml Wed Feb 18 22:22:26 2009
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+ <modelVersion>4.0.0</modelVersion>
+ <parent>
+ <artifactId>level2</artifactId>
+ <groupId>org.apache.maven.its.mng3057</groupId>
+ <version>${testVersion}</version>
+ </parent>
+ <artifactId>level3</artifactId>
+ <version>${testVersion}</version>
+
+ <dependencies>
+ <dependency>
+ <groupId>junit</groupId>
+ <artifactId>junit</artifactId>
+ <version>3.8.1</version>
+ <scope>test</scope>
+ </dependency>
+ </dependencies>
+</project>
Propchange: maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-3057/level2/level3/pom.xml
------------------------------------------------------------------------------
svn:eol-style = native
Added: maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-3057/level2/level3/src/main/java/org/apache/maven/its/mng3057/App.java
URL: http://svn.apache.org/viewvc/maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-3057/level2/level3/src/main/java/org/apache/maven/its/mng3057/App.java?rev=745676&view=auto
==============================================================================
--- maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-3057/level2/level3/src/main/java/org/apache/maven/its/mng3057/App.java (added)
+++ maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-3057/level2/level3/src/main/java/org/apache/maven/its/mng3057/App.java Wed Feb 18 22:22:26 2009
@@ -0,0 +1,13 @@
+package org.apache.maven.its.mng3057;
+
+/**
+ * Hello world!
+ *
+ */
+public class App
+{
+ public static void main( String[] args )
+ {
+ System.out.println( "Hello World!" );
+ }
+}
Propchange: maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-3057/level2/level3/src/main/java/org/apache/maven/its/mng3057/App.java
------------------------------------------------------------------------------
svn:eol-style = native
Added: maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-3057/level2/level3/src/test/java/org/apache/maven/its/mng3057/AppTest.java
URL: http://svn.apache.org/viewvc/maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-3057/level2/level3/src/test/java/org/apache/maven/its/mng3057/AppTest.java?rev=745676&view=auto
==============================================================================
--- maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-3057/level2/level3/src/test/java/org/apache/maven/its/mng3057/AppTest.java (added)
+++ maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-3057/level2/level3/src/test/java/org/apache/maven/its/mng3057/AppTest.java Wed Feb 18 22:22:26 2009
@@ -0,0 +1,38 @@
+package org.apache.maven.its.mng3057;
+
+import junit.framework.Test;
+import junit.framework.TestCase;
+import junit.framework.TestSuite;
+
+/**
+ * Unit test for simple App.
+ */
+public class AppTest
+ extends TestCase
+{
+ /**
+ * Create the test case
+ *
+ * @param testName name of the test case
+ */
+ public AppTest( String testName )
+ {
+ super( testName );
+ }
+
+ /**
+ * @return the suite of tests being tested
+ */
+ public static Test suite()
+ {
+ return new TestSuite( AppTest.class );
+ }
+
+ /**
+ * Rigourous Test :-)
+ */
+ public void testApp()
+ {
+ assertTrue( true );
+ }
+}
Propchange: maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-3057/level2/level3/src/test/java/org/apache/maven/its/mng3057/AppTest.java
------------------------------------------------------------------------------
svn:eol-style = native
Added: maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-3057/level2/pom.xml
URL: http://svn.apache.org/viewvc/maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-3057/level2/pom.xml?rev=745676&view=auto
==============================================================================
--- maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-3057/level2/pom.xml (added)
+++ maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-3057/level2/pom.xml Wed Feb 18 22:22:26 2009
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<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>
+ <parent>
+ <artifactId>mng-3057</artifactId>
+ <groupId>org.apache.maven.its.mng3057</groupId>
+ <version>${testVersion}</version>
+ </parent>
+ <artifactId>level2</artifactId>
+ <version>${testVersion}</version>
+ <packaging>pom</packaging>
+ <modules>
+ <module>level3</module>
+ </modules>
+</project>
\ No newline at end of file
Propchange: maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-3057/level2/pom.xml
------------------------------------------------------------------------------
svn:eol-style = native
Added: maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-3057/pom.xml
URL: http://svn.apache.org/viewvc/maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-3057/pom.xml?rev=745676&view=auto
==============================================================================
--- maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-3057/pom.xml (added)
+++ maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-3057/pom.xml Wed Feb 18 22:22:26 2009
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<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.mng3057</groupId>
+ <artifactId>mng-3057</artifactId>
+ <version>${testVersion}</version>
+
+ <packaging>pom</packaging>
+
+ <name>Integration Test Project for MNG-3057</name>
+ <description>
+ This project verifies that MNG-3057 is fixed. It is controlled by a JUnit test called org.apache.maven.integrationtests.MNG3057Test
+ </description>
+
+ <url>http://jira.codehaus.org/browse/MNG-3057</url>
+
+ <modules>
+ <module>level2</module>
+ </modules>
+</project>
\ No newline at end of file
Propchange: maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-3057/pom.xml
------------------------------------------------------------------------------
svn:eol-style = native