Author: dfabulich
Date: Mon Nov 26 02:51:09 2007
New Revision: 598217
URL: http://svn.apache.org/viewvc?rev=598217&view=rev
Log:
[SUREFIRE-121] Overlay current system properties with the properties user
specified in the POM. Is this wise? I dunno, but apparently it used to work,
and it makes sense as a use case.
Added:
maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/SystemPropertiesTest.java
maven/surefire/trunk/surefire-integration-tests/src/test/resources/system-properties/
(with props)
maven/surefire/trunk/surefire-integration-tests/src/test/resources/system-properties/pom.xml
maven/surefire/trunk/surefire-integration-tests/src/test/resources/system-properties/src/
maven/surefire/trunk/surefire-integration-tests/src/test/resources/system-properties/src/test/
maven/surefire/trunk/surefire-integration-tests/src/test/resources/system-properties/src/test/java/
maven/surefire/trunk/surefire-integration-tests/src/test/resources/system-properties/src/test/java/systemProperties/
maven/surefire/trunk/surefire-integration-tests/src/test/resources/system-properties/src/test/java/systemProperties/BasicTest.java
Modified:
maven/surefire/trunk/maven-surefire-plugin/src/main/java/org/apache/maven/plugin/surefire/SurefirePlugin.java
Modified:
maven/surefire/trunk/maven-surefire-plugin/src/main/java/org/apache/maven/plugin/surefire/SurefirePlugin.java
URL:
http://svn.apache.org/viewvc/maven/surefire/trunk/maven-surefire-plugin/src/main/java/org/apache/maven/plugin/surefire/SurefirePlugin.java?rev=598217&r1=598216&r2=598217&view=diff
==============================================================================
---
maven/surefire/trunk/maven-surefire-plugin/src/main/java/org/apache/maven/plugin/surefire/SurefirePlugin.java
(original)
+++
maven/surefire/trunk/maven-surefire-plugin/src/main/java/org/apache/maven/plugin/surefire/SurefirePlugin.java
Mon Nov 26 02:51:09 2007
@@ -929,6 +929,12 @@
}
originalSystemProperties = (Properties) System.getProperties().clone();
+
+ // SUREFIRE-121 overlay our system properties with user specified
properties
+ // Is this wise?
+ Properties userSpecifiedProperties = (Properties)
System.getProperties().clone();
+ userSpecifiedProperties.putAll( systemProperties );
+ systemProperties = userSpecifiedProperties;
systemProperties.setProperty( "basedir", basedir.getAbsolutePath() );
Added:
maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/SystemPropertiesTest.java
URL:
http://svn.apache.org/viewvc/maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/SystemPropertiesTest.java?rev=598217&view=auto
==============================================================================
---
maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/SystemPropertiesTest.java
(added)
+++
maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/SystemPropertiesTest.java
Mon Nov 26 02:51:09 2007
@@ -0,0 +1,34 @@
+package org.apache.maven.surefire.its;
+
+import java.io.File;
+import java.util.ArrayList;
+
+import org.apache.maven.integrationtests.AbstractMavenIntegrationTestCase;
+import org.apache.maven.it.Verifier;
+import org.apache.maven.it.util.ResourceExtractor;
+
+/**
+ * Test system properties
+ *
+ * @author <a href="mailto:[EMAIL PROTECTED]">Dan Fabulich</a>
+ *
+ */
+public class SystemPropertiesTest
+ extends AbstractMavenIntegrationTestCase
+{
+ public void testSystemProperties ()
+ throws Exception
+ {
+ File testDir = ResourceExtractor.simpleExtractResources( getClass(),
"/system-properties" );
+
+ Verifier verifier = new Verifier( testDir.getAbsolutePath() );
+ ArrayList goals = new ArrayList();
+ goals.add( "test" );
+ goals.add( "-Dbaz=baz" );
+ verifier.executeGoals( goals );
+ verifier.verifyErrorFreeLog();
+ verifier.resetStreams();
+
+ HelperAssertions.assertTestSuiteResults( 3, 0, 0, 0, testDir );
+ }
+}
Propchange:
maven/surefire/trunk/surefire-integration-tests/src/test/resources/system-properties/
------------------------------------------------------------------------------
--- svn:ignore (added)
+++ svn:ignore Mon Nov 26 02:51:09 2007
@@ -0,0 +1,5 @@
+.classpath
+.project
+target
+.settings
+log.txt
Added:
maven/surefire/trunk/surefire-integration-tests/src/test/resources/system-properties/pom.xml
URL:
http://svn.apache.org/viewvc/maven/surefire/trunk/surefire-integration-tests/src/test/resources/system-properties/pom.xml?rev=598217&view=auto
==============================================================================
---
maven/surefire/trunk/surefire-integration-tests/src/test/resources/system-properties/pom.xml
(added)
+++
maven/surefire/trunk/surefire-integration-tests/src/test/resources/system-properties/pom.xml
Mon Nov 26 02:51:09 2007
@@ -0,0 +1,57 @@
+<?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.plugins.surefire</groupId>
+ <artifactId>system-properties</artifactId>
+ <version>1.0-SNAPSHOT</version>
+ <name>Test for systemProperties</name>
+
+ <build>
+ <plugins>
+ <plugin>
+ <artifactId>maven-surefire-plugin</artifactId>
+ <configuration>
+ <systemProperties>
+ <property>
+ <name>foo</name>
+ <value>foo</value>
+ </property>
+ </systemProperties>
+ <argLine>-Dbar=bar</argLine>
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
+
+ <dependencies>
+ <dependency>
+ <groupId>junit</groupId>
+ <artifactId>junit</artifactId>
+ <version>3.8.1</version>
+ <scope>test</scope>
+ </dependency>
+ </dependencies>
+
+</project>
Added:
maven/surefire/trunk/surefire-integration-tests/src/test/resources/system-properties/src/test/java/systemProperties/BasicTest.java
URL:
http://svn.apache.org/viewvc/maven/surefire/trunk/surefire-integration-tests/src/test/resources/system-properties/src/test/java/systemProperties/BasicTest.java?rev=598217&view=auto
==============================================================================
---
maven/surefire/trunk/surefire-integration-tests/src/test/resources/system-properties/src/test/java/systemProperties/BasicTest.java
(added)
+++
maven/surefire/trunk/surefire-integration-tests/src/test/resources/system-properties/src/test/java/systemProperties/BasicTest.java
Mon Nov 26 02:51:09 2007
@@ -0,0 +1,27 @@
+package systemProperties;
+
+import junit.framework.Test;
+import junit.framework.TestCase;
+import junit.framework.TestSuite;
+
+public class BasicTest
+ extends TestCase
+{
+
+
+ public void testFoo()
+ {
+ assertEquals("foo property not set", "foo", System.getProperty("foo"));
+ }
+
+ public void testBar()
+ {
+ assertEquals("bar property not set", "bar", System.getProperty("bar"));
+ }
+
+ public void testBaz()
+ {
+ assertEquals("baz property not set", "baz", System.getProperty("baz"));
+ }
+
+}
