svn commit: r1375736 - /ant/ivy/core/trunk/test/java/org/apache/ivy/plugins/resolver/PackagerResolverTest.java

[hibou]

Author: hibou
Date: Tue Aug 21 19:34:05 2012
New Revision: 1375736

URL: http://svn.apache.org/viewvc?rev=1375736&view=rev
Log:
Fix tests: don't urlify the pattern, only the root

Modified:
    
ant/ivy/core/trunk/test/java/org/apache/ivy/plugins/resolver/PackagerResolverTest.java

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=1375736&r1=1375735&r2=1375736&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 19:34:05 2012
@@ -95,11 +95,10 @@ public class PackagerResolverTest extend
             // Create and configure resolver
             PackagerResolver resolver = new PackagerResolver();
             resolver.setSettings(settings);
-            File repoRoot = new File("test/repositories/packager/repo");
-            resolver.addIvyPattern(
-                    new File(repoRoot, 
"[organisation]/[module]/[revision]/ivy.xml").toURI().toURL().toExternalForm());
-            resolver.setPackagerPattern(
-                    new File(repoRoot, 
"[organisation]/[module]/[revision]/packager.xml").toURI().toURL().toExternalForm());
+            String repoRoot = new 
File("test/repositories/packager/repo").toURI().toURL().toExternalForm();
+            resolver.addIvyPattern(repoRoot + 
"[organisation]/[module]/[revision]/ivy.xml");
+            resolver.setPackagerPattern(repoRoot
+                    + "[organisation]/[module]/[revision]/packager.xml");
             resolver.setBuildRoot(builddir);
             resolver.setResourceCache(cachedir);
             resolver.setPreserveBuildDirectories(true);
@@ -177,11 +176,11 @@ public class PackagerResolverTest extend
             // Create and configure resolver
             PackagerResolver resolver = new PackagerResolver();
             resolver.setSettings(settings);
-            File repoRoot = new File("test/repositories/IVY-1179/repo");
-            resolver.addIvyPattern(
-                    new File(repoRoot, 
"[organisation]/[module]/[revision]/ivy.xml").toURI().toURL().toExternalForm());
-            resolver.setPackagerPattern(
-                    new File(repoRoot, 
"[organisation]/[module]/[revision]/packager.xml").toURI().toURL().toExternalForm());
+            String repoRoot = new 
File("test/repositories/IVY-1179/repo").toURI().toURL()
+                    .toExternalForm();
+            resolver.addIvyPattern(repoRoot + 
"[organisation]/[module]/[revision]/ivy.xml");
+            resolver.setPackagerPattern(repoRoot
+                    + "[organisation]/[module]/[revision]/packager.xml");
             resolver.setBuildRoot(builddir);
             resolver.setResourceCache(cachedir);
             resolver.setPreserveBuildDirectories(true);
@@ -223,11 +222,11 @@ public class PackagerResolverTest extend
             // Create and configure resolver
             PackagerResolver resolver = new PackagerResolver();
             resolver.setSettings(settings);
-            File repoRoot = new File("test/repositories/IVY-1179/repo");
-            resolver.addIvyPattern(
-                    new File(repoRoot, 
"[organisation]/[module]/[revision]/ivy.xml").toURI().toURL().toExternalForm());
-            resolver.setPackagerPattern(
-                    new File(repoRoot, 
"[organisation]/[module]/[revision]/packager.xml").toURI().toURL().toExternalForm());
+            String repoRoot = new 
File("test/repositories/IVY-1179/repo").toURI().toURL()
+                    .toExternalForm();
+            resolver.addIvyPattern(repoRoot + 
"[organisation]/[module]/[revision]/ivy.xml");
+            resolver.setPackagerPattern(repoRoot
+                    + "[organisation]/[module]/[revision]/packager.xml");
             resolver.setBuildRoot(builddir);
             resolver.setResourceCache(cachedir);
             resolver.setPreserveBuildDirectories(true);