You are viewing a plain text version of this content. The canonical link for it is here.
Posted to ivy-commits@incubator.apache.org by xa...@apache.org on 2007/06/05 12:02:43 UTC
svn commit: r544459 [28/36] - in /incubator/ivy/core/trunk:
src/java/org/apache/ivy/ src/java/org/apache/ivy/ant/
src/java/org/apache/ivy/core/ src/java/org/apache/ivy/core/cache/
src/java/org/apache/ivy/core/check/ src/java/org/apache/ivy/core/deliver...
Modified: incubator/ivy/core/trunk/test/java/org/apache/ivy/ant/IvyListModulesTest.java
URL: http://svn.apache.org/viewvc/incubator/ivy/core/trunk/test/java/org/apache/ivy/ant/IvyListModulesTest.java?view=diff&rev=544459&r1=544458&r2=544459
==============================================================================
--- incubator/ivy/core/trunk/test/java/org/apache/ivy/ant/IvyListModulesTest.java (original)
+++ incubator/ivy/core/trunk/test/java/org/apache/ivy/ant/IvyListModulesTest.java Tue Jun 5 05:02:27 2007
@@ -26,8 +26,9 @@
public class IvyListModulesTest extends TestCase {
private File _cache;
+
private IvyListModules _findModules;
-
+
protected void setUp() throws Exception {
createCache();
Project project = new Project();
@@ -41,7 +42,7 @@
_cache = new File("build/cache");
_cache.mkdirs();
}
-
+
protected void tearDown() throws Exception {
cleanCache();
}
@@ -54,25 +55,25 @@
}
public void testExact() throws Exception {
- _findModules.setOrganisation("org1");
- _findModules.setModule("mod1.1");
- _findModules.setRevision("1.0");
- _findModules.setProperty("found");
- _findModules.setValue("[organisation]/[module]/[revision]");
- _findModules.execute();
- assertEquals("org1/mod1.1/1.0", _findModules.getProject().getProperty("found"));
+ _findModules.setOrganisation("org1");
+ _findModules.setModule("mod1.1");
+ _findModules.setRevision("1.0");
+ _findModules.setProperty("found");
+ _findModules.setValue("[organisation]/[module]/[revision]");
+ _findModules.execute();
+ assertEquals("org1/mod1.1/1.0", _findModules.getProject().getProperty("found"));
}
-
+
public void testAllRevs() throws Exception {
- _findModules.setOrganisation("org1");
- _findModules.setModule("mod1.1");
- _findModules.setRevision("*");
- _findModules.setProperty("found.[revision]");
- _findModules.setValue("true");
- _findModules.execute();
- assertEquals("true", _findModules.getProject().getProperty("found.1.0"));
- assertEquals("true", _findModules.getProject().getProperty("found.1.1"));
- assertEquals("true", _findModules.getProject().getProperty("found.2.0"));
+ _findModules.setOrganisation("org1");
+ _findModules.setModule("mod1.1");
+ _findModules.setRevision("*");
+ _findModules.setProperty("found.[revision]");
+ _findModules.setValue("true");
+ _findModules.execute();
+ assertEquals("true", _findModules.getProject().getProperty("found.1.0"));
+ assertEquals("true", _findModules.getProject().getProperty("found.1.1"));
+ assertEquals("true", _findModules.getProject().getProperty("found.2.0"));
}
-
+
}
Modified: incubator/ivy/core/trunk/test/java/org/apache/ivy/ant/IvyPostResolveTaskTest.java
URL: http://svn.apache.org/viewvc/incubator/ivy/core/trunk/test/java/org/apache/ivy/ant/IvyPostResolveTaskTest.java?view=diff&rev=544459&r1=544458&r2=544459
==============================================================================
--- incubator/ivy/core/trunk/test/java/org/apache/ivy/ant/IvyPostResolveTaskTest.java (original)
+++ incubator/ivy/core/trunk/test/java/org/apache/ivy/ant/IvyPostResolveTaskTest.java Tue Jun 5 05:02:27 2007
@@ -31,20 +31,22 @@
public class IvyPostResolveTaskTest extends TestCase {
private File _cache;
+
private IvyPostResolveTask _task;
+
private Project _project;
-
+
protected void setUp() throws Exception {
- Message.init(new DefaultMessageImpl(10));
+ Message.init(new DefaultMessageImpl(10));
createCache();
_project = new Project();
_project.setProperty("ivy.settings.file", "test/repositories/ivysettings.xml");
_task = new IvyPostResolveTask() {
- public void doExecute() throws BuildException {
- prepareAndCheck();
- }
+ public void doExecute() throws BuildException {
+ prepareAndCheck();
+ }
};
_task.setProject(_project);
_task.setCache(_cache);
@@ -54,7 +56,7 @@
_cache = new File("build/cache");
_cache.mkdirs();
}
-
+
protected void tearDown() throws Exception {
cleanCache();
}
@@ -67,314 +69,343 @@
}
public void testWithPreviousResolveInSameBuildAndLessConfs() throws Exception {
- IvyResolve resolve = new IvyResolve();
- resolve.setProject(_project);
- resolve.setCache(_cache);
- resolve.setFile(new File("test/java/org/apache/ivy/ant/ivy-multiconf.xml"));
- resolve.setConf("default,compile");
- resolve.execute();
-
- ResolveReport reportBefore = (ResolveReport) _project.getReference("ivy.resolved.report");
-
- _task.setConf("default");
- _task.execute();
-
- ResolveReport reportAfter = (ResolveReport) _project.getReference("ivy.resolved.report");
-
- assertSame("IvyPostResolveTask has performed a resolve where it shouldn't", reportBefore, reportAfter);
+ IvyResolve resolve = new IvyResolve();
+ resolve.setProject(_project);
+ resolve.setCache(_cache);
+ resolve.setFile(new File("test/java/org/apache/ivy/ant/ivy-multiconf.xml"));
+ resolve.setConf("default,compile");
+ resolve.execute();
+
+ ResolveReport reportBefore = (ResolveReport) _project.getReference("ivy.resolved.report");
+
+ _task.setConf("default");
+ _task.execute();
+
+ ResolveReport reportAfter = (ResolveReport) _project.getReference("ivy.resolved.report");
+
+ assertSame("IvyPostResolveTask has performed a resolve where it shouldn't", reportBefore,
+ reportAfter);
}
public void testWithPreviousResolveInSameBuildAndSameConfs() throws Exception {
- IvyResolve resolve = new IvyResolve();
- resolve.setProject(_project);
- resolve.setCache(_cache);
- resolve.setFile(new File("test/java/org/apache/ivy/ant/ivy-multiconf.xml"));
- resolve.setConf("default");
- resolve.execute();
-
- ResolveReport reportBefore = (ResolveReport) _project.getReference("ivy.resolved.report");
-
- _task.setConf("default");
- _task.execute();
-
- ResolveReport reportAfter = (ResolveReport) _project.getReference("ivy.resolved.report");
-
- assertSame("IvyPostResolveTask has performed a resolve where it shouldn't", reportBefore, reportAfter);
+ IvyResolve resolve = new IvyResolve();
+ resolve.setProject(_project);
+ resolve.setCache(_cache);
+ resolve.setFile(new File("test/java/org/apache/ivy/ant/ivy-multiconf.xml"));
+ resolve.setConf("default");
+ resolve.execute();
+
+ ResolveReport reportBefore = (ResolveReport) _project.getReference("ivy.resolved.report");
+
+ _task.setConf("default");
+ _task.execute();
+
+ ResolveReport reportAfter = (ResolveReport) _project.getReference("ivy.resolved.report");
+
+ assertSame("IvyPostResolveTask has performed a resolve where it shouldn't", reportBefore,
+ reportAfter);
}
public void testWithPreviousResolveInSameBuildAndWildcard() throws Exception {
- IvyResolve resolve = new IvyResolve();
- resolve.setProject(_project);
- resolve.setCache(_cache);
- resolve.setFile(new File("test/java/org/apache/ivy/ant/ivy-multiconf.xml"));
- resolve.setConf("*");
- resolve.execute();
-
- ResolveReport reportBefore = (ResolveReport) _project.getReference("ivy.resolved.report");
-
- _task.setConf("default");
- _task.execute();
-
- ResolveReport reportAfter = (ResolveReport) _project.getReference("ivy.resolved.report");
-
- assertSame("IvyPostResolveTask has performed a resolve where it shouldn't", reportBefore, reportAfter);
+ IvyResolve resolve = new IvyResolve();
+ resolve.setProject(_project);
+ resolve.setCache(_cache);
+ resolve.setFile(new File("test/java/org/apache/ivy/ant/ivy-multiconf.xml"));
+ resolve.setConf("*");
+ resolve.execute();
+
+ ResolveReport reportBefore = (ResolveReport) _project.getReference("ivy.resolved.report");
+
+ _task.setConf("default");
+ _task.execute();
+
+ ResolveReport reportAfter = (ResolveReport) _project.getReference("ivy.resolved.report");
+
+ assertSame("IvyPostResolveTask has performed a resolve where it shouldn't", reportBefore,
+ reportAfter);
}
public void testWithPreviousResolveInSameBuildAndBothWildcard() throws Exception {
- IvyResolve resolve = new IvyResolve();
- resolve.setProject(_project);
- resolve.setCache(_cache);
- resolve.setFile(new File("test/java/org/apache/ivy/ant/ivy-multiconf.xml"));
- resolve.setConf("*");
- resolve.execute();
-
- ResolveReport reportBefore = (ResolveReport) _project.getReference("ivy.resolved.report");
-
- _task.setConf("*");
- _task.execute();
-
- ResolveReport reportAfter = (ResolveReport) _project.getReference("ivy.resolved.report");
-
- assertSame("IvyPostResolveTask has performed a resolve where it shouldn't", reportBefore, reportAfter);
+ IvyResolve resolve = new IvyResolve();
+ resolve.setProject(_project);
+ resolve.setCache(_cache);
+ resolve.setFile(new File("test/java/org/apache/ivy/ant/ivy-multiconf.xml"));
+ resolve.setConf("*");
+ resolve.execute();
+
+ ResolveReport reportBefore = (ResolveReport) _project.getReference("ivy.resolved.report");
+
+ _task.setConf("*");
+ _task.execute();
+
+ ResolveReport reportAfter = (ResolveReport) _project.getReference("ivy.resolved.report");
+
+ assertSame("IvyPostResolveTask has performed a resolve where it shouldn't", reportBefore,
+ reportAfter);
}
public void testWithPreviousResolveInSameBuildAndMoreConfs() throws Exception {
- IvyResolve resolve = new IvyResolve();
- resolve.setProject(_project);
- resolve.setCache(_cache);
- resolve.setFile(new File("test/java/org/apache/ivy/ant/ivy-multiconf.xml"));
- resolve.setConf("compile");
- resolve.execute();
-
- ResolveReport reportBefore = (ResolveReport) _project.getReference("ivy.resolved.report");
- assertTrue(getArchiveFileInCache("org1", "mod1.1", "2.0", "mod1.1", "jar", "jar").exists());
- assertFalse(getArchiveFileInCache("org1", "mod1.2", "2.0", "mod1.2", "jar", "jar").exists());
-
- _task.setConf("*");
- _task.execute();
-
- ResolveReport reportAfter = (ResolveReport) _project.getReference("ivy.resolved.report");
-
- assertNotSame("IvyPostResolveTask hasn't performed a resolve where it should have", reportBefore, reportAfter);
- assertTrue(getArchiveFileInCache("org1", "mod1.2", "2.0", "mod1.2", "jar", "jar").exists());
+ IvyResolve resolve = new IvyResolve();
+ resolve.setProject(_project);
+ resolve.setCache(_cache);
+ resolve.setFile(new File("test/java/org/apache/ivy/ant/ivy-multiconf.xml"));
+ resolve.setConf("compile");
+ resolve.execute();
+
+ ResolveReport reportBefore = (ResolveReport) _project.getReference("ivy.resolved.report");
+ assertTrue(getArchiveFileInCache("org1", "mod1.1", "2.0", "mod1.1", "jar", "jar").exists());
+ assertFalse(getArchiveFileInCache("org1", "mod1.2", "2.0", "mod1.2", "jar", "jar").exists());
+
+ _task.setConf("*");
+ _task.execute();
+
+ ResolveReport reportAfter = (ResolveReport) _project.getReference("ivy.resolved.report");
+
+ assertNotSame("IvyPostResolveTask hasn't performed a resolve where it should have",
+ reportBefore, reportAfter);
+ assertTrue(getArchiveFileInCache("org1", "mod1.2", "2.0", "mod1.2", "jar", "jar").exists());
}
public void testWithoutKeep() throws Exception {
- IvyResolve resolve = new IvyResolve();
- resolve.setProject(_project);
- resolve.setCache(_cache);
- resolve.setFile(new File("test/java/org/apache/ivy/ant/ivy-multiconf.xml"));
- resolve.setConf("compile");
- resolve.execute();
-
- ResolveReport reportBefore = (ResolveReport) _project.getReference("ivy.resolved.report");
- assertTrue(getArchiveFileInCache("org1", "mod1.1", "2.0", "mod1.1", "jar", "jar").exists());
- assertFalse(getArchiveFileInCache("org1", "mod1.2", "2.0", "mod1.2", "jar", "jar").exists());
-
- _task.setConf("*"); // will trigger a resolve
- _task.setKeep(false); // don't keep the resolve results
- _task.execute();
-
- ResolveReport reportAfter = (ResolveReport) _project.getReference("ivy.resolved.report");
-
- assertSame("IvyPostResolveTask has kept the resolve report where it should have", reportBefore, reportAfter);
- assertTrue(getArchiveFileInCache("org1", "mod1.2", "2.0", "mod1.2", "jar", "jar").exists());
+ IvyResolve resolve = new IvyResolve();
+ resolve.setProject(_project);
+ resolve.setCache(_cache);
+ resolve.setFile(new File("test/java/org/apache/ivy/ant/ivy-multiconf.xml"));
+ resolve.setConf("compile");
+ resolve.execute();
+
+ ResolveReport reportBefore = (ResolveReport) _project.getReference("ivy.resolved.report");
+ assertTrue(getArchiveFileInCache("org1", "mod1.1", "2.0", "mod1.1", "jar", "jar").exists());
+ assertFalse(getArchiveFileInCache("org1", "mod1.2", "2.0", "mod1.2", "jar", "jar").exists());
+
+ _task.setConf("*"); // will trigger a resolve
+ _task.setKeep(false); // don't keep the resolve results
+ _task.execute();
+
+ ResolveReport reportAfter = (ResolveReport) _project.getReference("ivy.resolved.report");
+
+ assertSame("IvyPostResolveTask has kept the resolve report where it should have",
+ reportBefore, reportAfter);
+ assertTrue(getArchiveFileInCache("org1", "mod1.2", "2.0", "mod1.2", "jar", "jar").exists());
}
public void testInlineWithoutKeep() throws Exception {
- _task.setOrganisation("org1");
- _task.setModule("mod1.1");
- _task.setRevision("2.0");
- _task.setInline(true);
- _task.setConf("*"); // will trigger a resolve
- _task.execute();
-
- ResolveReport reportAfter = (ResolveReport) _project.getReference("ivy.resolved.report");
-
- assertNull("IvyPostResolveTask has kept the resolve report where it should have", reportAfter);
- assertTrue(getArchiveFileInCache("org1", "mod1.2", "2.1", "mod1.2", "jar", "jar").exists());
+ _task.setOrganisation("org1");
+ _task.setModule("mod1.1");
+ _task.setRevision("2.0");
+ _task.setInline(true);
+ _task.setConf("*"); // will trigger a resolve
+ _task.execute();
+
+ ResolveReport reportAfter = (ResolveReport) _project.getReference("ivy.resolved.report");
+
+ assertNull("IvyPostResolveTask has kept the resolve report where it should have",
+ reportAfter);
+ assertTrue(getArchiveFileInCache("org1", "mod1.2", "2.1", "mod1.2", "jar", "jar").exists());
}
public void testInlineWithKeep() throws Exception {
- _task.setOrganisation("org1");
- _task.setModule("mod1.1");
- _task.setRevision("2.0");
- _task.setInline(true);
- _task.setKeep(true);
- _task.setConf("*"); // will trigger a resolve
- _task.execute();
-
- ResolveReport reportAfter = (ResolveReport) _project.getReference("ivy.resolved.report");
-
- assertNotNull("IvyPostResolveTask has kept the resolve report where it should have", reportAfter);
- assertTrue(getArchiveFileInCache("org1", "mod1.2", "2.1", "mod1.2", "jar", "jar").exists());
+ _task.setOrganisation("org1");
+ _task.setModule("mod1.1");
+ _task.setRevision("2.0");
+ _task.setInline(true);
+ _task.setKeep(true);
+ _task.setConf("*"); // will trigger a resolve
+ _task.execute();
+
+ ResolveReport reportAfter = (ResolveReport) _project.getReference("ivy.resolved.report");
+
+ assertNotNull("IvyPostResolveTask has kept the resolve report where it should have",
+ reportAfter);
+ assertTrue(getArchiveFileInCache("org1", "mod1.2", "2.1", "mod1.2", "jar", "jar").exists());
}
public void testWithResolveIdAndPreviousResolveInSameBuildAndLessConfs() throws Exception {
- IvyResolve resolve = new IvyResolve();
- resolve.setProject(_project);
- resolve.setCache(_cache);
- resolve.setFile(new File("test/java/org/apache/ivy/ant/ivy-multiconf.xml"));
- resolve.setConf("default,compile");
- resolve.setResolveId("testResolveId");
- resolve.execute();
-
- ResolveReport report1 = (ResolveReport) _project.getReference("ivy.resolved.report.testResolveId");
-
- // perform another resolve
- resolve = new IvyResolve();
- resolve.setProject(_project);
- resolve.setCache(_cache);
- resolve.setFile(new File("test/java/org/apache/ivy/ant/ivy-simple.xml"));
- resolve.setConf("*");
- resolve.execute();
-
- ResolveReport reportBefore = (ResolveReport) _project.getReference("ivy.resolved.report");
-
- _task.setConf("default");
- _task.setResolveId("testResolveId");
- _task.execute();
-
- ResolveReport reportAfter = (ResolveReport) _project.getReference("ivy.resolved.report");
- ResolveReport report2 = (ResolveReport) _project.getReference("ivy.resolved.report.testResolveId");
-
- assertSame("IvyPostResolveTask has performed a resolve where it shouldn't", reportBefore, reportAfter);
- assertSame("IvyPostResolveTask has performed a resolve where it shouldn't", report1, report2);
+ IvyResolve resolve = new IvyResolve();
+ resolve.setProject(_project);
+ resolve.setCache(_cache);
+ resolve.setFile(new File("test/java/org/apache/ivy/ant/ivy-multiconf.xml"));
+ resolve.setConf("default,compile");
+ resolve.setResolveId("testResolveId");
+ resolve.execute();
+
+ ResolveReport report1 = (ResolveReport) _project
+ .getReference("ivy.resolved.report.testResolveId");
+
+ // perform another resolve
+ resolve = new IvyResolve();
+ resolve.setProject(_project);
+ resolve.setCache(_cache);
+ resolve.setFile(new File("test/java/org/apache/ivy/ant/ivy-simple.xml"));
+ resolve.setConf("*");
+ resolve.execute();
+
+ ResolveReport reportBefore = (ResolveReport) _project.getReference("ivy.resolved.report");
+
+ _task.setConf("default");
+ _task.setResolveId("testResolveId");
+ _task.execute();
+
+ ResolveReport reportAfter = (ResolveReport) _project.getReference("ivy.resolved.report");
+ ResolveReport report2 = (ResolveReport) _project
+ .getReference("ivy.resolved.report.testResolveId");
+
+ assertSame("IvyPostResolveTask has performed a resolve where it shouldn't", reportBefore,
+ reportAfter);
+ assertSame("IvyPostResolveTask has performed a resolve where it shouldn't", report1,
+ report2);
}
public void testWithResolveIdAndPreviousResolveInSameBuildAndSameConfs() throws Exception {
- IvyResolve resolve = new IvyResolve();
- resolve.setProject(_project);
- resolve.setCache(_cache);
- resolve.setFile(new File("test/java/org/apache/ivy/ant/ivy-multiconf.xml"));
- resolve.setConf("default");
- resolve.setResolveId("testResolveId");
- resolve.execute();
-
- ResolveReport report1 = (ResolveReport) _project.getReference("ivy.resolved.report.testResolveId");
-
- // perform another resolve
- resolve = new IvyResolve();
- resolve.setProject(_project);
- resolve.setCache(_cache);
- resolve.setFile(new File("test/java/org/apache/ivy/ant/ivy-simple.xml"));
- resolve.setConf("*");
- resolve.execute();
-
- ResolveReport reportBefore = (ResolveReport) _project.getReference("ivy.resolved.report");
-
- _task.setConf("default");
- _task.setResolveId("testResolveId");
- _task.execute();
-
- ResolveReport reportAfter = (ResolveReport) _project.getReference("ivy.resolved.report");
- ResolveReport report2 = (ResolveReport) _project.getReference("ivy.resolved.report.testResolveId");
-
- assertSame("IvyPostResolveTask has performed a resolve where it shouldn't", reportBefore, reportAfter);
- assertSame("IvyPostResolveTask has performed a resolve where it shouldn't", report1, report2);
+ IvyResolve resolve = new IvyResolve();
+ resolve.setProject(_project);
+ resolve.setCache(_cache);
+ resolve.setFile(new File("test/java/org/apache/ivy/ant/ivy-multiconf.xml"));
+ resolve.setConf("default");
+ resolve.setResolveId("testResolveId");
+ resolve.execute();
+
+ ResolveReport report1 = (ResolveReport) _project
+ .getReference("ivy.resolved.report.testResolveId");
+
+ // perform another resolve
+ resolve = new IvyResolve();
+ resolve.setProject(_project);
+ resolve.setCache(_cache);
+ resolve.setFile(new File("test/java/org/apache/ivy/ant/ivy-simple.xml"));
+ resolve.setConf("*");
+ resolve.execute();
+
+ ResolveReport reportBefore = (ResolveReport) _project.getReference("ivy.resolved.report");
+
+ _task.setConf("default");
+ _task.setResolveId("testResolveId");
+ _task.execute();
+
+ ResolveReport reportAfter = (ResolveReport) _project.getReference("ivy.resolved.report");
+ ResolveReport report2 = (ResolveReport) _project
+ .getReference("ivy.resolved.report.testResolveId");
+
+ assertSame("IvyPostResolveTask has performed a resolve where it shouldn't", reportBefore,
+ reportAfter);
+ assertSame("IvyPostResolveTask has performed a resolve where it shouldn't", report1,
+ report2);
}
public void testWithResolveIdAndPreviousResolveInSameBuildAndWildcard() throws Exception {
- IvyResolve resolve = new IvyResolve();
- resolve.setProject(_project);
- resolve.setCache(_cache);
- resolve.setFile(new File("test/java/org/apache/ivy/ant/ivy-multiconf.xml"));
- resolve.setConf("*");
- resolve.setResolveId("testResolveId");
- resolve.execute();
-
- ResolveReport report1 = (ResolveReport) _project.getReference("ivy.resolved.report.testResolveId");
-
- // perform another resolve
- resolve = new IvyResolve();
- resolve.setProject(_project);
- resolve.setCache(_cache);
- resolve.setFile(new File("test/java/org/apache/ivy/ant/ivy-simple.xml"));
- resolve.setConf("*");
- resolve.execute();
-
- ResolveReport reportBefore = (ResolveReport) _project.getReference("ivy.resolved.report");
-
- _task.setConf("default");
- _task.setResolveId("testResolveId");
- _task.execute();
-
- ResolveReport reportAfter = (ResolveReport) _project.getReference("ivy.resolved.report");
- ResolveReport report2 = (ResolveReport) _project.getReference("ivy.resolved.report.testResolveId");
-
- assertSame("IvyPostResolveTask has performed a resolve where it shouldn't", reportBefore, reportAfter);
- assertSame("IvyPostResolveTask has performed a resolve where it shouldn't", report1, report2);
+ IvyResolve resolve = new IvyResolve();
+ resolve.setProject(_project);
+ resolve.setCache(_cache);
+ resolve.setFile(new File("test/java/org/apache/ivy/ant/ivy-multiconf.xml"));
+ resolve.setConf("*");
+ resolve.setResolveId("testResolveId");
+ resolve.execute();
+
+ ResolveReport report1 = (ResolveReport) _project
+ .getReference("ivy.resolved.report.testResolveId");
+
+ // perform another resolve
+ resolve = new IvyResolve();
+ resolve.setProject(_project);
+ resolve.setCache(_cache);
+ resolve.setFile(new File("test/java/org/apache/ivy/ant/ivy-simple.xml"));
+ resolve.setConf("*");
+ resolve.execute();
+
+ ResolveReport reportBefore = (ResolveReport) _project.getReference("ivy.resolved.report");
+
+ _task.setConf("default");
+ _task.setResolveId("testResolveId");
+ _task.execute();
+
+ ResolveReport reportAfter = (ResolveReport) _project.getReference("ivy.resolved.report");
+ ResolveReport report2 = (ResolveReport) _project
+ .getReference("ivy.resolved.report.testResolveId");
+
+ assertSame("IvyPostResolveTask has performed a resolve where it shouldn't", reportBefore,
+ reportAfter);
+ assertSame("IvyPostResolveTask has performed a resolve where it shouldn't", report1,
+ report2);
}
public void testWithResolveIdAndPreviousResolveInSameBuildAndBothWildcard() throws Exception {
- IvyResolve resolve = new IvyResolve();
- resolve.setProject(_project);
- resolve.setCache(_cache);
- resolve.setFile(new File("test/java/org/apache/ivy/ant/ivy-multiconf.xml"));
- resolve.setConf("*");
- resolve.setResolveId("testResolveId");
- resolve.execute();
-
- ResolveReport report1 = (ResolveReport) _project.getReference("ivy.resolved.report.testResolveId");
-
- // perform another resolve
- resolve = new IvyResolve();
- resolve.setProject(_project);
- resolve.setCache(_cache);
- resolve.setFile(new File("test/java/org/apache/ivy/ant/ivy-simple.xml"));
- resolve.setConf("*");
- resolve.execute();
-
- ResolveReport reportBefore = (ResolveReport) _project.getReference("ivy.resolved.report");
-
- _task.setConf("*");
- _task.setResolveId("testResolveId");
- _task.execute();
-
- ResolveReport reportAfter = (ResolveReport) _project.getReference("ivy.resolved.report");
- ResolveReport report2 = (ResolveReport) _project.getReference("ivy.resolved.report.testResolveId");
-
- assertSame("IvyPostResolveTask has performed a resolve where it shouldn't", reportBefore, reportAfter);
- assertSame("IvyPostResolveTask has performed a resolve where it shouldn't", report1, report2);
+ IvyResolve resolve = new IvyResolve();
+ resolve.setProject(_project);
+ resolve.setCache(_cache);
+ resolve.setFile(new File("test/java/org/apache/ivy/ant/ivy-multiconf.xml"));
+ resolve.setConf("*");
+ resolve.setResolveId("testResolveId");
+ resolve.execute();
+
+ ResolveReport report1 = (ResolveReport) _project
+ .getReference("ivy.resolved.report.testResolveId");
+
+ // perform another resolve
+ resolve = new IvyResolve();
+ resolve.setProject(_project);
+ resolve.setCache(_cache);
+ resolve.setFile(new File("test/java/org/apache/ivy/ant/ivy-simple.xml"));
+ resolve.setConf("*");
+ resolve.execute();
+
+ ResolveReport reportBefore = (ResolveReport) _project.getReference("ivy.resolved.report");
+
+ _task.setConf("*");
+ _task.setResolveId("testResolveId");
+ _task.execute();
+
+ ResolveReport reportAfter = (ResolveReport) _project.getReference("ivy.resolved.report");
+ ResolveReport report2 = (ResolveReport) _project
+ .getReference("ivy.resolved.report.testResolveId");
+
+ assertSame("IvyPostResolveTask has performed a resolve where it shouldn't", reportBefore,
+ reportAfter);
+ assertSame("IvyPostResolveTask has performed a resolve where it shouldn't", report1,
+ report2);
}
public void testWithResolveIdAndPreviousResolveInSameBuildAndMoreConfs() throws Exception {
- IvyResolve resolve = new IvyResolve();
- resolve.setProject(_project);
- resolve.setCache(_cache);
- resolve.setFile(new File("test/java/org/apache/ivy/ant/ivy-multiconf.xml"));
- resolve.setConf("compile");
- resolve.setResolveId("testResolveId");
- resolve.execute();
-
- ResolveReport report1 = (ResolveReport) _project.getReference("ivy.resolved.report.testResolveId");
- assertTrue(getArchiveFileInCache("org1", "mod1.1", "2.0", "mod1.1", "jar", "jar").exists());
- assertFalse(getArchiveFileInCache("org1", "mod1.2", "2.0", "mod1.2", "jar", "jar").exists());
-
- // perform another resolve
- resolve = new IvyResolve();
- resolve.setProject(_project);
- resolve.setCache(_cache);
- resolve.setFile(new File("test/java/org/apache/ivy/ant/ivy-simple.xml"));
- resolve.setConf("*");
- resolve.execute();
-
- ResolveReport reportBefore = (ResolveReport) _project.getReference("ivy.resolved.report");
-
- _task.setConf("*");
- _task.setResolveId("testResolveId");
- _task.execute();
-
- ResolveReport reportAfter = (ResolveReport) _project.getReference("ivy.resolved.report");
- ResolveReport report2 = (ResolveReport) _project.getReference("ivy.resolved.report.testResolveId");
-
- assertNotSame("IvyPostResolveTask hasn't performed a resolve where it should have", reportBefore, reportAfter);
- assertNotSame("IvyPostResolveTask hasn't performed a resolve where it should have", report1, report2);
- assertTrue(getArchiveFileInCache("org1", "mod1.2", "2.0", "mod1.2", "jar", "jar").exists());
- }
-
- private File getArchiveFileInCache(String organisation, String module, String revision, String artifact, String type, String ext) {
- return TestHelper.getArchiveFileInCache(_task.getIvyInstance(), _cache,
- organisation, module, revision, artifact, type, ext);
- }
+ IvyResolve resolve = new IvyResolve();
+ resolve.setProject(_project);
+ resolve.setCache(_cache);
+ resolve.setFile(new File("test/java/org/apache/ivy/ant/ivy-multiconf.xml"));
+ resolve.setConf("compile");
+ resolve.setResolveId("testResolveId");
+ resolve.execute();
+
+ ResolveReport report1 = (ResolveReport) _project
+ .getReference("ivy.resolved.report.testResolveId");
+ assertTrue(getArchiveFileInCache("org1", "mod1.1", "2.0", "mod1.1", "jar", "jar").exists());
+ assertFalse(getArchiveFileInCache("org1", "mod1.2", "2.0", "mod1.2", "jar", "jar").exists());
+
+ // perform another resolve
+ resolve = new IvyResolve();
+ resolve.setProject(_project);
+ resolve.setCache(_cache);
+ resolve.setFile(new File("test/java/org/apache/ivy/ant/ivy-simple.xml"));
+ resolve.setConf("*");
+ resolve.execute();
+
+ ResolveReport reportBefore = (ResolveReport) _project.getReference("ivy.resolved.report");
+
+ _task.setConf("*");
+ _task.setResolveId("testResolveId");
+ _task.execute();
+
+ ResolveReport reportAfter = (ResolveReport) _project.getReference("ivy.resolved.report");
+ ResolveReport report2 = (ResolveReport) _project
+ .getReference("ivy.resolved.report.testResolveId");
+
+ assertNotSame("IvyPostResolveTask hasn't performed a resolve where it should have",
+ reportBefore, reportAfter);
+ assertNotSame("IvyPostResolveTask hasn't performed a resolve where it should have",
+ report1, report2);
+ assertTrue(getArchiveFileInCache("org1", "mod1.2", "2.0", "mod1.2", "jar", "jar").exists());
+ }
+
+ private File getArchiveFileInCache(String organisation, String module, String revision,
+ String artifact, String type, String ext) {
+ return TestHelper.getArchiveFileInCache(_task.getIvyInstance(), _cache, organisation,
+ module, revision, artifact, type, ext);
+ }
}
Modified: incubator/ivy/core/trunk/test/java/org/apache/ivy/ant/IvyPublishTest.java
URL: http://svn.apache.org/viewvc/incubator/ivy/core/trunk/test/java/org/apache/ivy/ant/IvyPublishTest.java?view=diff&rev=544459&r1=544458&r2=544459
==============================================================================
--- incubator/ivy/core/trunk/test/java/org/apache/ivy/ant/IvyPublishTest.java (original)
+++ incubator/ivy/core/trunk/test/java/org/apache/ivy/ant/IvyPublishTest.java Tue Jun 5 05:02:27 2007
@@ -30,18 +30,18 @@
import org.apache.ivy.util.DefaultMessageImpl;
import org.apache.ivy.util.FileUtil;
import org.apache.ivy.util.Message;
-import org.apache.ivy.util.MessageImpl;
import org.apache.tools.ant.BuildException;
import org.apache.tools.ant.Project;
import org.apache.tools.ant.taskdefs.Delete;
import org.apache.tools.ant.taskdefs.Echo;
-
public class IvyPublishTest extends TestCase {
private File _cache;
+
private IvyPublish _publish;
+
private Project _project;
-
+
protected void setUp() throws Exception {
cleanTestDir();
cleanRep();
@@ -53,7 +53,7 @@
_publish = new IvyPublish();
_publish.setProject(_project);
_publish.setCache(_cache);
-
+
Message.init(new DefaultMessageImpl(10));
}
@@ -61,7 +61,7 @@
_cache = new File("build/cache");
_cache.mkdirs();
}
-
+
protected void tearDown() throws Exception {
cleanCache();
cleanTestDir();
@@ -94,31 +94,34 @@
IvyResolve res = new IvyResolve();
res.setProject(_project);
res.execute();
-
+
_publish.setPubrevision("1.2");
_publish.setResolver("1");
File art = new File("build/test/publish/resolve-simple-1.2.jar");
FileUtil.copy(new File("test/repositories/1/org1/mod1.1/jars/mod1.1-1.0.jar"), art, null);
_publish.execute();
-
+
// should have do the ivy delivering
- assertTrue(new File("build/test/publish/ivy-1.2.xml").exists());
-
+ assertTrue(new File("build/test/publish/ivy-1.2.xml").exists());
+
// should have published the files with "1" resolver
- assertTrue(new File("test/repositories/1/apache/resolve-simple/ivys/ivy-1.2.xml").exists());
- assertTrue(new File("test/repositories/1/apache/resolve-simple/jars/resolve-simple-1.2.jar").exists());
-
+ assertTrue(new File("test/repositories/1/apache/resolve-simple/ivys/ivy-1.2.xml").exists());
+ assertTrue(new File("test/repositories/1/apache/resolve-simple/jars/resolve-simple-1.2.jar")
+ .exists());
+
// should have updated published ivy version
- ModuleDescriptor md = XmlModuleDescriptorParser.getInstance().parseDescriptor(new IvySettings(), new File("test/repositories/1/apache/resolve-simple/ivys/ivy-1.2.xml").toURL(), false);
+ ModuleDescriptor md = XmlModuleDescriptorParser.getInstance().parseDescriptor(
+ new IvySettings(),
+ new File("test/repositories/1/apache/resolve-simple/ivys/ivy-1.2.xml").toURL(), false);
assertEquals("1.2", md.getModuleRevisionId().getRevision());
}
-
+
public void testPublishNotAllConfigs() throws Exception {
_project.setProperty("ivy.dep.file", "test/java/org/apache/ivy/ant/ivy-multiconf.xml");
IvyResolve res = new IvyResolve();
res.setProject(_project);
res.execute();
-
+
_publish.setPubrevision("1.2");
_publish.setResolver("1");
_publish.setConf("compile");
@@ -126,18 +129,21 @@
File art = new File("build/test/publish/resolve-simple-1.2.jar");
FileUtil.copy(new File("test/repositories/1/org1/mod1.1/jars/mod1.1-1.0.jar"), art, null);
_publish.execute();
-
+
// should have do the ivy delivering
- assertTrue(new File("build/test/publish/ivy-1.2.xml").exists());
-
+ assertTrue(new File("build/test/publish/ivy-1.2.xml").exists());
+
// should have published the files with "1" resolver
- assertTrue(new File("test/repositories/1/apache/resolve-simple/ivys/ivy-1.2.xml").exists());
- assertTrue(new File("test/repositories/1/apache/resolve-simple/jars/resolve-simple-1.2.jar").exists());
-
+ assertTrue(new File("test/repositories/1/apache/resolve-simple/ivys/ivy-1.2.xml").exists());
+ assertTrue(new File("test/repositories/1/apache/resolve-simple/jars/resolve-simple-1.2.jar")
+ .exists());
+
// should have updated published ivy version
- ModuleDescriptor md = XmlModuleDescriptorParser.getInstance().parseDescriptor(new IvySettings(), new File("test/repositories/1/apache/resolve-simple/ivys/ivy-1.2.xml").toURL(), false);
+ ModuleDescriptor md = XmlModuleDescriptorParser.getInstance().parseDescriptor(
+ new IvySettings(),
+ new File("test/repositories/1/apache/resolve-simple/ivys/ivy-1.2.xml").toURL(), false);
assertEquals("1.2", md.getModuleRevisionId().getRevision());
-
+
// should only contain the default configuration
String[] configs = md.getConfigurationsNames();
assertEquals("Number of configurations not correct", 1, configs.length);
@@ -149,7 +155,7 @@
IvyResolve res = new IvyResolve();
res.setProject(_project);
res.execute();
-
+
_publish.setPubrevision("1.2");
_publish.setResolver("1");
File art = new File("build/test/publish/1/multi1-1.2.jar");
@@ -159,12 +165,12 @@
_publish.addArtifactspattern("build/test/publish/1/[artifact]-[revision].[ext]");
_publish.addArtifactspattern("build/test/publish/2/[artifact]-[revision].[ext]");
_publish.execute();
-
+
// should have do the ivy delivering
- assertTrue(new File("build/test/publish/1/ivy-1.2.xml").exists());
-
+ assertTrue(new File("build/test/publish/1/ivy-1.2.xml").exists());
+
// should have published the files with "1" resolver
- assertTrue(new File("test/repositories/1/apache/multi/ivys/ivy-1.2.xml").exists());
+ assertTrue(new File("test/repositories/1/apache/multi/ivys/ivy-1.2.xml").exists());
assertTrue(new File("test/repositories/1/apache/multi/jars/multi1-1.2.jar").exists());
assertTrue(new File("test/repositories/1/apache/multi/jars/multi2-1.2.jar").exists());
}
@@ -175,7 +181,7 @@
res.setValidate(false);
res.setProject(_project);
res.execute();
-
+
_publish.setPubrevision("1.2");
_publish.setPubdate("20060906141243");
_publish.setResolver("1");
@@ -183,29 +189,32 @@
File art = new File("build/test/publish/resolve-custom-1.2.jar");
FileUtil.copy(new File("test/repositories/1/org1/mod1.1/jars/mod1.1-1.0.jar"), art, null);
_publish.execute();
-
+
// should have do the ivy delivering
- assertTrue(new File("build/test/publish/ivy-1.2.xml").exists());
-
+ assertTrue(new File("build/test/publish/ivy-1.2.xml").exists());
+
File dest = new File("test/repositories/1/apache/resolve-custom/ivys/ivy-1.2.xml");
- // should have published the files with "1" resolver
- assertTrue(dest.exists());
- assertTrue(new File("test/repositories/1/apache/resolve-custom/jars/resolve-custom-1.2.jar").exists());
-
+ // should have published the files with "1" resolver
+ assertTrue(dest.exists());
+ assertTrue(new File("test/repositories/1/apache/resolve-custom/jars/resolve-custom-1.2.jar")
+ .exists());
+
// should have updated published ivy version
- ModuleDescriptor md = XmlModuleDescriptorParser.getInstance().parseDescriptor(new IvySettings(), dest.toURL(), false);
+ ModuleDescriptor md = XmlModuleDescriptorParser.getInstance().parseDescriptor(
+ new IvySettings(), dest.toURL(), false);
assertEquals("1.2", md.getModuleRevisionId().getRevision());
-
+
// should have kept custom attributes
assertEquals("cval1", md.getModuleRevisionId().getAttribute("custom-info"));
assertEquals("cval2", md.getConfiguration("default").getAttribute("custom-conf"));
assertEquals("cval3", md.getDependencies()[0].getAttribute("custom-dep"));
-
+
// should respect the ivy file, with descriptions, ...
- String expected = FileUtil.readEntirely(new BufferedReader(new InputStreamReader(IvyPublishTest.class.getResourceAsStream("published-ivy-custom.xml"))));
+ String expected = FileUtil.readEntirely(new BufferedReader(new InputStreamReader(
+ IvyPublishTest.class.getResourceAsStream("published-ivy-custom.xml"))));
String updated = FileUtil.readEntirely(new BufferedReader(new FileReader(dest)));
assertEquals(expected, updated);
-
+
}
public void testNoDeliver() throws Exception {
@@ -213,28 +222,32 @@
IvyResolve res = new IvyResolve();
res.setProject(_project);
res.execute();
-
-
+
_publish.setPubrevision("1.3");
_publish.setResolver("1");
_publish.setSrcivypattern("build/test/publish/ivy-1.3.xml");
- FileUtil.copy(new File("test/java/org/apache/ivy/ant/ivy-publish.xml"), new File("build/test/publish/ivy-1.3.xml"), null);
+ FileUtil.copy(new File("test/java/org/apache/ivy/ant/ivy-publish.xml"), new File(
+ "build/test/publish/ivy-1.3.xml"), null);
File art = new File("build/test/publish/resolve-latest-1.3.jar");
FileUtil.copy(new File("test/repositories/1/org1/mod1.1/jars/mod1.1-1.0.jar"), art, null);
_publish.execute();
-
+
// should have published the files with "1" resolver
- assertTrue(new File("test/repositories/1/apache/resolve-latest/ivys/ivy-1.3.xml").exists());
- assertTrue(new File("test/repositories/1/apache/resolve-latest/jars/resolve-latest-1.3.jar").exists());
-
+ assertTrue(new File("test/repositories/1/apache/resolve-latest/ivys/ivy-1.3.xml").exists());
+ assertTrue(new File("test/repositories/1/apache/resolve-latest/jars/resolve-latest-1.3.jar")
+ .exists());
+
// the published ivy version should be ok (ok in ivy-publish file)
- ModuleDescriptor md = XmlModuleDescriptorParser.getInstance().parseDescriptor(new IvySettings(), new File("test/repositories/1/apache/resolve-latest/ivys/ivy-1.3.xml").toURL(), false);
+ ModuleDescriptor md = XmlModuleDescriptorParser.getInstance().parseDescriptor(
+ new IvySettings(),
+ new File("test/repositories/1/apache/resolve-latest/ivys/ivy-1.3.xml").toURL(), false);
assertEquals("1.3", md.getModuleRevisionId().getRevision());
-
+
// should not have done delivery (replace dynamic revisions with static ones)
- assertEquals("latest.integration", md.getDependencies()[0].getDependencyRevisionId().getRevision());
+ assertEquals("latest.integration", md.getDependencies()[0].getDependencyRevisionId()
+ .getRevision());
}
public void testForceDeliver() throws Exception {
@@ -242,24 +255,28 @@
IvyResolve res = new IvyResolve();
res.setProject(_project);
res.execute();
-
+
_publish.setPubrevision("1.3");
_publish.setResolver("1");
_publish.setSrcivypattern("build/test/publish/ivy-1.3.xml");
_publish.setForcedeliver(true);
- FileUtil.copy(new File("test/java/org/apache/ivy/ant/ivy-latest.xml"), new File("build/test/publish/ivy-1.3.xml"), null);
+ FileUtil.copy(new File("test/java/org/apache/ivy/ant/ivy-latest.xml"), new File(
+ "build/test/publish/ivy-1.3.xml"), null);
File art = new File("build/test/publish/resolve-latest-1.3.jar");
FileUtil.copy(new File("test/repositories/1/org1/mod1.1/jars/mod1.1-1.0.jar"), art, null);
_publish.execute();
-
+
// should have published the files with "1" resolver
- assertTrue(new File("test/repositories/1/apache/resolve-latest/ivys/ivy-1.3.xml").exists());
- assertTrue(new File("test/repositories/1/apache/resolve-latest/jars/resolve-latest-1.3.jar").exists());
-
+ assertTrue(new File("test/repositories/1/apache/resolve-latest/ivys/ivy-1.3.xml").exists());
+ assertTrue(new File("test/repositories/1/apache/resolve-latest/jars/resolve-latest-1.3.jar")
+ .exists());
+
// should have updated published ivy version
- ModuleDescriptor md = XmlModuleDescriptorParser.getInstance().parseDescriptor(new IvySettings(), new File("test/repositories/1/apache/resolve-latest/ivys/ivy-1.3.xml").toURL(), false);
+ ModuleDescriptor md = XmlModuleDescriptorParser.getInstance().parseDescriptor(
+ new IvySettings(),
+ new File("test/repositories/1/apache/resolve-latest/ivys/ivy-1.3.xml").toURL(), false);
assertEquals("1.3", md.getModuleRevisionId().getRevision());
}
@@ -268,21 +285,21 @@
IvyResolve res = new IvyResolve();
res.setProject(_project);
res.execute();
-
-
+
_publish.setPubrevision("1.3");
_publish.setResolver("1");
_publish.setSrcivypattern("build/test/publish/ivy-1.3.xml");
- FileUtil.copy(new File("test/java/org/apache/ivy/ant/ivy-latest.xml"), new File("build/test/publish/ivy-1.3.xml"), null);
+ FileUtil.copy(new File("test/java/org/apache/ivy/ant/ivy-latest.xml"), new File(
+ "build/test/publish/ivy-1.3.xml"), null);
File art = new File("build/test/publish/resolve-latest-1.3.jar");
FileUtil.copy(new File("test/repositories/1/org1/mod1.1/jars/mod1.1-1.0.jar"), art, null);
try {
- _publish.execute();
- fail("shouldn't publish ivy file with bad revision");
+ _publish.execute();
+ fail("shouldn't publish ivy file with bad revision");
} catch (BuildException ex) {
-
+
}
}
@@ -291,21 +308,21 @@
IvyResolve res = new IvyResolve();
res.setProject(_project);
res.execute();
-
+
_publish.setPubrevision("1.2");
_publish.setResolver("1");
File art = new File("build/test/publish/resolve-simple-1.2.jar");
FileUtil.copy(new File("test/repositories/1/org1/mod1.1/jars/mod1.1-1.0.jar"), art, null);
-
+
Echo echo = new Echo();
echo.setProject(_project);
echo.setMessage("new version");
echo.setFile(art);
echo.execute();
- File dest = new File("test/repositories/1/apache/resolve-simple/jars/resolve-simple-1.2.jar");
- FileUtil.copy(new File("test/repositories/1/org1/mod1.1/jars/mod1.1-1.0.jar"),
- dest, null);
+ File dest = new File(
+ "test/repositories/1/apache/resolve-simple/jars/resolve-simple-1.2.jar");
+ FileUtil.copy(new File("test/repositories/1/org1/mod1.1/jars/mod1.1-1.0.jar"), dest, null);
echo = new Echo();
echo.setProject(_project);
@@ -314,7 +331,7 @@
echo.execute();
dest.setReadOnly();
-
+
try {
_publish.execute();
fail("by default, publish should fail when a readonly artifact already exist");
@@ -331,21 +348,21 @@
IvyResolve res = new IvyResolve();
res.setProject(_project);
res.execute();
-
+
_publish.setPubrevision("1.2");
_publish.setResolver("1");
File art = new File("build/test/publish/resolve-simple-1.2.jar");
FileUtil.copy(new File("test/repositories/1/org1/mod1.1/jars/mod1.1-1.0.jar"), art, null);
-
+
Echo echo = new Echo();
echo.setProject(_project);
echo.setMessage("new version");
echo.setFile(art);
echo.execute();
- File dest = new File("test/repositories/1/apache/resolve-simple/jars/resolve-simple-1.2.jar");
- FileUtil.copy(new File("test/repositories/1/org1/mod1.1/jars/mod1.1-1.0.jar"),
- dest, null);
+ File dest = new File(
+ "test/repositories/1/apache/resolve-simple/jars/resolve-simple-1.2.jar");
+ FileUtil.copy(new File("test/repositories/1/org1/mod1.1/jars/mod1.1-1.0.jar"), dest, null);
echo = new Echo();
echo.setProject(_project);
@@ -353,7 +370,6 @@
echo.setFile(dest);
echo.execute();
-
_publish.setOverwrite(true);
_publish.execute();
assertTrue(dest.exists());
@@ -367,21 +383,21 @@
IvyResolve res = new IvyResolve();
res.setProject(_project);
res.execute();
-
+
_publish.setPubrevision("1.2");
_publish.setResolver("1");
File art = new File("build/test/publish/resolve-simple-1.2.jar");
FileUtil.copy(new File("test/repositories/1/org1/mod1.1/jars/mod1.1-1.0.jar"), art, null);
-
+
Echo echo = new Echo();
echo.setProject(_project);
echo.setMessage("new version");
echo.setFile(art);
echo.execute();
- File dest = new File("test/repositories/1/apache/resolve-simple/jars/resolve-simple-1.2.jar");
- FileUtil.copy(new File("test/repositories/1/org1/mod1.1/jars/mod1.1-1.0.jar"),
- dest, null);
+ File dest = new File(
+ "test/repositories/1/apache/resolve-simple/jars/resolve-simple-1.2.jar");
+ FileUtil.copy(new File("test/repositories/1/org1/mod1.1/jars/mod1.1-1.0.jar"), dest, null);
echo = new Echo();
echo.setProject(_project);
@@ -390,7 +406,7 @@
echo.execute();
dest.setReadOnly();
-
+
_publish.setOverwrite(true);
_publish.execute();
assertTrue(dest.exists());
Modified: incubator/ivy/core/trunk/test/java/org/apache/ivy/ant/IvyReportTest.java
URL: http://svn.apache.org/viewvc/incubator/ivy/core/trunk/test/java/org/apache/ivy/ant/IvyReportTest.java?view=diff&rev=544459&r1=544458&r2=544459
==============================================================================
--- incubator/ivy/core/trunk/test/java/org/apache/ivy/ant/IvyReportTest.java (original)
+++ incubator/ivy/core/trunk/test/java/org/apache/ivy/ant/IvyReportTest.java Tue Jun 5 05:02:27 2007
@@ -26,9 +26,11 @@
public class IvyReportTest extends TestCase {
private File _cache;
+
private IvyReport _report;
+
private Project _project;
-
+
protected void setUp() throws Exception {
createCache();
_project = new Project();
@@ -44,7 +46,7 @@
_cache = new File("build/cache");
_cache.mkdirs();
}
-
+
protected void tearDown() throws Exception {
cleanCache();
}
@@ -61,16 +63,17 @@
IvyResolve res = new IvyResolve();
res.setProject(_project);
res.execute();
-
+
_report.setTodir(new File(_cache, "report"));
_report.setXml(true);
-
- // do not test any xsl transformation here, because of problems of build in our continuous integration server
- _report.setXsl(false);
+
+ // do not test any xsl transformation here, because of problems of build in our continuous
+ // integration server
+ _report.setXsl(false);
_report.setGraph(false);
-
+
_report.execute();
-
+
assertTrue(new File(_cache, "report/org11-mod11.1-compile.xml").exists());
}
}
Modified: incubator/ivy/core/trunk/test/java/org/apache/ivy/ant/IvyRepositoryReportTest.java
URL: http://svn.apache.org/viewvc/incubator/ivy/core/trunk/test/java/org/apache/ivy/ant/IvyRepositoryReportTest.java?view=diff&rev=544459&r1=544458&r2=544459
==============================================================================
--- incubator/ivy/core/trunk/test/java/org/apache/ivy/ant/IvyRepositoryReportTest.java (original)
+++ incubator/ivy/core/trunk/test/java/org/apache/ivy/ant/IvyRepositoryReportTest.java Tue Jun 5 05:02:27 2007
@@ -26,8 +26,9 @@
public class IvyRepositoryReportTest extends TestCase {
private File _cache;
+
private IvyRepositoryReport _report;
-
+
protected void setUp() throws Exception {
createCache();
Project project = new Project();
@@ -42,7 +43,7 @@
_cache = new File("build/cache");
_cache.mkdirs();
}
-
+
protected void tearDown() throws Exception {
cleanCache();
}
@@ -53,35 +54,37 @@
del.setDir(_cache);
del.execute();
}
-
- public void test() {}
-// no xslt transformation is possible in the junit test on our continuous integration server for the moment...
-// public void testGraph() throws Exception {
-// _report.setOrganisation("org1");
-// _report.setXml(false);
-// _report.setGraph(true);
-// _report.setTodir(_cache);
-// _report.setOutputname("test-graph");
-// _report.execute();
-// File graphml = new File(_cache, "test-graph.graphml");
-// assertTrue(graphml.exists());
-// String g = FileUtil.readEntirely(new BufferedReader(new FileReader(graphml)));
-// assertFalse(g.indexOf("caller") != -1);
-// assertTrue(g.indexOf("mod1.1") != -1);
-// }
-//
-// public void testDot() throws Exception {
-// _report.setOrganisation("org1");
-// _report.setXml(false);
-// _report.setDot(true);
-// _report.setTodir(_cache);
-// _report.setOutputname("test-graph");
-// _report.execute();
-// File dot = new File(_cache, "test-graph.dot");
-// assertTrue(dot.exists());
-// String g = FileUtil.readEntirely(new BufferedReader(new FileReader(dot)));
-// assertFalse(g.indexOf("caller") != -1);
-// assertTrue(g.indexOf("mod1.1") != -1);
-// }
+ public void test() {
+ }
+
+ // no xslt transformation is possible in the junit test on our continuous integration server for
+ // the moment...
+ // public void testGraph() throws Exception {
+ // _report.setOrganisation("org1");
+ // _report.setXml(false);
+ // _report.setGraph(true);
+ // _report.setTodir(_cache);
+ // _report.setOutputname("test-graph");
+ // _report.execute();
+ // File graphml = new File(_cache, "test-graph.graphml");
+ // assertTrue(graphml.exists());
+ // String g = FileUtil.readEntirely(new BufferedReader(new FileReader(graphml)));
+ // assertFalse(g.indexOf("caller") != -1);
+ // assertTrue(g.indexOf("mod1.1") != -1);
+ // }
+ //
+ // public void testDot() throws Exception {
+ // _report.setOrganisation("org1");
+ // _report.setXml(false);
+ // _report.setDot(true);
+ // _report.setTodir(_cache);
+ // _report.setOutputname("test-graph");
+ // _report.execute();
+ // File dot = new File(_cache, "test-graph.dot");
+ // assertTrue(dot.exists());
+ // String g = FileUtil.readEntirely(new BufferedReader(new FileReader(dot)));
+ // assertFalse(g.indexOf("caller") != -1);
+ // assertTrue(g.indexOf("mod1.1") != -1);
+ // }
}
Modified: incubator/ivy/core/trunk/test/java/org/apache/ivy/ant/IvyResolveTest.java
URL: http://svn.apache.org/viewvc/incubator/ivy/core/trunk/test/java/org/apache/ivy/ant/IvyResolveTest.java?view=diff&rev=544459&r1=544458&r2=544459
==============================================================================
--- incubator/ivy/core/trunk/test/java/org/apache/ivy/ant/IvyResolveTest.java (original)
+++ incubator/ivy/core/trunk/test/java/org/apache/ivy/ant/IvyResolveTest.java Tue Jun 5 05:02:27 2007
@@ -24,16 +24,15 @@
import org.apache.ivy.Ivy;
import org.apache.ivy.TestHelper;
import org.apache.ivy.core.module.id.ModuleRevisionId;
-import org.apache.ivy.core.report.ResolveReport;
import org.apache.tools.ant.BuildException;
import org.apache.tools.ant.Project;
import org.apache.tools.ant.taskdefs.Delete;
-
public class IvyResolveTest extends TestCase {
private File _cache;
+
private IvyResolve _resolve;
-
+
protected void setUp() throws Exception {
createCache();
Project project = new Project();
@@ -48,7 +47,7 @@
_cache = new File("build/cache");
_cache.mkdirs();
}
-
+
protected void tearDown() throws Exception {
cleanCache();
}
@@ -61,89 +60,98 @@
}
public void testSimple() throws Exception {
- // depends on org="org1" name="mod1.2" rev="2.0"
+ // depends on org="org1" name="mod1.2" rev="2.0"
_resolve.setFile(new File("test/java/org/apache/ivy/ant/ivy-simple.xml"));
_resolve.execute();
-
- assertTrue(getResolvedIvyFileInCache(ModuleRevisionId.newInstance("apache", "resolve-simple", "1.0")).exists());
-
+
+ assertTrue(getResolvedIvyFileInCache(
+ ModuleRevisionId.newInstance("apache", "resolve-simple", "1.0")).exists());
+
// dependencies
- assertTrue(getIvyFileInCache(ModuleRevisionId.newInstance("org1", "mod1.2", "2.0")).exists());
+ assertTrue(getIvyFileInCache(ModuleRevisionId.newInstance("org1", "mod1.2", "2.0"))
+ .exists());
assertTrue(getArchiveFileInCache("org1", "mod1.2", "2.0", "mod1.2", "jar", "jar").exists());
}
- private File getArchiveFileInCache(String organisation, String module, String revision, String artifact, String type, String ext) {
- return TestHelper.getArchiveFileInCache(getIvy(), _cache,
- organisation, module, revision, artifact, type, ext);
- }
+ private File getArchiveFileInCache(String organisation, String module, String revision,
+ String artifact, String type, String ext) {
+ return TestHelper.getArchiveFileInCache(getIvy(), _cache, organisation, module, revision,
+ artifact, type, ext);
+ }
+
private File getIvyFileInCache(ModuleRevisionId id) {
- return getIvy().getCacheManager(_cache).getIvyFileInCache(id);
- }
+ return getIvy().getCacheManager(_cache).getIvyFileInCache(id);
+ }
- private File getResolvedIvyFileInCache(ModuleRevisionId id) {
- return getIvy().getCacheManager(_cache).getResolvedIvyFileInCache(id);
- }
+ private File getResolvedIvyFileInCache(ModuleRevisionId id) {
+ return getIvy().getCacheManager(_cache).getResolvedIvyFileInCache(id);
+ }
- public void testInline() throws Exception {
- // same as before, but expressing dependency directly without ivy file
+ public void testInline() throws Exception {
+ // same as before, but expressing dependency directly without ivy file
_resolve.setOrganisation("org1");
_resolve.setModule("mod1.2");
_resolve.setRevision("2.0");
_resolve.setInline(true);
_resolve.execute();
-
+
// dependencies
- assertTrue(getIvyFileInCache(ModuleRevisionId.newInstance("org1", "mod1.2", "2.0")).exists());
+ assertTrue(getIvyFileInCache(ModuleRevisionId.newInstance("org1", "mod1.2", "2.0"))
+ .exists());
assertTrue(getArchiveFileInCache("org1", "mod1.2", "2.0", "mod1.2", "jar", "jar").exists());
}
public void testWithSlashes() throws Exception {
_resolve.setFile(new File("test/java/org/apache/ivy/core/resolve/ivy-198.xml"));
_resolve.execute();
-
- File resolvedIvyFileInCache = getResolvedIvyFileInCache(ModuleRevisionId.newInstance("myorg/mydep", "system/module", "1.0"));
+
+ File resolvedIvyFileInCache = getResolvedIvyFileInCache(ModuleRevisionId.newInstance(
+ "myorg/mydep", "system/module", "1.0"));
assertTrue(resolvedIvyFileInCache.exists());
-
+
// dependencies
- assertTrue(getIvyFileInCache(ModuleRevisionId.newInstance("org1", "mod1.2", "2.0")).exists());
+ assertTrue(getIvyFileInCache(ModuleRevisionId.newInstance("org1", "mod1.2", "2.0"))
+ .exists());
assertTrue(getArchiveFileInCache("org1", "mod1.2", "2.0", "mod1.2", "jar", "jar").exists());
- assertTrue(getIvyFileInCache(ModuleRevisionId.newInstance("yourorg/yourdep", "yoursys/yourmod", "1.0")).exists());
- assertTrue(getArchiveFileInCache("yourorg/yourdep", "yoursys/yourmod", "1.0", "yourmod", "jar", "jar").exists());
+ assertTrue(getIvyFileInCache(
+ ModuleRevisionId.newInstance("yourorg/yourdep", "yoursys/yourmod", "1.0")).exists());
+ assertTrue(getArchiveFileInCache("yourorg/yourdep", "yoursys/yourmod", "1.0", "yourmod",
+ "jar", "jar").exists());
}
public void testDepsChanged() throws Exception {
_resolve.setFile(new File("test/java/org/apache/ivy/ant/ivy-simple.xml"));
_resolve.execute();
-
+
assertEquals("true", getIvy().getVariable("ivy.deps.changed"));
_resolve.execute();
-
+
assertEquals("false", getIvy().getVariable("ivy.deps.changed"));
}
public void testConflictingDepsChanged() throws Exception {
_resolve.setFile(new File("test/repositories/2/mod4.1/ivy-4.1.xml"));
_resolve.execute();
-
+
assertEquals("true", getIvy().getVariable("ivy.deps.changed"));
_resolve.execute();
-
+
assertEquals("false", getIvy().getVariable("ivy.deps.changed"));
}
public void testDouble() throws Exception {
_resolve.setFile(new File("test/java/org/apache/ivy/ant/ivy-simple.xml"));
_resolve.execute();
-
+
assertEquals("resolve-simple", getIvy().getVariable("ivy.module"));
assertEquals("1.0", getIvy().getVariable("ivy.revision"));
_resolve.setFile(new File("test/java/org/apache/ivy/ant/ivy-double.xml"));
_resolve.execute();
-
+
assertEquals("resolve-double", getIvy().getVariable("ivy.module"));
assertEquals("1.1", getIvy().getVariable("ivy.revision"));
}
@@ -188,19 +196,22 @@
fail("failure raised an exception with haltonfailure set to false");
}
}
-
+
public void testWithResolveId() throws Exception {
- _resolve.setFile(new File("test/java/org/apache/ivy/ant/ivy-simple.xml"));
- _resolve.setResolveId("testWithResolveId");
- _resolve.execute();
-
- assertTrue(getResolvedIvyFileInCache(ModuleRevisionId.newInstance("apache", "resolve-simple", "1.0")).exists());
- assertTrue(getIvy().getCacheManager(_cache).getConfigurationResolveReportInCache("testWithResolveId", "default").exists());
-
+ _resolve.setFile(new File("test/java/org/apache/ivy/ant/ivy-simple.xml"));
+ _resolve.setResolveId("testWithResolveId");
+ _resolve.execute();
+
+ assertTrue(getResolvedIvyFileInCache(
+ ModuleRevisionId.newInstance("apache", "resolve-simple", "1.0")).exists());
+ assertTrue(getIvy().getCacheManager(_cache).getConfigurationResolveReportInCache(
+ "testWithResolveId", "default").exists());
+
// dependencies
- assertTrue(getIvyFileInCache(ModuleRevisionId.newInstance("org1", "mod1.2", "2.0")).exists());
+ assertTrue(getIvyFileInCache(ModuleRevisionId.newInstance("org1", "mod1.2", "2.0"))
+ .exists());
assertTrue(getArchiveFileInCache("org1", "mod1.2", "2.0", "mod1.2", "jar", "jar").exists());
-
+
// test the properties
Project project = _resolve.getProject();
assertEquals("apache", project.getProperty("ivy.organisation"));
@@ -212,8 +223,9 @@
assertEquals("true", project.getProperty("ivy.deps.changed"));
assertEquals("true", project.getProperty("ivy.deps.changed.testWithResolveId"));
assertEquals("default", project.getProperty("ivy.resolved.configurations"));
- assertEquals("default", project.getProperty("ivy.resolved.configurations.testWithResolveId"));
-
+ assertEquals("default", project
+ .getProperty("ivy.resolved.configurations.testWithResolveId"));
+
// test the references
assertNotNull(project.getReference("ivy.resolved.report"));
assertNotNull(project.getReference("ivy.resolved.report.testWithResolveId"));
@@ -222,17 +234,17 @@
assertNotNull(project.getReference("ivy.resolved.configurations.ref"));
assertNotNull(project.getReference("ivy.resolved.configurations.ref.testWithResolveId"));
}
-
+
public void testDoubleResolveWithResolveId() throws Exception {
- _resolve.setFile(new File("test/java/org/apache/ivy/ant/ivy-simple.xml"));
- _resolve.setResolveId("testWithResolveId");
- _resolve.execute();
-
- IvyResolve newResolve = new IvyResolve();
- newResolve.setProject(_resolve.getProject());
- newResolve.setFile(new File("test/java/org/apache/ivy/ant/ivy-simple2.xml"));
- newResolve.execute();
-
+ _resolve.setFile(new File("test/java/org/apache/ivy/ant/ivy-simple.xml"));
+ _resolve.setResolveId("testWithResolveId");
+ _resolve.execute();
+
+ IvyResolve newResolve = new IvyResolve();
+ newResolve.setProject(_resolve.getProject());
+ newResolve.setFile(new File("test/java/org/apache/ivy/ant/ivy-simple2.xml"));
+ newResolve.execute();
+
// test the properties
Project project = _resolve.getProject();
assertEquals("apache2", project.getProperty("ivy.organisation"));
@@ -244,8 +256,9 @@
assertEquals("true", project.getProperty("ivy.deps.changed"));
assertEquals("true", project.getProperty("ivy.deps.changed.testWithResolveId"));
assertEquals("default", project.getProperty("ivy.resolved.configurations"));
- assertEquals("default", project.getProperty("ivy.resolved.configurations.testWithResolveId"));
-
+ assertEquals("default", project
+ .getProperty("ivy.resolved.configurations.testWithResolveId"));
+
// test the references
assertNotNull(project.getReference("ivy.resolved.report"));
assertNotNull(project.getReference("ivy.resolved.report.testWithResolveId"));
@@ -254,18 +267,18 @@
assertNotNull(project.getReference("ivy.resolved.configurations.ref"));
assertNotNull(project.getReference("ivy.resolved.configurations.ref.testWithResolveId"));
}
-
+
public void testDifferentResolveWithSameResolveId() throws Exception {
- _resolve.setFile(new File("test/java/org/apache/ivy/ant/ivy-simple.xml"));
- _resolve.setResolveId("testWithResolveId");
- _resolve.execute();
-
- IvyResolve newResolve = new IvyResolve();
- newResolve.setProject(_resolve.getProject());
- newResolve.setFile(new File("test/java/org/apache/ivy/ant/ivy-simple2.xml"));
- newResolve.setResolveId("testWithResolveId");
- newResolve.execute();
-
+ _resolve.setFile(new File("test/java/org/apache/ivy/ant/ivy-simple.xml"));
+ _resolve.setResolveId("testWithResolveId");
+ _resolve.execute();
+
+ IvyResolve newResolve = new IvyResolve();
+ newResolve.setProject(_resolve.getProject());
+ newResolve.setFile(new File("test/java/org/apache/ivy/ant/ivy-simple2.xml"));
+ newResolve.setResolveId("testWithResolveId");
+ newResolve.execute();
+
// test the properties
Project project = _resolve.getProject();
assertEquals("apache2", project.getProperty("ivy.organisation"));
@@ -277,8 +290,9 @@
assertEquals("true", project.getProperty("ivy.deps.changed"));
assertEquals("true", project.getProperty("ivy.deps.changed.testWithResolveId"));
assertEquals("default", project.getProperty("ivy.resolved.configurations"));
- assertEquals("default", project.getProperty("ivy.resolved.configurations.testWithResolveId"));
-
+ assertEquals("default", project
+ .getProperty("ivy.resolved.configurations.testWithResolveId"));
+
// test the references
assertNotNull(project.getReference("ivy.resolved.report"));
assertNotNull(project.getReference("ivy.resolved.report.testWithResolveId"));
@@ -287,27 +301,29 @@
assertNotNull(project.getReference("ivy.resolved.configurations.ref"));
assertNotNull(project.getReference("ivy.resolved.configurations.ref.testWithResolveId"));
}
-
+
public void testResolveWithAbsoluteFile() {
- // IVY-396
- File ivyFile = new File("test/java/org/apache/ivy/ant/ivy-simple.xml");
- _resolve.getProject().setProperty("ivy.dep.file", ivyFile.getAbsolutePath());
- _resolve.execute();
-
- assertTrue(getResolvedIvyFileInCache(ModuleRevisionId.newInstance("apache", "resolve-simple", "1.0")).exists());
+ // IVY-396
+ File ivyFile = new File("test/java/org/apache/ivy/ant/ivy-simple.xml");
+ _resolve.getProject().setProperty("ivy.dep.file", ivyFile.getAbsolutePath());
+ _resolve.execute();
+
+ assertTrue(getResolvedIvyFileInCache(
+ ModuleRevisionId.newInstance("apache", "resolve-simple", "1.0")).exists());
}
-
+
public void testResolveWithRelativeFile() {
- // IVY-396
- _resolve.getProject().setProperty("ivy.dep.file", "test/java/org/apache/ivy/ant/ivy-simple.xml");
- _resolve.execute();
-
- assertTrue(getResolvedIvyFileInCache(ModuleRevisionId.newInstance("apache", "resolve-simple", "1.0")).exists());
+ // IVY-396
+ _resolve.getProject().setProperty("ivy.dep.file",
+ "test/java/org/apache/ivy/ant/ivy-simple.xml");
+ _resolve.execute();
+
+ assertTrue(getResolvedIvyFileInCache(
+ ModuleRevisionId.newInstance("apache", "resolve-simple", "1.0")).exists());
}
-
+
private Ivy getIvy() {
return _resolve.getIvyInstance();
}
-
}
Modified: incubator/ivy/core/trunk/test/java/org/apache/ivy/ant/IvyRetrieveTest.java
URL: http://svn.apache.org/viewvc/incubator/ivy/core/trunk/test/java/org/apache/ivy/ant/IvyRetrieveTest.java?view=diff&rev=544459&r1=544458&r2=544459
==============================================================================
--- incubator/ivy/core/trunk/test/java/org/apache/ivy/ant/IvyRetrieveTest.java (original)
+++ incubator/ivy/core/trunk/test/java/org/apache/ivy/ant/IvyRetrieveTest.java Tue Jun 5 05:02:27 2007
@@ -28,12 +28,15 @@
import org.apache.tools.ant.Project;
import org.apache.tools.ant.taskdefs.Delete;
-
public class IvyRetrieveTest extends TestCase {
private static final String IVY_RETRIEVE_PATTERN = "build/test/lib/[organisation]/[module]/ivy-[revision].xml";
+
private static final String RETRIEVE_PATTERN = "build/test/lib/[conf]/[artifact]-[revision].[type]";
+
private File _cache;
+
private IvyRetrieve _retrieve;
+
private Project _project;
protected void setUp() throws Exception {
@@ -75,84 +78,84 @@
public void testSimple() throws Exception {
_project.setProperty("ivy.dep.file", "test/java/org/apache/ivy/ant/ivy-simple.xml");
_retrieve.execute();
- assertTrue(new File(IvyPatternHelper.substitute(RETRIEVE_PATTERN,
- "org1", "mod1.2", "2.0", "mod1.2", "jar", "jar")).exists());
+ assertTrue(new File(IvyPatternHelper.substitute(RETRIEVE_PATTERN, "org1", "mod1.2", "2.0",
+ "mod1.2", "jar", "jar")).exists());
}
-
+
public void testRetrievePrivateWithWildcard() throws Exception {
_project.setProperty("ivy.dep.file", "test/java/org/apache/ivy/ant/ivy-381.xml");
_retrieve.setConf("*");
_retrieve.execute();
- assertTrue(new File(IvyPatternHelper.substitute(RETRIEVE_PATTERN,
- "org1", "mod1.2", "1.1", "mod1.2", "jar", "jar", "public")).exists());
- assertTrue(new File(IvyPatternHelper.substitute(RETRIEVE_PATTERN,
- "org3", "mod3.2", "1.4", "mod3.2", "jar", "jar", "private")).exists());
+ assertTrue(new File(IvyPatternHelper.substitute(RETRIEVE_PATTERN, "org1", "mod1.2", "1.1",
+ "mod1.2", "jar", "jar", "public")).exists());
+ assertTrue(new File(IvyPatternHelper.substitute(RETRIEVE_PATTERN, "org3", "mod3.2", "1.4",
+ "mod3.2", "jar", "jar", "private")).exists());
}
public void testInline() throws Exception {
- // we first resolve another ivy file
- IvyResolve resolve = new IvyResolve();
- resolve.setProject(_project);
- resolve.setFile(new File("test/java/org/apache/ivy/ant/ivy-latest.xml"));
- resolve.execute();
-
- assertTrue(getArchiveFileInCache("org1", "mod1.2", "2.2", "mod1.2", "jar", "jar").exists());
-
- // then we resolve a dependency directly
- _retrieve.setOrganisation("org1");
- _retrieve.setModule("mod1.2");
- _retrieve.setRevision("2.0");
- _retrieve.setInline(true);
- _retrieve.execute();
- assertTrue(new File(IvyPatternHelper.substitute(RETRIEVE_PATTERN,
- "org1", "mod1.2", "2.0", "mod1.2", "jar", "jar")).exists());
- }
+ // we first resolve another ivy file
+ IvyResolve resolve = new IvyResolve();
+ resolve.setProject(_project);
+ resolve.setFile(new File("test/java/org/apache/ivy/ant/ivy-latest.xml"));
+ resolve.execute();
+
+ assertTrue(getArchiveFileInCache("org1", "mod1.2", "2.2", "mod1.2", "jar", "jar").exists());
+ // then we resolve a dependency directly
+ _retrieve.setOrganisation("org1");
+ _retrieve.setModule("mod1.2");
+ _retrieve.setRevision("2.0");
+ _retrieve.setInline(true);
+ _retrieve.execute();
+ assertTrue(new File(IvyPatternHelper.substitute(RETRIEVE_PATTERN, "org1", "mod1.2", "2.0",
+ "mod1.2", "jar", "jar")).exists());
+ }
public void testWithConf() throws Exception {
_project.setProperty("ivy.dep.file", "test/repositories/1/org6/mod6.2/ivys/ivy-0.4.xml");
_retrieve.execute();
- assertTrue(new File(IvyPatternHelper.substitute(RETRIEVE_PATTERN,
- "org6", "mod6.1", "0.4", "mod6.1", "jar", "jar", "default")).exists());
- assertTrue(new File(IvyPatternHelper.substitute(RETRIEVE_PATTERN,
- "org6", "mod6.1", "0.4", "mod6.1", "jar", "jar", "extension")).exists());
- assertTrue(new File(IvyPatternHelper.substitute(RETRIEVE_PATTERN,
- "org1", "mod1.2", "2.1", "mod1.2", "jar", "jar", "extension")).exists());
+ assertTrue(new File(IvyPatternHelper.substitute(RETRIEVE_PATTERN, "org6", "mod6.1", "0.4",
+ "mod6.1", "jar", "jar", "default")).exists());
+ assertTrue(new File(IvyPatternHelper.substitute(RETRIEVE_PATTERN, "org6", "mod6.1", "0.4",
+ "mod6.1", "jar", "jar", "extension")).exists());
+ assertTrue(new File(IvyPatternHelper.substitute(RETRIEVE_PATTERN, "org1", "mod1.2", "2.1",
+ "mod1.2", "jar", "jar", "extension")).exists());
}
public void testSync() throws Exception {
_project.setProperty("ivy.dep.file", "test/repositories/1/org6/mod6.2/ivys/ivy-0.4.xml");
_retrieve.setSync(true);
-
+
File[] old = new File[] {
- new File(IvyPatternHelper.substitute(RETRIEVE_PATTERN,
- "org6", "mod6.1", "0.4", "mod6.1", "jar", "jar", "unknown")), // unknown configuration
- new File(IvyPatternHelper.substitute(RETRIEVE_PATTERN,
- "org6", "mod6.1", "0.4", "mod6.1", "unknown", "unknown", "default")), // unknown type
- new File(IvyPatternHelper.substitute(RETRIEVE_PATTERN,
- "org6", "mod6.1", "0.4", "unknown", "jar", "jar", "default")), // unknown artifact
- new File(IvyPatternHelper.substitute(RETRIEVE_PATTERN,
- "org6", "mod6.1", "unknown", "mod6.1", "jar", "jar", "default")), // unknown revision
+ new File(IvyPatternHelper.substitute(RETRIEVE_PATTERN, "org6", "mod6.1", "0.4",
+ "mod6.1", "jar", "jar", "unknown")), // unknown configuration
+ new File(IvyPatternHelper.substitute(RETRIEVE_PATTERN, "org6", "mod6.1", "0.4",
+ "mod6.1", "unknown", "unknown", "default")), // unknown type
+ new File(IvyPatternHelper.substitute(RETRIEVE_PATTERN, "org6", "mod6.1", "0.4",
+ "unknown", "jar", "jar", "default")), // unknown artifact
+ new File(IvyPatternHelper.substitute(RETRIEVE_PATTERN, "org6", "mod6.1", "unknown",
+ "mod6.1", "jar", "jar", "default")), // unknown revision
};
for (int i = 0; i < old.length; i++) {
- touch(old[i]);
- }
+ touch(old[i]);
+ }
_retrieve.execute();
- assertTrue(new File(IvyPatternHelper.substitute(RETRIEVE_PATTERN,
- "org6", "mod6.1", "0.4", "mod6.1", "jar", "jar", "default")).exists());
- assertTrue(new File(IvyPatternHelper.substitute(RETRIEVE_PATTERN,
- "org6", "mod6.1", "0.4", "mod6.1", "jar", "jar", "extension")).exists());
- assertTrue(new File(IvyPatternHelper.substitute(RETRIEVE_PATTERN,
- "org1", "mod1.2", "2.1", "mod1.2", "jar", "jar", "extension")).exists());
+ assertTrue(new File(IvyPatternHelper.substitute(RETRIEVE_PATTERN, "org6", "mod6.1", "0.4",
+ "mod6.1", "jar", "jar", "default")).exists());
+ assertTrue(new File(IvyPatternHelper.substitute(RETRIEVE_PATTERN, "org6", "mod6.1", "0.4",
+ "mod6.1", "jar", "jar", "extension")).exists());
+ assertTrue(new File(IvyPatternHelper.substitute(RETRIEVE_PATTERN, "org1", "mod1.2", "2.1",
+ "mod1.2", "jar", "jar", "extension")).exists());
for (int i = 0; i < old.length; i++) {
- assertFalse(old[i] +" should have been deleted by sync", old[i].exists());
- }
- assertFalse(new File("build/test/lib/unknown").exists()); //even conf directory should have been deleted
+ assertFalse(old[i] + " should have been deleted by sync", old[i].exists());
+ }
+ assertFalse(new File("build/test/lib/unknown").exists()); // even conf directory should
+ // have been deleted
}
- public void testWithAPreviousResolve() throws Exception {
+ public void testWithAPreviousResolve() throws Exception {
// first we do a resolve in another project
Project project = new Project();
project.setProperty("ivy.settings.file", "test/repositories/ivysettings.xml");
@@ -168,13 +171,13 @@
_retrieve.setConf("default");
_retrieve.execute();
- assertTrue(new File(IvyPatternHelper.substitute(RETRIEVE_PATTERN, "org1", "mod1.2", "2.0", "mod1.2",
- "jar", "jar")).exists());
+ assertTrue(new File(IvyPatternHelper.substitute(RETRIEVE_PATTERN, "org1", "mod1.2", "2.0",
+ "mod1.2", "jar", "jar")).exists());
}
- public void testUseOrigin() throws Exception {
+ public void testUseOrigin() throws Exception {
// test case for IVY-304
- // first we do a resolve with useOrigin=true in another project
+ // first we do a resolve with useOrigin=true in another project
Project project = new Project();
project.setProperty("ivy.settings.file", "test/repositories/ivysettings.xml");
project.setProperty("ivy.dep.file", "test/java/org/apache/ivy/ant/ivy-simple.xml");
@@ -191,8 +194,8 @@
_retrieve.setUseOrigin(false);
_retrieve.execute();
- assertTrue(new File(IvyPatternHelper.substitute(RETRIEVE_PATTERN, "org1", "mod1.2", "2.0", "mod1.2",
- "jar", "jar")).exists());
+ assertTrue(new File(IvyPatternHelper.substitute(RETRIEVE_PATTERN, "org1", "mod1.2", "2.0",
+ "mod1.2", "jar", "jar")).exists());
}
public void testFailureWithoutAPreviousResolve() throws Exception {
@@ -230,7 +233,8 @@
}
public void testCustomIvyPattern() throws Exception {
- // mod2.5 depends on virtual mod2.3 which depends on mod2.1 which depends on mod1.1 which depends on mod1.2
+ // mod2.5 depends on virtual mod2.3 which depends on mod2.1 which depends on mod1.1 which
+ // depends on mod1.2
_project.setProperty("ivy.dep.file", "test/repositories/1/org2/mod2.5/ivys/ivy-0.6.1.xml");
String ivyPattern = IVY_RETRIEVE_PATTERN;
@@ -238,16 +242,16 @@
_retrieve.setIvypattern(ivyPattern);
_retrieve.execute();
- assertTrue(new File(IvyPatternHelper.substitute(ivyPattern,
- "org2", "mod2.3", "0.4.1", "ivy", "ivy", "xml")).exists());
- assertTrue(new File(IvyPatternHelper.substitute(ivyPattern,
- "org2", "mod2.1", "0.3", "ivy", "ivy", "xml")).exists());
- assertTrue(new File(IvyPatternHelper.substitute(ivyPattern,
- "org1", "mod1.1", "1.0", "ivy", "ivy", "xml")).exists());
- assertFalse(new File(IvyPatternHelper.substitute(ivyPattern,
- "org1", "mod1.2", "2.0", "ivy", "ivy", "xml")).exists());
+ assertTrue(new File(IvyPatternHelper.substitute(ivyPattern, "org2", "mod2.3", "0.4.1",
+ "ivy", "ivy", "xml")).exists());
+ assertTrue(new File(IvyPatternHelper.substitute(ivyPattern, "org2", "mod2.1", "0.3", "ivy",
+ "ivy", "xml")).exists());
+ assertTrue(new File(IvyPatternHelper.substitute(ivyPattern, "org1", "mod1.1", "1.0", "ivy",
+ "ivy", "xml")).exists());
+ assertFalse(new File(IvyPatternHelper.substitute(ivyPattern, "org1", "mod1.2", "2.0",
+ "ivy", "ivy", "xml")).exists());
}
-
+
public void testCustomIvyPatternWithConf() throws Exception {
_project.setProperty("ivy.dep.file", "test/repositories/1/org6/mod6.2/ivys/ivy-0.4.xml");
@@ -256,12 +260,12 @@
_retrieve.setIvypattern(ivyPattern);
_retrieve.execute();
- assertTrue(new File(IvyPatternHelper.substitute(ivyPattern,
- "org6", "mod6.1", "0.4", "ivy", "ivy", "xml", "default")).exists());
- assertTrue(new File(IvyPatternHelper.substitute(ivyPattern,
- "org6", "mod6.1", "0.4", "ivy", "ivy", "xml", "extension")).exists());
- assertFalse(new File(IvyPatternHelper.substitute(ivyPattern,
- "org1", "mod1.2", "2.1", "ivy", "ivy", "xml", "extension")).exists());
+ assertTrue(new File(IvyPatternHelper.substitute(ivyPattern, "org6", "mod6.1", "0.4", "ivy",
+ "ivy", "xml", "default")).exists());
+ assertTrue(new File(IvyPatternHelper.substitute(ivyPattern, "org6", "mod6.1", "0.4", "ivy",
+ "ivy", "xml", "extension")).exists());
+ assertFalse(new File(IvyPatternHelper.substitute(ivyPattern, "org1", "mod1.2", "2.1",
+ "ivy", "ivy", "xml", "extension")).exists());
}
public void testSyncWithIvyPattern() throws Exception {
@@ -272,44 +276,44 @@
_retrieve.setIvypattern(ivyPattern);
_retrieve.setSync(true);
-
+
File[] old = new File[] {
- new File(IvyPatternHelper.substitute(RETRIEVE_PATTERN,
- "org6", "mod6.1", "0.4", "mod6.1", "jar", "jar", "unknown")), // unknown configuration
- new File(IvyPatternHelper.substitute(RETRIEVE_PATTERN,
- "org6", "mod6.1", "0.4", "mod6.1", "unknown", "unknown", "default")), // unknown type
- new File(IvyPatternHelper.substitute(ivyPattern,
- "org6", "mod6.1", "0.4", "ivy", "ivy", "xml", "unk")), // unknown conf for ivy
- new File(IvyPatternHelper.substitute(ivyPattern,
- "unknown", "mod6.1", "0.4", "ivy", "ivy", "xml", "default")), // unknown organisation for ivy
+ new File(IvyPatternHelper.substitute(RETRIEVE_PATTERN, "org6", "mod6.1", "0.4",
+ "mod6.1", "jar", "jar", "unknown")), // unknown configuration
+ new File(IvyPatternHelper.substitute(RETRIEVE_PATTERN, "org6", "mod6.1", "0.4",
+ "mod6.1", "unknown", "unknown", "default")), // unknown type
+ new File(IvyPatternHelper.substitute(ivyPattern, "org6", "mod6.1", "0.4", "ivy",
+ "ivy", "xml", "unk")), // unknown conf for ivy
+ new File(IvyPatternHelper.substitute(ivyPattern, "unknown", "mod6.1", "0.4", "ivy",
+ "ivy", "xml", "default")), // unknown organisation for ivy
};
for (int i = 0; i < old.length; i++) {
- touch(old[i]);
- }
+ touch(old[i]);
+ }
_retrieve.execute();
- assertTrue(new File(IvyPatternHelper.substitute(ivyPattern,
- "org6", "mod6.1", "0.4", "ivy", "ivy", "xml", "default")).exists());
- assertTrue(new File(IvyPatternHelper.substitute(ivyPattern,
- "org6", "mod6.1", "0.4", "ivy", "ivy", "xml", "extension")).exists());
- assertFalse(new File(IvyPatternHelper.substitute(ivyPattern,
- "org1", "mod1.2", "2.1", "ivy", "ivy", "xml", "extension")).exists());
+ assertTrue(new File(IvyPatternHelper.substitute(ivyPattern, "org6", "mod6.1", "0.4", "ivy",
+ "ivy", "xml", "default")).exists());
+ assertTrue(new File(IvyPatternHelper.substitute(ivyPattern, "org6", "mod6.1", "0.4", "ivy",
+ "ivy", "xml", "extension")).exists());
+ assertFalse(new File(IvyPatternHelper.substitute(ivyPattern, "org1", "mod1.2", "2.1",
+ "ivy", "ivy", "xml", "extension")).exists());
for (int i = 0; i < old.length; i++) {
- assertFalse(old[i] +" should have been deleted by sync", old[i].exists());
- }
- assertFalse(new File("build/test/lib/unknown").exists());
- assertFalse(new File("build/test/lib/unk").exists());
- assertFalse(new File("build/test/lib/default/unknown").exists());
+ assertFalse(old[i] + " should have been deleted by sync", old[i].exists());
+ }
+ assertFalse(new File("build/test/lib/unknown").exists());
+ assertFalse(new File("build/test/lib/unk").exists());
+ assertFalse(new File("build/test/lib/default/unknown").exists());
}
-
+
public void testDoubleRetrieveWithDifferentConfigurations() {
- // IVY-315
+ // IVY-315
_project.setProperty("ivy.dep.file", "test/java/org/apache/ivy/ant/ivy-doubleretrieve.xml");
-
+
_retrieve.setConf("compile");
_retrieve.execute();
-
+
_retrieve = new IvyRetrieve();
_retrieve.setProject(_project);
_retrieve.setCache(_cache);
@@ -320,14 +324,16 @@
// creates an empty file, creating parent directories if necessary
private void touch(File file) throws IOException {
- if (file.getParentFile() != null) {
- file.getParentFile().mkdirs();
- }
- file.createNewFile();
- }
- private File getArchiveFileInCache(String organisation, String module, String revision, String artifact, String type, String ext) {
- return TestHelper.getArchiveFileInCache(_retrieve.getIvyInstance(), _cache,
- organisation, module, revision, artifact, type, ext);
- }
+ if (file.getParentFile() != null) {
+ file.getParentFile().mkdirs();
+ }
+ file.createNewFile();
+ }
+
+ private File getArchiveFileInCache(String organisation, String module, String revision,
+ String artifact, String type, String ext) {
+ return TestHelper.getArchiveFileInCache(_retrieve.getIvyInstance(), _cache, organisation,
+ module, revision, artifact, type, ext);
+ }
}