svn commit: r606805 - 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

[dfabulich]

Author: dfabulich
Date: Tue Dec 25 11:53:01 2007
New Revision: 606805

URL: http://svn.apache.org/viewvc?rev=606805&view=rev
Log:
Clarifying system property test; adding forkMode=never test

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=606805&r1=606804&r2=606805&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
 Tue Dec 25 11:53:01 2007
@@ -25,11 +25,30 @@
         Verifier verifier = new Verifier( testDir.getAbsolutePath() );
         ArrayList goals = new ArrayList();
         goals.add( "test" );
-        goals.add( "-Dbaz=baz" );
+        goals.add( "-DsetOnMavenCommandLine=baz" );
         verifier.executeGoals( goals );
         verifier.verifyErrorFreeLog();
         verifier.resetStreams();
         
         HelperAssertions.assertTestSuiteResults( 3, 0, 0, 0, testDir );        
+    }
+    
+    public void testSystemPropertiesNoFork()
+        throws Exception
+    {
+        File testDir = ResourceExtractor.simpleExtractResources( getClass(), 
"/system-properties" );
+
+        Verifier verifier = new Verifier( testDir.getAbsolutePath() );
+        ArrayList goals = new ArrayList();
+        goals.add( "test" );
+        goals.add( "-DforkMode=never" );
+        goals.add( "-DsetOnMavenCommandLine=baz" );
+        // DGF fake the argLine, since we're not forking
+        goals.add( "-DsetOnArgLine=bar" );
+        verifier.executeGoals( goals );
+        verifier.verifyErrorFreeLog();
+        verifier.resetStreams();
+
+        HelperAssertions.assertTestSuiteResults( 3, 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=606805&r1=606804&r2=606805&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
 Tue Dec 25 11:53:01 2007
@@ -32,18 +32,26 @@
     <plugins>
       <plugin>
         <artifactId>maven-surefire-plugin</artifactId>
+        <version>2.4</version>
         <configuration>
           <systemProperties>
             <property>
-              <name>foo</name>
+              <name>setInPom</name>
               <value>foo</value>
             </property>
           </systemProperties>
-          <argLine>-Dbar=bar</argLine>
+          <argLine>-DsetOnArgLine=bar</argLine>
         </configuration>
       </plugin>
     </plugins>
+    
   </build>
+  <pluginRepositories>
+        <pluginRepository>
+          <id>dfabulich</id>
+          <url>http://people.apache.org/~dfabulich/staging-repo/</url>
+        </pluginRepository>
+    </pluginRepositories>
 
   <dependencies>
     <dependency>

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=606805&r1=606804&r2=606805&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
 Tue Dec 25 11:53:01 2007
@@ -9,19 +9,19 @@
 {
 
 
-    public void testFoo()
+    public void testSetInPom()
     {
-        assertEquals("foo property not set", "foo", System.getProperty("foo"));
+        assertEquals("property setInPom not set", "foo", 
System.getProperty("setInPom"));
     }
     
-    public void testBar()
+    public void testSetOnArgLine()
     {
-        assertEquals("bar property not set", "bar", System.getProperty("bar"));
+        assertEquals("setOnArgLine property not set", "bar", 
System.getProperty("setOnArgLine"));
     }
     
-    public void testBaz()
+    public void testSetOnMavenCommandLine()
     {
-        assertEquals("baz property not set", "baz", System.getProperty("baz"));
+        assertEquals("property setOnMavenCommandLine not set", "baz", 
System.getProperty("setOnMavenCommandLine"));
     }
     
 }