Author: xavier
Date: Thu Jun 12 04:28:55 2008
New Revision: 667047
URL: http://svn.apache.org/viewvc?rev=667047&view=rev
Log:
improve unit test on for branch and branch constraint handling
Modified:
ant/ivy/core/trunk/test/java/org/apache/ivy/plugins/parser/xml/XmlModuleUpdaterTest.java
ant/ivy/core/trunk/test/java/org/apache/ivy/plugins/parser/xml/updated.xml
Modified:
ant/ivy/core/trunk/test/java/org/apache/ivy/plugins/parser/xml/XmlModuleUpdaterTest.java
URL:
http://svn.apache.org/viewvc/ant/ivy/core/trunk/test/java/org/apache/ivy/plugins/parser/xml/XmlModuleUpdaterTest.java?rev=667047&r1=667046&r2=667047&view=diff
==============================================================================
---
ant/ivy/core/trunk/test/java/org/apache/ivy/plugins/parser/xml/XmlModuleUpdaterTest.java
(original)
+++
ant/ivy/core/trunk/test/java/org/apache/ivy/plugins/parser/xml/XmlModuleUpdaterTest.java
Thu Jun 12 04:28:55 2008
@@ -58,8 +58,8 @@
Map resolvedRevisions = new HashMap();
resolvedRevisions.put(ModuleRevisionId.newInstance(
"yourorg", "yourmodule2", "branch1", "2+"), "2.5");
- resolvedRevisions.put(ModuleRevisionId.newInstance("yourorg",
"yourmodule6",
- "latest.integration"), "6.3");
+ resolvedRevisions.put(ModuleRevisionId.newInstance(
+ "yourorg", "yourmodule6", "trunk", "latest.integration"), "6.3");
GregorianCalendar cal = new GregorianCalendar();
cal.set(2005, 2, 22, 14, 32, 54);
@@ -90,8 +90,8 @@
Map resolvedRevisions = new HashMap();
resolvedRevisions.put(ModuleRevisionId.newInstance(
"yourorg", "yourmodule2", "branch1", "2+"), "2.5");
- resolvedRevisions.put(ModuleRevisionId.newInstance("yourorg",
"yourmodule6",
- "latest.integration"), "6.3");
+ resolvedRevisions.put(ModuleRevisionId.newInstance(
+ "yourorg", "yourmodule6", "trunk", "latest.integration"), "6.3");
GregorianCalendar cal = new GregorianCalendar();
cal.set(2005, 2, 22, 14, 32, 54);
Modified:
ant/ivy/core/trunk/test/java/org/apache/ivy/plugins/parser/xml/updated.xml
URL:
http://svn.apache.org/viewvc/ant/ivy/core/trunk/test/java/org/apache/ivy/plugins/parser/xml/updated.xml?rev=667047&r1=667046&r2=667047&view=diff
==============================================================================
--- ant/ivy/core/trunk/test/java/org/apache/ivy/plugins/parser/xml/updated.xml
(original)
+++ ant/ivy/core/trunk/test/java/org/apache/ivy/plugins/parser/xml/updated.xml
Thu Jun 12 04:28:55 2008
@@ -62,7 +62,7 @@
<dependency org="yourorg" name="yourmodule4" rev="4.1"
conf="myconf1, myconf2->yourconf1, yourconf2"/>
<dependency org="yourorg" name="yourmodule5" rev="5.1"
conf="myconf1->yourconf1;myconf2->yourconf1, yourconf2"/>
- <dependency org="yourorg" name="yourmodule6" rev="6.3"
revConstraint="latest.integration">
+ <dependency org="yourorg" name="yourmodule6" rev="6.3"
revConstraint="latest.integration" branch="trunk">
<conf name="myconf1" mapped="yourconf1"/>
<conf name="myconf2" mapped="yourconf1, yourconf2"/>
</dependency>
