You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by br...@apache.org on 2007/06/10 03:42:42 UTC
svn commit: r545827 - in
/maven/plugins/trunk/maven-dependency-plugin/src/test/java/org/apache/maven/plugin/dependency:
TestBuildClasspathMojo.java TestUnpackDependenciesMojo.java
Author: brianf
Date: Sat Jun 9 18:42:41 2007
New Revision: 545827
URL: http://svn.apache.org/viewvc?view=rev&rev=545827
Log:
MDEP-95: applied patch from Oliver Lamy to fix JDK 1.4 OOM in unit tests
Modified:
maven/plugins/trunk/maven-dependency-plugin/src/test/java/org/apache/maven/plugin/dependency/TestBuildClasspathMojo.java
maven/plugins/trunk/maven-dependency-plugin/src/test/java/org/apache/maven/plugin/dependency/TestUnpackDependenciesMojo.java
Modified: maven/plugins/trunk/maven-dependency-plugin/src/test/java/org/apache/maven/plugin/dependency/TestBuildClasspathMojo.java
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-dependency-plugin/src/test/java/org/apache/maven/plugin/dependency/TestBuildClasspathMojo.java?view=diff&rev=545827&r1=545826&r2=545827
==============================================================================
--- maven/plugins/trunk/maven-dependency-plugin/src/test/java/org/apache/maven/plugin/dependency/TestBuildClasspathMojo.java (original)
+++ maven/plugins/trunk/maven-dependency-plugin/src/test/java/org/apache/maven/plugin/dependency/TestBuildClasspathMojo.java Sat Jun 9 18:42:41 2007
@@ -78,8 +78,8 @@
assertNotNull( file );
assertTrue( file.length() > 0 );
- assertTrue(file.contains( File.pathSeparator ));
- assertTrue(file.contains( File.separator ));
+ assertTrue(file.indexOf( File.pathSeparator ) >= 0 );
+ assertTrue(file.indexOf( File.separator ) >= 0 );
String fileSep = "#####";
String pathSep = "%%%%%";
@@ -92,10 +92,10 @@
assertNotNull( file );
assertTrue( file.length() > 0 );
- assertFalse(file.contains( File.pathSeparator ));
- assertFalse(file.contains( File.separator ));
- assertTrue(file.contains( fileSep ));
- assertTrue(file.contains( pathSep ));
+ assertFalse(file.indexOf( File.pathSeparator ) >= 0 );
+ assertFalse(file.indexOf( File.separator ) >= 0 );
+ assertTrue(file.indexOf( fileSep ) >= 0 );
+ assertTrue(file.indexOf( pathSep ) >= 0 );
}
-}
\ No newline at end of file
+}
Modified: maven/plugins/trunk/maven-dependency-plugin/src/test/java/org/apache/maven/plugin/dependency/TestUnpackDependenciesMojo.java
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-dependency-plugin/src/test/java/org/apache/maven/plugin/dependency/TestUnpackDependenciesMojo.java?view=diff&rev=545827&r1=545826&r2=545827
==============================================================================
--- maven/plugins/trunk/maven-dependency-plugin/src/test/java/org/apache/maven/plugin/dependency/TestUnpackDependenciesMojo.java (original)
+++ maven/plugins/trunk/maven-dependency-plugin/src/test/java/org/apache/maven/plugin/dependency/TestUnpackDependenciesMojo.java Sat Jun 9 18:42:41 2007
@@ -737,6 +737,8 @@
mojo.execute();
assertTrue( time != unpackedFile.lastModified() );
+
+ System.gc();
}
public void assertUnpacked( Artifact artifact, boolean overWrite )