Align handling of ParameterizedTest annotations in Java and Python code

chrome/android/javatests/src/org/chromium/base/test/util/parameter/ParameterizedTestClassAnnotationTest.java

Index: chrome/android/javatests/src/org/chromium/base/test/util/parameter/ParameterizedTestClassAnnotationTest.java
diff --git a/chrome/android/javatests/src/org/chromium/base/test/util/parameter/ParameterizedTestClassAnnotationTest.java b/chrome/android/javatests/src/org/chromium/base/test/util/parameter/ParameterizedTestClassAnnotationTest.java
index 65b9fb45051331f194cede4dea529ec9d4db31bf..59208a5db07a19446a871693b0847d3202ade9be 100644
--- a/chrome/android/javatests/src/org/chromium/base/test/util/parameter/ParameterizedTestClassAnnotationTest.java
+++ b/chrome/android/javatests/src/org/chromium/base/test/util/parameter/ParameterizedTestClassAnnotationTest.java
@@ -50,22 +50,30 @@ public class ParameterizedTestClassAnnotationTest extends
             @Parameter(tag = MethodParameter.PARAMETER_TAG,
                     arguments = {@Parameter.Argument(name = "string", stringVar = "value")})})
     public void testMethodParametersWithOneStringValue() {
-        if (getArgument("string") != null) {
-            // An invocation with a test method parameter.
-            String expected = "value";
-            String actual = getArgument("string").stringVar();
-            assertEquals(mismatchMessage("string"), expected, actual);
-        } else {
-            assertEquals(0,
-                    getParameterReader().getParameter(
-                            MethodParameter.PARAMETER_TAG).arguments().length);
-        }
+        // Method parameter overrides class parameter.
+        assertNotNull("string parameter should exist.", getArgument("string"));
+        String expected = "value";
+        String actual = getArgument("string").stringVar();
+        assertEquals(mismatchMessage("string"), expected, actual);
         assertNull("someParameter should not exist.", getParameterReader()
                 .getParameter("someParameter"));
         assertNull("someParameterArgument should not exist.", getParameterReader()
                 .getParameterArgument("someParameter", "someParameterArgument"));
     }
 
+    @SmallTest
+    @ParameterizedTest.Set(tests = {
+            @ParameterizedTest(parameters = {
+                    @Parameter(
+                            tag = MethodParameter.PARAMETER_TAG,
+                            arguments = {
+                                    @Parameter.Argument(name = "string", stringVar = "s_val")})})})
+    public void testParameterizedSetOverridesParameterizedTest() {
+        String expected = "s_val";
+        String actual = getArgument("string").stringVar();
+        assertEquals("Expected the value set via @ParameterizedTest.Set", expected, actual);
+    }
+
     private static String mismatchMessage(String name) {
         return String.format("The ParameterArgument %s does not match expected value.", name);
     }