Author: gscokart
Date: Wed Aug 6 02:39:32 2008
New Revision: 683200
URL: http://svn.apache.org/viewvc?rev=683200&view=rev
Log:
fix unit test on IBM JVM (probably broken by IVY-868)
Modified:
ant/ivy/core/trunk/test/java/org/apache/ivy/ant/IvyAntSettingsTest.java
ant/ivy/core/trunk/test/java/org/apache/ivy/ant/IvyConfigureTest.java
ant/ivy/core/trunk/test/java/org/apache/ivy/core/NormalRelativeUrlResolverTest.java
Modified:
ant/ivy/core/trunk/test/java/org/apache/ivy/ant/IvyAntSettingsTest.java
URL:
http://svn.apache.org/viewvc/ant/ivy/core/trunk/test/java/org/apache/ivy/ant/IvyAntSettingsTest.java?rev=683200&r1=683199&r2=683200&view=diff
==============================================================================
--- ant/ivy/core/trunk/test/java/org/apache/ivy/ant/IvyAntSettingsTest.java
(original)
+++ ant/ivy/core/trunk/test/java/org/apache/ivy/ant/IvyAntSettingsTest.java Wed
Aug 6 02:39:32 2008
@@ -100,7 +100,7 @@
assertEquals(new File("build/cache"), settings.getDefaultCache());
assertEquals(new
File("test/repositories/ivysettings.xml").getAbsolutePath(), settings
.getVariables().getVariable("ivy.settings.file"));
- assertEquals(new
File("test/repositories/ivysettings.xml").toURL().toExternalForm(),
+ assertEquals(new
File("test/repositories/ivysettings.xml").toURI().toURL().toExternalForm(),
settings.getVariables().getVariable("ivy.settings.url"));
assertEquals(new File("test/repositories").getAbsolutePath(),
settings.getVariables().getVariable(
"ivy.settings.dir"));
Modified: ant/ivy/core/trunk/test/java/org/apache/ivy/ant/IvyConfigureTest.java
URL:
http://svn.apache.org/viewvc/ant/ivy/core/trunk/test/java/org/apache/ivy/ant/IvyConfigureTest.java?rev=683200&r1=683199&r2=683200&view=diff
==============================================================================
--- ant/ivy/core/trunk/test/java/org/apache/ivy/ant/IvyConfigureTest.java
(original)
+++ ant/ivy/core/trunk/test/java/org/apache/ivy/ant/IvyConfigureTest.java Wed
Aug 6 02:39:32 2008
@@ -103,7 +103,7 @@
assertEquals(new File("build/cache"), settings.getDefaultCache());
assertEquals(new
File("test/repositories/ivysettings.xml").getAbsolutePath(), settings
.getVariables().getVariable("ivy.settings.file"));
- assertEquals(new
File("test/repositories/ivysettings.xml").toURL().toExternalForm(),
+ assertEquals(new
File("test/repositories/ivysettings.xml").toURI().toURL().toExternalForm(),
settings.getVariables().getVariable("ivy.settings.url"));
assertEquals(new File("test/repositories").getAbsolutePath(),
settings.getVariables().getVariable(
"ivy.settings.dir"));
Modified:
ant/ivy/core/trunk/test/java/org/apache/ivy/core/NormalRelativeUrlResolverTest.java
URL:
http://svn.apache.org/viewvc/ant/ivy/core/trunk/test/java/org/apache/ivy/core/NormalRelativeUrlResolverTest.java?rev=683200&r1=683199&r2=683200&view=diff
==============================================================================
---
ant/ivy/core/trunk/test/java/org/apache/ivy/core/NormalRelativeUrlResolverTest.java
(original)
+++
ant/ivy/core/trunk/test/java/org/apache/ivy/core/NormalRelativeUrlResolverTest.java
Wed Aug 6 02:39:32 2008
@@ -45,9 +45,9 @@
public void testFileAndUrlWithAbsoluteFile() throws MalformedURLException {
URL base = new URL("file://xxx/file.txt");
File absFile = new File(".").getAbsoluteFile();
- assertEquals(absFile.toURL(), t.getURL(base , absFile.toString() ,
null));
- assertEquals(absFile.toURL(), t.getURL(base , absFile.toString() ,
""));
- assertEquals(absFile.toURL(), t.getURL(base , absFile.toString() ,
"somthing.txt"));
+ assertEquals(absFile.toURI().toURL(), t.getURL(base ,
absFile.toString() , null));
+ assertEquals(absFile.toURI().toURL(), t.getURL(base ,
absFile.toString() , ""));
+ assertEquals(absFile.toURI().toURL(), t.getURL(base ,
absFile.toString() , "somthing.txt"));
}
public void testFileAndUrlWithRelativeFile() throws MalformedURLException {
