[2/3] maven-surefire git commit: SUREFIRE-1136 Current working directory propagation in forked mode - mark CurrentWorkingDirectoryInForkedModeTest as not compatible with maven 2.x since ${surefire.forkNumber} expansion cannot work on this version.

[tibordigana]

SUREFIRE-1136 Current working directory propagation in forked mode - mark 
CurrentWorkingDirectoryInForkedModeTest as not compatible with maven 2.x since 
${surefire.forkNumber} expansion cannot work on this version.


Project: http://git-wip-us.apache.org/repos/asf/maven-surefire/repo
Commit: http://git-wip-us.apache.org/repos/asf/maven-surefire/commit/9a8bb172
Tree: http://git-wip-us.apache.org/repos/asf/maven-surefire/tree/9a8bb172
Diff: http://git-wip-us.apache.org/repos/asf/maven-surefire/diff/9a8bb172

Branch: refs/heads/master
Commit: 9a8bb172cae84fe89f597843560056def30bd351
Parents: d6a8af5
Author: norbertwnuk <norbert.w...@gmail.com>
Authored: Sat Jan 31 00:38:31 2015 +0100
Committer: norbertwnuk <norbert.w...@gmail.com>
Committed: Sat Jan 31 10:08:10 2015 +0100

----------------------------------------------------------------------
 .../its/jiras/Surefire1136CwdPropagationInForkedModeIT.java  | 8 +++++++-
 .../java/cwd/CurrentWorkingDirectoryInForkedModeTest.java    | 6 +++---
 2 files changed, 10 insertions(+), 4 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/9a8bb172/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/jiras/Surefire1136CwdPropagationInForkedModeIT.java
----------------------------------------------------------------------
diff --git 
a/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/jiras/Surefire1136CwdPropagationInForkedModeIT.java
 
b/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/jiras/Surefire1136CwdPropagationInForkedModeIT.java
index bcd6f2a..cd6de87 100644
--- 
a/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/jiras/Surefire1136CwdPropagationInForkedModeIT.java
+++ 
b/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/jiras/Surefire1136CwdPropagationInForkedModeIT.java
@@ -19,15 +19,21 @@ package org.apache.maven.surefire.its.jiras;
  * under the License.
  */
 
+import org.apache.maven.surefire.its.Not2xCompatible;
 import org.apache.maven.surefire.its.fixture.OutputValidator;
 import org.apache.maven.surefire.its.fixture.SurefireJUnit4IntegrationTestCase;
 import org.junit.Test;
+import org.junit.experimental.categories.Category;
 
 /**
- * SUREFIRE-1136 Correct current working directory propagation
+ * SUREFIRE-1136 Correct current working directory propagation in forked mode
+ *
+ * Note: variables expansion behaves differently on MVN 2.x since not existing 
variables
+ * are resolved to 'null' value so that ${surefire.forkNumber} cannot work.
  *
  * @author Norbert Wnuk
  */
+@Category( Not2xCompatible.class )
 public class Surefire1136CwdPropagationInForkedModeIT
     extends SurefireJUnit4IntegrationTestCase
 {

http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/9a8bb172/surefire-integration-tests/src/test/resources/surefire-1136-cwd-propagation-in-forked-mode/src/test/java/cwd/CurrentWorkingDirectoryInForkedModeTest.java
----------------------------------------------------------------------
diff --git 
a/surefire-integration-tests/src/test/resources/surefire-1136-cwd-propagation-in-forked-mode/src/test/java/cwd/CurrentWorkingDirectoryInForkedModeTest.java
 
b/surefire-integration-tests/src/test/resources/surefire-1136-cwd-propagation-in-forked-mode/src/test/java/cwd/CurrentWorkingDirectoryInForkedModeTest.java
index 9dc0ffe..6a82ee3 100644
--- 
a/surefire-integration-tests/src/test/resources/surefire-1136-cwd-propagation-in-forked-mode/src/test/java/cwd/CurrentWorkingDirectoryInForkedModeTest.java
+++ 
b/surefire-integration-tests/src/test/resources/surefire-1136-cwd-propagation-in-forked-mode/src/test/java/cwd/CurrentWorkingDirectoryInForkedModeTest.java
@@ -39,9 +39,9 @@ public class CurrentWorkingDirectoryInForkedModeTest
         forkDirectory.deleteOnExit();
 
         // user.dir and current working directory must be aligned, base 
directory is not affected
-        assertEquals( System.getProperty( "basedir" ), 
projectDirectory.getCanonicalPath() );
-        assertEquals( System.getProperty( "user.dir" ), 
forkDirectory.getCanonicalPath() );
-        assertEquals( new File( "." ).getCanonicalPath(), 
forkDirectory.getCanonicalPath() );
+        assertEquals( projectDirectory.getCanonicalPath(), System.getProperty( 
"basedir" ) );
+        assertEquals( forkDirectory.getCanonicalPath(), System.getProperty( 
"user.dir" ) );
+        assertEquals( forkDirectory.getCanonicalPath(), new File( "." 
).getCanonicalPath() );
 
         // original working directory (before variable expansion) should not 
be created
         assertFalse( new File( "cwd_${surefire.forkNumber}" ).exists() );