Author: brett
Date: Thu Jan 29 02:36:41 2009
New Revision: 738718
URL: http://svn.apache.org/viewvc?rev=738718&view=rev
Log:
[MNG-3760] add IT for project.baseUri and backwards compatibility
Added:
maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3760BaseUriPropertyTest.java
(with props)
maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-3760/
maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-3760/pom.xml
(with props)
Added:
maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3760BaseUriPropertyTest.java
URL:
http://svn.apache.org/viewvc/maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3760BaseUriPropertyTest.java?rev=738718&view=auto
==============================================================================
---
maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3760BaseUriPropertyTest.java
(added)
+++
maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3760BaseUriPropertyTest.java
Thu Jan 29 02:36:41 2009
@@ -0,0 +1,86 @@
+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 java.io.File;
+import java.util.Collections;
+import java.util.List;
+import java.util.Properties;
+
+import org.apache.maven.it.Verifier;
+import org.apache.maven.it.util.ResourceExtractor;
+
+/**
+ * This is a test set for <a
href="http://jira.codehaus.org/browse/MNG-3760";>MNG-3760</a>.
+ *
+ * @author Brett Porter
+ * @version $Id: MavenITmng2605BogusProfileActivationTest.java 734813
2009-01-15 20:41:59Z bentmann $
+ */
+public class MavenITmng3760BaseUriPropertyTest
+ extends AbstractMavenIntegrationTestCase
+{
+
+ public MavenITmng3760BaseUriPropertyTest()
+ {
+ super( "(2.1.0-M1,3.0-alpha-1),(3.0-alpha-1,)" ); // 2.1.0-M2+,
3.0-alpha-2+
+ }
+
+ public void testitMNG3760()
+ throws Exception
+ {
+ File testDir = ResourceExtractor.simpleExtractResources( getClass(),
"/mng-3760" );
+
+ Verifier verifier = new Verifier( testDir.getAbsolutePath() );
+ verifier.setAutoclean( false );
+ verifier.deleteDirectory( "target" );
+ verifier.executeGoal( "validate" );
+ verifier.verifyErrorFreeLog();
+ verifier.resetStreams();
+
+ Properties props = verifier.loadProperties(
"target/profile.properties" );
+ // set via project
+ assertEquals( testDir.toURI().toString(), props.getProperty(
"project.properties.pomProperty" ) );
+ // check that project prefix is required
+ assertEquals( "${baseUri}", props.getProperty(
"project.properties.baseUriProperty" ) );
+ }
+
+ public void testitMNG3760SystemPropertyOverride()
+ throws Exception
+ {
+ File testDir = ResourceExtractor.simpleExtractResources( getClass(),
"/mng-3760" );
+
+ // check that setting baseUri doesn't override project value
+ Verifier verifier = new Verifier( testDir.getAbsolutePath() );
+ verifier.setAutoclean( false );
+ verifier.deleteDirectory( "target" );
+ List cliOptions = Collections.singletonList( "-DbaseUri=myBaseUri" );
+ verifier.setCliOptions( cliOptions );
+ verifier.executeGoal( "validate" );
+ verifier.verifyErrorFreeLog();
+ verifier.resetStreams();
+
+ Properties props = verifier.loadProperties(
"target/profile.properties" );
+ // set via project
+ assertEquals( testDir.toURI().toString(), props.getProperty(
"project.properties.pomProperty" ) );
+ // check that project prefix is required
+ assertEquals( "myBaseUri", props.getProperty(
"project.properties.baseUriProperty" ) );
+ }
+
+}
Propchange:
maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3760BaseUriPropertyTest.java
------------------------------------------------------------------------------
svn:eol-style = native
Added:
maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-3760/pom.xml
URL:
http://svn.apache.org/viewvc/maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-3760/pom.xml?rev=738718&view=auto
==============================================================================
---
maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-3760/pom.xml
(added)
+++
maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-3760/pom.xml
Thu Jan 29 02:36:41 2009
@@ -0,0 +1,62 @@
+<?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>
+ <modelVersion>4.0.0</modelVersion>
+
+ <groupId>org.apache.maven.its.mng3760</groupId>
+ <artifactId>child</artifactId>
+ <version>0.1</version>
+
+ <name>Maven Integration Test :: MNG-3760</name>
+ <description>
+ Test project.baseUri property.
+ </description>
+
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.its.plugins</groupId>
+ <artifactId>maven-it-plugin-expression</artifactId>
+ <version>2.1-SNAPSHOT</version>
+ <executions>
+ <execution>
+ <phase>validate</phase>
+ <goals>
+ <goal>eval</goal>
+ </goals>
+ <configuration>
+ <outputFile>target/profile.properties</outputFile>
+ <expressions>
+ <expression>project/properties</expression>
+ </expressions>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+ </plugins>
+ </build>
+
+ <properties>
+ <pomProperty>${project.baseUri}</pomProperty>
+ <baseUriProperty>${baseUri}</baseUriProperty>
+ </properties>
+</project>
Propchange:
maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-3760/pom.xml
------------------------------------------------------------------------------
svn:eol-style = native
