--- a/jdk/test/java/lang/reflect/Generics/Probe.java Fri Sep 04 14:59:20 2009 +0800
+++ b/jdk/test/java/lang/reflect/Generics/Probe.java Fri Sep 04 13:11:17 2009 -0700
@@ -23,11 +23,9 @@
/*
* @test
- * @bug 5003916 6704655
+ * @bug 5003916 6704655 6873951
* @summary Testing parsing of signatures attributes of nested classes
* @author Joseph D. Darcy
- * @compile -source 1.5 Probe.java
- * @run main Probe
*/
import java.lang.reflect.*;
@@ -35,51 +33,35 @@
import java.util.*;
import static java.util.Arrays.*;
-@Classes(value={
- "java.util.concurrent.FutureTask",
- "java.util.concurrent.ConcurrentHashMap$EntryIterator",
- "java.util.concurrent.ConcurrentHashMap$KeyIterator",
- "java.util.concurrent.ConcurrentHashMap$ValueIterator",
- "java.util.AbstractList$ListItr",
- "java.util.EnumMap$EntryIterator",
- "java.util.EnumMap$KeyIterator",
- "java.util.EnumMap$ValueIterator",
- "java.util.IdentityHashMap$EntryIterator",
- "java.util.IdentityHashMap$KeyIterator",
- "java.util.IdentityHashMap$ValueIterator",
- "java.util.WeakHashMap$EntryIterator",
- "java.util.WeakHashMap$KeyIterator",
- "java.util.WeakHashMap$ValueIterator",
- "java.util.TreeMap$EntryIterator",
- "java.util.TreeMap$KeyIterator",
- "java.util.TreeMap$ValueIterator",
- "java.util.HashMap$EntryIterator",
- "java.util.HashMap$KeyIterator",
- "java.util.HashMap$ValueIterator",
- "java.util.LinkedHashMap$EntryIterator",
- "java.util.LinkedHashMap$KeyIterator",
- "java.util.LinkedHashMap$ValueIterator"
- },
- sunClasses={
- "javax.crypto.SunJCE_c",
- "javax.crypto.SunJCE_e",
- "javax.crypto.SunJCE_f",
- "javax.crypto.SunJCE_j",
- "javax.crypto.SunJCE_k",
- "javax.crypto.SunJCE_l"
- })
+@Classes({"java.util.concurrent.FutureTask",
+ "java.util.concurrent.ConcurrentHashMap$EntryIterator",
+ "java.util.concurrent.ConcurrentHashMap$KeyIterator",
+ "java.util.concurrent.ConcurrentHashMap$ValueIterator",
+ "java.util.AbstractList$ListItr",
+ "java.util.EnumMap$EntryIterator",
+ "java.util.EnumMap$KeyIterator",
+ "java.util.EnumMap$ValueIterator",
+ "java.util.IdentityHashMap$EntryIterator",
+ "java.util.IdentityHashMap$KeyIterator",
+ "java.util.IdentityHashMap$ValueIterator",
+ "java.util.WeakHashMap$EntryIterator",
+ "java.util.WeakHashMap$KeyIterator",
+ "java.util.WeakHashMap$ValueIterator",
+ "java.util.TreeMap$EntryIterator",
+ "java.util.TreeMap$KeyIterator",
+ "java.util.TreeMap$ValueIterator",
+ "java.util.HashMap$EntryIterator",
+ "java.util.HashMap$KeyIterator",
+ "java.util.HashMap$ValueIterator",
+ "java.util.LinkedHashMap$EntryIterator",
+ "java.util.LinkedHashMap$KeyIterator",
+ "java.util.LinkedHashMap$ValueIterator"})
public class Probe {
- public static void main (String[] args) throws Throwable {
+ public static void main (String... args) throws Throwable {
Classes classesAnnotation = (Probe.class).getAnnotation(Classes.class);
List<String> names =
new ArrayList<String>(asList(classesAnnotation.value()));
- if (System.getProperty("java.runtime.name").startsWith("Java(TM)")) {
- // Sun production JDK; test crypto classes too
- for(String name: classesAnnotation.sunClasses())
- names.add(name);
- }
-
int errs = 0;
for(String name: names) {
System.out.println("\nCLASS " + name);
@@ -152,5 +134,4 @@
@Retention(RetentionPolicy.RUNTIME)
@interface Classes {
String [] value(); // list of classes to probe
- String [] sunClasses(); // list of Sun-production JDK specific classes to probe
}