From 656c8563d5bc4d452f30ab86cad417eee2f745cc Mon Sep 17 00:00:00 2001 From: wisberg Date: Fri, 31 Oct 2003 19:47:08 +0000 Subject: [PATCH] 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 .../extdirs-src/{dir-1/pack => jar}/Util.java | 2 +- tests/bugs/extdirs/extdirs-src/main/Main.java | 6 +-- tests/bugs/extdirs/extdirs-src/main/main.lst | 1 - .../{dir-2/pack2/Util2.java => zip/Util.java} | 4 +- 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 11 files changed, 40 insertions(+), 17 deletions(-) delete mode 100644 tests/bugs/extdirs/dir-1/util-1.JAR delete mode 100644 tests/bugs/extdirs/dir-2/util-2.ZIP rename tests/bugs/extdirs/extdirs-src/{dir-1/pack => jar}/Util.java (82%) delete mode 100644 tests/bugs/extdirs/extdirs-src/main/main.lst rename tests/bugs/extdirs/extdirs-src/{dir-2/pack2/Util2.java => zip/Util.java} (58%) 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 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 0342041aa3f2fa9885485abfdc56e3bb034b09d4..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 377 zcmWIWW@h1H00HmWar$5elwbwY1&PVo`T;;CA`Bcrh^~YmrX;i^Ge<8uC$YHL`fL7m zJGL~oST;F5g`+3W9XNXKz}XWA(k9QG9+`Cf#DO&nC6Apr@MzBbNnA^cgpEH-NFFg+ zRJ%#&w9waLq0g7THhXs&eZI8T^l*hlghYg-qy@Lo%*r0j6H=Hzu{4?}Pe{9Z>)e4If@>NkH_mNj);i05L?Ls92s1-~H#^6R z?xPDQ16{ivhy%PCnM9azdm5+&2m~13I)Z3u5P-BG0s+}LP$0m-l16196RZUhBmv&6 QY#;?pKv)2zKZ7_70Pn+RivR!s 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 276240568152ba6e8241c04e1228a8859e2d1e29..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 385 zcmWIWW@h1H00E!bar$5elwbqW1&PVoM*0CjH6jcgK!~nJ5UwV)Bs0fIFF7Z%xY+t@ z{&hRHG`3haIX#7=C(j)?dhWp469>{J&zv5abo|7DH47z=ojCAl&iqMSONxYzKTAj+ zF;s9?(CJ|=bJ_jlR0s)4%jvyKq4j?^0bwza{sH1J0071QX4U`z diff --git a/tests/bugs/extdirs/extdirs-src/dir-1/pack/Util.java b/tests/bugs/extdirs/extdirs-src/jar/Util.java similarity index 82% rename from tests/bugs/extdirs/extdirs-src/dir-1/pack/Util.java rename to tests/bugs/extdirs/extdirs-src/jar/Util.java index fc17f5cb1..e8f4dffb5 100644 --- a/tests/bugs/extdirs/extdirs-src/dir-1/pack/Util.java +++ b/tests/bugs/extdirs/extdirs-src/jar/Util.java @@ -1,5 +1,5 @@ -package pack; +package jar; public class Util { public static void main(String[] args) { 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/dir-2/pack2/Util2.java b/tests/bugs/extdirs/extdirs-src/zip/Util.java similarity index 58% rename from tests/bugs/extdirs/extdirs-src/dir-2/pack2/Util2.java rename to tests/bugs/extdirs/extdirs-src/zip/Util.java index 9678b8226..368b2bcc5 100644 --- a/tests/bugs/extdirs/extdirs-src/dir-2/pack2/Util2.java +++ b/tests/bugs/extdirs/extdirs-src/zip/Util.java @@ -1,7 +1,7 @@ -package pack2; +package zip; -public class Util2 { +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 0000000000000000000000000000000000000000..fb306ab3decbf01a1f4c1083158305b27e53a988 GIT binary patch literal 372 zcmWIWW@h1H0D<;3ar$5elwbkUS&2pZ0YDWZ3>-j+u7VG$BD5qkM=v=ivAEd!YyNdR zwlua_HaR_oqbJWDIC}2D*%JrSCeNH6nRNWbfi(*ykDWO1XwLjeTuX|CjXz6B9x+)| zyGiJ@(AQ$2&zHV7dv_UqzO>f#aD_yKM1-WI#U`QdFV5aZ#S)S%0;~Q^-V`+1TS7!~ zM#HrR24QAp58DYT%%4~qO_V33UA=Ygzz)GR4U-$^HZp6S5&X52moDggokhPRF&8sdMD4nznbn+6I27+BJ%1Z0AAAi^WSo0SbD O&jf^dK>7oS!vFw6&Sl^L literal 0 HcmV?d00001 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 0000000000000000000000000000000000000000..8b7f9c609a3634183772136c2fbb8847ee4d0edc GIT binary patch literal 372 zcmWIWW@h1H0D+D*ar$5elwbkURhb3)0YDWZ3>-j+u7VG$BD5qkM=v=ivAEd!YyNdR zwlua_HaR_oqbJWDIC}2D*%JrSCeNH6nRNWbfi(*ykDWO1XwLjeTuX|CjXz6B9x+)| zyGiJ@(AQ$2&zHV7dv_UqzO>f#aD_yKM1-WI#VRB2FV5aZ#S)S%0;~Q^-V`+1TS7!~ zM#HrR24QAp58DYT%%4~qO_V33UA=Ygzz)GR4U-$^HZp6S5&X52moDggokhPRF&8sdMD4nznbn+6I27+BJ%1Z0AAAi^WSo0SbD O&jf^dK>7oS!vFwNXl5t? literal 0 HcmV?d00001 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 0000000000000000000000000000000000000000..fb306ab3decbf01a1f4c1083158305b27e53a988 GIT binary patch literal 372 zcmWIWW@h1H0D<;3ar$5elwbkUS&2pZ0YDWZ3>-j+u7VG$BD5qkM=v=ivAEd!YyNdR zwlua_HaR_oqbJWDIC}2D*%JrSCeNH6nRNWbfi(*ykDWO1XwLjeTuX|CjXz6B9x+)| zyGiJ@(AQ$2&zHV7dv_UqzO>f#aD_yKM1-WI#U`QdFV5aZ#S)S%0;~Q^-V`+1TS7!~ zM#HrR24QAp58DYT%%4~qO_V33UA=Ygzz)GR4U-$^HZp6S5&X52moDggokhPRF&8sdMD4nznbn+6I27+BJ%1Z0AAAi^WSo0SbD O&jf^dK>7oS!vFw6&Sl^L literal 0 HcmV?d00001 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 0000000000000000000000000000000000000000..8b7f9c609a3634183772136c2fbb8847ee4d0edc GIT binary patch literal 372 zcmWIWW@h1H0D+D*ar$5elwbkURhb3)0YDWZ3>-j+u7VG$BD5qkM=v=ivAEd!YyNdR zwlua_HaR_oqbJWDIC}2D*%JrSCeNH6nRNWbfi(*ykDWO1XwLjeTuX|CjXz6B9x+)| zyGiJ@(AQ$2&zHV7dv_UqzO>f#aD_yKM1-WI#VRB2FV5aZ#S)S%0;~Q^-V`+1TS7!~ zM#HrR24QAp58DYT%%4~qO_V33UA=Ygzz)GR4U-$^HZp6S5&X52moDggokhPRF&8sdMD4nznbn+6I27+BJ%1Z0AAAi^WSo0SbD O&jf^dK>7oS!vFwNXl5t? literal 0 HcmV?d00001 -- 2.39.5