Author: xavier
Date: Wed Jan 17 03:19:08 2007
New Revision: 496993
URL: http://svn.apache.org/viewvc?view=rev&rev=496993
Log:
IMPROVE: Add a unit test to verify that latest.integration accepts released
modules (IVY-394) (thanks to Gilles Scokart)
Added:
incubator/ivy/trunk/test/java/org/apache/ivy/ivy-latestreleased.xml
incubator/ivy/trunk/test/repositories/2/mod_released/
incubator/ivy/trunk/test/repositories/2/mod_released/ivy-1.0.xml
incubator/ivy/trunk/test/repositories/2/mod_released/ivy-1.1.xml
incubator/ivy/trunk/test/repositories/2/mod_released/mod_released-1.1.jar
Modified:
incubator/ivy/trunk/CHANGES.txt
incubator/ivy/trunk/test/java/org/apache/ivy/ResolveTest.java
Modified: incubator/ivy/trunk/CHANGES.txt
URL:
http://svn.apache.org/viewvc/incubator/ivy/trunk/CHANGES.txt?view=diff&rev=496993&r1=496992&r2=496993
==============================================================================
--- incubator/ivy/trunk/CHANGES.txt (original)
+++ incubator/ivy/trunk/CHANGES.txt Wed Jan 17 03:19:08 2007
@@ -11,6 +11,7 @@
- IMPROVE: ivy:retrieve should be able to create symlinks (IVY-353) (thanks to
John Williams)
- IMPROVE: Ability to have multiple roots in the <ivy:buildfilelist> task
(IVY-340) (thanks to Matt Inger)
- IMPROVE: Refactoring / documentation / test of matcher package (IVY-375)
(thanks to Stephane Baillez)
+- IMPROVE: Add a unit test to verify that latest.integration accepts released
modules (IVY-394) (thanks to Gilles Scokart)
- FIX: IOException during publish causes NullPointerException (IVY-371)
- FIX: Comments in ivy.xml duplicated (IVY-336) (thanks to Gilles Scokart)
Modified: incubator/ivy/trunk/test/java/org/apache/ivy/ResolveTest.java
URL:
http://svn.apache.org/viewvc/incubator/ivy/trunk/test/java/org/apache/ivy/ResolveTest.java?view=diff&rev=496993&r1=496992&r2=496993
==============================================================================
--- incubator/ivy/trunk/test/java/org/apache/ivy/ResolveTest.java (original)
+++ incubator/ivy/trunk/test/java/org/apache/ivy/ResolveTest.java Wed Jan 17
03:19:08 2007
@@ -1867,6 +1867,18 @@
assertTrue(_ivy.getArchiveFileInCache(_cache, "org1", "mod1.2", "2.2",
"mod1.2", "jar", "jar").exists());
}
+
+
+ public void testLatestWhenReleased() throws Exception {
+ //The test verify that latest.integration dependencies can be resolved
with released version also.
+ ResolveReport report =
_ivy.resolve(ResolveTest.class.getResource("ivy-latestreleased.xml"),
+ null, new String[] {"default"}, _cache, null, true);
+ assertFalse(report.hasError());
+
+ // dependencies
+ assertTrue(_ivy.getIvyFileInCache(_cache,
ModuleRevisionId.newInstance("org1", "mod_released", "1.1")).exists());
+ }
+
public void testVersionRange1() throws Exception {
// mod 1.4 depends on mod1.2 [1.0,2.0[
Added: incubator/ivy/trunk/test/java/org/apache/ivy/ivy-latestreleased.xml
URL:
http://svn.apache.org/viewvc/incubator/ivy/trunk/test/java/org/apache/ivy/ivy-latestreleased.xml?view=auto&rev=496993
==============================================================================
--- incubator/ivy/trunk/test/java/org/apache/ivy/ivy-latestreleased.xml (added)
+++ incubator/ivy/trunk/test/java/org/apache/ivy/ivy-latestreleased.xml Wed Jan
17 03:19:08 2007
@@ -0,0 +1,8 @@
+<ivy-module version="1.0">
+ <info organisation="apache" module="latestreleased" revision="1.0" />
+ <!-- Used by the test ResolveTest.testLatestWhenReleased -->
+
+ <dependencies>
+ <dependency org="org1" name="mod_released"
rev="latest.integration" />
+ </dependencies>
+</ivy-module>
Added: incubator/ivy/trunk/test/repositories/2/mod_released/ivy-1.0.xml
URL:
http://svn.apache.org/viewvc/incubator/ivy/trunk/test/repositories/2/mod_released/ivy-1.0.xml?view=auto&rev=496993
==============================================================================
--- incubator/ivy/trunk/test/repositories/2/mod_released/ivy-1.0.xml (added)
+++ incubator/ivy/trunk/test/repositories/2/mod_released/ivy-1.0.xml Wed Jan 17
03:19:08 2007
@@ -0,0 +1,13 @@
+<ivy-module version="1.0">
+ <info organisation="org1"
+ module="mod_released"
+ revision="1.0"
+ status="integration"
+ publication="20041101110000"
+ />
+ <publications>
+ <artifact name="mod_released" type="jar" conf="compile"/>
+ </publications>
+ <dependencies>
+ </dependencies>
+</ivy-module>
Added: incubator/ivy/trunk/test/repositories/2/mod_released/ivy-1.1.xml
URL:
http://svn.apache.org/viewvc/incubator/ivy/trunk/test/repositories/2/mod_released/ivy-1.1.xml?view=auto&rev=496993
==============================================================================
--- incubator/ivy/trunk/test/repositories/2/mod_released/ivy-1.1.xml (added)
+++ incubator/ivy/trunk/test/repositories/2/mod_released/ivy-1.1.xml Wed Jan 17
03:19:08 2007
@@ -0,0 +1,13 @@
+<ivy-module version="1.0">
+ <info organisation="org1"
+ module="mod_released"
+ revision="1.1"
+ status="release"
+ publication="20051101110000"
+ />
+ <publications>
+ <artifact name="mod_released" type="jar" conf="compile"/>
+ </publications>
+ <dependencies>
+ </dependencies>
+</ivy-module>
Added: incubator/ivy/trunk/test/repositories/2/mod_released/mod_released-1.1.jar
URL:
http://svn.apache.org/viewvc/incubator/ivy/trunk/test/repositories/2/mod_released/mod_released-1.1.jar?view=auto&rev=496993
==============================================================================
--- incubator/ivy/trunk/test/repositories/2/mod_released/mod_released-1.1.jar
(added)
+++ incubator/ivy/trunk/test/repositories/2/mod_released/mod_released-1.1.jar
Wed Jan 17 03:19:08 2007
@@ -0,0 +1 @@
+
