[FFI/Test_JDK22] Add test suites intended for union

The changes add all the same test suites intended for union in JDK21 to JDK22 with the updated APIs introduced in JDK22. Signed-off-by: ChengJin01 <[email protected]>
eclipse-openj9 · Nov 2, 2023 · c0f1b71 · c0f1b71
1 parent 59eb37d
commit c0f1b71
Show file tree

Hide file tree

Showing 9 changed files with 9,329 additions and 18 deletions.
diff --git a/test/functional/Java21Only/src/org/openj9/test/jep442/downcall/UnionStructTests.java b/test/functional/Java21Only/src/org/openj9/test/jep442/downcall/UnionStructTests.java
@@ -26,7 +26,6 @@
 import org.testng.AssertJUnit;
 
 import java.lang.invoke.MethodHandle;
-import java.lang.invoke.VarHandle;
 
 import java.lang.foreign.Arena;
 import java.lang.foreign.Linker;
@@ -825,8 +824,6 @@ public void test_addDoubleAndDoublesFromUnion_Nested4DoubleStruct() throws Throw
 	@Test
 	public void test_add2DoubleStructs_returnStruct_Nested2DoubleUnion() throws Throwable {
 		GroupLayout structLayout = MemoryLayout.structLayout(JAVA_DOUBLE.withName("elem1"), JAVA_DOUBLE.withName("elem2"));
-		VarHandle doubleHandle1 = structLayout.varHandle(PathElement.groupElement("elem1"));
-		VarHandle doubleHandle2 = structLayout.varHandle(PathElement.groupElement("elem2"));
 
 		FunctionDescriptor fd = FunctionDescriptor.of(structLayout, structLayout, structLayout);
 		MemorySegment functionSymbol = nativeLibLookup.find("add2DoubleStructs_returnStruct_Nested2DoubleUnion").get();

diff --git a/test/functional/Java21Only/src/org/openj9/test/jep442/upcall/UpcallMHWithUnionTests.java b/test/functional/Java21Only/src/org/openj9/test/jep442/upcall/UpcallMHWithUnionTests.java
@@ -46,7 +46,6 @@
  */
 @Test(groups = { "level.sanity" })
 public class UpcallMHWithUnionTests {
-	private static boolean isAixOS = System.getProperty("os.name").toLowerCase().contains("aix");
 	private static Linker linker = Linker.nativeLinker();
 
 	static {

diff --git a/test/functional/Java21Only/testng_210.xml b/test/functional/Java21Only/testng_210.xml
@@ -37,6 +37,8 @@
 			<class name="org.openj9.test.jep442.downcall.PrimitiveTypeTests2"/>
 			<class name="org.openj9.test.jep442.downcall.StructTests1"/>
 			<class name="org.openj9.test.jep442.downcall.StructTests2"/>
+			<class name="org.openj9.test.jep442.downcall.UnionStructTests"/>
+			<class name="org.openj9.test.jep442.downcall.UnionTests"/>
 		</classes>
 	</test>
 	<test name="Jep442Tests_testLinkerFfi_UpCall">
@@ -48,6 +50,8 @@
 			<class name="org.openj9.test.jep442.upcall.UpcallMHWithMixedSigStruTests"/>
 			<class name="org.openj9.test.jep442.upcall.UpcallMHWithPrimTests"/>
 			<class name="org.openj9.test.jep442.upcall.UpcallMHWithStructTests"/>
+			<class name="org.openj9.test.jep442.upcall.UpcallMHWithUnionStructTests"/>
+			<class name="org.openj9.test.jep442.upcall.UpcallMHWithUnionTests"/>
 		</classes>
 	</test>
 </suite>
diff --git a/test/functional/Java22andUp/src/org/openj9/test/jep454/downcall/UnionStructTests.java b/test/functional/Java22andUp/src/org/openj9/test/jep454/downcall/UnionStructTests.java
diff --git a/test/functional/Java22andUp/src/org/openj9/test/jep454/downcall/UnionTests.java b/test/functional/Java22andUp/src/org/openj9/test/jep454/downcall/UnionTests.java
diff --git a/...unctional/Java22andUp/src/org/openj9/test/jep454/upcall/UpcallMHWithUnionStructTests.java b/...unctional/Java22andUp/src/org/openj9/test/jep454/upcall/UpcallMHWithUnionStructTests.java
diff --git a/test/functional/Java22andUp/src/org/openj9/test/jep454/upcall/UpcallMHWithUnionTests.java b/test/functional/Java22andUp/src/org/openj9/test/jep454/upcall/UpcallMHWithUnionTests.java
diff --git a/test/functional/Java22andUp/src/org/openj9/test/jep454/upcall/UpcallMethodHandles.java b/test/functional/Java22andUp/src/org/openj9/test/jep454/upcall/UpcallMethodHandles.java
diff --git a/test/functional/Java22andUp/testng_220.xml b/test/functional/Java22andUp/testng_220.xml
@@ -37,6 +37,8 @@
 			<class name="org.openj9.test.jep454.downcall.PrimitiveTypeTests2"/>
 			<class name="org.openj9.test.jep454.downcall.StructTests1"/>
 			<class name="org.openj9.test.jep454.downcall.StructTests2"/>
+			<class name="org.openj9.test.jep454.downcall.UnionStructTests"/>
+			<class name="org.openj9.test.jep454.downcall.UnionTests"/>
 		</classes>
 	</test>
 	<test name="Jep454Tests_testLinkerFfi_UpCall">
@@ -48,6 +50,8 @@
 			<class name="org.openj9.test.jep454.upcall.UpcallMHWithMixedSigStruTests"/>
 			<class name="org.openj9.test.jep454.upcall.UpcallMHWithPrimTests"/>
 			<class name="org.openj9.test.jep454.upcall.UpcallMHWithStructTests"/>
+			<class name="org.openj9.test.jep454.upcall.UpcallMHWithUnionStructTests"/>
+			<class name="org.openj9.test.jep454.upcall.UpcallMHWithUnionTests"/>
 		</classes>
 	</test>
 </suite>