From 61ceab358805dea81c0e554a4bccfd62fd30e8ae Mon Sep 17 00:00:00 2001
From: Jaikiran Pai <jaikiran@apache.org>
Date: Tue, 23 Oct 2018 11:52:28 +0530
Subject: [PATCH] IVY-1594 Use a separate moduleid for the testcase to prevent
 other tests, reliant on the org1:mod1.1 module, from being impacted

---
 .../org/apache/ivy/core/retrieve/RetrieveTest.java  |   4 ++--
 .../1/org1/{mod1.1 => mod1.7}/ivys/ivy-3.0.xml      |   2 +-
 .../{mod1.1 => mod1.7}/jars/zipped-artifact-3.0.zip | Bin
 3 files changed, 3 insertions(+), 3 deletions(-)
 rename test/repositories/1/org1/{mod1.1 => mod1.7}/ivys/ivy-3.0.xml (97%)
 rename test/repositories/1/org1/{mod1.1 => mod1.7}/jars/zipped-artifact-3.0.zip (100%)

diff --git a/test/java/org/apache/ivy/core/retrieve/RetrieveTest.java b/test/java/org/apache/ivy/core/retrieve/RetrieveTest.java
index 239cd36c..fd842989 100644
--- a/test/java/org/apache/ivy/core/retrieve/RetrieveTest.java
+++ b/test/java/org/apache/ivy/core/retrieve/RetrieveTest.java
@@ -265,7 +265,7 @@ public class RetrieveTest {
     @Test
     public void testRetrieveZipArtifactWithSymlinks() throws Exception {
         // resolve (inline) with org1:mod1.1:3.0 as a dependency
-        final ResolveReport report = ivy.resolve(new ModuleRevisionId(new ModuleId("org1", "mod1.1"), "3.0"),
+        final ResolveReport report = ivy.resolve(new ModuleRevisionId(new ModuleId("org1", "mod1.7"), "3.0"),
                 getResolveOptions(new String[]{"*"}), false);
         assertNotNull("Resolution report is null", report);
         final ModuleDescriptor md = report.getModuleDescriptor();
@@ -275,7 +275,7 @@ public class RetrieveTest {
         ivy.retrieve(md.getModuleRevisionId(),
                 getRetrieveOptions().setMakeSymlinks(true).setDestArtifactPattern(retrievePattern));
 
-        final String expectedRetrieveLocation = IvyPatternHelper.substitute(retrievePattern, "org1", "mod1.1",
+        final String expectedRetrieveLocation = IvyPatternHelper.substitute(retrievePattern, "org1", "mod1.7",
                 "3.0", "zipped-artifact", null, null, "default");
         // make sure it's retrieved as a symlink (on systems that support symlink)
         assertLinkOrExists(expectedRetrieveLocation);
diff --git a/test/repositories/1/org1/mod1.1/ivys/ivy-3.0.xml b/test/repositories/1/org1/mod1.7/ivys/ivy-3.0.xml
similarity index 97%
rename from test/repositories/1/org1/mod1.1/ivys/ivy-3.0.xml
rename to test/repositories/1/org1/mod1.7/ivys/ivy-3.0.xml
index 373ca31e..7d6eb74d 100644
--- a/test/repositories/1/org1/mod1.1/ivys/ivy-3.0.xml
+++ b/test/repositories/1/org1/mod1.7/ivys/ivy-3.0.xml
@@ -16,7 +16,7 @@
   -->
 <ivy-module version="1.0">
     <info organisation="org1"
-          module="mod1.1"
+          module="mod1.7"
           revision="3.0"
     />
     <publications>
diff --git a/test/repositories/1/org1/mod1.1/jars/zipped-artifact-3.0.zip b/test/repositories/1/org1/mod1.7/jars/zipped-artifact-3.0.zip
similarity index 100%
rename from test/repositories/1/org1/mod1.1/jars/zipped-artifact-3.0.zip
rename to test/repositories/1/org1/mod1.7/jars/zipped-artifact-3.0.zip