reorganize test b/c conflating two issues:

(a) zip not accepted by extdirs
(b) uppercase ZIP and JAR not accepted by eclipse FileSystem

11 files changed, 40 insertions, 17 deletions

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 @@
 		<mkdir dir="${classes.dir}"/>
 		<javac destdir="${classes.dir}"
 			target="1.1"
-			includes="**/*.java"
-			srcdir="${basedir}/extdirs-src/dir-1"/>		
-		<zip destfile="${basedir}/dir-1/util-1.JAR">
+			includes="jar/Util.java"
+			srcdir="${basedir}/extdirs-src"/>		
+		<zip destfile="${basedir}/lib/lowercase/util-jar.jar">
 			<fileset dir="${classes.dir}"/>	
 		</zip>
+		<zip destfile="${basedir}/lib/uppercase/util-jar.JAR">
+			<fileset dir="${classes.dir}"/>	
+		</zip>
+		
 		
 		<mkdir dir="${classes.dir}"/>
 		<delete	dir="${classes.dir}"/>
 		<mkdir dir="${classes.dir}"/>
 		<javac destdir="${classes.dir}"
 			target="1.1"
-			includes="**/*.java"
-			srcdir="${basedir}/extdirs-src/dir-2"/>		
-		<zip destfile="${basedir}/dir-2/util-2.ZIP">
+			includes="zip/Util.java"
+			srcdir="${basedir}/extdirs-src"/>		
+		<zip destfile="${basedir}/lib/lowercase/util-zip.zip">
+			<fileset dir="${classes.dir}"/>	
+		</zip>
+		<zip destfile="${basedir}/lib/uppercase/util-zip.ZIP">
 			<fileset dir="${classes.dir}"/>	
 		</zip>
 		
@@ -36,15 +43,32 @@
 			srcdir="${basedir}/extdirs-src/main"
 			includes="Main.java">
 			<classpath>
-				<pathelement path="${basedir}/dir-2/util-2.ZIP"/>
-				<pathelement path="${basedir}/dir-1/util-1.JAR"/>
+				<pathelement path="${basedir}/lib/uppercase/util-jar.JAR"/>
+				<pathelement path="${basedir}/lib/uppercase/util-zip.ZIP"/>
+			</classpath>		
+		</javac>
+		<java classname="Main">
+			<classpath>
+				<pathelement path="${classes.dir}"/>
+				<pathelement path="${basedir}/lib/uppercase/util-jar.JAR"/>
+				<pathelement path="${basedir}/lib/uppercase/util-zip.ZIP"/>
+			</classpath>		
+		</java>
+
+		<javac 
+			destdir="${classes.dir}"
+			srcdir="${basedir}/extdirs-src/main"
+			includes="Main.java">
+			<classpath>
+				<pathelement path="${basedir}/lib/uppercase/util-jar.JAR"/>
+				<pathelement path="${basedir}/lib/uppercase/util-zip.ZIP"/>
 			</classpath>		
 		</javac>
 		<java classname="Main">
 			<classpath>
 				<pathelement path="${classes.dir}"/>
-				<pathelement path="${basedir}/dir-2/util-2.ZIP"/>
-				<pathelement path="${basedir}/dir-1/util-1.JAR"/>
+				<pathelement path="${basedir}/lib/lowercase/util-jar.jar"/>
+				<pathelement path="${basedir}/lib/lowercase/util-zip.zip"/>
 			</classpath>		
 		</java>
 		<mkdir dir="${classes.dir}"/>
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
--- a/tests/bugs/extdirs/dir-1/util-1.JAR
+++ /dev/null
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
--- a/tests/bugs/extdirs/dir-2/util-2.ZIP
+++ /dev/null
diff --git a/tests/bugs/extdirs/extdirs-src/dir-1/pack/Util.java b/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
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 000000000..fb306ab3d
--- /dev/null
+++ b/tests/bugs/extdirs/lib/lowercase/util-jar.jar
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
--- /dev/null
+++ b/tests/bugs/extdirs/lib/lowercase/util-zip.zip
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
--- /dev/null
+++ b/tests/bugs/extdirs/lib/uppercase/util-jar.JAR
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
--- /dev/null
+++ b/tests/bugs/extdirs/lib/uppercase/util-zip.ZIP