Author: dantran
Date: Sun Jan 4 00:42:42 2009
New Revision: 731207
URL: http://svn.apache.org/viewvc?rev=731207&view=rev
Log:
SUREFIRE-511: allow null systemPropertyVariable's value, otherwise user cannot
migrate deprecated systemProperties
Modified:
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/pom.xml
maven/surefire/trunk/surefire-integration-tests/src/test/resources/system-properties/src/test/java/systemProperties/BasicTest.java
Modified:
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=731207&r1=731206&r2=731207&view=diff
==============================================================================
---
maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/SystemPropertiesTest.java
(original)
+++
maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/SystemPropertiesTest.java
Sun Jan 4 00:42:42 2009
@@ -30,7 +30,7 @@
verifier.verifyErrorFreeLog();
verifier.resetStreams();
- HelperAssertions.assertTestSuiteResults( 4, 0, 0, 0, testDir );
+ HelperAssertions.assertTestSuiteResults( 5, 0, 0, 0, testDir );
}
public void testSystemPropertiesNoFork()
@@ -50,6 +50,6 @@
verifier.verifyErrorFreeLog();
verifier.resetStreams();
- HelperAssertions.assertTestSuiteResults( 4, 0, 0, 0, testDir );
+ HelperAssertions.assertTestSuiteResults( 5, 0, 0, 0, testDir );
}
}
Modified:
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=731207&r1=731206&r2=731207&view=diff
==============================================================================
---
maven/surefire/trunk/surefire-integration-tests/src/test/resources/system-properties/pom.xml
(original)
+++
maven/surefire/trunk/surefire-integration-tests/src/test/resources/system-properties/pom.xml
Sun Jan 4 00:42:42 2009
@@ -67,6 +67,8 @@
<reservedPort1>${reservedPort1}</reservedPort1>
<reservedPort2>${reservedPort2}</reservedPort2>
<reservedPort3>${reservedPort3}</reservedPort3>
+ <nullProperty></nullProperty>
+ <blankProperty> </blankProperty>
</systemPropertyVariables>
<argLine>-DsetOnArgLine=bar</argLine>
</configuration>
Modified:
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=731207&r1=731206&r2=731207&view=diff
==============================================================================
---
maven/surefire/trunk/surefire-integration-tests/src/test/resources/system-properties/src/test/java/systemProperties/BasicTest.java
(original)
+++
maven/surefire/trunk/surefire-integration-tests/src/test/resources/system-properties/src/test/java/systemProperties/BasicTest.java
Sun Jan 4 00:42:42 2009
@@ -42,11 +42,16 @@
assertTrue( reservedPort1 != reservedPort2 );
- //plugin cannot overwrite the default value set in the pom, this is
maven bug
+ //plugin cannot overwrite the default value set in the pom, this is
maven bug but fixed at 2.1-M1
assertEquals( 1, reservedPort3 );
}
+ public void testEmptySystemProperties()
+ {
+ assertNull( "Null property is not null", System.getProperty(
"nullProperty" ) );
+ assertNull( "Blank property is not null", System.getProperty(
"blankProperty" ) );
+ }
// SUREFIRE-121; someday we should re-enable this
// public void testSetOnMavenCommandLine()
