Simplify CommandLine parameterizing J3 Instrumentation Tests

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
deleted file mode 100644
index b7c1fcce920c0701468fa48b6b537486d23752c5..0000000000000000000000000000000000000000
--- a/chrome/android/javatests/src/org/chromium/base/test/util/parameter/ParameterizedTestClassAnnotationTest.java
+++ /dev/null
@@ -1,84 +0,0 @@
-// 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.app.Activity;
-import android.support.test.filters.SmallTest;
-
-import org.chromium.base.test.BaseActivityInstrumentationTestCase;
-import org.chromium.base.test.util.parameter.parameters.MethodParameter;
-
-/**
- * Tester class for the {@link ParameterizedTest} annotation applied to a TestCase class.
- */
-@ParameterizedTest(parameters = {@Parameter(tag = MethodParameter.PARAMETER_TAG)})
-public class ParameterizedTestClassAnnotationTest extends
-        BaseActivityInstrumentationTestCase<Activity> {
-    public ParameterizedTestClassAnnotationTest() {
-        super(Activity.class);
-    }
-
-    @SmallTest
-    public void testNoParameterizedTestAnnotation() {
-        // The test is parametrized because the entire test case class is parametrized.
-        assertTrue("This is not a parameterized test.", getParameterReader()
-                .isParameterizedTest());
-        assertEquals(0,
-                getParameterReader().getParameter(
-                        MethodParameter.PARAMETER_TAG).arguments().length);
-        assertNull("someParameter should not exist.", getParameterReader()
-                .getParameter("someParameter"));
-        assertNull("someParameterArgument should not exist.", getParameterReader()
-                .getParameterArgument("someParameter", "someParameterArgument"));
-    }
-
-    @SmallTest
-    @ParameterizedTest()
-    public void testEmptyParameterizedTestAnnotation() {
-        assertTrue("This is not a parameterized test.", getParameterReader()
-                .isParameterizedTest());
-        assertNull("someParameter should not exist.", getParameterReader()
-                .getParameter("someParameter"));
-        assertNull("someParameterArgument should not exist.", getParameterReader()
-                .getParameterArgument("someParameter", "someParameterArgument"));
-    }
-
-    @SmallTest
-    @ParameterizedTest(parameters = {
-            @Parameter(tag = MethodParameter.PARAMETER_TAG,
-                    arguments = {@Parameter.Argument(name = "string", stringVar = "value")})})
-    public void testMethodParametersWithOneStringValue() {
-        // 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);
-    }
-
-    private Parameter.Argument getArgument(String name) {
-        return getParameterReader().getParameterArgument(MethodParameter.PARAMETER_TAG, name);
-    }
-}