From 656c8563d5bc4d452f30ab86cad417eee2f745cc Mon Sep 17 00:00:00 2001 From: wisberg Date: Fri, 31 Oct 2003 19:47:08 +0000 Subject: reorganize test b/c conflating two issues: (a) zip not accepted by extdirs (b) uppercase ZIP and JAR not accepted by eclipse FileSystem --- tests/bugs/extdirs/build.xml | 44 ++++++++++++++++----- tests/bugs/extdirs/dir-1/util-1.JAR | Bin 377 -> 0 bytes tests/bugs/extdirs/dir-2/util-2.ZIP | Bin 385 -> 0 bytes .../bugs/extdirs/extdirs-src/dir-1/pack/Util.java | 7 ---- .../extdirs/extdirs-src/dir-2/pack2/Util2.java | 7 ---- tests/bugs/extdirs/extdirs-src/jar/Util.java | 7 ++++ tests/bugs/extdirs/extdirs-src/main/Main.java | 6 +-- tests/bugs/extdirs/extdirs-src/main/main.lst | 1 - tests/bugs/extdirs/extdirs-src/zip/Util.java | 7 ++++ tests/bugs/extdirs/lib/lowercase/util-jar.jar | Bin 0 -> 372 bytes tests/bugs/extdirs/lib/lowercase/util-zip.zip | Bin 0 -> 372 bytes tests/bugs/extdirs/lib/uppercase/util-jar.JAR | Bin 0 -> 372 bytes tests/bugs/extdirs/lib/uppercase/util-zip.ZIP | Bin 0 -> 372 bytes 13 files changed, 51 insertions(+), 28 deletions(-) delete mode 100644 tests/bugs/extdirs/dir-1/util-1.JAR delete mode 100644 tests/bugs/extdirs/dir-2/util-2.ZIP delete mode 100644 tests/bugs/extdirs/extdirs-src/dir-1/pack/Util.java delete mode 100644 tests/bugs/extdirs/extdirs-src/dir-2/pack2/Util2.java create mode 100644 tests/bugs/extdirs/extdirs-src/jar/Util.java delete mode 100644 tests/bugs/extdirs/extdirs-src/main/main.lst create mode 100644 tests/bugs/extdirs/extdirs-src/zip/Util.java create mode 100644 tests/bugs/extdirs/lib/lowercase/util-jar.jar create mode 100644 tests/bugs/extdirs/lib/lowercase/util-zip.zip create mode 100644 tests/bugs/extdirs/lib/uppercase/util-jar.JAR create mode 100644 tests/bugs/extdirs/lib/uppercase/util-zip.ZIP (limited to 'tests') diff --git a/tests/bugs/extdirs/build.xml b/tests/bugs/extdirs/build.xml index 7798f7189..b709d3b9a 100644 --- a/tests/bugs/extdirs/build.xml +++ b/tests/bugs/extdirs/build.xml @@ -10,20 +10,27 @@ - + includes="jar/Util.java" + srcdir="${basedir}/extdirs-src"/> + + + + + - + includes="zip/Util.java" + srcdir="${basedir}/extdirs-src"/> + + + + @@ -36,15 +43,32 @@ srcdir="${basedir}/extdirs-src/main" includes="Main.java"> - - + + + + + + + + + + + + + + + + - - + + diff --git a/tests/bugs/extdirs/dir-1/util-1.JAR b/tests/bugs/extdirs/dir-1/util-1.JAR deleted file mode 100644 index 0342041aa..000000000 Binary files a/tests/bugs/extdirs/dir-1/util-1.JAR and /dev/null differ diff --git a/tests/bugs/extdirs/dir-2/util-2.ZIP b/tests/bugs/extdirs/dir-2/util-2.ZIP deleted file mode 100644 index 276240568..000000000 Binary files a/tests/bugs/extdirs/dir-2/util-2.ZIP and /dev/null differ diff --git a/tests/bugs/extdirs/extdirs-src/dir-1/pack/Util.java b/tests/bugs/extdirs/extdirs-src/dir-1/pack/Util.java deleted file mode 100644 index fc17f5cb1..000000000 --- a/tests/bugs/extdirs/extdirs-src/dir-1/pack/Util.java +++ /dev/null @@ -1,7 +0,0 @@ - -package pack; - -public class Util { - public static void main(String[] args) { - } -} \ No newline at end of file diff --git a/tests/bugs/extdirs/extdirs-src/dir-2/pack2/Util2.java b/tests/bugs/extdirs/extdirs-src/dir-2/pack2/Util2.java deleted file mode 100644 index 9678b8226..000000000 --- a/tests/bugs/extdirs/extdirs-src/dir-2/pack2/Util2.java +++ /dev/null @@ -1,7 +0,0 @@ - -package pack2; - -public class Util2 { - public static void main(String[] args) { - } -} \ No newline at end of file diff --git a/tests/bugs/extdirs/extdirs-src/jar/Util.java b/tests/bugs/extdirs/extdirs-src/jar/Util.java new file mode 100644 index 000000000..e8f4dffb5 --- /dev/null +++ b/tests/bugs/extdirs/extdirs-src/jar/Util.java @@ -0,0 +1,7 @@ + +package jar; + +public class Util { + public static void main(String[] args) { + } +} \ No newline at end of file diff --git a/tests/bugs/extdirs/extdirs-src/main/Main.java b/tests/bugs/extdirs/extdirs-src/main/Main.java index 987cbf32b..932315d50 100644 --- a/tests/bugs/extdirs/extdirs-src/main/Main.java +++ b/tests/bugs/extdirs/extdirs-src/main/Main.java @@ -2,7 +2,7 @@ /** @testcase PR#42574 ZIP and JAR extensions in classpath and extdirs */ public class Main { public static void main(String[] args) { - pack.Util.main(args); - pack2.Util2.main(args); + jar.Util.main(args); + zip.Util.main(args); } -} \ No newline at end of file +} diff --git a/tests/bugs/extdirs/extdirs-src/main/main.lst b/tests/bugs/extdirs/extdirs-src/main/main.lst deleted file mode 100644 index 53d33fb7e..000000000 --- a/tests/bugs/extdirs/extdirs-src/main/main.lst +++ /dev/null @@ -1 +0,0 @@ -Main.java diff --git a/tests/bugs/extdirs/extdirs-src/zip/Util.java b/tests/bugs/extdirs/extdirs-src/zip/Util.java new file mode 100644 index 000000000..368b2bcc5 --- /dev/null +++ b/tests/bugs/extdirs/extdirs-src/zip/Util.java @@ -0,0 +1,7 @@ + +package zip; + +public class Util { + public static void main(String[] args) { + } +} \ No newline at end of file diff --git a/tests/bugs/extdirs/lib/lowercase/util-jar.jar b/tests/bugs/extdirs/lib/lowercase/util-jar.jar new file mode 100644 index 000000000..fb306ab3d Binary files /dev/null and b/tests/bugs/extdirs/lib/lowercase/util-jar.jar differ diff --git a/tests/bugs/extdirs/lib/lowercase/util-zip.zip b/tests/bugs/extdirs/lib/lowercase/util-zip.zip new file mode 100644 index 000000000..8b7f9c609 Binary files /dev/null and b/tests/bugs/extdirs/lib/lowercase/util-zip.zip differ diff --git a/tests/bugs/extdirs/lib/uppercase/util-jar.JAR b/tests/bugs/extdirs/lib/uppercase/util-jar.JAR new file mode 100644 index 000000000..fb306ab3d Binary files /dev/null and b/tests/bugs/extdirs/lib/uppercase/util-jar.JAR differ diff --git a/tests/bugs/extdirs/lib/uppercase/util-zip.ZIP b/tests/bugs/extdirs/lib/uppercase/util-zip.ZIP new file mode 100644 index 000000000..8b7f9c609 Binary files /dev/null and b/tests/bugs/extdirs/lib/uppercase/util-zip.ZIP differ -- cgit v1.2.3