Merge pull request #22650 from theresa-m/strictfield_4

Correct stack size for StrictField test

Author: tajila

test/functional/Valhalla/src/org/openj9/test/lworld/StrictFieldGenerator.java

@@ -62,7 +62,7 @@ private static Class<?> generateTestPutStrictFinalField(String className, boolea
             mv.visitFieldInsn(PUTFIELD, className, fieldName, fieldDesc);
         }
         mv.visitInsn(RETURN);
-        mv.visitMaxs(1, 1);
+        mv.visitMaxs(lateLarval ? 2 : 1, 1);
         mv.visitEnd();
 
         if (unrestricted) {

test/functional/Valhalla/src/org/openj9/test/lworld/StrictFieldTests.java

@@ -32,7 +32,7 @@ public class StrictFieldTests {
 	/* A strict final field cannot be set outside earlyLarvel.
 	 * Test in <init> after invokespecial (lateLarval).
 	 */
-	@Test(expectedExceptions = VerifyError.class)
+	@Test(expectedExceptions = VerifyError.class, expectedExceptionsMessageRegExp = ".*<init>.*JBputfield.*")
 	static public void testPutStrictFinalFieldLateLarval() throws Throwable{
 		Class<?> c = StrictFieldGenerator.generateTestPutStrictFinalFieldLateLarval();
 		c.newInstance();
@@ -41,7 +41,7 @@ static public void testPutStrictFinalFieldLateLarval() throws Throwable{
 	/* A strict final field cannot be set outside earlyLarvel.
 	 * Test outside of <init> (initialization state unrestricted).
 	 */
-	@Test(expectedExceptions = VerifyError.class)
+	@Test(expectedExceptions = VerifyError.class, expectedExceptionsMessageRegExp = ".*putI.*JBputfield.*")
 	static public void testPutStrictFinalFieldUnrestricted() throws Throwable {
 		Class<?> c = StrictFieldGenerator.generateTestPutStrictFinalFieldUnrestricted();
 		c.newInstance();