author | darcy |
Mon, 18 Jul 2016 10:27:58 -0700 | |
changeset 39731 | 7a4bc90065bd |
parent 28519 | 299787d4cf96 |
permissions | -rw-r--r-- |
16743
b0b34102bb4c
6298888: Add toGenericString to j.l.Class and getTypeName to j.l.reflect.Type
darcy
parents:
diff
changeset
|
1 |
/* |
39731
7a4bc90065bd
8161500: Use getTypeName and StringJoiner in core reflection toString methods
darcy
parents:
28519
diff
changeset
|
2 |
* Copyright (c) 2013, 2016, Oracle and/or its affiliates. All rights reserved. |
16743
b0b34102bb4c
6298888: Add toGenericString to j.l.Class and getTypeName to j.l.reflect.Type
darcy
parents:
diff
changeset
|
3 |
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. |
b0b34102bb4c
6298888: Add toGenericString to j.l.Class and getTypeName to j.l.reflect.Type
darcy
parents:
diff
changeset
|
4 |
* |
b0b34102bb4c
6298888: Add toGenericString to j.l.Class and getTypeName to j.l.reflect.Type
darcy
parents:
diff
changeset
|
5 |
* This code is free software; you can redistribute it and/or modify it |
b0b34102bb4c
6298888: Add toGenericString to j.l.Class and getTypeName to j.l.reflect.Type
darcy
parents:
diff
changeset
|
6 |
* under the terms of the GNU General Public License version 2 only, as |
b0b34102bb4c
6298888: Add toGenericString to j.l.Class and getTypeName to j.l.reflect.Type
darcy
parents:
diff
changeset
|
7 |
* published by the Free Software Foundation. |
b0b34102bb4c
6298888: Add toGenericString to j.l.Class and getTypeName to j.l.reflect.Type
darcy
parents:
diff
changeset
|
8 |
* |
b0b34102bb4c
6298888: Add toGenericString to j.l.Class and getTypeName to j.l.reflect.Type
darcy
parents:
diff
changeset
|
9 |
* This code is distributed in the hope that it will be useful, but WITHOUT |
b0b34102bb4c
6298888: Add toGenericString to j.l.Class and getTypeName to j.l.reflect.Type
darcy
parents:
diff
changeset
|
10 |
* ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or |
b0b34102bb4c
6298888: Add toGenericString to j.l.Class and getTypeName to j.l.reflect.Type
darcy
parents:
diff
changeset
|
11 |
* FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License |
b0b34102bb4c
6298888: Add toGenericString to j.l.Class and getTypeName to j.l.reflect.Type
darcy
parents:
diff
changeset
|
12 |
* version 2 for more details (a copy is included in the LICENSE file that |
b0b34102bb4c
6298888: Add toGenericString to j.l.Class and getTypeName to j.l.reflect.Type
darcy
parents:
diff
changeset
|
13 |
* accompanied this code). |
b0b34102bb4c
6298888: Add toGenericString to j.l.Class and getTypeName to j.l.reflect.Type
darcy
parents:
diff
changeset
|
14 |
* |
b0b34102bb4c
6298888: Add toGenericString to j.l.Class and getTypeName to j.l.reflect.Type
darcy
parents:
diff
changeset
|
15 |
* You should have received a copy of the GNU General Public License version |
b0b34102bb4c
6298888: Add toGenericString to j.l.Class and getTypeName to j.l.reflect.Type
darcy
parents:
diff
changeset
|
16 |
* 2 along with this work; if not, write to the Free Software Foundation, |
b0b34102bb4c
6298888: Add toGenericString to j.l.Class and getTypeName to j.l.reflect.Type
darcy
parents:
diff
changeset
|
17 |
* Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. |
b0b34102bb4c
6298888: Add toGenericString to j.l.Class and getTypeName to j.l.reflect.Type
darcy
parents:
diff
changeset
|
18 |
* |
b0b34102bb4c
6298888: Add toGenericString to j.l.Class and getTypeName to j.l.reflect.Type
darcy
parents:
diff
changeset
|
19 |
* Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA |
b0b34102bb4c
6298888: Add toGenericString to j.l.Class and getTypeName to j.l.reflect.Type
darcy
parents:
diff
changeset
|
20 |
* or visit www.oracle.com if you need additional information or have any |
b0b34102bb4c
6298888: Add toGenericString to j.l.Class and getTypeName to j.l.reflect.Type
darcy
parents:
diff
changeset
|
21 |
* questions. |
b0b34102bb4c
6298888: Add toGenericString to j.l.Class and getTypeName to j.l.reflect.Type
darcy
parents:
diff
changeset
|
22 |
*/ |
b0b34102bb4c
6298888: Add toGenericString to j.l.Class and getTypeName to j.l.reflect.Type
darcy
parents:
diff
changeset
|
23 |
|
b0b34102bb4c
6298888: Add toGenericString to j.l.Class and getTypeName to j.l.reflect.Type
darcy
parents:
diff
changeset
|
24 |
/* |
b0b34102bb4c
6298888: Add toGenericString to j.l.Class and getTypeName to j.l.reflect.Type
darcy
parents:
diff
changeset
|
25 |
* @test |
39731
7a4bc90065bd
8161500: Use getTypeName and StringJoiner in core reflection toString methods
darcy
parents:
28519
diff
changeset
|
26 |
* @bug 6298888 6992705 8161500 |
16743
b0b34102bb4c
6298888: Add toGenericString to j.l.Class and getTypeName to j.l.reflect.Type
darcy
parents:
diff
changeset
|
27 |
* @summary Check Class.toGenericString() |
b0b34102bb4c
6298888: Add toGenericString to j.l.Class and getTypeName to j.l.reflect.Type
darcy
parents:
diff
changeset
|
28 |
* @author Joseph D. Darcy |
b0b34102bb4c
6298888: Add toGenericString to j.l.Class and getTypeName to j.l.reflect.Type
darcy
parents:
diff
changeset
|
29 |
*/ |
b0b34102bb4c
6298888: Add toGenericString to j.l.Class and getTypeName to j.l.reflect.Type
darcy
parents:
diff
changeset
|
30 |
|
b0b34102bb4c
6298888: Add toGenericString to j.l.Class and getTypeName to j.l.reflect.Type
darcy
parents:
diff
changeset
|
31 |
import java.lang.reflect.*; |
b0b34102bb4c
6298888: Add toGenericString to j.l.Class and getTypeName to j.l.reflect.Type
darcy
parents:
diff
changeset
|
32 |
import java.lang.annotation.*; |
b0b34102bb4c
6298888: Add toGenericString to j.l.Class and getTypeName to j.l.reflect.Type
darcy
parents:
diff
changeset
|
33 |
import java.util.*; |
b0b34102bb4c
6298888: Add toGenericString to j.l.Class and getTypeName to j.l.reflect.Type
darcy
parents:
diff
changeset
|
34 |
|
b0b34102bb4c
6298888: Add toGenericString to j.l.Class and getTypeName to j.l.reflect.Type
darcy
parents:
diff
changeset
|
35 |
@ExpectedGenericString("public class GenericStringTest") |
b0b34102bb4c
6298888: Add toGenericString to j.l.Class and getTypeName to j.l.reflect.Type
darcy
parents:
diff
changeset
|
36 |
public class GenericStringTest { |
28519
299787d4cf96
8060077: Class.toGenericString specification doesn't mention array types
darcy
parents:
16743
diff
changeset
|
37 |
public Map<String, Integer>[] mixed = null; |
299787d4cf96
8060077: Class.toGenericString specification doesn't mention array types
darcy
parents:
16743
diff
changeset
|
38 |
public Map<String, Integer>[][] mixed2 = null; |
299787d4cf96
8060077: Class.toGenericString specification doesn't mention array types
darcy
parents:
16743
diff
changeset
|
39 |
|
299787d4cf96
8060077: Class.toGenericString specification doesn't mention array types
darcy
parents:
16743
diff
changeset
|
40 |
public static void main(String... args) throws ReflectiveOperationException { |
16743
b0b34102bb4c
6298888: Add toGenericString to j.l.Class and getTypeName to j.l.reflect.Type
darcy
parents:
diff
changeset
|
41 |
int failures = 0; |
b0b34102bb4c
6298888: Add toGenericString to j.l.Class and getTypeName to j.l.reflect.Type
darcy
parents:
diff
changeset
|
42 |
|
28519
299787d4cf96
8060077: Class.toGenericString specification doesn't mention array types
darcy
parents:
16743
diff
changeset
|
43 |
String[][] nested = {{""}}; |
299787d4cf96
8060077: Class.toGenericString specification doesn't mention array types
darcy
parents:
16743
diff
changeset
|
44 |
int[][] intArray = {{1}}; |
299787d4cf96
8060077: Class.toGenericString specification doesn't mention array types
darcy
parents:
16743
diff
changeset
|
45 |
|
16743
b0b34102bb4c
6298888: Add toGenericString to j.l.Class and getTypeName to j.l.reflect.Type
darcy
parents:
diff
changeset
|
46 |
failures += checkToGenericString(int.class, "int"); |
28519
299787d4cf96
8060077: Class.toGenericString specification doesn't mention array types
darcy
parents:
16743
diff
changeset
|
47 |
failures += checkToGenericString(void.class, "void"); |
299787d4cf96
8060077: Class.toGenericString specification doesn't mention array types
darcy
parents:
16743
diff
changeset
|
48 |
failures += checkToGenericString(args.getClass(), "java.lang.String[]"); |
299787d4cf96
8060077: Class.toGenericString specification doesn't mention array types
darcy
parents:
16743
diff
changeset
|
49 |
failures += checkToGenericString(nested.getClass(), "java.lang.String[][]"); |
299787d4cf96
8060077: Class.toGenericString specification doesn't mention array types
darcy
parents:
16743
diff
changeset
|
50 |
failures += checkToGenericString(intArray.getClass(), "int[][]"); |
299787d4cf96
8060077: Class.toGenericString specification doesn't mention array types
darcy
parents:
16743
diff
changeset
|
51 |
failures += checkToGenericString(java.util.Map.class, "public abstract interface java.util.Map<K,V>"); |
299787d4cf96
8060077: Class.toGenericString specification doesn't mention array types
darcy
parents:
16743
diff
changeset
|
52 |
|
299787d4cf96
8060077: Class.toGenericString specification doesn't mention array types
darcy
parents:
16743
diff
changeset
|
53 |
Field f = GenericStringTest.class.getDeclaredField("mixed"); |
299787d4cf96
8060077: Class.toGenericString specification doesn't mention array types
darcy
parents:
16743
diff
changeset
|
54 |
// The expected value includes "<K,V>" rather than |
299787d4cf96
8060077: Class.toGenericString specification doesn't mention array types
darcy
parents:
16743
diff
changeset
|
55 |
// "<...String,...Integer>" since the Class object rather than |
299787d4cf96
8060077: Class.toGenericString specification doesn't mention array types
darcy
parents:
16743
diff
changeset
|
56 |
// Type objects is being queried. |
299787d4cf96
8060077: Class.toGenericString specification doesn't mention array types
darcy
parents:
16743
diff
changeset
|
57 |
failures += checkToGenericString(f.getType(), "java.util.Map<K,V>[]"); |
299787d4cf96
8060077: Class.toGenericString specification doesn't mention array types
darcy
parents:
16743
diff
changeset
|
58 |
f = GenericStringTest.class.getDeclaredField("mixed2"); |
299787d4cf96
8060077: Class.toGenericString specification doesn't mention array types
darcy
parents:
16743
diff
changeset
|
59 |
failures += checkToGenericString(f.getType(), "java.util.Map<K,V>[][]"); |
16743
b0b34102bb4c
6298888: Add toGenericString to j.l.Class and getTypeName to j.l.reflect.Type
darcy
parents:
diff
changeset
|
60 |
|
39731
7a4bc90065bd
8161500: Use getTypeName and StringJoiner in core reflection toString methods
darcy
parents:
28519
diff
changeset
|
61 |
for(Class<?> clazz : List.of(GenericStringTest.class, |
7a4bc90065bd
8161500: Use getTypeName and StringJoiner in core reflection toString methods
darcy
parents:
28519
diff
changeset
|
62 |
AnInterface.class, |
7a4bc90065bd
8161500: Use getTypeName and StringJoiner in core reflection toString methods
darcy
parents:
28519
diff
changeset
|
63 |
LocalMap.class, |
7a4bc90065bd
8161500: Use getTypeName and StringJoiner in core reflection toString methods
darcy
parents:
28519
diff
changeset
|
64 |
AnEnum.class, |
7a4bc90065bd
8161500: Use getTypeName and StringJoiner in core reflection toString methods
darcy
parents:
28519
diff
changeset
|
65 |
AnotherEnum.class)) { |
16743
b0b34102bb4c
6298888: Add toGenericString to j.l.Class and getTypeName to j.l.reflect.Type
darcy
parents:
diff
changeset
|
66 |
failures += checkToGenericString(clazz, clazz.getAnnotation(ExpectedGenericString.class).value()); |
b0b34102bb4c
6298888: Add toGenericString to j.l.Class and getTypeName to j.l.reflect.Type
darcy
parents:
diff
changeset
|
67 |
} |
b0b34102bb4c
6298888: Add toGenericString to j.l.Class and getTypeName to j.l.reflect.Type
darcy
parents:
diff
changeset
|
68 |
|
b0b34102bb4c
6298888: Add toGenericString to j.l.Class and getTypeName to j.l.reflect.Type
darcy
parents:
diff
changeset
|
69 |
if (failures > 0) { |
b0b34102bb4c
6298888: Add toGenericString to j.l.Class and getTypeName to j.l.reflect.Type
darcy
parents:
diff
changeset
|
70 |
throw new RuntimeException(); |
b0b34102bb4c
6298888: Add toGenericString to j.l.Class and getTypeName to j.l.reflect.Type
darcy
parents:
diff
changeset
|
71 |
} |
b0b34102bb4c
6298888: Add toGenericString to j.l.Class and getTypeName to j.l.reflect.Type
darcy
parents:
diff
changeset
|
72 |
} |
b0b34102bb4c
6298888: Add toGenericString to j.l.Class and getTypeName to j.l.reflect.Type
darcy
parents:
diff
changeset
|
73 |
|
b0b34102bb4c
6298888: Add toGenericString to j.l.Class and getTypeName to j.l.reflect.Type
darcy
parents:
diff
changeset
|
74 |
private static int checkToGenericString(Class<?> clazz, String expected) { |
b0b34102bb4c
6298888: Add toGenericString to j.l.Class and getTypeName to j.l.reflect.Type
darcy
parents:
diff
changeset
|
75 |
String genericString = clazz.toGenericString(); |
b0b34102bb4c
6298888: Add toGenericString to j.l.Class and getTypeName to j.l.reflect.Type
darcy
parents:
diff
changeset
|
76 |
if (!genericString.equals(expected)) { |
b0b34102bb4c
6298888: Add toGenericString to j.l.Class and getTypeName to j.l.reflect.Type
darcy
parents:
diff
changeset
|
77 |
System.err.printf("Unexpected Class.toGenericString output; expected '%s', got '%s'.%n", |
b0b34102bb4c
6298888: Add toGenericString to j.l.Class and getTypeName to j.l.reflect.Type
darcy
parents:
diff
changeset
|
78 |
expected, |
b0b34102bb4c
6298888: Add toGenericString to j.l.Class and getTypeName to j.l.reflect.Type
darcy
parents:
diff
changeset
|
79 |
genericString); |
b0b34102bb4c
6298888: Add toGenericString to j.l.Class and getTypeName to j.l.reflect.Type
darcy
parents:
diff
changeset
|
80 |
return 1; |
b0b34102bb4c
6298888: Add toGenericString to j.l.Class and getTypeName to j.l.reflect.Type
darcy
parents:
diff
changeset
|
81 |
} else |
b0b34102bb4c
6298888: Add toGenericString to j.l.Class and getTypeName to j.l.reflect.Type
darcy
parents:
diff
changeset
|
82 |
return 0; |
b0b34102bb4c
6298888: Add toGenericString to j.l.Class and getTypeName to j.l.reflect.Type
darcy
parents:
diff
changeset
|
83 |
} |
b0b34102bb4c
6298888: Add toGenericString to j.l.Class and getTypeName to j.l.reflect.Type
darcy
parents:
diff
changeset
|
84 |
} |
b0b34102bb4c
6298888: Add toGenericString to j.l.Class and getTypeName to j.l.reflect.Type
darcy
parents:
diff
changeset
|
85 |
|
b0b34102bb4c
6298888: Add toGenericString to j.l.Class and getTypeName to j.l.reflect.Type
darcy
parents:
diff
changeset
|
86 |
@Retention(RetentionPolicy.RUNTIME) |
b0b34102bb4c
6298888: Add toGenericString to j.l.Class and getTypeName to j.l.reflect.Type
darcy
parents:
diff
changeset
|
87 |
@interface ExpectedGenericString { |
b0b34102bb4c
6298888: Add toGenericString to j.l.Class and getTypeName to j.l.reflect.Type
darcy
parents:
diff
changeset
|
88 |
String value(); |
b0b34102bb4c
6298888: Add toGenericString to j.l.Class and getTypeName to j.l.reflect.Type
darcy
parents:
diff
changeset
|
89 |
} |
b0b34102bb4c
6298888: Add toGenericString to j.l.Class and getTypeName to j.l.reflect.Type
darcy
parents:
diff
changeset
|
90 |
|
b0b34102bb4c
6298888: Add toGenericString to j.l.Class and getTypeName to j.l.reflect.Type
darcy
parents:
diff
changeset
|
91 |
@ExpectedGenericString("abstract interface AnInterface") |
b0b34102bb4c
6298888: Add toGenericString to j.l.Class and getTypeName to j.l.reflect.Type
darcy
parents:
diff
changeset
|
92 |
strictfp interface AnInterface {} |
b0b34102bb4c
6298888: Add toGenericString to j.l.Class and getTypeName to j.l.reflect.Type
darcy
parents:
diff
changeset
|
93 |
|
b0b34102bb4c
6298888: Add toGenericString to j.l.Class and getTypeName to j.l.reflect.Type
darcy
parents:
diff
changeset
|
94 |
@ExpectedGenericString("abstract interface LocalMap<K,V>") |
b0b34102bb4c
6298888: Add toGenericString to j.l.Class and getTypeName to j.l.reflect.Type
darcy
parents:
diff
changeset
|
95 |
interface LocalMap<K,V> {} |
b0b34102bb4c
6298888: Add toGenericString to j.l.Class and getTypeName to j.l.reflect.Type
darcy
parents:
diff
changeset
|
96 |
|
b0b34102bb4c
6298888: Add toGenericString to j.l.Class and getTypeName to j.l.reflect.Type
darcy
parents:
diff
changeset
|
97 |
@ExpectedGenericString("final enum AnEnum") |
b0b34102bb4c
6298888: Add toGenericString to j.l.Class and getTypeName to j.l.reflect.Type
darcy
parents:
diff
changeset
|
98 |
enum AnEnum { |
b0b34102bb4c
6298888: Add toGenericString to j.l.Class and getTypeName to j.l.reflect.Type
darcy
parents:
diff
changeset
|
99 |
FOO; |
b0b34102bb4c
6298888: Add toGenericString to j.l.Class and getTypeName to j.l.reflect.Type
darcy
parents:
diff
changeset
|
100 |
} |
b0b34102bb4c
6298888: Add toGenericString to j.l.Class and getTypeName to j.l.reflect.Type
darcy
parents:
diff
changeset
|
101 |
|
b0b34102bb4c
6298888: Add toGenericString to j.l.Class and getTypeName to j.l.reflect.Type
darcy
parents:
diff
changeset
|
102 |
@ExpectedGenericString("enum AnotherEnum") |
b0b34102bb4c
6298888: Add toGenericString to j.l.Class and getTypeName to j.l.reflect.Type
darcy
parents:
diff
changeset
|
103 |
enum AnotherEnum { |
b0b34102bb4c
6298888: Add toGenericString to j.l.Class and getTypeName to j.l.reflect.Type
darcy
parents:
diff
changeset
|
104 |
BAR{}; |
b0b34102bb4c
6298888: Add toGenericString to j.l.Class and getTypeName to j.l.reflect.Type
darcy
parents:
diff
changeset
|
105 |
} |