Author: olamy
Date: Sat Feb 26 22:53:15 2011
New Revision: 1074949
URL: http://svn.apache.org/viewvc?rev=1074949&view=rev
Log:
upgrade to last junit version.
try to take care of symlink in a junit.
Modified:
maven/scm/trunk/maven-scm-providers/maven-scm-provider-accurev/pom.xml
maven/scm/trunk/maven-scm-providers/maven-scm-provider-accurev/src/test/java/org/apache/maven/scm/provider/accurev/cli/AccuRevCommandLineTest.java
maven/scm/trunk/pom.xml
Modified: maven/scm/trunk/maven-scm-providers/maven-scm-provider-accurev/pom.xml
URL:
http://svn.apache.org/viewvc/maven/scm/trunk/maven-scm-providers/maven-scm-provider-accurev/pom.xml?rev=1074949&r1=1074948&r2=1074949&view=diff
==============================================================================
--- maven/scm/trunk/maven-scm-providers/maven-scm-provider-accurev/pom.xml
(original)
+++ maven/scm/trunk/maven-scm-providers/maven-scm-provider-accurev/pom.xml Sat
Feb 26 22:53:15 2011
@@ -41,7 +41,6 @@
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
- <version>4.5</version>
<scope>test</scope>
</dependency>
<dependency>
Modified:
maven/scm/trunk/maven-scm-providers/maven-scm-provider-accurev/src/test/java/org/apache/maven/scm/provider/accurev/cli/AccuRevCommandLineTest.java
URL:
http://svn.apache.org/viewvc/maven/scm/trunk/maven-scm-providers/maven-scm-provider-accurev/src/test/java/org/apache/maven/scm/provider/accurev/cli/AccuRevCommandLineTest.java?rev=1074949&r1=1074948&r2=1074949&view=diff
==============================================================================
---
maven/scm/trunk/maven-scm-providers/maven-scm-provider-accurev/src/test/java/org/apache/maven/scm/provider/accurev/cli/AccuRevCommandLineTest.java
(original)
+++
maven/scm/trunk/maven-scm-providers/maven-scm-provider-accurev/src/test/java/org/apache/maven/scm/provider/accurev/cli/AccuRevCommandLineTest.java
Sat Feb 26 22:53:15 2011
@@ -290,7 +290,14 @@ public class AccuRevCommandLineTest
Commandline lastCL = accuRevCL.getCommandline();
assertThat( lastCL.getExecutable(), is( "accurev.exe" ) );
- assertThat( lastCL.getWorkingDirectory(), is( new File(
"/home/workspace" ).getCanonicalFile() ) );
+ // take care of symlink
+ if (lastCL.getWorkingDirectory().getCanonicalFile().equals(
lastCL.getWorkingDirectory().getAbsoluteFile() ))
+ {
+ assertThat( lastCL.getWorkingDirectory(), is( new File(
"/home/workspace" ).getCanonicalFile() ) );
+ } else {
+ assertThat( lastCL.getWorkingDirectory(), is( new File(
"/home/workspace" ).getAbsoluteFile() ));// .getCanonicalFile() ) );
+ }
+
assertThat( lastCL.getArguments(), is( new String[] { "pop", "-R",
testFile.getPath() } ) );
}
Modified: maven/scm/trunk/pom.xml
URL:
http://svn.apache.org/viewvc/maven/scm/trunk/pom.xml?rev=1074949&r1=1074948&r2=1074949&view=diff
==============================================================================
--- maven/scm/trunk/pom.xml (original)
+++ maven/scm/trunk/pom.xml Sat Feb 26 22:53:15 2011
@@ -222,7 +222,7 @@
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
- <version>3.8.2</version>
+ <version>4.8.2</version>
</dependency>
<dependency>
<groupId>org.apache.maven.scm</groupId>
