Modified: ant/ivy/core/trunk/test/java/org/apache/ivy/core/retrieve/RetrieveTest.java URL: http://svn.apache.org/viewvc/ant/ivy/core/trunk/test/java/org/apache/ivy/core/retrieve/RetrieveTest.java?rev=1375715&r1=1375714&r2=1375715&view=diff ============================================================================== --- ant/ivy/core/trunk/test/java/org/apache/ivy/core/retrieve/RetrieveTest.java (original) +++ ant/ivy/core/trunk/test/java/org/apache/ivy/core/retrieve/RetrieveTest.java Tue Aug 21 18:55:01 2012 @@ -219,7 +219,7 @@ public class RetrieveTest extends TestCa // mod1.1 depends on mod1.2 ResolveReport report = ivy.resolve(new File( - "test/repositories/1/org1/mod1.1/ivys/ivy-1.0.xml").toURL(), + "test/repositories/1/org1/mod1.1/ivys/ivy-1.0.xml").toURI().toURL(), getResolveOptions(new String[] {"*"})); assertNotNull(report); ModuleDescriptor md = report.getModuleDescriptor();
Modified: ant/ivy/core/trunk/test/java/org/apache/ivy/core/search/SearchTest.java URL: http://svn.apache.org/viewvc/ant/ivy/core/trunk/test/java/org/apache/ivy/core/search/SearchTest.java?rev=1375715&r1=1375714&r2=1375715&view=diff ============================================================================== --- ant/ivy/core/trunk/test/java/org/apache/ivy/core/search/SearchTest.java (original) +++ ant/ivy/core/trunk/test/java/org/apache/ivy/core/search/SearchTest.java Tue Aug 21 18:55:01 2012 @@ -37,7 +37,7 @@ import org.apache.ivy.plugins.resolver.I public class SearchTest extends TestCase { public void testListInMavenRepo() throws Exception { Ivy ivy = Ivy.newInstance(); - ivy.configure(new File("test/repositories/m2/ivysettings.xml").toURL()); + ivy.configure(new File("test/repositories/m2/ivysettings.xml").toURI().toURL()); Map otherTokenValues = new HashMap(); otherTokenValues.put(IvyPatternHelper.ORGANISATION_KEY, "org.apache"); @@ -51,7 +51,7 @@ public class SearchTest extends TestCase public void testListInMavenRepo2() throws Exception { Ivy ivy = Ivy.newInstance(); - ivy.configure(new File("test/repositories/m2/ivysettings.xml").toURL()); + ivy.configure(new File("test/repositories/m2/ivysettings.xml").toURI().toURL()); ((IBiblioResolver) ivy.getSettings().getResolver("m2")).setUseMavenMetadata(false); Map otherTokenValues = new HashMap(); Modified: ant/ivy/core/trunk/test/java/org/apache/ivy/core/settings/ConfigureTest.java URL: http://svn.apache.org/viewvc/ant/ivy/core/trunk/test/java/org/apache/ivy/core/settings/ConfigureTest.java?rev=1375715&r1=1375714&r2=1375715&view=diff ============================================================================== --- ant/ivy/core/trunk/test/java/org/apache/ivy/core/settings/ConfigureTest.java (original) +++ ant/ivy/core/trunk/test/java/org/apache/ivy/core/settings/ConfigureTest.java Tue Aug 21 18:55:01 2012 @@ -57,7 +57,7 @@ public class ConfigureTest extends TestC public void testTypedefWithCustomClasspath() throws Exception { Ivy ivy = new Ivy(); ivy.setVariable("ivy.custom.test.dir", new File("test/java/org/apache/ivy/core/settings") - .toURL().toString()); + .toURI().toURL().toString()); ivy.configure(ConfigureTest.class.getResource("ivysettings-custom-typedef.xml")); DependencyResolver custom = ivy.getSettings().getResolver("custom"); Modified: ant/ivy/core/trunk/test/java/org/apache/ivy/osgi/p2/P2DescriptorTest.java URL: http://svn.apache.org/viewvc/ant/ivy/core/trunk/test/java/org/apache/ivy/osgi/p2/P2DescriptorTest.java?rev=1375715&r1=1375714&r2=1375715&view=diff ============================================================================== --- ant/ivy/core/trunk/test/java/org/apache/ivy/osgi/p2/P2DescriptorTest.java (original) +++ ant/ivy/core/trunk/test/java/org/apache/ivy/osgi/p2/P2DescriptorTest.java Tue Aug 21 18:55:01 2012 @@ -56,13 +56,13 @@ public class P2DescriptorTest extends Te p2SourceResolver = new UpdateSiteResolver(); p2SourceResolver.setName("p2-sources"); - p2SourceResolver.setUrl(new File("test/test-p2/sources").toURL().toExternalForm()); + p2SourceResolver.setUrl(new File("test/test-p2/sources").toURI().toURL().toExternalForm()); p2SourceResolver.setSettings(settings); settings.addResolver(p2SourceResolver); p2ZippedResolver = new UpdateSiteResolver(); p2ZippedResolver.setName("p2-zipped"); - p2ZippedResolver.setUrl(new File("test/test-p2/zipped").toURL().toExternalForm()); + p2ZippedResolver.setUrl(new File("test/test-p2/zipped").toURI().toURL().toExternalForm()); p2ZippedResolver.setSettings(settings); settings.addResolver(p2ZippedResolver); Modified: ant/ivy/core/trunk/test/java/org/apache/ivy/osgi/updatesite/UpdateSiteAndIbiblioResolverTest.java URL: http://svn.apache.org/viewvc/ant/ivy/core/trunk/test/java/org/apache/ivy/osgi/updatesite/UpdateSiteAndIbiblioResolverTest.java?rev=1375715&r1=1375714&r2=1375715&view=diff ============================================================================== --- ant/ivy/core/trunk/test/java/org/apache/ivy/osgi/updatesite/UpdateSiteAndIbiblioResolverTest.java (original) +++ ant/ivy/core/trunk/test/java/org/apache/ivy/osgi/updatesite/UpdateSiteAndIbiblioResolverTest.java Tue Aug 21 18:55:01 2012 @@ -59,7 +59,7 @@ public class UpdateSiteAndIbiblioResolve resolver = new UpdateSiteResolver(); resolver.setName("ivyde-repo"); - resolver.setUrl(new File("test/test-p2/ivyde-repo").toURL().toExternalForm()); + resolver.setUrl(new File("test/test-p2/ivyde-repo").toURI().toURL().toExternalForm()); resolver.setSettings(settings); resolver2 = new IBiblioResolver(); Modified: ant/ivy/core/trunk/test/java/org/apache/ivy/osgi/updatesite/UpdateSiteResolverTest.java URL: http://svn.apache.org/viewvc/ant/ivy/core/trunk/test/java/org/apache/ivy/osgi/updatesite/UpdateSiteResolverTest.java?rev=1375715&r1=1375714&r2=1375715&view=diff ============================================================================== --- ant/ivy/core/trunk/test/java/org/apache/ivy/osgi/updatesite/UpdateSiteResolverTest.java (original) +++ ant/ivy/core/trunk/test/java/org/apache/ivy/osgi/updatesite/UpdateSiteResolverTest.java Tue Aug 21 18:55:01 2012 @@ -57,7 +57,7 @@ public class UpdateSiteResolverTest exte resolver = new UpdateSiteResolver(); resolver.setName("ivyde-repo"); - resolver.setUrl(new File("test/test-p2/ivyde-repo").toURL().toExternalForm()); + resolver.setUrl(new File("test/test-p2/ivyde-repo").toURI().toURL().toExternalForm()); resolver.setSettings(settings); settings.addResolver(resolver); Modified: ant/ivy/core/trunk/test/java/org/apache/ivy/plugins/parser/m2/PomModuleDescriptorParserTest.java URL: http://svn.apache.org/viewvc/ant/ivy/core/trunk/test/java/org/apache/ivy/plugins/parser/m2/PomModuleDescriptorParserTest.java?rev=1375715&r1=1375714&r2=1375715&view=diff ============================================================================== --- ant/ivy/core/trunk/test/java/org/apache/ivy/plugins/parser/m2/PomModuleDescriptorParserTest.java (original) +++ ant/ivy/core/trunk/test/java/org/apache/ivy/plugins/parser/m2/PomModuleDescriptorParserTest.java Tue Aug 21 18:55:01 2012 @@ -294,7 +294,7 @@ public class PomModuleDescriptorParserTe // the converted Ivy file should be parsable with validate=true ModuleDescriptor md2 = XmlModuleDescriptorParser.getInstance() - .parseDescriptor(new IvySettings(), dest.toURL(), true); + .parseDescriptor(new IvySettings(), dest.toURI().toURL(), true); // and the parsed module descriptor should be similar to the original assertNotNull(md2); Modified: ant/ivy/core/trunk/test/java/org/apache/ivy/plugins/parser/xml/XmlModuleUpdaterTest.java URL: http://svn.apache.org/viewvc/ant/ivy/core/trunk/test/java/org/apache/ivy/plugins/parser/xml/XmlModuleUpdaterTest.java?rev=1375715&r1=1375714&r2=1375715&view=diff ============================================================================== --- ant/ivy/core/trunk/test/java/org/apache/ivy/plugins/parser/xml/XmlModuleUpdaterTest.java (original) +++ ant/ivy/core/trunk/test/java/org/apache/ivy/plugins/parser/xml/XmlModuleUpdaterTest.java Tue Aug 21 18:55:01 2012 @@ -88,7 +88,7 @@ public class XmlModuleUpdaterTest extend public void testUpdateWithComments() throws Exception { ByteArrayOutputStream buffer = new ByteArrayOutputStream(); URL settingsUrl = new File("test/java/org/apache/ivy/plugins/parser/xml/" - + "test-with-comments.xml").toURL(); + + "test-with-comments.xml").toURI().toURL(); XmlModuleDescriptorUpdater.update(settingsUrl, new BufferedOutputStream(buffer, 1024), getUpdateOptions("release", "mynewrev")); @@ -184,7 +184,7 @@ public class XmlModuleUpdaterTest extend public void testUpdateWithImportedMappingOverride() throws Exception { ByteArrayOutputStream buffer = new ByteArrayOutputStream(); URL settingsUrl = new File("test/java/org/apache/ivy/plugins/parser/xml/" - + "test-configurations-import4.xml").toURL(); + + "test-configurations-import4.xml").toURI().toURL(); XmlModuleDescriptorUpdater.update(settingsUrl, buffer, getUpdateOptions("release", "mynewrev")); @@ -198,7 +198,7 @@ public class XmlModuleUpdaterTest extend public void testUpdateWithExcludeConfigurations1() throws Exception { ByteArrayOutputStream buffer = new ByteArrayOutputStream(); URL settingsUrl = new File("test/java/org/apache/ivy/plugins/parser/xml/" - + "test-update-excludedconfs1.xml").toURL(); + + "test-update-excludedconfs1.xml").toURI().toURL(); XmlModuleDescriptorUpdater.update(settingsUrl, buffer, getUpdateOptions("release", "mynewrev").setConfsToExclude(new String[] {"myconf2"})); @@ -224,7 +224,7 @@ public class XmlModuleUpdaterTest extend public void testUpdateWithExcludeConfigurations2() throws Exception { ByteArrayOutputStream buffer = new ByteArrayOutputStream(); URL settingFile = new File("test/java/org/apache/ivy/plugins/parser/xml/" - + "test-update-excludedconfs2.xml").toURL(); + + "test-update-excludedconfs2.xml").toURI().toURL(); try { XmlModuleDescriptorUpdater.update(settingFile, buffer, getUpdateOptions("release", "mynewrev") @@ -240,7 +240,7 @@ public class XmlModuleUpdaterTest extend public void testUpdateWithExcludeConfigurations3() throws Exception { ByteArrayOutputStream buffer = new ByteArrayOutputStream(); URL settingsUrl = new File("test/java/org/apache/ivy/plugins/parser/xml/" - + "test-update-excludedconfs3.xml").toURL(); + + "test-update-excludedconfs3.xml").toURI().toURL(); XmlModuleDescriptorUpdater.update(settingsUrl, buffer, getUpdateOptions("release", "mynewrev") @@ -270,7 +270,7 @@ public class XmlModuleUpdaterTest extend public void testUpdateWithExcludeConfigurations4() throws Exception { ByteArrayOutputStream buffer = new ByteArrayOutputStream(); URL settingsUrl = new File("test/java/org/apache/ivy/plugins/parser/xml/" - + "test-update-excludedconfs4.xml").toURL(); + + "test-update-excludedconfs4.xml").toURI().toURL(); XmlModuleDescriptorUpdater.update(settingsUrl, buffer, getUpdateOptions("release", "mynewrev").setConfsToExclude(new String[] {"myconf2"})); @@ -296,7 +296,7 @@ public class XmlModuleUpdaterTest extend public void testUpdateWithExcludeConfigurations5() throws Exception { ByteArrayOutputStream buffer = new ByteArrayOutputStream(); URL settingsUrl = new File("test/java/org/apache/ivy/plugins/parser/xml/" - + "test-update-excludedconfs5.xml").toURL(); + + "test-update-excludedconfs5.xml").toURI().toURL(); XmlModuleDescriptorUpdater.update(settingsUrl, buffer, getUpdateOptions("release", "mynewrev") .setConfsToExclude(new String[] {"myconf2"})); Modified: ant/ivy/core/trunk/test/java/org/apache/ivy/plugins/report/XmlReportParserTest.java URL: http://svn.apache.org/viewvc/ant/ivy/core/trunk/test/java/org/apache/ivy/plugins/report/XmlReportParserTest.java?rev=1375715&r1=1375714&r2=1375715&view=diff ============================================================================== --- ant/ivy/core/trunk/test/java/org/apache/ivy/plugins/report/XmlReportParserTest.java (original) +++ ant/ivy/core/trunk/test/java/org/apache/ivy/plugins/report/XmlReportParserTest.java Tue Aug 21 18:55:01 2012 @@ -58,7 +58,7 @@ public class XmlReportParserTest extends public void testGetResolvedModule() throws Exception { ResolveReport report = _ivy.resolve(new File( - "test/java/org/apache/ivy/plugins/report/ivy-with-info.xml").toURL(), + "test/java/org/apache/ivy/plugins/report/ivy-with-info.xml"), getResolveOptions(new String[] {"default"}).setValidate(false).setResolveId( "testGetResolvedModule")); assertNotNull(report); Modified: ant/ivy/core/trunk/test/java/org/apache/ivy/plugins/report/XmlReportWriterTest.java URL: http://svn.apache.org/viewvc/ant/ivy/core/trunk/test/java/org/apache/ivy/plugins/report/XmlReportWriterTest.java?rev=1375715&r1=1375714&r2=1375715&view=diff ============================================================================== --- ant/ivy/core/trunk/test/java/org/apache/ivy/plugins/report/XmlReportWriterTest.java (original) +++ ant/ivy/core/trunk/test/java/org/apache/ivy/plugins/report/XmlReportWriterTest.java Tue Aug 21 18:55:01 2012 @@ -57,7 +57,7 @@ public class XmlReportWriterTest extends public void testWriteOrigin() throws Exception { ResolveReport report = _ivy.resolve(new File( - "test/repositories/1/special-encoding-root-ivy.xml").toURL(), + "test/repositories/1/special-encoding-root-ivy.xml"), getResolveOptions(new String[] {"default"})); assertNotNull(report); @@ -71,7 +71,7 @@ public class XmlReportWriterTest extends + new File("test/repositories/1/org1/mod1.2/jars/mod1.2-2.0.jar").getAbsolutePath() + "\""; String expectedIsLocal = "is-local=\"true\""; - String expectedOrg = "organisation=\"spécial\""; + String expectedOrg = "organisation=\"sp�cial\""; assertTrue("XML doesn't contain artifact location attribute", xml.indexOf(expectedLocation) != -1); @@ -88,7 +88,7 @@ public class XmlReportWriterTest extends public void testEscapeXml() throws Exception { _ivy.configure(new File("test/repositories/IVY-635/ivysettings.xml")); ResolveReport report = _ivy.resolve(new File( - "test/java/org/apache/ivy/plugins/report/ivy-635.xml").toURL(), + "test/java/org/apache/ivy/plugins/report/ivy-635.xml"), getResolveOptions(new String[] {"default"})); assertNotNull(report); @@ -106,7 +106,7 @@ public class XmlReportWriterTest extends public void testWriteModuleInfo() throws Exception { ResolveReport report = _ivy.resolve(new File( - "test/java/org/apache/ivy/plugins/report/ivy-with-info.xml").toURL(), + "test/java/org/apache/ivy/plugins/report/ivy-with-info.xml"), getResolveOptions(new String[] {"default"}).setValidate(false)); assertNotNull(report); Modified: ant/ivy/core/trunk/test/java/org/apache/ivy/plugins/resolver/Maven2LocalTest.java URL: http://svn.apache.org/viewvc/ant/ivy/core/trunk/test/java/org/apache/ivy/plugins/resolver/Maven2LocalTest.java?rev=1375715&r1=1375714&r2=1375715&view=diff ============================================================================== --- ant/ivy/core/trunk/test/java/org/apache/ivy/plugins/resolver/Maven2LocalTest.java (original) +++ ant/ivy/core/trunk/test/java/org/apache/ivy/plugins/resolver/Maven2LocalTest.java Tue Aug 21 18:55:01 2012 @@ -91,7 +91,7 @@ public class Maven2LocalTest extends Tes resolver.setSettings(settings); resolver.setName("maven2"); resolver.setM2compatible(true); - resolver.setRoot(new File("test/repositories/m2").toURL().toExternalForm()); + resolver.setRoot(new File("test/repositories/m2").toURI().toURL().toExternalForm()); return resolver; } } Modified: ant/ivy/core/trunk/test/java/org/apache/ivy/plugins/resolver/PackagerResolverTest.java URL: http://svn.apache.org/viewvc/ant/ivy/core/trunk/test/java/org/apache/ivy/plugins/resolver/PackagerResolverTest.java?rev=1375715&r1=1375714&r2=1375715&view=diff ============================================================================== --- ant/ivy/core/trunk/test/java/org/apache/ivy/plugins/resolver/PackagerResolverTest.java (original) +++ ant/ivy/core/trunk/test/java/org/apache/ivy/plugins/resolver/PackagerResolverTest.java Tue Aug 21 18:55:01 2012 @@ -97,16 +97,16 @@ public class PackagerResolverTest extend resolver.setSettings(settings); File repoRoot = new File("test/repositories/packager/repo"); resolver.addIvyPattern( - new File(repoRoot, "[organisation]/[module]/[revision]/ivy.xml").getAbsoluteFile().toURL().toExternalForm()); + new File(repoRoot, "[organisation]/[module]/[revision]/ivy.xml").toURI().toURL().toExternalForm()); resolver.setPackagerPattern( - new File(repoRoot, "[organisation]/[module]/[revision]/packager.xml").getAbsoluteFile().toURL().toExternalForm()); + new File(repoRoot, "[organisation]/[module]/[revision]/packager.xml").toURI().toURL().toExternalForm()); resolver.setBuildRoot(builddir); resolver.setResourceCache(cachedir); resolver.setPreserveBuildDirectories(true); resolver.setVerbose(true); resolver.setProperty("packager.website.url", - new File("test/repositories/packager/website").getAbsoluteFile().toURL().toExternalForm()); + new File("test/repositories/packager/website").toURI().toURL().toExternalForm()); resolver.setName("packager"); assertEquals("packager", resolver.getName()); @@ -179,16 +179,16 @@ public class PackagerResolverTest extend resolver.setSettings(settings); File repoRoot = new File("test/repositories/IVY-1179/repo"); resolver.addIvyPattern( - new File(repoRoot, "[organisation]/[module]/[revision]/ivy.xml").getAbsoluteFile().toURL().toExternalForm()); + new File(repoRoot, "[organisation]/[module]/[revision]/ivy.xml").toURI().toURL().toExternalForm()); resolver.setPackagerPattern( - new File(repoRoot, "[organisation]/[module]/[revision]/packager.xml").getAbsoluteFile().toURL().toExternalForm()); + new File(repoRoot, "[organisation]/[module]/[revision]/packager.xml").toURI().toURL().toExternalForm()); resolver.setBuildRoot(builddir); resolver.setResourceCache(cachedir); resolver.setPreserveBuildDirectories(true); resolver.setVerbose(true); resolver.setProperty("packager.website.url", - new File("test/repositories/IVY-1179/website").getAbsoluteFile().toURL().toExternalForm()); + new File("test/repositories/IVY-1179/website").toURI().toURL().toExternalForm()); resolver.setName("packager"); @@ -225,16 +225,16 @@ public class PackagerResolverTest extend resolver.setSettings(settings); File repoRoot = new File("test/repositories/IVY-1179/repo"); resolver.addIvyPattern( - new File(repoRoot, "[organisation]/[module]/[revision]/ivy.xml").getAbsoluteFile().toURL().toExternalForm()); + new File(repoRoot, "[organisation]/[module]/[revision]/ivy.xml").toURI().toURL().toExternalForm()); resolver.setPackagerPattern( - new File(repoRoot, "[organisation]/[module]/[revision]/packager.xml").getAbsoluteFile().toURL().toExternalForm()); + new File(repoRoot, "[organisation]/[module]/[revision]/packager.xml").toURI().toURL().toExternalForm()); resolver.setBuildRoot(builddir); resolver.setResourceCache(cachedir); resolver.setPreserveBuildDirectories(true); resolver.setVerbose(true); resolver.setProperty("packager.website.url", - new File("test/repositories/IVY-1179/website").getAbsoluteFile().toURL().toExternalForm()); + new File("test/repositories/IVY-1179/website").toURI().toURL().toExternalForm()); resolver.setName("packager"); Modified: ant/ivy/core/trunk/test/java/org/apache/ivy/util/url/BasicURLHandlerTest.java URL: http://svn.apache.org/viewvc/ant/ivy/core/trunk/test/java/org/apache/ivy/util/url/BasicURLHandlerTest.java?rev=1375715&r1=1375714&r2=1375715&view=diff ============================================================================== --- ant/ivy/core/trunk/test/java/org/apache/ivy/util/url/BasicURLHandlerTest.java (original) +++ ant/ivy/core/trunk/test/java/org/apache/ivy/util/url/BasicURLHandlerTest.java Tue Aug 21 18:55:01 2012 @@ -47,8 +47,8 @@ public class BasicURLHandlerTest extends assertTrue(handler.isReachable(new URL("http://www.google.fr/";))); assertFalse(handler.isReachable(new URL("http://www.google.fr/unknownpage.html";))); - assertTrue(handler.isReachable(new File("build.xml").toURL())); - assertFalse(handler.isReachable(new File("unknownfile.xml").toURL())); + assertTrue(handler.isReachable(new File("build.xml").toURI().toURL())); + assertFalse(handler.isReachable(new File("unknownfile.xml").toURI().toURL())); // to test ftp we should know of an anonymous ftp site... ! // assertTrue(handler.isReachable(new URL("ftp://ftp.mozilla.org/pub/dir.sizes";)));
