Initial load
diff --git a/test/java/util/ServiceLoader/Basic.java b/test/java/util/ServiceLoader/Basic.java
new file mode 100644
index 0000000..dcfb3b1
--- /dev/null
+++ b/test/java/util/ServiceLoader/Basic.java
@@ -0,0 +1,62 @@
+/*
+ * Copyright 2005-2006 Sun Microsystems, Inc. All Rights Reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
+ * CA 95054 USA or visit www.sun.com if you need additional information or
+ * have any questions.
+ */
+
+//
+
+import java.io.*;
+import java.util.*;
+
+
+public class Basic {
+
+ private static PrintStream out = System.err;
+
+ private static <T> Set<T> setOf(Iterable<T> it) {
+ Set<T> s = new HashSet<T>();
+ for (T t : it)
+ s.add(t);
+ return s;
+ }
+
+ private static <T> void checkEquals(Set<T> s1, Set<T> s2, boolean eq) {
+ if (s1.equals(s2) != eq)
+ throw new RuntimeException(String.format("%b %s : %s",
+ eq, s1, s2));
+ }
+
+ public static void main(String[] args) {
+
+ ServiceLoader<FooService> sl = ServiceLoader.load(FooService.class);
+ out.format("%s%n", sl);
+
+ // Providers are cached
+ Set<FooService> ps = setOf(sl);
+ checkEquals(ps, setOf(sl), true);
+
+ // The cache can be flushed and reloaded
+ sl.reload();
+ checkEquals(ps, setOf(sl), false);
+
+ }
+
+}
diff --git a/test/java/util/ServiceLoader/FooProvider1.java b/test/java/util/ServiceLoader/FooProvider1.java
new file mode 100644
index 0000000..ecc8b14
--- /dev/null
+++ b/test/java/util/ServiceLoader/FooProvider1.java
@@ -0,0 +1,24 @@
+/*
+ * Copyright 2005 Sun Microsystems, Inc. All Rights Reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
+ * CA 95054 USA or visit www.sun.com if you need additional information or
+ * have any questions.
+ */
+
+public class FooProvider1 extends FooService { }
diff --git a/test/java/util/ServiceLoader/FooProvider2.java b/test/java/util/ServiceLoader/FooProvider2.java
new file mode 100644
index 0000000..8593b72
--- /dev/null
+++ b/test/java/util/ServiceLoader/FooProvider2.java
@@ -0,0 +1,24 @@
+/*
+ * Copyright 2005 Sun Microsystems, Inc. All Rights Reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
+ * CA 95054 USA or visit www.sun.com if you need additional information or
+ * have any questions.
+ */
+
+public class FooProvider2 extends FooService { }
diff --git a/test/java/util/ServiceLoader/FooProvider3.java b/test/java/util/ServiceLoader/FooProvider3.java
new file mode 100644
index 0000000..958ed10
--- /dev/null
+++ b/test/java/util/ServiceLoader/FooProvider3.java
@@ -0,0 +1,24 @@
+/*
+ * Copyright 2005 Sun Microsystems, Inc. All Rights Reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
+ * CA 95054 USA or visit www.sun.com if you need additional information or
+ * have any questions.
+ */
+
+public class FooProvider3 extends FooService { }
diff --git a/test/java/util/ServiceLoader/FooService.java b/test/java/util/ServiceLoader/FooService.java
new file mode 100644
index 0000000..31bc79f
--- /dev/null
+++ b/test/java/util/ServiceLoader/FooService.java
@@ -0,0 +1,24 @@
+/*
+ * Copyright 2005 Sun Microsystems, Inc. All Rights Reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
+ * CA 95054 USA or visit www.sun.com if you need additional information or
+ * have any questions.
+ */
+
+public abstract class FooService { }
diff --git a/test/java/util/ServiceLoader/Load.java b/test/java/util/ServiceLoader/Load.java
new file mode 100644
index 0000000..42007f1
--- /dev/null
+++ b/test/java/util/ServiceLoader/Load.java
@@ -0,0 +1,79 @@
+/*
+ * Copyright 2005-2006 Sun Microsystems, Inc. All Rights Reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
+ * CA 95054 USA or visit www.sun.com if you need additional information or
+ * have any questions.
+ */
+
+//
+
+import java.io.*;
+import java.util.*;
+
+
+public class Load {
+
+ private static PrintStream out = System.err;
+
+ public static void main(String[] args) throws Exception {
+
+ boolean installedOnly = false;
+
+ List<String> expected = new ArrayList<String>(Arrays.asList(args));
+ if (!expected.isEmpty() && expected.get(0).equals("-i")) {
+ expected.remove(0);
+ installedOnly = true;
+ }
+ if (expected.isEmpty())
+ throw new Exception("usage: Load [-i] ( fail | provider-class-name )*");
+
+ ServiceLoader<FooService> sl = (installedOnly
+ ? ServiceLoader.loadInstalled(FooService.class)
+ : ServiceLoader.load(FooService.class));
+ out.format("%s%n", sl);
+ Iterator<FooService> sli = sl.iterator();
+ Iterator<String> ei = expected.iterator();
+
+ for (;; ei.remove()) {
+ FooService fp = null;
+ try {
+ if (!sli.hasNext())
+ break;
+ fp = sli.next();
+ } catch (ServiceConfigurationError x) {
+ if (ei.next().equals("fail")) {
+ out.format("Failed as expected: %s%n", x);
+ continue;
+ }
+ throw x;
+ }
+ String ec = ei.next();
+ if (!fp.getClass().getName().equals(ec))
+ throw new
+ Exception(String.format("Wrong provider %s; expected %s",
+ fp.getClass().getName(), ec));
+ out.format("Provider found: %s%n", fp.getClass().getName());
+ }
+
+ if (ei.hasNext())
+ throw new Exception("Missing providers: " + expected);
+
+ }
+
+}
diff --git a/test/java/util/ServiceLoader/basic.sh b/test/java/util/ServiceLoader/basic.sh
new file mode 100644
index 0000000..4f80b17
--- /dev/null
+++ b/test/java/util/ServiceLoader/basic.sh
@@ -0,0 +1,153 @@
+#
+# Copyright 2005-2006 Sun Microsystems, Inc. All Rights Reserved.
+# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+#
+# This code is free software; you can redistribute it and/or modify it
+# under the terms of the GNU General Public License version 2 only, as
+# published by the Free Software Foundation.
+#
+# This code is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
+# version 2 for more details (a copy is included in the LICENSE file that
+# accompanied this code).
+#
+# You should have received a copy of the GNU General Public License version
+# 2 along with this work; if not, write to the Free Software Foundation,
+# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+#
+# Please contact Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
+# CA 95054 USA or visit www.sun.com if you need additional information or
+# have any questions.
+#
+
+# @test
+# @bug 4640520 6354623
+# @summary Unit test for java.util.ServiceLoader
+#
+# @build Basic Load FooService FooProvider1 FooProvider2 FooProvider3
+# @run shell basic.sh
+
+# Command-line usage: sh basic.sh /path/to/build
+
+if [ -z "$TESTJAVA" ]; then
+ if [ $# -lt 1 ]; then exit 1; fi
+ TESTJAVA="$1"; shift
+ TESTSRC="`pwd`"
+ TESTCLASSES="`pwd`"
+fi
+
+JAVA="$TESTJAVA/bin/java"
+JAR="$TESTJAVA/bin/jar"
+
+OS=`uname -s`
+case "$OS" in
+ SunOS )
+ SEP=':' ;;
+ Linux )
+ SEP=':' ;;
+ * )
+ SEP='\;' ;;
+esac
+
+JARD=`pwd`/x.jar
+EXTD=`pwd`/x.ext
+TESTD=`pwd`/x.test
+
+if [ \! -d $EXTD ]; then
+ # Initialize
+ echo Initializing...
+ rm -rf $JARD $EXTD $TESTD
+ mkdir -p $JARD $EXTD $TESTD
+
+ for n in 2 3; do
+ rm -rf $JARD/*; mkdir -p $JARD/META-INF/services
+ echo FooProvider$n \
+ >$JARD/META-INF/services/FooService
+ cp $TESTCLASSES/FooProvider$n.class $JARD
+ if [ $n = 3 ]; then
+ cp $TESTCLASSES/FooService.class $JARD
+ fi
+ (cd $JARD; "$JAR" -cf ../p$n.jar *)
+ done
+
+ mv p3.jar $EXTD
+
+ cp $TESTCLASSES/Load.class $TESTD
+ cp $TESTCLASSES/FooService.class $TESTD
+ cp $TESTCLASSES/FooProvider1.class $TESTD
+ mkdir -p $TESTD/META-INF/services
+ echo FooProvider1 \
+ >$TESTD/META-INF/services/FooService
+
+ # This gives us:
+ # $TESTD: FooProvider1
+ # . : FooProvider2, in p2.jar
+ # $EXTD: FooProvider3, in p3.jar
+
+fi
+
+failures=0
+
+go() {
+ echo ''
+ cp="$1"; shift
+ if [ -z "$cp" ]; then cp="$TESTCLASSES"; else cp="$TESTCLASSES$SEP$cp"; fi
+ vmargs="$1"; shift
+ sh -xc "'$JAVA' -cp $cp $vmargs $T $*" 2>&1
+ if [ $? != 0 ]; then failures=`expr $failures + 1`; fi
+}
+
+
+# Java-level tests
+
+T=Basic
+go ".${SEP}$TESTD${SEP}p2.jar" "-Djava.ext.dirs=$EXTD"
+
+
+# Success cases
+
+T=Load
+
+go "$TESTD" "" FooProvider1
+
+go ".${SEP}p2.jar" "" FooProvider2
+
+go "" "-Djava.ext.dirs=$EXTD" FooProvider3
+
+go "$TESTD${SEP}p2.jar" "" FooProvider1 FooProvider2
+
+go "$TESTD" "-Djava.ext.dirs=$EXTD" FooProvider3 FooProvider1
+
+go "$TESTD${SEP}p2.jar" "-Djava.ext.dirs=$EXTD" \
+ FooProvider3 FooProvider1 FooProvider2
+
+# Should only find the installed provider
+go "$TESTD${SEP}p2.jar" "-Djava.ext.dirs=$EXTD" -i FooProvider3
+
+
+# Failure cases
+
+mkdir -p x.meta/META-INF/services
+
+# Simple failures
+for p in FooProvider42 'blah blah' 9234 'X!' java.lang.Object; do
+ echo $p >x.meta/META-INF/services/FooService
+ go ".${SEP}x.meta" "" fail
+done
+
+# Failures followed by successes
+echo FooProvider42 >x.meta/META-INF/services/FooService
+go "$TESTD${SEP}x.meta" "" FooProvider1 fail
+go "x.meta${SEP}$TESTD" "" fail FooProvider1
+go "$TESTD${SEP}x.meta${SEP}${SEP}p2.jar" "-Djava.ext.dirs=$EXTD" \
+ FooProvider3 FooProvider1 fail FooProvider2
+
+
+# Summary
+
+echo ''
+if [ $failures -gt 0 ];
+ then echo "$failures case(s) failed";
+ else echo "All cases passed"; fi
+exit $failures