From 63f41f90c64fcf6f7d32776f74f7c2103f7e102b Mon Sep 17 00:00:00 2001
From: Stefan Bodewig <bodewig@apache.org>
Date: Thu, 18 Sep 2003 09:02:23 +0000
Subject: [PATCH] Add tests for <import> inside <target>

git-svn-id: https://svn.apache.org/repos/asf/ant/core/trunk@275257 13f79535-47bb-0310-9956-ffa450edef68
---
 .../taskdefs/import/subdir/importintarget-inner.xml  |  6 ++++++
 .../taskdefs/import/subdir/importintarget.xml        |  7 +++++++
 .../org/apache/tools/ant/taskdefs/ImportTest.java    | 12 ++++++++++++
 3 files changed, 25 insertions(+)
 create mode 100644 src/etc/testcases/taskdefs/import/subdir/importintarget-inner.xml
 create mode 100644 src/etc/testcases/taskdefs/import/subdir/importintarget.xml

diff --git a/src/etc/testcases/taskdefs/import/subdir/importintarget-inner.xml b/src/etc/testcases/taskdefs/import/subdir/importintarget-inner.xml
new file mode 100644
index 000000000..72c84774b
--- /dev/null
+++ b/src/etc/testcases/taskdefs/import/subdir/importintarget-inner.xml
@@ -0,0 +1,6 @@
+<project>
+  <property name="foo" value="bar"/>
+  <path id="baz">
+    <pathelement location="."/>
+  </path>
+</project>
\ No newline at end of file
diff --git a/src/etc/testcases/taskdefs/import/subdir/importintarget.xml b/src/etc/testcases/taskdefs/import/subdir/importintarget.xml
new file mode 100644
index 000000000..a6617b77b
--- /dev/null
+++ b/src/etc/testcases/taskdefs/import/subdir/importintarget.xml
@@ -0,0 +1,7 @@
+<project>
+  <target name="do-import">
+    <import file="importintarget-inner.xml"/>
+  </target>
+
+  <target name="no-import"/>
+</project>
diff --git a/src/testcases/org/apache/tools/ant/taskdefs/ImportTest.java b/src/testcases/org/apache/tools/ant/taskdefs/ImportTest.java
index 27a5e03a3..9179c55cb 100644
--- a/src/testcases/org/apache/tools/ant/taskdefs/ImportTest.java
+++ b/src/testcases/org/apache/tools/ant/taskdefs/ImportTest.java
@@ -90,5 +90,17 @@ public class ImportTest extends BuildFileTest {
         assertLogContaining(
             "Unnamed2.xmlUnnamed1.xmlSkipped already imported file");
     }
+
+    public void testImportInTargetNoEffect() {
+        configureProject("src/etc/testcases/taskdefs/import/subdir/importintarget.xml");
+        expectPropertyUnset("no-import", "foo");
+        assertTrue(null == getProject().getReference("baz"));
+    }
+
+    public void testImportInTargetWithEffect() {
+        configureProject("src/etc/testcases/taskdefs/import/subdir/importintarget.xml");
+        expectPropertySet("do-import", "foo", "bar");
+        assertNotNull(getProject().getReference("baz"));
+    }
 }