Author: hibou
Date: Tue Aug 21 22:16:06 2012
New Revision: 1375823
URL: http://svn.apache.org/viewvc?rev=1375823&view=rev
Log:
Fix tests: properly set the ivy settings dir url
Modified:
ant/ivy/core/trunk/src/java/org/apache/ivy/core/settings/IvySettings.java
ant/ivy/core/trunk/test/java/org/apache/ivy/core/resolve/ResolveTest.java
ant/ivy/core/trunk/test/java/org/apache/ivy/core/retrieve/RetrieveTest.java
ant/ivy/core/trunk/test/repositories/IVY-258/ivysettings.xml
ant/ivy/core/trunk/test/repositories/IVY-448/ivysettings.xml
ant/ivy/core/trunk/test/repositories/norev/ivysettings.xml
ant/ivy/core/trunk/test/repositories/xml-entities/ivysettings.xml
Modified:
ant/ivy/core/trunk/src/java/org/apache/ivy/core/settings/IvySettings.java
URL:
http://svn.apache.org/viewvc/ant/ivy/core/trunk/src/java/org/apache/ivy/core/settings/IvySettings.java?rev=1375823&r1=1375822&r2=1375823&view=diff
==============================================================================
--- ant/ivy/core/trunk/src/java/org/apache/ivy/core/settings/IvySettings.java
(original)
+++ ant/ivy/core/trunk/src/java/org/apache/ivy/core/settings/IvySettings.java
Tue Aug 21 22:16:06 2012
@@ -506,7 +506,9 @@ public class IvySettings implements Sort
setDeprecatedVariable("ivy.conf.url", "ivy.settings.url");
int slashIndex = settingsURLStr.lastIndexOf('/');
if (slashIndex != -1) {
- setVariable("ivy.settings.dir", settingsURLStr.substring(0,
slashIndex));
+ String dirUrl = settingsURLStr.substring(0, slashIndex);
+ setVariable("ivy.settings.dir", dirUrl);
+ setVariable("ivy.settings.dir.url", dirUrl);
setDeprecatedVariable("ivy.conf.dir", "ivy.settings.dir");
} else {
Message.warn("settings url does not contain any slash (/): "
Modified:
ant/ivy/core/trunk/test/java/org/apache/ivy/core/resolve/ResolveTest.java
URL:
http://svn.apache.org/viewvc/ant/ivy/core/trunk/test/java/org/apache/ivy/core/resolve/ResolveTest.java?rev=1375823&r1=1375822&r2=1375823&view=diff
==============================================================================
--- ant/ivy/core/trunk/test/java/org/apache/ivy/core/resolve/ResolveTest.java
(original)
+++ ant/ivy/core/trunk/test/java/org/apache/ivy/core/resolve/ResolveTest.java
Tue Aug 21 22:16:06 2012
@@ -4951,7 +4951,7 @@ public class ResolveTest extends TestCas
public void testExternalArtifacts() throws Exception {
Ivy ivy = Ivy.newInstance();
ivy.getSettings().setVariable("test.base.url",
- new File("test/repositories/external-artifacts").toString());
+ new
File("test/repositories/external-artifacts").toURI().toURL().toExternalForm());
ivy.configure(new
File("test/repositories/external-artifacts/ivysettings.xml"));
ResolveReport report = ivy.resolve(new
File("test/repositories/external-artifacts/ivy.xml")
@@ -5434,7 +5434,7 @@ public class ResolveTest extends TestCas
assertFalse(report.hasError());
}
- public void testCompressed() throws Exception {
+ public void testUncompress() throws Exception {
ResolveOptions options = getResolveOptions(new String[] {"*"});
options.setUncompress(true);
@@ -5452,6 +5452,7 @@ public class ResolveTest extends TestCas
adr.getUncompressedLocalDir());
File[] jarContents = adr.getUncompressedLocalDir().listFiles();
+ Arrays.sort(jarContents);
assertEquals(new File(adr.getUncompressedLocalDir(), "META-INF"),
jarContents[0]);
assertEquals(new File(adr.getUncompressedLocalDir(), "test.txt"),
jarContents[1]);
assertEquals(new File(adr.getUncompressedLocalDir(),
"META-INF/MANIFEST.MF"),
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=1375823&r1=1375822&r2=1375823&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 22:16:06 2012
@@ -21,6 +21,7 @@ import java.io.File;
import java.io.IOException;
import java.net.URL;
import java.util.ArrayList;
+import java.util.Arrays;
import java.util.List;
import java.util.Map;
@@ -329,6 +330,7 @@ public class RetrieveTest extends TestCa
assertTrue(dest.exists());
assertTrue(dest.isDirectory());
File[] jarContents = dest.listFiles();
+ Arrays.sort(jarContents);
assertEquals(new File(dest, "META-INF"), jarContents[0]);
assertEquals(new File(dest, "test.txt"), jarContents[1]);
assertEquals(new File(dest, "META-INF/MANIFEST.MF"),
jarContents[0].listFiles()[0]);
@@ -358,6 +360,7 @@ public class RetrieveTest extends TestCa
assertTrue(dest.exists());
assertTrue(dest.isDirectory());
File[] jarContents = dest.listFiles();
+ Arrays.sort(jarContents);
assertEquals(new File(dest, "META-INF"), jarContents[0]);
assertEquals(new File(dest, "test.txt"), jarContents[1]);
assertEquals(new File(dest, "META-INF/MANIFEST.MF"),
jarContents[0].listFiles()[0]);
Modified: ant/ivy/core/trunk/test/repositories/IVY-258/ivysettings.xml
URL:
http://svn.apache.org/viewvc/ant/ivy/core/trunk/test/repositories/IVY-258/ivysettings.xml?rev=1375823&r1=1375822&r2=1375823&view=diff
==============================================================================
--- ant/ivy/core/trunk/test/repositories/IVY-258/ivysettings.xml (original)
+++ ant/ivy/core/trunk/test/repositories/IVY-258/ivysettings.xml Tue Aug 21
22:16:06 2012
@@ -20,8 +20,8 @@
<settings defaultResolver="myresolver"/>
<resolvers>
<url name="myresolver">
- <ivy
pattern="${ivy.settings.dir}/[module]/ivy.xml" />
- <artifact
pattern="${ivy.settings.dir}/[module]/[artifact].[ext]" />
+ <ivy
pattern="${ivy.settings.dir.url}/[module]/ivy.xml" />
+ <artifact
pattern="${ivy.settings.dir.url}/[module]/[artifact].[ext]" />
</url>
</resolvers>
<modules>
Modified: ant/ivy/core/trunk/test/repositories/IVY-448/ivysettings.xml
URL:
http://svn.apache.org/viewvc/ant/ivy/core/trunk/test/repositories/IVY-448/ivysettings.xml?rev=1375823&r1=1375822&r2=1375823&view=diff
==============================================================================
--- ant/ivy/core/trunk/test/repositories/IVY-448/ivysettings.xml (original)
+++ ant/ivy/core/trunk/test/repositories/IVY-448/ivysettings.xml Tue Aug 21
22:16:06 2012
@@ -20,8 +20,8 @@
<settings defaultResolver="myresolver" defaultConflictManager="all"/>
<resolvers>
<url name="myresolver">
- <ivy
pattern="${ivy.settings.dir}/[module]/ivy-[revision].xml" />
- <artifact
pattern="${ivy.settings.dir}/[module]/[artifact]-[revision].[ext]" />
+ <ivy
pattern="${ivy.settings.dir.url}/[module]/ivy-[revision].xml" />
+ <artifact
pattern="${ivy.settings.dir.url}/[module]/[artifact]-[revision].[ext]" />
</url>
</resolvers>
<modules>
Modified: ant/ivy/core/trunk/test/repositories/norev/ivysettings.xml
URL:
http://svn.apache.org/viewvc/ant/ivy/core/trunk/test/repositories/norev/ivysettings.xml?rev=1375823&r1=1375822&r2=1375823&view=diff
==============================================================================
--- ant/ivy/core/trunk/test/repositories/norev/ivysettings.xml (original)
+++ ant/ivy/core/trunk/test/repositories/norev/ivysettings.xml Tue Aug 21
22:16:06 2012
@@ -20,8 +20,8 @@
<settings defaultResolver="myresolver"/>
<resolvers>
<url name="myresolver">
- <ivy
pattern="${ivy.settings.dir}/[module]/ivy.xml" />
- <artifact
pattern="${ivy.settings.dir}/[module]/[artifact].[ext]" />
+ <ivy
pattern="${ivy.settings.dir.url}/[module]/ivy.xml" />
+ <artifact
pattern="${ivy.settings.dir.url}/[module]/[artifact].[ext]" />
</url>
</resolvers>
<modules>
Modified: ant/ivy/core/trunk/test/repositories/xml-entities/ivysettings.xml
URL:
http://svn.apache.org/viewvc/ant/ivy/core/trunk/test/repositories/xml-entities/ivysettings.xml?rev=1375823&r1=1375822&r2=1375823&view=diff
==============================================================================
--- ant/ivy/core/trunk/test/repositories/xml-entities/ivysettings.xml (original)
+++ ant/ivy/core/trunk/test/repositories/xml-entities/ivysettings.xml Tue Aug
21 22:16:06 2012
@@ -23,8 +23,8 @@
&bar;
<resolvers>
<url name="myresolver">
- <ivy pattern="${ivy.settings.dir}/[module]/ivy-[revision].xml"/>
- <artifact
pattern="${ivy.settings.dir}/[module]/[artifact]-[revision].[ext]"/>
+ <ivy
pattern="${ivy.settings.dir.url}/[module]/ivy-[revision].xml"/>
+ <artifact
pattern="${ivy.settings.dir.url}/[module]/[artifact]-[revision].[ext]"/>
</url>
</resolvers>
<modules>
