| Index: chrome/android/javatests/src/org/chromium/base/test/util/parameter/ParameterizedTestAnnotationTest.java
|
| diff --git a/chrome/android/javatests/src/org/chromium/base/test/util/parameter/ParameterizedTestAnnotationTest.java b/chrome/android/javatests/src/org/chromium/base/test/util/parameter/ParameterizedTestAnnotationTest.java
|
| index 0b37bada139ec43ab7e02def46da405b1dd614bb..2dedfadf91b6f288bd3951b4bab6034e8b02af2a 100644
|
| --- a/chrome/android/javatests/src/org/chromium/base/test/util/parameter/ParameterizedTestAnnotationTest.java
|
| +++ b/chrome/android/javatests/src/org/chromium/base/test/util/parameter/ParameterizedTestAnnotationTest.java
|
| @@ -190,6 +190,22 @@ public class ParameterizedTestAnnotationTest extends
|
| }
|
|
|
| @SmallTest
|
| + @ParameterizedTest(parameters = {
|
| + @Parameter(tag = MethodParameter.PARAMETER_TAG,
|
| + arguments = {@Parameter.Argument(name = "string", stringVar = "t_val")})})
|
| + @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);
|
| + }
|
| +
|
| + @SmallTest
|
| @ParameterizedTest.Set(tests = {
|
| @ParameterizedTest(parameters = {
|
| @Parameter(
|
|
|