use the one_version_allowlist_for_tests instead of the one_version_allowlist for test targets

Googler · copybara-github · commit 37268de70822 · 2023-08-09T13:46:38.000-07:00
PiperOrigin-RevId: 555263433
Change-Id: I67322f53da7c6bc71df3c82036d0c38ff8857fac
diff --git a/src/main/java/com/google/devtools/build/lib/rules/java/OneVersionCheckActionBuilder.java b/src/main/java/com/google/devtools/build/lib/rules/java/OneVersionCheckActionBuilder.java
@@ -77,7 +77,12 @@ public Artifact build(RuleContext ruleContext) throws InterruptedException {
     Preconditions.checkNotNull(jarsToCheck);
 
     FilesToRunProvider oneVersionTool = javaToolchain.getOneVersionBinary();
-    Artifact oneVersionAllowlist = javaToolchain.getOneVersionAllowlist();
+    Artifact oneVersionAllowlist;
+    if (ruleContext.isTestTarget()) {
+      oneVersionAllowlist = javaToolchain.oneVersionAllowlistForTests();
+    } else {
+      oneVersionAllowlist = javaToolchain.getOneVersionAllowlist();
+    }
     if (oneVersionTool == null || oneVersionAllowlist == null) {
       return null;
     }
diff --git a/src/main/starlark/builtins_bzl/common/java/java_binary.bzl b/src/main/starlark/builtins_bzl/common/java/java_binary.bzl
@@ -210,7 +210,7 @@ def basic_java_binary(
             transitive = [output_groups["_source_jars"]],
         )
 
-    one_version_output = _create_one_version_check(ctx, java_attrs.runtime_classpath) if (
+    one_version_output = _create_one_version_check(ctx, java_attrs.runtime_classpath, is_test_rule_class) if (
         ctx.fragments.java.one_version_enforcement_on_java_tests or not is_test_rule_class
     ) else None
     validation_outputs = [one_version_output] if one_version_output else []
@@ -383,12 +383,18 @@ def _create_shared_archive(ctx, java_attrs):
     )
     return jsa
 
-def _create_one_version_check(ctx, inputs):
+def _create_one_version_check(ctx, inputs, is_test_rule_class):
     one_version_level = ctx.fragments.java.one_version_enforcement_level
     if one_version_level == "OFF":
         return None
     tool = helper.check_and_get_one_version_attribute(ctx, "one_version_tool")
-    allowlist = helper.check_and_get_one_version_attribute(ctx, "one_version_allowlist")
+
+    if is_test_rule_class:
+        toolchain = semantics.find_java_toolchain(ctx)
+        allowlist = toolchain.one_version_allowlist_for_tests()
+    else:
+        allowlist = helper.check_and_get_one_version_attribute(ctx, "one_version_allowlist")
+
     if not tool or not allowlist:  # On Mac oneversion tool is not available
         return None
 
