Author: maartenc Date: Fri Mar 14 22:04:57 2014 New Revision: 1577738 URL: http://svn.apache.org/r1577738 Log: Fixed testcases on Windows.
Modified: ant/ivy/core/trunk/test/java/org/apache/ivy/plugins/resolver/URLResolverTest.java Modified: ant/ivy/core/trunk/test/java/org/apache/ivy/plugins/resolver/URLResolverTest.java URL: http://svn.apache.org/viewvc/ant/ivy/core/trunk/test/java/org/apache/ivy/plugins/resolver/URLResolverTest.java?rev=1577738&r1=1577737&r2=1577738&view=diff ============================================================================== --- ant/ivy/core/trunk/test/java/org/apache/ivy/plugins/resolver/URLResolverTest.java (original) +++ ant/ivy/core/trunk/test/java/org/apache/ivy/plugins/resolver/URLResolverTest.java Fri Mar 14 22:04:57 2014 @@ -75,10 +75,9 @@ public class URLResolverTest extends Abs public void testFile() throws Exception { URLResolver resolver = new URLResolver(); resolver.setSettings(settings); - String rootpath = new File("test/repositories/1").getAbsolutePath(); - resolver.addIvyPattern("file:" + rootpath - + "/[organisation]/[module]/ivys/ivy-[revision].xml"); - resolver.addArtifactPattern("file:" + rootpath + String rootpath = new File("test/repositories/1").toURI().toURL().toExternalForm(); + resolver.addIvyPattern(rootpath + "/[organisation]/[module]/ivys/ivy-[revision].xml"); + resolver.addArtifactPattern(rootpath + "/[organisation]/[module]/[type]s/[artifact]-[revision].[type]"); resolver.setName("test"); assertEquals("test", resolver.getName()); @@ -327,10 +326,9 @@ public class URLResolverTest extends Abs public void testDownloadWithUseOriginIsTrue() throws Exception { URLResolver resolver = new URLResolver(); resolver.setSettings(settings); - String rootpath = new File("test/repositories/1").getAbsolutePath(); - resolver.addIvyPattern("file:" + rootpath - + "/[organisation]/[module]/ivys/ivy-[revision].xml"); - resolver.addArtifactPattern("file:" + rootpath + String rootpath = new File("test/repositories/1").toURI().toURL().toExternalForm(); + resolver.addIvyPattern(rootpath + "/[organisation]/[module]/ivys/ivy-[revision].xml"); + resolver.addArtifactPattern(rootpath + "/[organisation]/[module]/[type]s/[artifact]-[revision].[type]"); resolver.setName("test"); ((DefaultRepositoryCacheManager) resolver.getRepositoryCacheManager()).setUseOrigin(true);