Set @ParametrizedTest for testDynamicInlineActions

Author: wojciszek

tool-testsuite/test/org/antlr/v4/test/tool/TestAttributeChecks.java

@@ -9,10 +9,17 @@
 import org.antlr.runtime.RecognitionException;
 import org.antlr.v4.tool.ErrorType;
 import org.junit.jupiter.api.Test;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.Arguments;
+import org.junit.jupiter.params.provider.MethodSource;
 import org.stringtemplate.v4.ST;
 import org.stringtemplate.v4.STGroup;
 import org.stringtemplate.v4.misc.ErrorBuffer;
 
+import java.util.ArrayList;
+import java.util.List;
+import java.util.stream.Stream;
+
 import static org.antlr.v4.test.tool.ToolTestUtils.testErrors;
 
 /** */
@@ -145,7 +152,7 @@ public class TestAttributeChecks {
 		"$S::j = $S::k;",	"error(" + ErrorType.UNDEFINED_RULE_IN_NONLOCAL_REF.code + "): A.g4:5:8: reference to undefined rule S in non-local ref $S::j = $S::k;\n",
 	};
 
-	String[] dynInlineChecks = {
+	static String[] dynInlineChecks = {
 		"$a",			"error(" + ErrorType.ISOLATED_RULE_REF.code + "): A.g4:7:4: missing attribute access on rule reference a in $a\n",
 		"$b",			"error(" + ErrorType.ISOLATED_RULE_REF.code + "): A.g4:7:4: missing attribute access on rule reference b in $b\n",
 		"$lab",			"error(" + ErrorType.ISOLATED_RULE_REF.code + "): A.g4:7:4: missing attribute access on rule reference lab in $lab\n",
@@ -214,8 +221,18 @@ public class TestAttributeChecks {
 		testActions("inline", inlineChecks, attributeTemplate);
 	}
 
-	@Test public void testDynamicInlineActions() throws RecognitionException {
-		testActions("inline", dynInlineChecks, attributeTemplate);
+	public static Stream<Arguments> testDynamicInlineActionsParams() {
+		List<Arguments> arguments = new ArrayList<>();
+		for (int i = 0; i < dynInlineChecks.length; i+=2) {
+			arguments.add(Arguments.of(dynInlineChecks[i], dynInlineChecks[i+1]));
+		}
+		return arguments.stream();
+	}
+
+	@ParameterizedTest
+	@MethodSource("testDynamicInlineActionsParams")
+	public void testDynamicInlineActions(String input, String expected) {
+		testAction("inline", attributeTemplate, input, expected);
 	}
 
 	@Test public void testBadInlineActions() throws RecognitionException {
@@ -244,12 +261,16 @@ private static void testActions(String location, String[] pairs, String template
 		for (int i = 0; i < pairs.length; i += 2) {
 			String action = pairs[i];
 			String expected = pairs[i + 1];
-			STGroup g = new STGroup('<', '>');
-			g.setListener(new ErrorBuffer()); // hush warnings
-			ST st = new ST(g, template);
-			st.add(location, action);
-			String grammar = st.render();
-			testErrors(new String[]{grammar, expected}, false);
+			testAction(location, template, action, expected);
 		}
 	}
+
+	private static void testAction(String location, String template, String action, String expected) {
+		STGroup g = new STGroup('<', '>');
+		g.setListener(new ErrorBuffer()); // hush warnings
+		ST st = new ST(g, template);
+		st.add(location, action);
+		String grammar = st.render();
+		testErrors(new String[]{grammar, expected}, false);
+	}
 }