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 @@ + + + + + + \ 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 @@ + + + + + + + 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")); + } }