Add a test asseting that the JavaInfo returned by java_binary targets are marked as such.

PiperOrigin-RevId: 721430757
Change-Id: Ia90863e31ef83407abbacc1c3f3b23907c59b46e

Author: hvadehra

.bazelci/presubmit.yml

@@ -44,6 +44,8 @@ tasks:
     bazel: "7.4.0"
     build_targets: *build_targets
     test_targets: *test_targets
+    test_flags:
+      - "--test_tag_filters=-min_bazel_8"
   ubuntu2004_integration:
     name: "Bazel 7.x Integration"
     bazel: "7.4.0"
@@ -117,6 +119,8 @@ tasks:
     platform: ubuntu2004
     build_targets: *build_targets_bazel6
     test_targets: *test_targets_bazel6
+    test_flags:
+      - "--test_tag_filters=-min_bazel_7,-min_bazel_8"
   ubuntu2004_integration_bazel6:
     name: "Bazel 6.x Integration"
     bazel: 6.4.0

java/test/common/rules/BUILD

@@ -1,3 +1,6 @@
+load(":java_binary_tests.bzl", "java_binary_tests")
 load(":merge_attrs_tests.bzl", "merge_attrs_test_suite")
 
 merge_attrs_test_suite(name = "merge_attrs_tests")
+
+java_binary_tests(name = "java_binary_tests")

java/test/common/rules/java_binary_tests.bzl

@@ -0,0 +1,30 @@
+"""Tests for the java_binary rule"""
+
+load("@rules_testing//lib:analysis_test.bzl", "analysis_test", "test_suite")
+load("@rules_testing//lib:util.bzl", "util")
+load("//java:java_binary.bzl", "java_binary")
+load("//java/test/testutil:java_info_subject.bzl", "java_info_subject")
+
+def _test_java_binary_provides_binary_java_info(name):
+    util.helper_target(java_binary, name = "bin", srcs = ["Main.java"])
+
+    analysis_test(
+        name = name,
+        impl = _test_java_binary_provides_binary_java_info_impl,
+        target = Label(":bin"),
+        attr_values = {"tags": ["min_bazel_7"]},
+    )
+
+def _test_java_binary_provides_binary_java_info_impl(env, target):
+    assert_java_info = java_info_subject.from_target(env, target)
+
+    assert_java_info.compilation_args().equals(None)
+    assert_java_info.is_binary().equals(True)
+
+def java_binary_tests(name):
+    test_suite(
+        name = name,
+        tests = [
+            _test_java_binary_provides_binary_java_info,
+        ],
+    )

java/test/private/android_support_tests.bzl

@@ -62,7 +62,7 @@ def _test_enable_implicit_sourceless_deps_exports_compatibility(name):
 def _test_enable_implicit_sourceless_deps_exports_compatibility_impl(env, targets):
     base_info = java_info_subject.from_target(env, targets.base)
     transformed_info = java_info_subject.from_target(env, targets.transformed)
-    transformed_info.compilation_args().equals(base_info.compilation_args())
+    transformed_info.compilation_args().equals_subject(base_info.compilation_args())
     base_info.plugins().processor_jars().contains_exactly(["{package}/libmy_plugin.jar"])
     transformed_info.plugins().processor_jars().contains_exactly([])
 

java/test/testutil/java_info_subject.bzl

@@ -8,6 +8,7 @@ def _new_java_info_subject(java_info, meta):
     public = struct(
         compilation_args = lambda: _new_java_compilation_args_subject(self.actual, self.meta),
         plugins = lambda: _new_java_info_plugins_subject(self.actual, self.meta),
+        is_binary = lambda: subjects.bool(getattr(java_info, "_is_binary", False), self.meta.derive("_is_binary")),
     )
     return public
 
@@ -20,30 +21,31 @@ def _java_info_subject_from_target(env, target):
     ))
 
 def _new_java_compilation_args_subject(java_info, meta):
+    is_binary = getattr(java_info, "_is_binary", False)
     actual = struct(
         transitive_runtime_jars = java_info.transitive_runtime_jars,
         compile_jars = java_info.compile_jars,
         transitive_compile_time_jars = java_info.transitive_compile_time_jars,
         full_compile_jars = java_info.full_compile_jars,
         _transitive_full_compile_time_jars = java_info._transitive_full_compile_time_jars,
         _compile_time_java_dependencies = java_info._compile_time_java_dependencies,
-        _is_binary = getattr(java_info, "_is_binary", False),
-    )
+    ) if not is_binary else None
     self = struct(
         actual = actual,
         meta = meta,
     )
     return struct(
         equals = lambda other: _java_compilation_args_equals(self, other),
+        equals_subject = lambda other: _java_compilation_args_equals(self, other.actual),
         self = self,
         actual = actual,
     )
 
 def _java_compilation_args_equals(self, other):
-    if self.actual == other.actual:
+    if self.actual == other:
         return
-    for attr in dir(other.actual):
-        other_attr = getattr(other.actual, attr)
+    for attr in dir(other):
+        other_attr = getattr(other, attr)
         this_attr = getattr(self.actual, attr)
         if this_attr != other_attr:
             self.meta.derive(attr).add_failure(