test/jdk/valhalla/valuetypes/QTypeDescriptorTest.java

rev 55127 : 8223351: [lworld] Primary mirror and nullable mirror for inline type
Reviewed-by: tbd

@@ -59,12 +59,12 @@
         f.apply(new Point[] { P0, P1});
     }
 
     @Test
     public static void testMethodInvoke() throws Exception {
-        Class<?> pointQType = Point.class.asValueType();
-        Class<?> nonFlattenValueQType = NonFlattenValue.class.asValueType();
+        Class<?> pointQType = Point.class;
+        Class<?> nonFlattenValueQType = NonFlattenValue.class;
         Method m = QTypeDescriptorTest.class
             .getDeclaredMethod("toLine", pointQType, nonFlattenValueQType);
         makeLine(m, P0, NFV);
 
         m = QTypeDescriptorTest.class

@@ -125,14 +125,14 @@
         assertEquals(l.p2, NFV.pointValue());
     }
 
     @DataProvider
     static Object[][] descriptors() {
-        Class<?> pointLType = Point.class.asBoxType();
-        Class<?> pointQType = Point.class.asValueType();
-        Class<?> nonFlattenValueLType = NonFlattenValue.class.asBoxType();
-        Class<?> nonFlattenValueQType = NonFlattenValue.class.asValueType();
+        Class<?> pointLType = Point.class.asNullableType();
+        Class<?> pointQType = Point.class;
+        Class<?> nonFlattenValueLType = NonFlattenValue.class.asNullableType();
+        Class<?> nonFlattenValueQType = NonFlattenValue.class;
         return new Object[][]{
             { QTypeDescriptorTest.class, "toLine", new Class<?>[] {pointQType, nonFlattenValueQType}, true},
             { QTypeDescriptorTest.class, "toLine", new Class<?>[] {pointLType, nonFlattenValueQType}, false},
             { QTypeDescriptorTest.class, "toLine", new Class<?>[] { Point[].class },                  true},
             { NonFlattenValue.class, "point",      null,                                              true},

@@ -152,12 +152,12 @@
         }
     }
 
     @DataProvider
     static Object[][] methodTypes() {
-        Class<?> pointLType = Point.class.asBoxType();
-        Class<?> pointQType = Point.class.asValueType();
+        Class<?> pointLType = Point.class.asNullableType();
+        Class<?> pointQType = Point.class;
         ClassLoader loader = QTypeDescriptorTest.class.getClassLoader();
         return new Object[][]{
             { "point",      MethodType.methodType(pointLType),                            true },
             { "pointValue", MethodType.methodType(pointQType),                            true },
             { "has",        MethodType.methodType(boolean.class, pointQType, pointLType), true },