Author: maartenc
Date: Tue Mar 13 15:46:24 2007
New Revision: 517925
URL: http://svn.apache.org/viewvc?view=rev&rev=517925
Log:
Extra junit test for IVY-366.
Modified:
incubator/ivy/core/trunk/test/java/org/apache/ivy/ant/IvyResolveTest.java
incubator/ivy/core/trunk/test/java/org/apache/ivy/ant/ivy-simple2.xml
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=517925&r1=517924&r2=517925
==============================================================================
--- 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 Mar 13 15:46:24 2007
@@ -254,6 +254,39 @@
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();
+
+ // test the properties
+ Project project = _resolve.getProject();
+ assertEquals("apache2", project.getProperty("ivy.organisation"));
+ assertEquals("apache2",
project.getProperty("ivy.organisation.testWithResolveId"));
+ assertEquals("resolve-simple2", project.getProperty("ivy.module"));
+ assertEquals("resolve-simple2",
project.getProperty("ivy.module.testWithResolveId"));
+ assertEquals("1.1", project.getProperty("ivy.revision"));
+ assertEquals("1.1",
project.getProperty("ivy.revision.testWithResolveId"));
+ 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"));
+
+ // test the references
+ assertNotNull(project.getReference("ivy.resolved.report"));
+
assertNotNull(project.getReference("ivy.resolved.report.testWithResolveId"));
+ assertNotNull(project.getReference("ivy.resolved.descriptor"));
+
assertNotNull(project.getReference("ivy.resolved.descriptor.testWithResolveId"));
+ assertNotNull(project.getReference("ivy.resolved.configurations.ref"));
+
assertNotNull(project.getReference("ivy.resolved.configurations.ref.testWithResolveId"));
+ }
+
private Ivy getIvy() {
return _resolve.getIvyInstance();
}
Modified: incubator/ivy/core/trunk/test/java/org/apache/ivy/ant/ivy-simple2.xml
URL:
http://svn.apache.org/viewvc/incubator/ivy/core/trunk/test/java/org/apache/ivy/ant/ivy-simple2.xml?view=diff&rev=517925&r1=517924&r2=517925
==============================================================================
--- incubator/ivy/core/trunk/test/java/org/apache/ivy/ant/ivy-simple2.xml
(original)
+++ incubator/ivy/core/trunk/test/java/org/apache/ivy/ant/ivy-simple2.xml Tue
Mar 13 15:46:24 2007
@@ -5,6 +5,6 @@
status="release"
/>
<dependencies>
- <dependency org="org1" name="mod1.2" rev="2.0"/>
+ <dependency org="org1" name="mod1.2" rev="2.1"/>
</dependencies>
</ivy-module>
