reorganize test b/c conflating two issues:

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

diff --git a/tests/bugs/extdirs/build.xml b/tests/bugs/extdirs/build.xml
index 7798f7189c9ea2028ff2c188bbe9d2516b28e80b..b709d3b9a8ee8b99e216965e6c43cfec0db1abb0 100644 (file)
--- 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 (file)
index 0342041..0000000
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 (file)
index 2762405..0000000
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 (file)
index fc17f5c..0000000
--- 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 (file)
index 9678b82..0000000
--- 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 (file)
index 0000000..e8f4dff
--- /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 987cbf32b76db85fb1c36624c60bfef69e729579..932315d50998197a11f6bcc9a88f013d9148b61b 100644 (file)
--- 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 (file)
index 53d33fb..0000000
--- 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 (file)
index 0000000..368b2bc
--- /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 (file)
index 0000000..fb306ab
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 (file)
index 0000000..8b7f9c6
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 (file)
index 0000000..fb306ab
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 (file)
index 0000000..8b7f9c6
Binary files /dev/null and b/tests/bugs/extdirs/lib/uppercase/util-zip.ZIP differ