Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

JDK-8322878: Including sealing information Class.toGenericString() #17239

Closed
wants to merge 8 commits into from
+205 −20
Closed

JDK-8322878: Including sealing information Class.toGenericString() #17239

Changes from 1 commit
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
8108483
JDK-8322878: Including sealing information Class.toGenericString()
jddarcy Jan 3, 2024
7222d78
Add non-seal'ing support.
jddarcy Jan 8, 2024
ac897d9
Update non-sealed computation.
jddarcy Jan 9, 2024
e1efbf3
Improve regression test.
jddarcy Jan 9, 2024
2d02d9b
Update spec; test sealed class structures.
jddarcy Jan 9, 2024
d5a451d
Expand test cases.
jddarcy Jan 9, 2024
22b5c88
Merge branch 'master' into JDK-8322878
jddarcy Jan 9, 2024
4cfc4e3
Adjust JLS quote and update copyright.
jddarcy Jan 10, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
39 changes: 24 additions & 15 deletions test/jdk/java/lang/Class/GenericStringTest.java
View file
Original file line number Diff line number Diff line change
@@ -36,32 +36,41 @@ public class GenericStringTest {
public Map<String, Integer>[] mixed = null;
public Map<String, Integer>[][] mixed2 = null;

private static record PlatformTestCase(Class<?> clazz, String expected) {}

public static void main(String... args) throws ReflectiveOperationException {
int failures = 0;

String[][] nested = {{""}};
int[][] intArray = {{1}};

Map<Class<?>, String> platformTestCases =
Map.of(//int.class, "int",
void.class, "void",
args.getClass(), "java.lang.String[]",
nested.getClass(), "java.lang.String[][]",
intArray.getClass(), "int[][]",
java.lang.Enum.class, "public abstract class java.lang.Enum<E extends java.lang.Enum<E>>",
java.util.Map.class, "public abstract interface java.util.Map<K,V>",
java.util.EnumMap.class, "public class java.util.EnumMap<K extends java.lang.Enum<K>,V>",
java.util.EventListenerProxy.class, "public abstract class java.util.EventListenerProxy<T extends java.util.EventListener>",
List<PlatformTestCase> platformTestCases =
List.of(new PlatformTestCase(int.class, "int"),
new PlatformTestCase(void.class, "void"),
new PlatformTestCase(args.getClass(), "java.lang.String[]"),
new PlatformTestCase(nested.getClass(), "java.lang.String[][]"),
new PlatformTestCase(intArray.getClass(), "int[][]"),

new PlatformTestCase(java.lang.Enum.class,
"public abstract class java.lang.Enum<E extends java.lang.Enum<E>>"),
new PlatformTestCase(java.util.Map.class,
"public abstract interface java.util.Map<K,V>"),
new PlatformTestCase(java.util.EnumMap.class,
"public class java.util.EnumMap<K extends java.lang.Enum<K>,V>"),
new PlatformTestCase(java.util.EventListenerProxy.class,
"public abstract class java.util.EventListenerProxy<T extends java.util.EventListener>"),

// Sealed class
java.lang.ref.Reference.class, "public abstract sealed class java.lang.ref.Reference<T>",
new PlatformTestCase(java.lang.ref.Reference.class,
"public abstract sealed class java.lang.ref.Reference<T>"),
// non-sealed class
java.lang.ref.WeakReference.class, "public non-sealed class java.lang.ref.WeakReference<T>"
new PlatformTestCase(java.lang.ref.WeakReference.class,
"public non-sealed class java.lang.ref.WeakReference<T>")
);

for (Map.Entry<Class<?>, String> platformTestCase : platformTestCases.entrySet()) {
failures += checkToGenericString(platformTestCase.getKey(),
platformTestCase.getValue());
for (PlatformTestCase platformTestCase : platformTestCases) {
failures += checkToGenericString(platformTestCase.clazz,
platformTestCase.expected);
}

Field f = GenericStringTest.class.getDeclaredField("mixed");