internal changes PiperOrigin-RevId: 971574061
diff --git a/bazel/tests/java_lite_proto_library_tests/binary_deps/BUILD b/bazel/tests/java_lite_proto_library_tests/binary_deps/BUILD deleted file mode 100644 index 1b9e958..0000000 --- a/bazel/tests/java_lite_proto_library_tests/binary_deps/BUILD +++ /dev/null
@@ -1,36 +0,0 @@ -load("@rules_testing//lib:util.bzl", "PREVENT_IMPLICIT_BUILDING_TAGS") -load("//bazel:java_lite_proto_library.bzl", "java_lite_proto_library") -load("//bazel:proto_library.bzl", "proto_library") -load("//bazel/tests:java_lite_proto_library_tests/test_utils.bzl", "java_info_subject_factory") -load("//bazel/tests:proto_bzl_test_suite.bzl", "bzl_test_suite") -load(":tests.bzl", "TESTS") - -package(default_applicable_licenses = ["//:license"]) - -proto_library( - name = "baz_proto", - srcs = ["baz.proto"], - tags = PREVENT_IMPLICIT_BUILDING_TAGS, -) - -proto_library( - name = "foo_proto", - srcs = [ - "baz.proto", - "foo.proto", - ], - tags = PREVENT_IMPLICIT_BUILDING_TAGS, - deps = [":baz_proto"], -) - -java_lite_proto_library( - name = "foo_java_proto_lite", - tags = PREVENT_IMPLICIT_BUILDING_TAGS, - deps = [":foo_proto"], -) - -bzl_test_suite( - name = "tests", - provider_subject_factories = [java_info_subject_factory], - tests = TESTS, -)
diff --git a/bazel/tests/java_lite_proto_library_tests/binary_deps/tests.bzl b/bazel/tests/java_lite_proto_library_tests/binary_deps/tests.bzl deleted file mode 100644 index 95bc44b..0000000 --- a/bazel/tests/java_lite_proto_library_tests/binary_deps/tests.bzl +++ /dev/null
@@ -1,30 +0,0 @@ -"""Tests that java_lite_proto_library depends on the right set of files.""" - -load("@rules_java//java/common:java_info.bzl", "JavaInfo") - -def _test_binary_deps(env, target): - java_info = env.expect.that_target(target).provider(JavaInfo) - - # Should depend on Java outputs. - java_info.transitive_source_jars_in_package().contains_exactly([ - "{package}/foo_proto-lite-src.jar", - "{package}/baz_proto-lite-src.jar", - ]) - java_info.transitive_source_jars().contains_at_least([ - "java/core/liblite-src.jar", - "java/core/liblite_runtime_only-src.jar", - ]) - - # Should depend on Java libraries. - java_info.transitive_compile_time_jars_in_package().contains_exactly([ - "{package}/libfoo_proto-lite-hjar.jar", - "{package}/libbaz_proto-lite-hjar.jar", - ]) - java_info.transitive_compile_time_jars().contains_at_least([ - "java/core/liblite-hjar.jar", - "java/core/liblite_runtime_only-hjar.jar", - ]) - -TESTS = { - ":foo_java_proto_lite": [_test_binary_deps], -}
diff --git a/bazel/tests/java_lite_proto_library_tests/binary_option_deps/BUILD b/bazel/tests/java_lite_proto_library_tests/binary_option_deps/BUILD deleted file mode 100644 index aac6a73..0000000 --- a/bazel/tests/java_lite_proto_library_tests/binary_option_deps/BUILD +++ /dev/null
@@ -1,36 +0,0 @@ -load("@rules_testing//lib:util.bzl", "PREVENT_IMPLICIT_BUILDING_TAGS") -load("//bazel:java_lite_proto_library.bzl", "java_lite_proto_library") -load("//bazel:proto_library.bzl", "proto_library") -load("//bazel/tests:java_lite_proto_library_tests/test_utils.bzl", "java_info_subject_factory") -load("//bazel/tests:proto_bzl_test_suite.bzl", "bzl_test_suite") -load(":tests.bzl", "TESTS") - -package(default_applicable_licenses = ["//:license"]) - -proto_library( - name = "baz_proto", - srcs = ["baz.proto"], - tags = PREVENT_IMPLICIT_BUILDING_TAGS, -) - -proto_library( - name = "foo_proto", - srcs = [ - "bar.proto", - "foo.proto", - ], - option_deps = [":baz_proto"], - tags = PREVENT_IMPLICIT_BUILDING_TAGS, -) - -java_lite_proto_library( - name = "foo_java_proto_lite", - tags = PREVENT_IMPLICIT_BUILDING_TAGS, - deps = [":foo_proto"], -) - -bzl_test_suite( - name = "tests", - provider_subject_factories = [java_info_subject_factory], - tests = TESTS, -)
diff --git a/bazel/tests/java_lite_proto_library_tests/binary_option_deps/tests.bzl b/bazel/tests/java_lite_proto_library_tests/binary_option_deps/tests.bzl deleted file mode 100644 index 84a8784..0000000 --- a/bazel/tests/java_lite_proto_library_tests/binary_option_deps/tests.bzl +++ /dev/null
@@ -1,28 +0,0 @@ -"""Tests that java_binaries which depend on proto_libraries depend on the right set of files for option_deps.""" - -load("@rules_java//java/common:java_info.bzl", "JavaInfo") - -def _test_binary_option_deps(env, target): - java_info = env.expect.that_target(target).provider(JavaInfo) - - # Should depend on Java outputs, excluding option_deps. - java_info.transitive_source_jars_in_package().contains_exactly([ - "{package}/foo_proto-lite-src.jar", - ]) - java_info.transitive_source_jars().contains_at_least([ - "java/core/liblite-src.jar", - "java/core/liblite_runtime_only-src.jar", - ]) - - # Should depend on Java libraries. - java_info.transitive_compile_time_jars_in_package().contains_exactly([ - "{package}/libfoo_proto-lite-hjar.jar", - ]) - java_info.transitive_compile_time_jars().contains_at_least([ - "java/core/liblite-hjar.jar", - "java/core/liblite_runtime_only-hjar.jar", - ]) - -TESTS = { - ":foo_java_proto_lite": [_test_binary_option_deps], -}
diff --git a/bazel/tests/java_lite_proto_library_tests/command_line_contains_target_label/BUILD b/bazel/tests/java_lite_proto_library_tests/command_line_contains_target_label/BUILD deleted file mode 100644 index 00619f3..0000000 --- a/bazel/tests/java_lite_proto_library_tests/command_line_contains_target_label/BUILD +++ /dev/null
@@ -1,19 +0,0 @@ -load("@rules_testing//lib:util.bzl", "PREVENT_IMPLICIT_BUILDING_TAGS") -load("//bazel:proto_library.bzl", "proto_library") -load("//bazel/tests:java_lite_proto_library_tests/test_utils.bzl", "JAVA_LITE_PROTO_TESTING_ASPECT") -load("//bazel/tests:proto_bzl_test_suite.bzl", "bzl_test_suite") -load(":tests.bzl", "TESTS") - -package(default_applicable_licenses = ["//:license"]) - -proto_library( - name = "foo_proto", - srcs = ["foo.proto"], - tags = PREVENT_IMPLICIT_BUILDING_TAGS, -) - -bzl_test_suite( - name = "tests", - testing_aspect = JAVA_LITE_PROTO_TESTING_ASPECT, - tests = TESTS, -)
diff --git a/bazel/tests/java_lite_proto_library_tests/command_line_contains_target_label/tests.bzl b/bazel/tests/java_lite_proto_library_tests/command_line_contains_target_label/tests.bzl deleted file mode 100644 index c0d75f7..0000000 --- a/bazel/tests/java_lite_proto_library_tests/command_line_contains_target_label/tests.bzl +++ /dev/null
@@ -1,14 +0,0 @@ -"""Tests that java_lite_proto_library passes the target label to the protocol compiler.""" - -def _test_lite_command_line_contains_target_label(env, target): - javac = env.expect.that_target(target).action_named("Javac") - javac.argv().contains_at_least([ - "--target_label", - "//{package}:foo_proto", - "--injecting_rule_kind", - "java_lite_proto_library", - ]).in_order() - -TESTS = { - ":foo_proto": [_test_lite_command_line_contains_target_label], -}
diff --git a/bazel/tests/java_lite_proto_library_tests/compiler_args/BUILD b/bazel/tests/java_lite_proto_library_tests/compiler_args/BUILD deleted file mode 100644 index 00619f3..0000000 --- a/bazel/tests/java_lite_proto_library_tests/compiler_args/BUILD +++ /dev/null
@@ -1,19 +0,0 @@ -load("@rules_testing//lib:util.bzl", "PREVENT_IMPLICIT_BUILDING_TAGS") -load("//bazel:proto_library.bzl", "proto_library") -load("//bazel/tests:java_lite_proto_library_tests/test_utils.bzl", "JAVA_LITE_PROTO_TESTING_ASPECT") -load("//bazel/tests:proto_bzl_test_suite.bzl", "bzl_test_suite") -load(":tests.bzl", "TESTS") - -package(default_applicable_licenses = ["//:license"]) - -proto_library( - name = "foo_proto", - srcs = ["foo.proto"], - tags = PREVENT_IMPLICIT_BUILDING_TAGS, -) - -bzl_test_suite( - name = "tests", - testing_aspect = JAVA_LITE_PROTO_TESTING_ASPECT, - tests = TESTS, -)
diff --git a/bazel/tests/java_lite_proto_library_tests/compiler_args/tests.bzl b/bazel/tests/java_lite_proto_library_tests/compiler_args/tests.bzl deleted file mode 100644 index 2daf7ca..0000000 --- a/bazel/tests/java_lite_proto_library_tests/compiler_args/tests.bzl +++ /dev/null
@@ -1,14 +0,0 @@ -"""Tests that we pass the correct arguments to the protocol compiler.""" - -def _test_lite_java_proto2_compiler_args(env, target): - genproto = env.expect.that_target(target).action_named("GenProto") - genproto.argv().contains("{package}/foo.proto") - genproto.argv().contains_at_least([ - "--java_out=lite:{bindir}/{package}/foo_proto-lite-src.jar", - "-I.", - "{package}/foo.proto", - ]).in_order() - -TESTS = { - ":foo_proto": [_test_lite_java_proto2_compiler_args], -}
diff --git a/bazel/tests/java_lite_proto_library_tests/correctly_defines_direct_jars/BUILD b/bazel/tests/java_lite_proto_library_tests/correctly_defines_direct_jars/BUILD deleted file mode 100644 index 4bf3203..0000000 --- a/bazel/tests/java_lite_proto_library_tests/correctly_defines_direct_jars/BUILD +++ /dev/null
@@ -1,46 +0,0 @@ -load("@rules_testing//lib:util.bzl", "PREVENT_IMPLICIT_BUILDING_TAGS") -load("//bazel:java_lite_proto_library.bzl", "java_lite_proto_library") -load("//bazel:proto_library.bzl", "proto_library") -load("//bazel/tests:java_lite_proto_library_tests/test_utils.bzl", "java_info_subject_factory") -load("//bazel/tests:proto_bzl_test_suite.bzl", "bzl_test_suite") -load(":tests.bzl", "TESTS") - -package(default_applicable_licenses = ["//:license"]) - -proto_library( - name = "baz_proto", - srcs = ["baz.proto"], - tags = PREVENT_IMPLICIT_BUILDING_TAGS, -) - -proto_library( - name = "bar_proto", - srcs = ["bar.proto"], - tags = PREVENT_IMPLICIT_BUILDING_TAGS, - deps = [":baz_proto"], -) - -java_lite_proto_library( - name = "bar_java_proto_lite", - tags = PREVENT_IMPLICIT_BUILDING_TAGS, - deps = ["bar_proto"], -) - -proto_library( - name = "foo_proto", - srcs = ["foo.proto"], - tags = PREVENT_IMPLICIT_BUILDING_TAGS, - deps = [":bar_proto"], -) - -java_lite_proto_library( - name = "foo_java_proto_lite", - tags = PREVENT_IMPLICIT_BUILDING_TAGS, - deps = [":foo_proto"], -) - -bzl_test_suite( - name = "tests", - provider_subject_factories = [java_info_subject_factory], - tests = TESTS, -)
diff --git a/bazel/tests/java_lite_proto_library_tests/correctly_defines_direct_jars/tests.bzl b/bazel/tests/java_lite_proto_library_tests/correctly_defines_direct_jars/tests.bzl deleted file mode 100644 index e524cc0..0000000 --- a/bazel/tests/java_lite_proto_library_tests/correctly_defines_direct_jars/tests.bzl +++ /dev/null
@@ -1,30 +0,0 @@ -"""Tests that a java_lite_proto_library only provides direct jars corresponding on the - * proto_library rules it directly depends on, excluding anything that the proto_library rules - * depends on themselves. This does not concern strict-deps in the compilation of the generated - * Java code itself, only compilation of regular code in java_library/java_binary and similar - * rules.""" - -load("@rules_java//java/common:java_info.bzl", "JavaInfo") - -def _test_foo_correctly_defines_direct_jars(env, target): - java_info = env.expect.that_target(target).provider(JavaInfo) - java_info.compile_jars().contains_exactly([ - "{package}/libfoo_proto-lite-hjar.jar", - ]) - java_info.source_jars().contains_exactly([ - "{package}/foo_proto-lite-src.jar", - ]) - -def _test_bar_correctly_defines_direct_jars(env, target): - java_info = env.expect.that_target(target).provider(JavaInfo) - java_info.compile_jars().contains_exactly([ - "{package}/libbar_proto-lite-hjar.jar", - ]) - java_info.source_jars().contains_exactly([ - "{package}/bar_proto-lite-src.jar", - ]) - -TESTS = { - ":foo_java_proto_lite": [_test_foo_correctly_defines_direct_jars], - ":bar_java_proto_lite": [_test_bar_correctly_defines_direct_jars], -}
diff --git a/bazel/tests/java_lite_proto_library_tests/correctly_defines_direct_jars_alias_proto/BUILD b/bazel/tests/java_lite_proto_library_tests/correctly_defines_direct_jars_alias_proto/BUILD deleted file mode 100644 index 768e333..0000000 --- a/bazel/tests/java_lite_proto_library_tests/correctly_defines_direct_jars_alias_proto/BUILD +++ /dev/null
@@ -1,32 +0,0 @@ -load("@rules_testing//lib:util.bzl", "PREVENT_IMPLICIT_BUILDING_TAGS") -load("//bazel:java_lite_proto_library.bzl", "java_lite_proto_library") -load("//bazel:proto_library.bzl", "proto_library") -load("//bazel/tests:java_lite_proto_library_tests/test_utils.bzl", "java_info_subject_factory") -load("//bazel/tests:proto_bzl_test_suite.bzl", "bzl_test_suite") -load(":tests.bzl", "TESTS") - -package(default_applicable_licenses = ["//:license"]) - -proto_library( - name = "bar_proto", - srcs = ["bar.proto"], - tags = PREVENT_IMPLICIT_BUILDING_TAGS, -) - -proto_library( - name = "foo_proto", - tags = PREVENT_IMPLICIT_BUILDING_TAGS, - deps = [":bar_proto"], -) - -java_lite_proto_library( - name = "foo_java_proto_lite", - tags = PREVENT_IMPLICIT_BUILDING_TAGS, - deps = [":foo_proto"], -) - -bzl_test_suite( - name = "tests", - provider_subject_factories = [java_info_subject_factory], - tests = TESTS, -)
diff --git a/bazel/tests/java_lite_proto_library_tests/correctly_defines_direct_jars_alias_proto/tests.bzl b/bazel/tests/java_lite_proto_library_tests/correctly_defines_direct_jars_alias_proto/tests.bzl deleted file mode 100644 index 79d85e7..0000000 --- a/bazel/tests/java_lite_proto_library_tests/correctly_defines_direct_jars_alias_proto/tests.bzl +++ /dev/null
@@ -1,18 +0,0 @@ -""" -Tests that a java_proto_library only provides direct jars corresponding on the proto_library -rules it directly depends on, excluding anything that the proto_library rules depends on -themselves. This does not concern strict-deps in the compilation of the generated Java code -itself, only compilation of regular code in java_library/java_binary and similar rules. -""" - -load("@rules_java//java/common:java_info.bzl", "JavaInfo") - -def _test_correctly_defines_direct_jars_alias_proto(env, target): - java_info = env.expect.that_target(target).provider(JavaInfo) - java_info.compile_jars().contains_exactly([ - "{package}/libbar_proto-lite-hjar.jar", - ]) - -TESTS = { - ":foo_java_proto_lite": [_test_correctly_defines_direct_jars_alias_proto], -}
diff --git a/bazel/tests/java_lite_proto_library_tests/empty_srcs_for_java_api/BUILD b/bazel/tests/java_lite_proto_library_tests/empty_srcs_for_java_api/BUILD deleted file mode 100644 index 05cbb01..0000000 --- a/bazel/tests/java_lite_proto_library_tests/empty_srcs_for_java_api/BUILD +++ /dev/null
@@ -1,25 +0,0 @@ -load("@rules_testing//lib:util.bzl", "PREVENT_IMPLICIT_BUILDING_TAGS") -load("//bazel:java_lite_proto_library.bzl", "java_lite_proto_library") -load("//bazel:proto_library.bzl", "proto_library") -load("//bazel/tests:java_proto_library_tests/test_utils.bzl", "java_info_subject_factory") -load("//bazel/tests:proto_bzl_test_suite.bzl", "bzl_test_suite") -load(":tests.bzl", "TESTS") - -package(default_applicable_licenses = ["//:license"]) - -proto_library( - name = "empty_proto", - tags = PREVENT_IMPLICIT_BUILDING_TAGS, -) - -java_lite_proto_library( - name = "empty_java_proto_lite", - tags = PREVENT_IMPLICIT_BUILDING_TAGS, - deps = [":empty_proto"], -) - -bzl_test_suite( - name = "tests", - provider_subject_factories = [java_info_subject_factory], - tests = TESTS, -)
diff --git a/bazel/tests/java_lite_proto_library_tests/empty_srcs_for_java_api/tests.bzl b/bazel/tests/java_lite_proto_library_tests/empty_srcs_for_java_api/tests.bzl deleted file mode 100644 index ffdc0a1..0000000 --- a/bazel/tests/java_lite_proto_library_tests/empty_srcs_for_java_api/tests.bzl +++ /dev/null
@@ -1,10 +0,0 @@ -"""Tests for empty srcs interop.""" - -load("@rules_java//java/common:java_info.bzl", "JavaInfo") - -def _test_empty_srcs(env, target): - env.expect.that_target(target).has_provider(JavaInfo) - -TESTS = { - ":empty_java_proto_lite": [_test_empty_srcs], -}
diff --git a/bazel/tests/java_lite_proto_library_tests/java_exports/BUILD b/bazel/tests/java_lite_proto_library_tests/java_exports/BUILD deleted file mode 100644 index 77d61ec..0000000 --- a/bazel/tests/java_lite_proto_library_tests/java_exports/BUILD +++ /dev/null
@@ -1,61 +0,0 @@ -load("@rules_java//java:java_library.bzl", "java_library") -load("@rules_testing//lib:util.bzl", "PREVENT_IMPLICIT_BUILDING_TAGS") -load("//bazel:java_lite_proto_library.bzl", "java_lite_proto_library") -load("//bazel:proto_library.bzl", "proto_library") -load("//bazel/tests:java_lite_proto_library_tests/test_utils.bzl", "java_info_subject_factory") -load("//bazel/tests:proto_bzl_test_suite.bzl", "bzl_test_suite") -load(":tests.bzl", "TESTS") - -package(default_applicable_licenses = ["//:license"]) - -proto_library( - name = "exported1", - srcs = ["exported1.proto"], - tags = PREVENT_IMPLICIT_BUILDING_TAGS, -) - -proto_library( - name = "exported2", - srcs = ["exported2.proto"], - tags = PREVENT_IMPLICIT_BUILDING_TAGS, -) - -proto_library( - name = "notexported", - srcs = ["notexported.proto"], - tags = PREVENT_IMPLICIT_BUILDING_TAGS, -) - -proto_library( - name = "top", - srcs = ["top.proto"], - tags = PREVENT_IMPLICIT_BUILDING_TAGS, - exports = [ - ":exported1", - ":exported2", - ], - deps = [ - ":exported1", - ":exported2", - ":notexported", - ], -) - -java_lite_proto_library( - name = "java_proto_lite", - tags = PREVENT_IMPLICIT_BUILDING_TAGS, - deps = [":top"], -) - -java_library( - name = "java_lib", - srcs = ["Foo.java"], - tags = PREVENT_IMPLICIT_BUILDING_TAGS, - deps = [":java_proto_lite"], -) - -bzl_test_suite( - name = "tests", - provider_subject_factories = [java_info_subject_factory], - tests = TESTS, -)
diff --git a/bazel/tests/java_lite_proto_library_tests/java_exports/tests.bzl b/bazel/tests/java_lite_proto_library_tests/java_exports/tests.bzl deleted file mode 100644 index 18368c6..0000000 --- a/bazel/tests/java_lite_proto_library_tests/java_exports/tests.bzl +++ /dev/null
@@ -1,15 +0,0 @@ -"""Tests for java_lite_proto_library exports.""" - -load("@rules_java//java/common:java_info.bzl", "JavaInfo") - -def _test_java_lib_depends_on_exports(env, target): - java_info = env.expect.that_target(target).provider(JavaInfo) - java_info.transitive_compile_time_jars_in_package().contains_at_least([ - "{package}/libtop-lite-hjar.jar", - "{package}/libexported1-lite-hjar.jar", - "{package}/libexported2-lite-hjar.jar", - ]) - -TESTS = { - ":java_lib": [_test_java_lib_depends_on_exports], -}
diff --git a/bazel/tests/java_lite_proto_library_tests/java_protos_exposes_java_provider/BUILD b/bazel/tests/java_lite_proto_library_tests/java_protos_exposes_java_provider/BUILD deleted file mode 100644 index 2337ad8..0000000 --- a/bazel/tests/java_lite_proto_library_tests/java_protos_exposes_java_provider/BUILD +++ /dev/null
@@ -1,26 +0,0 @@ -load("@rules_testing//lib:util.bzl", "PREVENT_IMPLICIT_BUILDING_TAGS") -load("//bazel:java_lite_proto_library.bzl", "java_lite_proto_library") -load("//bazel:proto_library.bzl", "proto_library") -load("//bazel/tests:java_proto_library_tests/test_utils.bzl", "java_info_subject_factory") -load("//bazel/tests:proto_bzl_test_suite.bzl", "bzl_test_suite") -load(":tests.bzl", "TESTS") - -package(default_applicable_licenses = ["//:license"]) - -proto_library( - name = "file_proto", - srcs = ["file.proto"], - tags = PREVENT_IMPLICIT_BUILDING_TAGS, -) - -java_lite_proto_library( - name = "file_java_proto_lite", - tags = PREVENT_IMPLICIT_BUILDING_TAGS, - deps = [":file_proto"], -) - -bzl_test_suite( - name = "tests", - provider_subject_factories = [java_info_subject_factory], - tests = TESTS, -)
diff --git a/bazel/tests/java_lite_proto_library_tests/java_protos_exposes_java_provider/tests.bzl b/bazel/tests/java_lite_proto_library_tests/java_protos_exposes_java_provider/tests.bzl deleted file mode 100644 index ee7225e..0000000 --- a/bazel/tests/java_lite_proto_library_tests/java_protos_exposes_java_provider/tests.bzl +++ /dev/null
@@ -1,10 +0,0 @@ -"""Tests tracking Java interop behaviors.""" - -load("@rules_java//java/common:java_info.bzl", "JavaInfo") - -def _test_java_protos_exposes_java_provider(env, target): - env.expect.that_target(target).has_provider(JavaInfo) - -TESTS = { - ":file_java_proto_lite": [_test_java_protos_exposes_java_provider], -}
diff --git a/bazel/tests/java_lite_proto_library_tests/proto_library_builds_compiled_jar/BUILD b/bazel/tests/java_lite_proto_library_tests/proto_library_builds_compiled_jar/BUILD deleted file mode 100644 index af694a0..0000000 --- a/bazel/tests/java_lite_proto_library_tests/proto_library_builds_compiled_jar/BUILD +++ /dev/null
@@ -1,24 +0,0 @@ -load("@rules_testing//lib:util.bzl", "PREVENT_IMPLICIT_BUILDING_TAGS") -load("//bazel:java_lite_proto_library.bzl", "java_lite_proto_library") -load("//bazel:proto_library.bzl", "proto_library") -load("//bazel/tests:proto_bzl_test_suite.bzl", "bzl_test_suite") -load(":tests.bzl", "TESTS") - -package(default_applicable_licenses = ["//:license"]) - -proto_library( - name = "foo_proto", - srcs = ["foo.proto"], - tags = PREVENT_IMPLICIT_BUILDING_TAGS, -) - -java_lite_proto_library( - name = "foo_java_proto_lite", - tags = PREVENT_IMPLICIT_BUILDING_TAGS, - deps = [":foo_proto"], -) - -bzl_test_suite( - name = "tests", - tests = TESTS, -)
diff --git a/bazel/tests/java_lite_proto_library_tests/proto_library_builds_compiled_jar/tests.bzl b/bazel/tests/java_lite_proto_library_tests/proto_library_builds_compiled_jar/tests.bzl deleted file mode 100644 index 0b858e3..0000000 --- a/bazel/tests/java_lite_proto_library_tests/proto_library_builds_compiled_jar/tests.bzl +++ /dev/null
@@ -1,10 +0,0 @@ -"""Tests that java_lite_proto_library builds a compiled jar.""" - -def _test_lite_proto_library_builds_compiled_jar(env, target): - env.expect.that_target(target).default_outputs().contains( - "{package}/libfoo_proto-lite.jar", - ) - -TESTS = { - ":foo_java_proto_lite": [_test_lite_proto_library_builds_compiled_jar], -}
diff --git a/bazel/tests/java_lite_proto_library_tests/proto_library_interop/BUILD b/bazel/tests/java_lite_proto_library_tests/proto_library_interop/BUILD deleted file mode 100644 index 2337ad8..0000000 --- a/bazel/tests/java_lite_proto_library_tests/proto_library_interop/BUILD +++ /dev/null
@@ -1,26 +0,0 @@ -load("@rules_testing//lib:util.bzl", "PREVENT_IMPLICIT_BUILDING_TAGS") -load("//bazel:java_lite_proto_library.bzl", "java_lite_proto_library") -load("//bazel:proto_library.bzl", "proto_library") -load("//bazel/tests:java_proto_library_tests/test_utils.bzl", "java_info_subject_factory") -load("//bazel/tests:proto_bzl_test_suite.bzl", "bzl_test_suite") -load(":tests.bzl", "TESTS") - -package(default_applicable_licenses = ["//:license"]) - -proto_library( - name = "file_proto", - srcs = ["file.proto"], - tags = PREVENT_IMPLICIT_BUILDING_TAGS, -) - -java_lite_proto_library( - name = "file_java_proto_lite", - tags = PREVENT_IMPLICIT_BUILDING_TAGS, - deps = [":file_proto"], -) - -bzl_test_suite( - name = "tests", - provider_subject_factories = [java_info_subject_factory], - tests = TESTS, -)
diff --git a/bazel/tests/java_lite_proto_library_tests/proto_library_interop/tests.bzl b/bazel/tests/java_lite_proto_library_tests/proto_library_interop/tests.bzl deleted file mode 100644 index edbf923..0000000 --- a/bazel/tests/java_lite_proto_library_tests/proto_library_interop/tests.bzl +++ /dev/null
@@ -1,10 +0,0 @@ -"""Tests tracking Java interop behaviors.""" - -load("@rules_java//java/common:java_info.bzl", "JavaInfo") - -def _test_interop(env, target): - env.expect.that_target(target).has_provider(JavaInfo) - -TESTS = { - ":file_java_proto_lite": [_test_interop], -}
diff --git a/bazel/tests/java_lite_proto_library_tests/same_version_compiler_arguments/BUILD b/bazel/tests/java_lite_proto_library_tests/same_version_compiler_arguments/BUILD deleted file mode 100644 index ebf53bb..0000000 --- a/bazel/tests/java_lite_proto_library_tests/same_version_compiler_arguments/BUILD +++ /dev/null
@@ -1,27 +0,0 @@ -load("@rules_testing//lib:util.bzl", "PREVENT_IMPLICIT_BUILDING_TAGS") -load("//bazel:proto_library.bzl", "proto_library") -load("//bazel/tests:java_lite_proto_library_tests/test_utils.bzl", "JAVA_LITE_PROTO_TESTING_ASPECT", "java_info_subject_factory") -load("//bazel/tests:proto_bzl_test_suite.bzl", "bzl_test_suite") -load(":tests.bzl", "TESTS") - -package(default_applicable_licenses = ["//:license"]) - -proto_library( - name = "foo_proto", - srcs = ["foo.proto"], - tags = PREVENT_IMPLICIT_BUILDING_TAGS, -) - -proto_library( - name = "baz_proto", - srcs = ["baz.proto"], - tags = PREVENT_IMPLICIT_BUILDING_TAGS, - deps = [":foo_proto"], -) - -bzl_test_suite( - name = "tests", - provider_subject_factories = [java_info_subject_factory], - testing_aspect = JAVA_LITE_PROTO_TESTING_ASPECT, - tests = TESTS, -)
diff --git a/bazel/tests/java_lite_proto_library_tests/same_version_compiler_arguments/tests.bzl b/bazel/tests/java_lite_proto_library_tests/same_version_compiler_arguments/tests.bzl deleted file mode 100644 index 59bb953..0000000 --- a/bazel/tests/java_lite_proto_library_tests/same_version_compiler_arguments/tests.bzl +++ /dev/null
@@ -1,23 +0,0 @@ -"""Tests for same version compiler arguments.""" - -load("@rules_java//java/common:java_info.bzl", "JavaInfo") - -def _test_same_version_compiler_arguments(env, target): - genproto = env.expect.that_target(target).action_named("GenProto") - genproto.argv().contains("{package}/baz.proto") - genproto.argv().contains_at_least([ - "--java_out=lite:{bindir}/{package}/baz_proto-lite-src.jar", - "-I.", - "{package}/baz.proto", - ]).in_order() - genproto.argv().not_contains("--java_out=lite,immutable:{bindir}/{package}/foo_proto-lite-src.jar") - java_info = env.expect.that_target(target).provider(JavaInfo) - java_info.transitive_runtime_jars().contains_at_least([ - "{package}/libbaz_proto-lite.jar", - "java/core/liblite.jar", - "java/core/liblite_runtime_only.jar", - ]) - -TESTS = { - ":baz_proto": [_test_same_version_compiler_arguments], -}
diff --git a/bazel/tests/java_lite_proto_library_tests/test_utils.bzl b/bazel/tests/java_lite_proto_library_tests/test_utils.bzl deleted file mode 100644 index cf65495..0000000 --- a/bazel/tests/java_lite_proto_library_tests/test_utils.bzl +++ /dev/null
@@ -1,63 +0,0 @@ -"""Common test utils for java_lite_proto_library tests.""" - -load("@rules_java//java/common:java_info.bzl", "JavaInfo") -load("@rules_testing//lib:truth.bzl", "subjects") -load("@rules_testing//lib:util.bzl", "util") -load("//bazel/private:java_lite_proto_library.bzl", "java_lite_proto_aspect") - -# Using this test aspect to mimic the java_lite_proto_library target. This is mainly used to test -# the java related actions created in the test that isn't possible to access in Starlark. -JAVA_LITE_PROTO_TESTING_ASPECT = util.make_testing_aspect(aspects = [java_lite_proto_aspect]) - -def _filter_inpackage(file_depset, owner): - return depset([f for f in file_depset.to_list() if f.owner.package == owner.package]) - -def _java_info_subject(info, *, meta): - """Creates a new `JavaInfoSubject` for a JavaInfo provider instance. - - Args: - info: The JavaInfo object - meta: ExpectMeta object. - - Returns: - A `JavaInfoSubject` struct - """ - self = struct(actual = info, meta = meta) - public = struct( - actual = info, - transitive_source_jars = lambda *a, **k: subjects.depset_file( - self.actual.transitive_source_jars, - meta = self.meta.derive("transitive_source_jars()"), - ), - transitive_source_jars_in_package = lambda *a, **k: subjects.depset_file( - _filter_inpackage(self.actual.transitive_source_jars, meta.ctx.label), - meta = self.meta.derive("transitive_source_jars_in_package()"), - ), - source_jars = lambda *a, **k: subjects.depset_file( - self.actual.source_jars, - meta = self.meta.derive("source_jars()"), - ), - transitive_runtime_jars = lambda *a, **k: subjects.depset_file( - self.actual.transitive_runtime_jars, - meta = self.meta.derive("transitive_runtime_jars()"), - ), - transitive_compile_time_jars = lambda *a, **k: subjects.depset_file( - self.actual.transitive_compile_time_jars, - meta = self.meta.derive("transitive_compile_time_jars()"), - ), - transitive_compile_time_jars_in_package = lambda *a, **k: subjects.depset_file( - _filter_inpackage(self.actual.transitive_compile_time_jars, meta.ctx.label), - meta = self.meta.derive("transitive_compile_time_jars_in_package()"), - ), - compile_jars = lambda *a, **k: subjects.depset_file( - self.actual.compile_jars, - meta = self.meta.derive("compile_jars()"), - ), - ) - return public - -java_info_subject_factory = struct( - type = JavaInfo, - name = "JavaInfo", - factory = _java_info_subject, -)