提交 09e6dd52 编写于 作者: A alanb

Merge

...@@ -2587,9 +2587,9 @@ class Character extends Object implements java.io.Serializable, Comparable<Chara ...@@ -2587,9 +2587,9 @@ class Character extends Object implements java.io.Serializable, Comparable<Chara
* significantly better space and time performance by caching * significantly better space and time performance by caching
* frequently requested values. * frequently requested values.
* *
* This method will always cache values in the range '&#92;u0000' * This method will always cache values in the range {@code
* to '&#92;u007f'", inclusive, and may cache other values outside * '\u005Cu0000'} to {@code '\u005Cu007f'}, inclusive, and may
* of this range. * cache other values outside of this range.
* *
* @param c a char value. * @param c a char value.
* @return a <tt>Character</tt> instance representing <tt>c</tt>. * @return a <tt>Character</tt> instance representing <tt>c</tt>.
......
...@@ -23,11 +23,9 @@ ...@@ -23,11 +23,9 @@
/* /*
* @test * @test
* @bug 5003916 6704655 * @bug 5003916 6704655 6873951
* @summary Testing parsing of signatures attributes of nested classes * @summary Testing parsing of signatures attributes of nested classes
* @author Joseph D. Darcy * @author Joseph D. Darcy
* @compile -source 1.5 Probe.java
* @run main Probe
*/ */
import java.lang.reflect.*; import java.lang.reflect.*;
...@@ -35,51 +33,35 @@ import java.lang.annotation.*; ...@@ -35,51 +33,35 @@ import java.lang.annotation.*;
import java.util.*; import java.util.*;
import static java.util.Arrays.*; import static java.util.Arrays.*;
@Classes(value={ @Classes({"java.util.concurrent.FutureTask",
"java.util.concurrent.FutureTask", "java.util.concurrent.ConcurrentHashMap$EntryIterator",
"java.util.concurrent.ConcurrentHashMap$EntryIterator", "java.util.concurrent.ConcurrentHashMap$KeyIterator",
"java.util.concurrent.ConcurrentHashMap$KeyIterator", "java.util.concurrent.ConcurrentHashMap$ValueIterator",
"java.util.concurrent.ConcurrentHashMap$ValueIterator", "java.util.AbstractList$ListItr",
"java.util.AbstractList$ListItr", "java.util.EnumMap$EntryIterator",
"java.util.EnumMap$EntryIterator", "java.util.EnumMap$KeyIterator",
"java.util.EnumMap$KeyIterator", "java.util.EnumMap$ValueIterator",
"java.util.EnumMap$ValueIterator", "java.util.IdentityHashMap$EntryIterator",
"java.util.IdentityHashMap$EntryIterator", "java.util.IdentityHashMap$KeyIterator",
"java.util.IdentityHashMap$KeyIterator", "java.util.IdentityHashMap$ValueIterator",
"java.util.IdentityHashMap$ValueIterator", "java.util.WeakHashMap$EntryIterator",
"java.util.WeakHashMap$EntryIterator", "java.util.WeakHashMap$KeyIterator",
"java.util.WeakHashMap$KeyIterator", "java.util.WeakHashMap$ValueIterator",
"java.util.WeakHashMap$ValueIterator", "java.util.TreeMap$EntryIterator",
"java.util.TreeMap$EntryIterator", "java.util.TreeMap$KeyIterator",
"java.util.TreeMap$KeyIterator", "java.util.TreeMap$ValueIterator",
"java.util.TreeMap$ValueIterator", "java.util.HashMap$EntryIterator",
"java.util.HashMap$EntryIterator", "java.util.HashMap$KeyIterator",
"java.util.HashMap$KeyIterator", "java.util.HashMap$ValueIterator",
"java.util.HashMap$ValueIterator", "java.util.LinkedHashMap$EntryIterator",
"java.util.LinkedHashMap$EntryIterator", "java.util.LinkedHashMap$KeyIterator",
"java.util.LinkedHashMap$KeyIterator", "java.util.LinkedHashMap$ValueIterator"})
"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"
})
public class Probe { 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); Classes classesAnnotation = (Probe.class).getAnnotation(Classes.class);
List<String> names = List<String> names =
new ArrayList<String>(asList(classesAnnotation.value())); 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; int errs = 0;
for(String name: names) { for(String name: names) {
System.out.println("\nCLASS " + name); System.out.println("\nCLASS " + name);
...@@ -152,5 +134,4 @@ public class Probe { ...@@ -152,5 +134,4 @@ public class Probe {
@Retention(RetentionPolicy.RUNTIME) @Retention(RetentionPolicy.RUNTIME)
@interface Classes { @interface Classes {
String [] value(); // list of classes to probe String [] value(); // list of classes to probe
String [] sunClasses(); // list of Sun-production JDK specific classes to probe
} }
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册