incubator-ivy-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From gscok...@apache.org
Subject svn commit: r582809 - in /incubator/ivy/core/trunk/test: java/org/apache/ivy/core/resolve/ResolveTest.java repositories/2/mod17.1/ repositories/2/mod17.1/ivy-1.0.xml repositories/2/mod9.1/
Date Mon, 08 Oct 2007 12:53:12 GMT
Author: gscokart
Date: Mon Oct  8 05:53:11 2007
New Revision: 582809

URL: http://svn.apache.org/viewvc?rev=582809&view=rev
Log:
mod9.1 was already used by an other unit test using the repository 1

Added:
    incubator/ivy/core/trunk/test/repositories/2/mod17.1/
    incubator/ivy/core/trunk/test/repositories/2/mod17.1/ivy-1.0.xml
      - copied, changed from r582808, incubator/ivy/core/trunk/test/repositories/2/mod9.1/ivy-1.0.xml
Removed:
    incubator/ivy/core/trunk/test/repositories/2/mod9.1/
Modified:
    incubator/ivy/core/trunk/test/java/org/apache/ivy/core/resolve/ResolveTest.java

Modified: incubator/ivy/core/trunk/test/java/org/apache/ivy/core/resolve/ResolveTest.java
URL: http://svn.apache.org/viewvc/incubator/ivy/core/trunk/test/java/org/apache/ivy/core/resolve/ResolveTest.java?rev=582809&r1=582808&r2=582809&view=diff
==============================================================================
--- incubator/ivy/core/trunk/test/java/org/apache/ivy/core/resolve/ResolveTest.java (original)
+++ incubator/ivy/core/trunk/test/java/org/apache/ivy/core/resolve/ResolveTest.java Mon Oct
 8 05:53:11 2007
@@ -1452,13 +1452,13 @@
     /**
      * Test IVY-618. 
      */
-/*    public void testResolveConflictFromPoms() throws Exception {
-        ResolveReport report = ivy.resolve(new File("test/repositories/2/mod9.1/ivy-1.0.xml")
+    public void testResolveConflictFromPoms() throws Exception {
+        ResolveReport report = ivy.resolve(new File("test/repositories/2/mod10.1/ivy-1.0.xml")
                 .toURL(), getResolveOptions(new String[] {"*"}));
         assertNotNull(report);
         assertFalse(report.hasError());
     }
-*/
+
     
     public void testTransitiveEviction() throws Exception {
         // mod7.3 depends on mod7.2 v1.0 and on mod7.1 v2.0

Copied: incubator/ivy/core/trunk/test/repositories/2/mod17.1/ivy-1.0.xml (from r582808, incubator/ivy/core/trunk/test/repositories/2/mod9.1/ivy-1.0.xml)
URL: http://svn.apache.org/viewvc/incubator/ivy/core/trunk/test/repositories/2/mod17.1/ivy-1.0.xml?p2=incubator/ivy/core/trunk/test/repositories/2/mod17.1/ivy-1.0.xml&p1=incubator/ivy/core/trunk/test/repositories/2/mod9.1/ivy-1.0.xml&r1=582808&r2=582809&rev=582809&view=diff
==============================================================================
--- incubator/ivy/core/trunk/test/repositories/2/mod9.1/ivy-1.0.xml (original)
+++ incubator/ivy/core/trunk/test/repositories/2/mod17.1/ivy-1.0.xml Mon Oct  8 05:53:11 2007
@@ -18,7 +18,7 @@
 -->
 <ivy-module version="1.0">
 	<info organisation="org9"
-	       module="mod9.1"
+	       module="mod17.1"
 	       revision="1.0"
 	       status="integration"
 	       publication="20050704110000"



Mime
View raw message