Author: maartenc
Date: Thu Oct 18 20:27:15 2012
New Revision: 1399832
URL: http://svn.apache.org/viewvc?rev=1399832&view=rev
Log:
fixed junit test errors using the 2.3 Ivy api.
Modified:
ant/ivy/core/branches/2.3.x/test/java/org/apache/ivy/core/resolve/ResolveTest.java
Modified:
ant/ivy/core/branches/2.3.x/test/java/org/apache/ivy/core/resolve/ResolveTest.java
URL:
http://svn.apache.org/viewvc/ant/ivy/core/branches/2.3.x/test/java/org/apache/ivy/core/resolve/ResolveTest.java?rev=1399832&r1=1399831&r2=1399832&view=diff
==============================================================================
---
ant/ivy/core/branches/2.3.x/test/java/org/apache/ivy/core/resolve/ResolveTest.java
(original)
+++
ant/ivy/core/branches/2.3.x/test/java/org/apache/ivy/core/resolve/ResolveTest.java
Thu Oct 18 20:27:15 2012
@@ -4608,12 +4608,12 @@ public class ResolveTest extends TestCas
// with m2 snapshotRepository/uniqueVersion set to true
// but retrieving by latest.integration
Ivy ivy = new Ivy();
- ivy.configure(new File("test/repositories/m2/ivysettings.xml"));
+ ivy.configure(new
File("test/repositories/m2/ivysettings.xml").toURL());
ResolveReport report = ivy.resolve(
ModuleRevisionId.newInstance("org.apache", "test-SNAPSHOT1",
"latest.integration"),
getResolveOptions(new String[] {"*(public)"}), true);
assertNotNull(report);
- //assertFalse(report.hasError());
+ assertFalse(report.hasError());
// dependencies
assertTrue(getIvyFileInCache(
@@ -4647,7 +4647,7 @@ public class ResolveTest extends TestCas
// with m2 snapshotRepository/uniqueVersion set to true
// but retrieving by latest.integration
Ivy ivy = new Ivy();
- ivy.configure(new File("test/repositories/m2/ivysettings.xml"));
+ ivy.configure(new
File("test/repositories/m2/ivysettings.xml").toURL());
ResolveReport report = ivy.resolve(
ModuleRevisionId.newInstance("org.apache", "test-SNAPSHOT2",
"latest.integration"),
getResolveOptions(new String[] { "*(public)" }), true);