diff --git a/test/java/org/apache/ivy/core/deliver/DeliverTest.java b/test/java/org/apache/ivy/core/deliver/DeliverTest.java
index 1ae6e9d9..9daacb6f 100644
--- a/test/java/org/apache/ivy/core/deliver/DeliverTest.java
+++ b/test/java/org/apache/ivy/core/deliver/DeliverTest.java
@@ -48,25 +48,6 @@ public class DeliverTest {
cacheDir.mkdirs();
}
- /**
- * Test case for IVY-1410.
- */
- @Test
- public void testDeliver1410() throws Exception {
- Project project = ivyDeliver.getProject();
- project.setProperty("ivy.settings.file", "test/repositories/ivysettings-1.xml");
- File ivyFile = new File(new URI(DeliverTest.class.getResource("ivy-1410.xml").toString()));
-
- resolve(ivyFile);
-
- ivyDeliver.setReplacedynamicrev(true);
- ivyDeliver.doExecute();
-
- String deliverContent = readFile(deliverDir.getAbsolutePath() + "/ivys/ivy-1.0.xml");
- assertTrue(deliverContent.contains("org=\"org1\" name=\"mod1.1\" rev=\"1.1\""));
- assertTrue(deliverContent.contains("org=\"org2\" name=\"mod2.1\" rev=\"0.7\""));
- }
-
private void resolve(File ivyFile) {
IvyResolve ivyResolve = new IvyResolve();
ivyResolve.setProject(ivyDeliver.getProject());
@@ -144,6 +125,43 @@ public class DeliverTest {
assertTrue(ivyFile.contains("org=\"junit\" name=\"junit\" rev=\"4.4\" revConstraint=\"latest.integration\""));
}
+ /**
+ * Test case for IVY-1410.
+ */
+ @Test
+ public void testDeliver1410() throws Exception {
+ ivyDeliver.getProject().setProperty("ivy.settings.file", "test/repositories/ivysettings-1.xml");
+
+ String ivyFile
+ = "\n"
+ + " \n"
+ + " \n"
+ + " \n"
+ + " \n"
+ + "\n";
+
+ ivyFile
+ = "\n"
+ + " \n"
+ + " \n"
+ + " \n"
+ + " \n"
+ + " \n"
+ + " \n"
+ + "\n";
+
+ resolve(writeFile(ivyFile));
+
+ ivyDeliver.setReplacedynamicrev(true);
+ ivyDeliver.doExecute();
+
+ ivyFile = readFile(deliverDir.getAbsolutePath() + "/ivys/ivy-1.0.xml");
+
+ assertTrue(ivyFile.contains("org=\"org1\" name=\"mod1.1\" rev=\"1.1\""));
+ assertTrue(ivyFile.contains("org=\"org2\" name=\"mod2.1\" rev=\"0.7\""));
+ }
+
/**
* Test case for IVY-1658.
*/
diff --git a/test/java/org/apache/ivy/core/deliver/ivy-1410-parent.xml b/test/java/org/apache/ivy/core/deliver/ivy-1410-parent.xml
deleted file mode 100644
index 31f59d37..00000000
--- a/test/java/org/apache/ivy/core/deliver/ivy-1410-parent.xml
+++ /dev/null
@@ -1,24 +0,0 @@
-
-
-
-
-
-
-
diff --git a/test/java/org/apache/ivy/core/deliver/ivy-1410.xml b/test/java/org/apache/ivy/core/deliver/ivy-1410.xml
deleted file mode 100644
index 459e18c4..00000000
--- a/test/java/org/apache/ivy/core/deliver/ivy-1410.xml
+++ /dev/null
@@ -1,27 +0,0 @@
-
-
-
-
-
-
-
-
-
\ No newline at end of file