diff options
| author | aclement <aclement> | 2004-02-26 11:22:31 +0000 |
|---|---|---|
| committer | aclement <aclement> | 2004-02-26 11:22:31 +0000 |
| commit | ff32dfb1ea7056dcafe28c7d2b78141568cc4fc6 (patch) | |
| tree | f1915f881e7f2fe5ffc194649d412165be702431 /ajde | |
| parent | 75ce009e27c754b669d8949342a3c2e15c197db4 (diff) | |
| download | aspectj-ff32dfb1ea7056dcafe28c7d2b78141568cc4fc6.tar.gz aspectj-ff32dfb1ea7056dcafe28c7d2b78141568cc4fc6.zip | |
Final part of bug #46347 (-inpath): We do not copy resources from inpath directories to the output.
Diffstat (limited to 'ajde')
| -rw-r--r-- | ajde/testsrc/org/aspectj/ajde/InpathTestcase.java | 22 |
1 files changed, 14 insertions, 8 deletions
diff --git a/ajde/testsrc/org/aspectj/ajde/InpathTestcase.java b/ajde/testsrc/org/aspectj/ajde/InpathTestcase.java index 36d4b2a09..ce7b3e5f3 100644 --- a/ajde/testsrc/org/aspectj/ajde/InpathTestcase.java +++ b/ajde/testsrc/org/aspectj/ajde/InpathTestcase.java @@ -73,9 +73,10 @@ public class InpathTestcase extends AjdeTestCase { Set expectedOutputJarContents = new HashSet(); // From indir1 - expectedOutputJarContents.add("META-INF/MANIFEST.MF"); - expectedOutputJarContents.add("META-INF/test.xml"); - expectedOutputJarContents.add("test/test.props"); +// If we don't copy resources, these next three files won't make it. +// expectedOutputJarContents.add("META-INF/MANIFEST.MF"); +// expectedOutputJarContents.add("META-INF/test.xml"); +// expectedOutputJarContents.add("test/test.props"); expectedOutputJarContents.add("test/TestProperties.class"); // From src expectedOutputJarContents.add("Main.class"); @@ -107,9 +108,10 @@ public class InpathTestcase extends AjdeTestCase { Set expectedBindirContents = new HashSet(); // From indir1 - expectedBindirContents.add("META-INF/MANIFEST.MF"); - expectedBindirContents.add("META-INF/test.xml"); - expectedBindirContents.add("test/test.props"); +// If we don't copy resources, these next three files won't make it +// expectedBindirContents.add("META-INF/MANIFEST.MF"); +// expectedBindirContents.add("META-INF/test.xml"); +// expectedBindirContents.add("test/test.props"); expectedBindirContents.add("test/TestProperties.class"); // From src expectedBindirContents.add("Main.class"); @@ -149,7 +151,9 @@ public class InpathTestcase extends AjdeTestCase { Set expectedOutputJarContents = new HashSet(); // From indir1 expectedOutputJarContents.add("example/HelloWorld.class"); - expectedOutputJarContents.add("example/HelloWorld.java"); + +// If we don't copy resources, this file won't make it +// expectedOutputJarContents.add("example/HelloWorld.java"); // From src expectedOutputJarContents.add("Aspect.class"); @@ -201,7 +205,9 @@ public class InpathTestcase extends AjdeTestCase { // From indir1 expectedBindirContents.add("example/HelloWorld.class"); - expectedBindirContents.add("example/HelloWorld.java"); + +// If we don't copy resources, this file won't make it +// expectedBindirContents.add("example/HelloWorld.java"); // From injar.jar expectedBindirContents.add("props/resources.properties"); // From src |