Simplify launcher tests setup (ignore-relnotes) PiperOrigin-RevId: 922647628 Change-Id: Icfb5c255867440ecef0cac070e7090308ab7ae46
diff --git a/test/java/common/rules/BUILD b/test/java/common/rules/BUILD index 0f1d293..9758924 100644 --- a/test/java/common/rules/BUILD +++ b/test/java/common/rules/BUILD
@@ -1,6 +1,8 @@ load("@rules_testing//lib:util.bzl", "util") load("//java:java_library.bzl", "java_library") load(":add_exports_tests.bzl", "add_exports_tests") +load(":common_launcher_java_binary_tests.bzl", "java_binary_launcher_tests") +load(":common_launcher_java_library_tests.bzl", "java_library_launcher_tests") load(":deploy_archive_builder_tests.bzl", "deploy_archive_builder_test_suite") load(":java_binary_tests.bzl", "java_binary_tests") load(":java_import_tests.bzl", "java_import_tests") @@ -19,10 +21,14 @@ java_binary_tests(name = "java_binary_tests") +java_binary_launcher_tests(name = "java_binary_launcher_tests") + java_plugin_tests(name = "java_plugin_tests") java_library_tests(name = "java_library_tests") +java_library_launcher_tests(name = "java_library_launcher_tests") + java_launcher_tests(name = "java_launcher_tests") java_import_tests(name = "java_import_tests")
diff --git a/test/java/common/rules/common_launcher_java_binary_tests.bzl b/test/java/common/rules/common_launcher_java_binary_tests.bzl index 34c6e3f..572f27a 100644 --- a/test/java/common/rules/common_launcher_java_binary_tests.bzl +++ b/test/java/common/rules/common_launcher_java_binary_tests.bzl
@@ -1,6 +1,6 @@ """Parameterized tests for java_binary with --java_launcher""" -load("@rules_testing//lib:analysis_test.bzl", "analysis_test") +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") @@ -23,6 +23,10 @@ "{package}/{name}.jar", ]) -JAVA_BINARY_LAUNCHER_TESTS = [ - _test_java_binary_non_executable_rule_outputs, -] +def java_binary_launcher_tests(name): + test_suite( + name = name, + tests = [ + _test_java_binary_non_executable_rule_outputs, + ], + )
diff --git a/test/java/common/rules/common_launcher_java_library_tests.bzl b/test/java/common/rules/common_launcher_java_library_tests.bzl index b1faa10..6c6af1d 100644 --- a/test/java/common/rules/common_launcher_java_library_tests.bzl +++ b/test/java/common/rules/common_launcher_java_library_tests.bzl
@@ -2,7 +2,7 @@ load("@bazel_features//:features.bzl", "bazel_features") load("@rules_cc//cc:cc_library.bzl", "cc_library") -load("@rules_testing//lib:analysis_test.bzl", "analysis_test") +load("@rules_testing//lib:analysis_test.bzl", "analysis_test", "test_suite") load("@rules_testing//lib:truth.bzl", "matching") load("@rules_testing//lib:util.bzl", "util") load("//java:java_import.bzl", "java_import") @@ -76,7 +76,7 @@ util.helper_target( native.genrule, name = name + "/has_java_dep", - outs = ["foo.jar"], + outs = [name + "_foo.jar"], cmd = "echo NOT EXECUTED", tools = [name + "/root_dep"], ) @@ -99,7 +99,7 @@ ) def _test_java_library_deps_of_genrule_are_not_on_classpath_impl(env, target): - expected_classpath = "{bin_path}/{package}/_ijar/{test_name}/has_java_dep_import/{package}/foo-ijar.jar" + expected_classpath = "{bin_path}/{package}/_ijar/{test_name}/has_java_dep_import/{package}/{test_name}_foo-ijar.jar" javac_action_subject.of(env, target, "{package}/lib{name}.jar").classpath().contains_exactly([expected_classpath]) def _test_java_library_compile_and_run_time_paths(name): @@ -1096,35 +1096,39 @@ "{package}/lib{test_name}/leaf_lib.jar", ).processors().contains_exactly(["com.example.process.stuff"]) -JAVA_LIBRARY_LAUNCHER_TESTS = [ - _test_java_library_rule_outputs, - _test_java_library_action_graph, - _test_java_library_deps_of_genrule_are_not_on_classpath, - _test_java_library_compile_and_run_time_paths, - _test_java_library_files_to_compile, - _test_java_library_runtime_deps_are_not_on_classpath, - _test_java_library_runtime_deps_are_not_on_classpath_with_header_compilation, - _test_java_library_propagates_native_libraries, - _test_java_library_gen_source_no_processor_names, - _test_java_library_annotation_processing_using_javacopt, - _test_java_library_javacopts_with_location_expansion, - _test_java_library_invalid_plugin, - _test_java_library_plugin_with_runtime_deps, - _test_java_library_source_jar_without_annotation_processing, - _test_java_library_source_jars_with_source_jars, - _test_java_library_should_set_bootclasspath, - _test_java_library_command_line_contains_target_label_and_rule_kind, - _test_java_library_compilation_info_provider, - _test_java_library_native_header_outputs, - _test_java_library_module_javacopts, - _test_java_library_forwarded_deps, - _test_java_library_transitive_strict_deps, - _test_java_library_emit_output_deps, - _test_java_library_deps_without_srcs, - _test_dependency_artifacts_with_exports, - _test_exports_are_indirect_not_direct, - _test_exports_runfiles, - _test_exports_collect_source_jars, - _test_exported_plugins_are_inherited, - _test_exported_plugins_are_propagated_through_exports, -] +def java_library_launcher_tests(name): + test_suite( + name = name, + tests = [ + _test_java_library_rule_outputs, + _test_java_library_action_graph, + _test_java_library_deps_of_genrule_are_not_on_classpath, + _test_java_library_compile_and_run_time_paths, + _test_java_library_files_to_compile, + _test_java_library_runtime_deps_are_not_on_classpath, + _test_java_library_runtime_deps_are_not_on_classpath_with_header_compilation, + _test_java_library_propagates_native_libraries, + _test_java_library_gen_source_no_processor_names, + _test_java_library_annotation_processing_using_javacopt, + _test_java_library_javacopts_with_location_expansion, + _test_java_library_invalid_plugin, + _test_java_library_plugin_with_runtime_deps, + _test_java_library_source_jar_without_annotation_processing, + _test_java_library_source_jars_with_source_jars, + _test_java_library_should_set_bootclasspath, + _test_java_library_command_line_contains_target_label_and_rule_kind, + _test_java_library_compilation_info_provider, + _test_java_library_native_header_outputs, + _test_java_library_module_javacopts, + _test_java_library_forwarded_deps, + _test_java_library_transitive_strict_deps, + _test_java_library_emit_output_deps, + _test_java_library_deps_without_srcs, + _test_dependency_artifacts_with_exports, + _test_exports_are_indirect_not_direct, + _test_exports_runfiles, + _test_exports_collect_source_jars, + _test_exported_plugins_are_inherited, + _test_exported_plugins_are_propagated_through_exports, + ], + )
diff --git a/test/java/common/rules/java_binary_tests.bzl b/test/java/common/rules/java_binary_tests.bzl index f2ab5be..b483516 100644 --- a/test/java/common/rules/java_binary_tests.bzl +++ b/test/java/common/rules/java_binary_tests.bzl
@@ -11,7 +11,6 @@ load("//java:java_library.bzl", "java_library") load("//java/common:java_semantics.bzl", "semantics") load("//java/common/rules:java_helper.bzl", "helper") -load("//test/java/common/rules:common_launcher_java_binary_tests.bzl", "JAVA_BINARY_LAUNCHER_TESTS") load("//test/java/testutil:helper.bzl", "always_passes") load("//test/java/testutil:java_info_subject.bzl", "java_info_subject") load("//test/java/testutil:mock_java_toolchain.bzl", "mock_java_toolchain") @@ -408,7 +407,7 @@ def java_binary_tests(name): test_suite( - name = "_basic_" + name, + name = name, tests = [ _test_java_binary_provides_binary_java_info, _test_stamp_conversion_does_not_override_int, @@ -421,17 +420,3 @@ _test_one_version_check_disabled, ], ) - - # TODO: unset --java_launcher explicitly - test_suite( - name = "_jdk_launcher_" + name, - tests = JAVA_BINARY_LAUNCHER_TESTS, - ) - - native.test_suite( - name = name, - tests = [ - "_basic_" + name, - "_jdk_launcher_" + name, - ], - )
diff --git a/test/java/common/rules/java_library_tests.bzl b/test/java/common/rules/java_library_tests.bzl index 77980f2..4115b12 100644 --- a/test/java/common/rules/java_library_tests.bzl +++ b/test/java/common/rules/java_library_tests.bzl
@@ -9,7 +9,6 @@ load("//java:java_library.bzl", "java_library") load("//java:java_plugin.bzl", "java_plugin") load("//java/common:java_info.bzl", "JavaInfo") -load("//test/java/common/rules:common_launcher_java_library_tests.bzl", "JAVA_LIBRARY_LAUNCHER_TESTS") load("//test/java/testutil:helper.bzl", "always_passes") load("//test/java/testutil:java_info_subject.bzl", "java_info_subject") load("//test/java/testutil:javac_action_subject.bzl", "javac_action_subject") @@ -351,7 +350,7 @@ def java_library_tests(name): test_suite( - name = "_basic_" + name, + name = name, tests = [ _test_exposes_plugins, _test_exposes_java_info, @@ -364,17 +363,3 @@ _test_strict_java_deps_error, ], ) - - # TODO: unset --java_launcher explicitly - test_suite( - name = "_jdk_launcher_" + name, - tests = JAVA_LIBRARY_LAUNCHER_TESTS, - ) - - native.test_suite( - name = name, - tests = [ - "_basic_" + name, - "_jdk_launcher_" + name, - ], - )