Align handling of ParameterizedTest annotations in Java and Python code

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

Index: chrome/android/javatests/src/org/chromium/base/test/util/parameter/ParameterizedTestClassAnnotationParametersTestSetInheritanceTest.java
diff --git a/chrome/android/javatests/src/org/chromium/base/test/util/parameter/ParameterizedTestClassAnnotationParametersTestSetInheritanceTest.java b/chrome/android/javatests/src/org/chromium/base/test/util/parameter/ParameterizedTestClassAnnotationParametersTestSetInheritanceTest.java
new file mode 100644
index 0000000000000000000000000000000000000000..2e08fe1324839eb4c35b47901c2b34e59a3bd9e6
--- /dev/null
+++ b/chrome/android/javatests/src/org/chromium/base/test/util/parameter/ParameterizedTestClassAnnotationParametersTestSetInheritanceTest.java
@@ -0,0 +1,45 @@
+// Copyright 2015 The Chromium Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
+package org.chromium.base.test.util.parameter;
+
+import android.test.suitebuilder.annotation.SmallTest;
+
+import org.chromium.base.test.util.parameter.parameters.MethodParameter;
+
+/**
+ * Tester class for inheritance of the {@link ParameterizedTest.Set} annotation applied to a
+ * TestCase class.
+ */
+public class ParameterizedTestClassAnnotationParametersTestSetInheritanceTest extends
+        ParameterizedTestClassAnnotationParametersTestSetTest {
+    public ParameterizedTestClassAnnotationParametersTestSetInheritanceTest() {
+        super();
+    }
+
+    @SmallTest
+    public void testMethodParametersFromClassAnnotation() {
+        super.testMethodParametersFromClassAnnotation();
+    }
+
+    @SmallTest
+    @ParameterizedTest.Set(tests = {
+            @ParameterizedTest(parameters = {
+                    @Parameter(
+                            tag = MethodParameter.PARAMETER_TAG,
+                            arguments = {
+                                    @Parameter.Argument(name = "m_string", stringVar = "value"),
+                                    @Parameter.Argument(name = "m_int", intVar = 0)})})})
+    public void testClassAndMethodParameterSets() {
+        super.testClassAndMethodParameterSets();
+    }
+
+    @SmallTest
+    @ParameterizedTest(parameters = {
+            @Parameter(tag = MethodParameter.PARAMETER_TAG,
+                    arguments = {@Parameter.Argument(name = "c_string1", stringVar = "t_val")})})
+    public void testParameterizedSetOverridesParameterizedTest() {
+        super.testParameterizedSetOverridesParameterizedTest();
+    }
+}