svn commit: r732922 - in /maven/surefire/trunk/surefire-integration-tests/src/test: java/org/apache/maven/surefire/its/SystemPropertiesTest.java resources/system-properties/pom.xml resources/system-properties/src/test/java/systemProperties/BasicTest.java

[dantran]

Author: dantran
Date: Thu Jan  8 20:19:49 2009
New Revision: 732922

URL: http://svn.apache.org/viewvc?rev=732922&view=rev
Log:
Add test to show the workaround for SUREFIRE-121

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=732922&r1=732921&r2=732922&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
 Thu Jan  8 20:19:49 2009
@@ -26,11 +26,13 @@
         goals.add( "test" );
         // SUREFIRE-121... someday we should re-enable this
         // goals.add( "-DsetOnMavenCommandLine=baz" );
+        
+        goals.add( "-DsetOnArgLineWorkAround=baz" );
         verifier.executeGoals( goals );
         verifier.verifyErrorFreeLog();
         verifier.resetStreams();
 
-        HelperAssertions.assertTestSuiteResults( 5, 0, 0, 0, testDir );
+        HelperAssertions.assertTestSuiteResults( 6, 0, 0, 0, testDir );
     }
 
     public void testSystemPropertiesNoFork()
@@ -42,6 +44,7 @@
         ArrayList goals = getInitialGoals();
         goals.add( "test" );
         goals.add( "-DforkMode=never" );
+        goals.add( "-DsetOnArgLineWorkAround=baz" );
         // SUREFIRE-121... someday we should re-enable this
         // goals.add( "-DsetOnMavenCommandLine=baz" );
         // DGF fake the argLine, since we're not forking
@@ -50,6 +53,6 @@
         verifier.verifyErrorFreeLog();
         verifier.resetStreams();
 
-        HelperAssertions.assertTestSuiteResults( 5, 0, 0, 0, testDir );
+        HelperAssertions.assertTestSuiteResults( 6, 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=732922&r1=732921&r2=732922&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
 Thu Jan  8 20:19:49 2009
@@ -69,6 +69,8 @@
             <reservedPort3>${reservedPort3}</reservedPort3>
             <nullProperty></nullProperty>
             <blankProperty> </blankProperty>
+            <!--  this is a work around for SUREFIRE-121 -->
+            
<setOnArgLineWorkAround>${setOnArgLineWorkAround}</setOnArgLineWorkAround>
           </systemPropertyVariables>
           <argLine>-DsetOnArgLine=bar</argLine>
         </configuration>
@@ -88,6 +90,7 @@
   
   <properties>
     <reservedPort3>1</reservedPort3>
+    <setOnArgLineWorkAround>fool</setOnArgLineWorkAround>
   </properties>
 
 </project>

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=732922&r1=732921&r2=732922&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
 Thu Jan  8 20:19:49 2009
@@ -52,6 +52,14 @@
         assertNull( "Null property is not null", System.getProperty(  
"nullProperty" ) );
         assertNull( "Blank property is not null", System.getProperty(  
"blankProperty" ) );
     }    
+
+    /**
+     * work around for SUREFIRE-121
+     */
+    public void testSetOnArgLineWorkAround()
+    {
+        assertEquals("property setOnArgLineWorkAround not set", "baz", 
System.getProperty( "setOnArgLineWorkAround" ) );
+    }
     
 // SUREFIRE-121; someday we should re-enable this    
 //    public void testSetOnMavenCommandLine()