Add a test for extending compile time jdeps

PiperOrigin-RevId: 729517655
Change-Id: I6eb39583a60cd964621b2499925e4d2bcca5c158

Author: hvadehra

java/test/common/java_common_tests.bzl

@@ -4,9 +4,11 @@ load("@rules_testing//lib:analysis_test.bzl", "analysis_test", "test_suite")
 load("@rules_testing//lib:util.bzl", "util")
 load("//java:java_library.bzl", "java_library")
 load("//java/common:java_common.bzl", "java_common")
+load("//java/common:java_info.bzl", "JavaInfo")
 load("//java/common:java_plugin_info.bzl", "JavaPluginInfo")
 load("//java/test/testutil:java_info_subject.bzl", "java_info_subject")
 load("//java/test/testutil:rules/custom_library.bzl", "custom_library")
+load("//java/test/testutil:rules/custom_library_extended_compile_jdeps.bzl", "CompileJdepsInfo", "custom_library_extended_jdeps")
 load("//java/test/testutil:rules/custom_library_with_exports.bzl", "custom_library_with_exports")
 load("//java/test/testutil:rules/custom_library_with_sourcepaths.bzl", "custom_library_with_sourcepaths")
 
@@ -74,6 +76,32 @@ def _test_java_plugin_info_impl(env, _target):
         "java_common.JavaPluginInfo == JavaPluginInfo",
     ).equals(True)
 
+# Tests that extended 'compile time jdeps' are consistently updated.
+def _test_compile_extend_compile_time_jdeps(name):
+    util.helper_target(
+        custom_library_extended_jdeps,
+        name = name + "/foo",
+        srcs = ["Foo.java"],
+        extra_jdeps = "Foo.jdeps",
+    )
+
+    analysis_test(
+        name = name,
+        impl = _test_compile_extend_compile_time_jdeps_impl,
+        target = name + "/foo",
+        attr_values = {"tags": ["min_bazel_7"]},
+    )
+
+def _test_compile_extend_compile_time_jdeps_impl(env, target):
+    before = target[CompileJdepsInfo].before.to_list()
+    assert_that_before = env.expect.that_collection(before)
+    assert_that_after = env.expect.that_collection(target[CompileJdepsInfo].after.to_list())
+
+    assert_that_before.has_size(1)
+    assert_that_after.has_size(2)
+    assert_that_after.contains_at_least(before)
+    assert_that_after.contains_exactly(target[JavaInfo]._compile_time_java_dependencies)
+
 def java_common_tests(name):
     test_suite(
         name = name,
@@ -82,5 +110,6 @@ def java_common_tests(name):
             _test_compile_sourcepath,
             _test_compile_exports_no_sources,
             _test_java_plugin_info,
+            _test_compile_extend_compile_time_jdeps,
         ],
     )

java/test/testutil/rules/custom_library_extended_compile_jdeps.bzl

@@ -0,0 +1,45 @@
+"""Helper rule to test extending compile time jdeps"""
+
+load("//java/common:java_common.bzl", "java_common")
+load("//java/common:java_info.bzl", "JavaInfo")
+load("//java/common:java_semantics.bzl", "semantics")
+
+CompileJdepsInfo = provider("Provider to testing compile jdeps", fields = ["before", "after"])
+
+def _compile_time_jdeps(info):
+    return depset([outputs.compile_jdeps for outputs in info.java_outputs if outputs.compile_jdeps != None])
+
+def _impl(ctx):
+    output_jar = ctx.actions.declare_file("lib" + ctx.label.name + ".jar")
+    info = java_common.compile(
+        ctx,
+        source_files = ctx.files.srcs,
+        output = output_jar,
+        java_toolchain = semantics.find_java_toolchain(ctx),
+    )
+    jdeps_info = JavaInfo(
+        output_jar = output_jar,
+        compile_jar = None,
+        compile_jdeps = ctx.file.extra_jdeps,
+    )
+    extra_info = java_common.merge([info, jdeps_info])
+    return [
+        extra_info,
+        CompileJdepsInfo(
+            before = _compile_time_jdeps(info),
+            after = _compile_time_jdeps(extra_info),
+        ),
+    ]
+
+custom_library_extended_jdeps = rule(
+    implementation = _impl,
+    outputs = {
+        "my_output": "lib%{name}.jar",
+    },
+    attrs = {
+        "srcs": attr.label_list(allow_files = [".java"]),
+        "extra_jdeps": attr.label(allow_single_file = True),
+    },
+    toolchains = [semantics.JAVA_TOOLCHAIN_TYPE],
+    fragments = ["java"],
+)