Serialization Test fixes for JDK 21.

aoeui · copybara-github · commit 052407b9e7ce · 2023-03-07T03:55:05.000-08:00
ImmutableMapCodecTest - was using getCanonicalName to retrieve the name
of an anonymous inner class and was getting null, as is the defined
behavior for anonymous inner classes. Switching to getName fixes the test,
which makes it consistent with production code anyway.

MethodCodecTest - this seems like weird JDK21 behavior. Looking up methods
returned by Class.getMethods against the declaring classes does not return
the same method. In this case, in particular, String.class.getMethods includes

  java.lang.String.resolveConstantDesc(java.lang.invoke.MethodHandles$Lookup)
      throws java.lang.ReflectiveOperationException

which is the method signature according to the ConstantDesc interface. Adding
to the strangeness, calling getDeclaringClass returns String instead of
ConstantDesc.

However, looking up the method with String.class.getDeclaredMethod by name and
parameters, results in

  java.lang.String.resolveConstantDesc(java.lang.invoke.MethodHandles$Lookup)

which drops the ReflectiveOperationException. This is actually the proper
signature for strings. This difference shouldn't really matter for
serialization correctness as long as both Method objects are invokable.

Changing the test to serialize the result of looking up via getDeclaredMethod
instead of getMethods fixes it.

PiperOrigin-RevId: 514686339
Change-Id: I1eecae589858fc9296fedee49f810d56720d6ab2
diff --git a/src/test/java/com/google/devtools/build/lib/skyframe/serialization/ImmutableMapCodecTest.java b/src/test/java/com/google/devtools/build/lib/skyframe/serialization/ImmutableMapCodecTest.java
@@ -96,7 +96,7 @@ public void immutableSortedMapUnserializableComparatorFails() {
                         .buildOrThrow()));
     assertThat(thrown)
         .hasMessageThat()
-        .startsWith("No default codec available for " + comparator.getClass().getCanonicalName());
+        .startsWith("No default codec available for " + comparator.getClass().getName());
   }
 
   @Test
diff --git a/src/test/java/com/google/devtools/build/lib/skyframe/serialization/MethodCodecTest.java b/src/test/java/com/google/devtools/build/lib/skyframe/serialization/MethodCodecTest.java
@@ -27,11 +27,17 @@
 public class MethodCodecTest {
   @Test
   public void smoke() throws Exception {
-    new SerializationTester(
-            ImmutableList.<Method>builder()
-                .add(String.class.getMethods())
-                .add(List.class.getMethods())
-                .build())
-        .runTests();
+    var methods = new ImmutableList.Builder<Method>();
+    getMethods(String.class, methods);
+    getMethods(List.class, methods);
+    new SerializationTester(methods.build()).runTests();
+  }
+
+  private static void getMethods(Class<?> clazz, ImmutableList.Builder<Method> out)
+      throws NoSuchMethodException {
+    for (var method : clazz.getMethods()) {
+      Class<?> declaringClass = method.getDeclaringClass();
+      out.add(declaringClass.getDeclaredMethod(method.getName(), method.getParameterTypes()));
+    }
   }
 }

Original file line number	Diff line number	Diff line change
`@@ -96,7 +96,7 @@ public void immutableSortedMapUnserializableComparatorFails() {`
`96`	`96`	`.buildOrThrow()));`
`97`	`97`	`assertThat(thrown)`
`98`	`98`	`.hasMessageThat()`
`99`		`- .startsWith("No default codec available for " + comparator.getClass().getCanonicalName());`
	`99`	`+ .startsWith("No default codec available for " + comparator.getClass().getName());`
`100`	`100`	`}`
`101`	`101`
`102`	`102`	`@Test`