Set test_class for java_test test target where it is needed

This make those test target compatible with --nolegacy_bazel_java_test.

--
Change-Id: I2316c9aa53327b417ecce5fd5dab95ec726da11d
Reviewed-on: https://bazel-review.googlesource.com/#/c/2690
MOS_MIGRATED_REVID=112446514

7 files changed, 36 insertions, 37 deletions

diff --git a/src/java_tools/buildjar/BUILD b/src/java_tools/buildjar/BUILD
index 1104e4876d..f0075031e6 100644
--- a/src/java_tools/buildjar/BUILD
+++ b/src/java_tools/buildjar/BUILD
@@ -168,12 +168,12 @@ java_test(
     name = "BazelJavaCompilerTest",
     size = "small",
     srcs = ["javatests/com/google/devtools/build/java/bazel/BazelJavaCompilerTest.java"],
-    args = ["com.google.devtools.build.java.bazel.BazelJavaCompilerTest"],
     jvm_flags = [
         # Simulates how Bazel invokes JavaBuilder
         "-Xbootclasspath/p:$${TEST_SRCDIR}/src/java_tools/buildjar/langtools-test.jar",
     ],
     tags = ["jdk8"],
+    test_class = "com.google.devtools.build.java.bazel.BazelJavaCompilerTest",
     deps = [
         ":BazelJavaCompiler",
         ":langtools-test",
diff --git a/src/java_tools/singlejar/BUILD b/src/java_tools/singlejar/BUILD
index 60a28b65db..d73efe60ac 100644
--- a/src/java_tools/singlejar/BUILD
+++ b/src/java_tools/singlejar/BUILD
@@ -29,7 +29,7 @@ java_binary(
 java_test(
     name = "tests",
     srcs = glob(["javatests/**/singlejar/**/*.java"]),
-    args = ["com.google.devtools.build.singlejar.SingleJarTests"],
+    test_class = "com.google.devtools.build.singlejar.SingleJarTests",
     deps = [
         ":libSingleJar",
         "//src/java_tools/singlejar/java/com/google/devtools/build/zip",
@@ -46,8 +46,8 @@ java_test(
     name = "zipTests",
     size = "enormous",
     srcs = glob(["javatests/**/zip/**/*.java"]),
-    args = ["com.google.devtools.build.zip.ZipTests"],
     tags = ["zip"],
+    test_class = "com.google.devtools.build.zip.ZipTests",
     deps = [
         "//src/java_tools/singlejar/java/com/google/devtools/build/zip",
         "//src/test/java/com/google/devtools/build/lib:testutil",
diff --git a/src/test/java/com/google/devtools/build/android/ziputils/BUILD b/src/test/java/com/google/devtools/build/android/ziputils/BUILD
index f05c1a6a23..643e29eeba 100644
--- a/src/test/java/com/google/devtools/build/android/ziputils/BUILD
+++ b/src/test/java/com/google/devtools/build/android/ziputils/BUILD
@@ -1,8 +1,8 @@
 java_test(
     name = "ziputils-tests",
     srcs = glob(["*.java"]),
-    args = ["com.google.devtools.build.android.ziputils.AllTests"],
     tags = ["ziputils"],
+    test_class = "com.google.devtools.build.android.ziputils.AllTests",
     deps = [
         "//src/test/java/com/google/devtools/build/lib:testutil",
         "//src/tools/android/java/com/google/devtools/build/android/ziputils:splitter_lib",
diff --git a/src/test/java/com/google/devtools/build/lib/BUILD b/src/test/java/com/google/devtools/build/lib/BUILD
index 231c0ce8d9..f1cc973817 100644
--- a/src/test/java/com/google/devtools/build/lib/BUILD
+++ b/src/test/java/com/google/devtools/build/lib/BUILD
@@ -76,8 +76,8 @@ java_test(
     srcs = glob([
         "skyframe/*.java",
     ]),
-    args = ["com.google.devtools.build.lib.AllTests"],
     tags = ["skyframe"],
+    test_class = "com.google.devtools.build.lib.AllTests",
     deps = [
         ":actions_testutil",
         ":analysis_testutil",
@@ -171,9 +171,9 @@ java_test(
             "vfs/PathWindowsTest.java",
         ],
     ),
-    args = ["com.google.devtools.build.lib.AllTests"],
     data = glob(["vfs/*.zip"]),
     tags = ["foundations"],
+    test_class = "com.google.devtools.build.lib.AllTests",
     deps = [
         ":foundations_testutil",
         ":test_runner",
@@ -206,10 +206,8 @@ java_test(
         "vfs/PathFragmentWindowsTest.java",
         "vfs/PathWindowsTest.java",
     ],
-    args = [
-        "com.google.devtools.build.lib.AllTests",
-    ],
     jvm_flags = ["-Dblaze.os=Windows"],
+    test_class = "com.google.devtools.build.lib.AllTests",
     deps = [
         ":foundations_testutil",
         ":test_runner",
@@ -263,7 +261,7 @@ java_test(
     srcs = glob([
         "actions/*.java",
     ]),
-    args = ["com.google.devtools.build.lib.AllTests"],
+    test_class = "com.google.devtools.build.lib.AllTests",
     deps = [
         ":actions_testutil",
         ":foundations_testutil",
@@ -352,8 +350,8 @@ java_test(
     srcs = glob([
         "analysis/actions/*.java",
     ]),
-    args = ["com.google.devtools.build.lib.AllTests"],
     tags = ["analysis"],
+    test_class = "com.google.devtools.build.lib.AllTests",
     deps = [
         ":actions_testutil",
         ":analysis_testutil",
@@ -381,8 +379,8 @@ java_test(
     srcs = glob([
         "analysis/config/*.java",
     ]),
-    args = ["com.google.devtools.build.lib.AllTests"],
     tags = ["analysis"],
+    test_class = "com.google.devtools.build.lib.AllTests",
     deps = [
         ":actions_testutil",
         ":analysis_testutil",
@@ -415,8 +413,8 @@ java_test(
     srcs = glob([
         "analysis/constraints/*.java",
     ]),
-    args = ["com.google.devtools.build.lib.AllTests"],
     tags = ["analysis"],
+    test_class = "com.google.devtools.build.lib.AllTests",
     deps = [
         ":actions_testutil",
         ":analysis_testutil",
@@ -440,8 +438,8 @@ java_test(
     srcs = glob([
         "analysis/select/*.java",
     ]),
-    args = ["com.google.devtools.build.lib.AllTests"],
     tags = ["analysis"],
+    test_class = "com.google.devtools.build.lib.AllTests",
     deps = [
         ":actions_testutil",
         ":analysis_testutil",
@@ -465,8 +463,8 @@ java_test(
     srcs = glob([
         "analysis/*.java",
     ]),
-    args = ["com.google.devtools.build.lib.AllTests"],
     tags = ["analysis"],
+    test_class = "com.google.devtools.build.lib.AllTests",
     deps = [
         ":actions_testutil",
         ":analysis_testutil",
@@ -501,7 +499,7 @@ java_test(
     srcs = glob([
         "graph/*.java",
     ]),
-    args = ["com.google.devtools.build.lib.AllTests"],
+    test_class = "com.google.devtools.build.lib.AllTests",
     deps = [
         ":foundations_testutil",
         ":test_runner",
@@ -562,7 +560,7 @@ java_test(
             "packages/BazelDocumentationTest.java",
         ],
     ),
-    args = ["com.google.devtools.build.lib.AllTests"],
+    test_class = "com.google.devtools.build.lib.AllTests",
     deps = [
         ":actions_testutil",
         ":analysis_testutil",
@@ -596,7 +594,7 @@ java_test(
             "pkgcache/*.java",
         ],
     ),
-    args = ["com.google.devtools.build.lib.AllTests"],
+    test_class = "com.google.devtools.build.lib.AllTests",
     deps = [
         ":analysis_testutil",
         ":packages_testutil",
@@ -619,9 +617,9 @@ java_test(
     srcs = glob([
         "ideinfo/*.java",
     ]),
-    args = ["com.google.devtools.build.lib.AllTests"],
     resources = ["ideinfo/intellij_info.bzl"],
     tags = ["ideinfo"],
+    test_class = "com.google.devtools.build.lib.AllTests",
     deps = [
         ":analysis_testutil",
         ":foundations_testutil",
@@ -658,11 +656,11 @@ java_test(
     srcs = glob([
         "shell/*.java",
     ]),
-    args = ["com.google.devtools.build.lib.AllTests"],
     data = [
         ":shell/killmyself",
     ],
     tags = ["shell"],
+    test_class = "com.google.devtools.build.lib.AllTests",
     deps = [
         ":foundations_testutil",
         ":test_runner",
@@ -684,8 +682,8 @@ java_test(
     srcs = glob([
         "server/*.java",
     ]),
-    args = ["com.google.devtools.build.lib.AllTests"],
     tags = ["server"],
+    test_class = "com.google.devtools.build.lib.AllTests",
     deps = [
         ":foundations_testutil",
         ":test_runner",
@@ -723,7 +721,7 @@ java_test(
     srcs = glob([
         "syntax/*.java",
     ]),
-    args = ["com.google.devtools.build.lib.AllTests"],
+    test_class = "com.google.devtools.build.lib.AllTests",
     deps = [
         ":foundations_testutil",
         ":syntax_testutil",
@@ -753,7 +751,7 @@ java_test(
     srcs = glob([
         "profiler/*.java",
     ]),
-    args = ["com.google.devtools.build.lib.AllTests"],
+    test_class = "com.google.devtools.build.lib.AllTests",
     deps = [
         ":foundations_testutil",
         ":syntax_testutil",
@@ -777,6 +775,7 @@ java_test(
     data = [
         "//site:docs/bazel-user-manual.html",
     ],
+    test_class = "com.google.devtools.build.lib.packages.BazelDocumentationTest",
     deps = [
         ":foundations_testutil",
         ":packages_testutil",
@@ -851,7 +850,7 @@ java_test(
     srcs = glob([
         "skylark/*.java",
     ]),
-    args = ["com.google.devtools.build.lib.AllTests"],
+    test_class = "com.google.devtools.build.lib.AllTests",
     deps = [
         ":actions_testutil",
         ":analysis_testutil",
@@ -885,8 +884,8 @@ java_test(
 java_test(
     name = "filegroup-rules-tests",
     srcs = glob(["rules/filegroup/*.java"]),
-    args = ["com.google.devtools.build.lib.AllTests"],
     tags = ["rules"],
+    test_class = "com.google.devtools.build.lib.AllTests",
     deps = [
         ":actions_testutil",
         ":analysis_testutil",
@@ -907,8 +906,8 @@ java_test(
 java_test(
     name = "java-rules-tests",
     srcs = glob(["rules/java/*.java"]),
-    args = ["com.google.devtools.build.lib.AllTests"],
     tags = ["rules"],
+    test_class = "com.google.devtools.build.lib.AllTests",
     deps = [
         ":actions_testutil",
         ":analysis_testutil",
@@ -928,8 +927,8 @@ java_test(
 java_test(
     name = "cpp-rules-tests",
     srcs = glob(["rules/cpp/*.java"]),
-    args = ["com.google.devtools.build.lib.AllTests"],
     tags = ["rules"],
+    test_class = "com.google.devtools.build.lib.AllTests",
     deps = [
         ":actions_testutil",
         ":analysis_testutil",
@@ -960,8 +959,8 @@ java_test(
 java_test(
     name = "repository-rules-tests",
     srcs = glob(["rules/repository/*.java"]),
-    args = ["com.google.devtools.build.lib.AllTests"],
     tags = ["rules"],
+    test_class = "com.google.devtools.build.lib.AllTests",
     deps = [
         ":analysis_testutil",
         ":testutil",
@@ -989,9 +988,9 @@ java_test(
     srcs = glob([
         "bazel/rules/**/*.java",
     ]),
-    args = ["com.google.devtools.build.lib.AllTests"],
     resources = glob(["bazel/rules/**/*.txt"]),
     tags = ["rules"],
+    test_class = "com.google.devtools.build.lib.AllTests",
     deps = [
         ":foundations_testutil",
         ":test_runner",
@@ -1012,8 +1011,8 @@ java_test(
     srcs = glob([
         "bazel/repository/*.java",
     ]),
-    args = ["com.google.devtools.build.lib.AllTests"],
     tags = ["rules"],
+    test_class = "com.google.devtools.build.lib.AllTests",
     deps = [
         ":foundations_testutil",
         ":test_runner",
@@ -1035,7 +1034,7 @@ java_test(
 java_test(
     name = "runtime-tests",
     srcs = glob(["runtime/*.java"]),
-    args = ["com.google.devtools.build.lib.AllTests"],
+    test_class = "com.google.devtools.build.lib.AllTests",
     deps = [
         ":foundations_testutil",
         ":test_runner",
@@ -1061,8 +1060,8 @@ java_test(
 java_test(
     name = "sandbox-tests",
     srcs = glob(["sandbox/*.java"]),
-    args = ["com.google.devtools.build.lib.AllTests"],
     data = [":embedded_scripts"],
+    test_class = "com.google.devtools.build.lib.AllTests",
     deps = [
         ":actions_testutil",
         ":analysis_testutil",
@@ -1088,8 +1087,8 @@ java_test(
 java_test(
     name = "standalone-tests",
     srcs = glob(["standalone/*.java"]),
-    args = ["com.google.devtools.build.lib.AllTests"],
     data = [":embedded_scripts"],
+    test_class = "com.google.devtools.build.lib.AllTests",
     deps = [
         ":actions_testutil",
         ":analysis_testutil",
@@ -1116,8 +1115,8 @@ java_test(
 java_test(
     name = "exec-tests",
     srcs = glob(["exec/*.java"]),
-    args = ["com.google.devtools.build.lib.AllTests"],
     tags = ["exec"],
+    test_class = "com.google.devtools.build.lib.AllTests",
     deps = [
         ":actions_testutil",
         ":analysis_testutil",
diff --git a/src/test/java/com/google/devtools/build/skyframe/BUILD b/src/test/java/com/google/devtools/build/skyframe/BUILD
index 7313ed09e8..1b24b4a979 100644
--- a/src/test/java/com/google/devtools/build/skyframe/BUILD
+++ b/src/test/java/com/google/devtools/build/skyframe/BUILD
@@ -35,7 +35,7 @@ java_test(
         ["*.java"],
         exclude = TESTUTIL_FILES,
     ),
-    args = ["com.google.devtools.build.skyframe.AllTests"],
+    test_class = "com.google.devtools.build.skyframe.AllTests",
     deps = [
         ":testutil",
         "//src/main/java/com/google/devtools/build/lib:collect",
diff --git a/src/test/java/com/google/devtools/common/options/BUILD b/src/test/java/com/google/devtools/common/options/BUILD
index 10b7179618..2cd7862068 100644
--- a/src/test/java/com/google/devtools/common/options/BUILD
+++ b/src/test/java/com/google/devtools/common/options/BUILD
@@ -1,7 +1,7 @@
 java_test(
     name = "options_test",
     srcs = glob(["*.java"]),
-    args = ["com.google.devtools.common.options.AllTests"],
+    test_class = "com.google.devtools.common.options.AllTests",
     deps = [
         "//src/main/java/com/google/devtools/common/options",
         "//src/test/java/com/google/devtools/build/lib:testutil",
diff --git a/third_party/ijar/test/BUILD b/third_party/ijar/test/BUILD
index 15ebdb37ea..a096417a2f 100644
--- a/third_party/ijar/test/BUILD
+++ b/third_party/ijar/test/BUILD
@@ -135,7 +135,6 @@ java_test(
         "IjarTests.java",
         "StripVerifyingVisitor.java",
     ],
-    args = ["IjarTests"],
     data = [
         "PrivateNestedClass.java",
         "UseDeprecatedParts.java",
@@ -144,6 +143,7 @@ java_test(
         ":interface_ijar_testlib",
     ],
     tags = ["zip"],
+    test_class = "IjarTests",
     deps = [
         "//src/java_tools/buildjar:BazelJavaCompiler",
         "//third_party:asm",