Skip to content

Commit

Permalink
Move some :unittest_(cpp|upb)_rust_proto target to be colocated with …
Browse files Browse the repository at this point in the history 
…the .proto file that defines them

This CL doesn't unbreak the bazel tests, but is yak shaving in prep for changes that will. This makes it more straightforward how the tests are broken by having bazel test rules name rust proto library targets that don't exist in bazel repo, instead of naming targets that do exist but are bogus.

Also correct unittest_edition target to match the order of words in the .proto file name (edition_unittest)

PiperOrigin-RevId: 674295376
  • Loading branch information
@protobuf-github-bot @copybara-github
protobuf-github-bot authored and copybara-github committed Sep 13, 2024
1 parent ea0ade3 commit 4834eb7
Show file tree
Hide file tree
Showing 6 changed files with 44 additions and 120 deletions.
76 changes: 0 additions & 76 deletions rust/test/BUILD
View file
Original file line number Diff line number Diff line change
Expand Up @@ -10,82 +10,6 @@ load(
"rust_upb_proto_library",
)

UNITTEST_PROTO_TARGET = "//src/google/protobuf:test_protos"

UNITTEST_PROTO3_TARGET = "//src/google/protobuf:test_protos"

UNITTEST_PROTO3_OPTIONAL_TARGET = "//src/google/protobuf:test_protos"

UNITTEST_EDITION_TARGET = "//src/google/protobuf:test_protos"

rust_upb_proto_library(
name = "unittest_upb_rust_proto",
testonly = True,
visibility = [
"//rust/test/shared:__subpackages__",
"//rust/test/upb:__subpackages__",
],
deps = [UNITTEST_PROTO_TARGET],
)

rust_cc_proto_library(
name = "unittest_cpp_rust_proto",
testonly = True,
visibility = [
"//rust/test/cpp:__subpackages__",
"//rust/test/shared:__subpackages__",
],
deps = [UNITTEST_PROTO_TARGET],
)

rust_cc_proto_library(
name = "unittest_proto3_cpp_rust_proto",
testonly = True,
visibility = ["//rust/test/shared:__subpackages__"],
deps = [UNITTEST_PROTO3_TARGET],
)

rust_upb_proto_library(
name = "unittest_proto3_upb_rust_proto",
testonly = True,
visibility = [
"//rust/test/shared:__subpackages__",
"//rust/test/upb:__subpackages__",
],
deps = [UNITTEST_PROTO3_TARGET],
)

rust_cc_proto_library(
name = "unittest_proto3_optional_cpp_rust_proto",
testonly = True,
visibility = ["//rust/test/shared:__subpackages__"],
deps = [UNITTEST_PROTO3_OPTIONAL_TARGET],
)

rust_upb_proto_library(
name = "unittest_proto3_optional_upb_rust_proto",
testonly = True,
visibility = ["//rust/test/shared:__subpackages__"],
deps = [UNITTEST_PROTO3_OPTIONAL_TARGET],
)

rust_cc_proto_library(
name = "unittest_edition_cpp_rust_proto",
testonly = True,
visibility = ["//rust/test/shared:__subpackages__"],
deps = [UNITTEST_EDITION_TARGET],
)

rust_upb_proto_library(
name = "unittest_edition_upb_rust_proto",
testonly = True,
visibility = [
"//rust/test/shared:__subpackages__",
"//rust/test/upb:__subpackages__",
],
deps = [UNITTEST_EDITION_TARGET],
)

proto_library(
name = "parent_proto",
srcs = ["parent.proto"],
Expand Down
2 changes: 1 addition & 1 deletion rust/test/cpp/interop/BUILD
View file
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ rust_test(
deps = [
":test_utils",
"//rust:protobuf_cpp",
"//rust/test:unittest_cpp_rust_proto",
"//src/google/protobuf:unittest_cpp_rust_proto",
"@crate_index//:googletest",
],
)
76 changes: 38 additions & 38 deletions rust/test/shared/BUILD
View file
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ rust_test(
},
deps = [
"//rust:protobuf_upb_export",
"//rust/test:unittest_upb_rust_proto",
"//src/google/protobuf:unittest_upb_rust_proto",
"@crate_index//:googletest",
],
)
Expand All @@ -37,7 +37,7 @@ rust_test(
},
deps = [
"//rust:protobuf_cpp_export",
"//rust/test:unittest_cpp_rust_proto",
"//src/google/protobuf:unittest_cpp_rust_proto",
"@crate_index//:googletest",
],
)
Expand Down Expand Up @@ -97,7 +97,7 @@ rust_test(
deps = [
"//rust:protobuf_cpp_export",
"//rust/test:enums_cpp_rust_proto",
"//rust/test:unittest_cpp_rust_proto",
"//src/google/protobuf:unittest_cpp_rust_proto",
"@crate_index//:googletest",
],
)
Expand All @@ -111,7 +111,7 @@ rust_test(
deps = [
"//rust:protobuf_upb_export",
"//rust/test:enums_upb_rust_proto",
"//rust/test:unittest_upb_rust_proto",
"//src/google/protobuf:unittest_upb_rust_proto",
"@crate_index//:googletest",
],
)
Expand Down Expand Up @@ -173,7 +173,7 @@ rust_test(
srcs = ["bad_names_test.rs"],
deps = [
"//rust/test:bad_names_cpp_rust_proto",
"//rust/test:unittest_cpp_rust_proto",
"//src/google/protobuf:unittest_cpp_rust_proto",
"@crate_index//:googletest",
],
)
Expand All @@ -186,15 +186,15 @@ rust_test(
# deps = [
# "@crate_index//:googletest",
# "//rust/test:bad_names_upb_rust_proto",
# "//rust/test:unittest_upb_rust_proto",
# "//src/google/protobuf:unittest_upb_rust_proto",
# ],
# )

rust_test(
name = "nested_types_cpp_test",
srcs = ["nested_types_test.rs"],
deps = [
"//rust/test:unittest_cpp_rust_proto",
"//src/google/protobuf:unittest_cpp_rust_proto",
"@crate_index//:googletest",
],
)
Expand All @@ -203,7 +203,7 @@ rust_test(
name = "nested_types_upb_test",
srcs = ["nested_types_test.rs"],
deps = [
"//rust/test:unittest_upb_rust_proto",
"//src/google/protobuf:unittest_upb_rust_proto",
"@crate_index//:googletest",
],
)
Expand All @@ -219,7 +219,7 @@ rust_test(
],
deps = [
"//rust:protobuf_cpp_export",
"//rust/test:unittest_cpp_rust_proto",
"//src/google/protobuf:unittest_cpp_rust_proto",
"@crate_index//:googletest",
],
)
Expand All @@ -235,7 +235,7 @@ rust_test(
],
deps = [
"//rust:protobuf_upb_export",
"//rust/test:unittest_upb_rust_proto",
"//src/google/protobuf:unittest_upb_rust_proto",
"@crate_index//:googletest",
],
)
Expand All @@ -248,8 +248,8 @@ rust_test(
},
deps = [
"//rust:protobuf_cpp_export",
"//rust/test:unittest_proto3_cpp_rust_proto",
"//rust/test:unittest_proto3_optional_cpp_rust_proto",
"//src/google/protobuf:unittest_proto3_cpp_rust_proto",
"//src/google/protobuf:unittest_proto3_optional_cpp_rust_proto",
"@crate_index//:googletest",
],
)
Expand All @@ -262,8 +262,8 @@ rust_test(
},
deps = [
"//rust:protobuf_upb_export",
"//rust/test:unittest_proto3_optional_upb_rust_proto",
"//rust/test:unittest_proto3_upb_rust_proto",
"//src/google/protobuf:unittest_proto3_optional_upb_rust_proto",
"//src/google/protobuf:unittest_proto3_upb_rust_proto",
"@crate_index//:googletest",
],
)
Expand All @@ -279,10 +279,10 @@ rust_test(
],
deps = [
"//rust:protobuf_upb_export",
"//rust/test:unittest_edition_upb_rust_proto",
"//rust/test:unittest_proto3_optional_upb_rust_proto",
"//rust/test:unittest_proto3_upb_rust_proto",
"//rust/test:unittest_upb_rust_proto",
"//src/google/protobuf:edition_unittest_upb_rust_proto",
"//src/google/protobuf:unittest_proto3_optional_upb_rust_proto",
"//src/google/protobuf:unittest_proto3_upb_rust_proto",
"//src/google/protobuf:unittest_upb_rust_proto",
"@crate_index//:googletest",
],
)
Expand All @@ -298,10 +298,10 @@ rust_test(
],
deps = [
"//rust:protobuf_cpp_export",
"//rust/test:unittest_cpp_rust_proto",
"//rust/test:unittest_edition_cpp_rust_proto",
"//rust/test:unittest_proto3_cpp_rust_proto",
"//rust/test:unittest_proto3_optional_cpp_rust_proto",
"//src/google/protobuf:edition_unittest_cpp_rust_proto",
"//src/google/protobuf:unittest_cpp_rust_proto",
"//src/google/protobuf:unittest_proto3_cpp_rust_proto",
"//src/google/protobuf:unittest_proto3_optional_cpp_rust_proto",
"@crate_index//:googletest",
],
)
Expand Down Expand Up @@ -343,7 +343,7 @@ rust_test(
],
deps = [
"//rust:protobuf_cpp_export",
"//rust/test:unittest_cpp_rust_proto",
"//src/google/protobuf:unittest_cpp_rust_proto",
"@crate_index//:googletest",
],
)
Expand All @@ -359,7 +359,7 @@ rust_test(
],
deps = [
"//rust:protobuf_upb_export",
"//rust/test:unittest_upb_rust_proto",
"//src/google/protobuf:unittest_upb_rust_proto",
"@crate_index//:googletest",
],
)
Expand All @@ -377,7 +377,7 @@ rust_test(
"//rust:protobuf_cpp_export",
"//rust/test:enums_cpp_rust_proto",
"//rust/test:map_unittest_cpp_rust_proto",
"//rust/test:unittest_cpp_rust_proto",
"//src/google/protobuf:unittest_cpp_rust_proto",
"@crate_index//:googletest",
],
)
Expand All @@ -395,7 +395,7 @@ rust_test(
"//rust:protobuf_upb_export",
"//rust/test:enums_upb_rust_proto",
"//rust/test:map_unittest_upb_rust_proto",
"//rust/test:unittest_upb_rust_proto",
"//src/google/protobuf:unittest_upb_rust_proto",
"@crate_index//:googletest",
],
)
Expand Down Expand Up @@ -430,7 +430,7 @@ rust_test(
},
deps = [
"//rust:protobuf_cpp",
"//rust/test:unittest_cpp_rust_proto",
"//src/google/protobuf:unittest_cpp_rust_proto",
"@crate_index//:googletest",
],
)
Expand All @@ -443,7 +443,7 @@ rust_test(
},
deps = [
"//rust:protobuf_upb",
"//rust/test:unittest_upb_rust_proto",
"//src/google/protobuf:unittest_upb_rust_proto",
"@crate_index//:googletest",
],
)
Expand All @@ -456,7 +456,7 @@ rust_test(
},
deps = [
"//rust:protobuf_cpp",
"//rust/test:unittest_cpp_rust_proto",
"//src/google/protobuf:unittest_cpp_rust_proto",
"@crate_index//:googletest",
],
)
Expand All @@ -471,7 +471,7 @@ rust_test(
deps = [
"//rust:protobuf_gtest_matchers_upb",
"//rust:protobuf_upb",
"//rust/test:unittest_upb_rust_proto",
"//src/google/protobuf:unittest_upb_rust_proto",
"@crate_index//:googletest",
],
)
Expand All @@ -489,10 +489,10 @@ rust_test(
deps = [
"//rust:protobuf_cpp",
"//rust:protobuf_gtest_matchers_cpp",
"//rust/test:unittest_cpp_rust_proto",
"//rust/test:unittest_edition_cpp_rust_proto",
"//rust/test:unittest_proto3_cpp_rust_proto",
"//rust/test:unittest_proto3_optional_cpp_rust_proto",
"//src/google/protobuf:edition_unittest_cpp_rust_proto",
"//src/google/protobuf:unittest_cpp_rust_proto",
"//src/google/protobuf:unittest_proto3_cpp_rust_proto",
"//src/google/protobuf:unittest_proto3_optional_cpp_rust_proto",
"@crate_index//:googletest",
],
)
Expand All @@ -510,10 +510,10 @@ rust_test(
deps = [
"//rust:protobuf_gtest_matchers_upb",
"//rust:protobuf_upb",
"//rust/test:unittest_edition_upb_rust_proto",
"//rust/test:unittest_proto3_optional_upb_rust_proto",
"//rust/test:unittest_proto3_upb_rust_proto",
"//rust/test:unittest_upb_rust_proto",
"//src/google/protobuf:edition_unittest_upb_rust_proto",
"//src/google/protobuf:unittest_proto3_optional_upb_rust_proto",
"//src/google/protobuf:unittest_proto3_upb_rust_proto",
"//src/google/protobuf:unittest_upb_rust_proto",
"@crate_index//:googletest",
],
)
2 changes: 1 addition & 1 deletion rust/test/shared/gtest_matchers_test.rs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,10 +5,10 @@
// license that can be found in the LICENSE file or at
// https://developers.google.com/open-source/licenses/bsd

use edition_unittest_rust_proto::TestAllTypes as TestAllTypesEditions;
use googletest::prelude::*;
use paste::paste;
use protobuf_gtest_matchers::proto_eq;
use unittest_edition_rust_proto::TestAllTypes as TestAllTypesEditions;
use unittest_proto3_rust_proto::TestAllTypes as TestAllTypesProto3;
use unittest_rust_proto::TestAllTypes as TestAllTypesProto2;

Expand Down
2 changes: 1 addition & 1 deletion rust/test/shared/serialization_test.rs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,8 +8,8 @@
use googletest::prelude::*;
use protobuf::prelude::*;

use edition_unittest_rust_proto::TestAllTypes as TestAllTypesEditions;
use paste::paste;
use unittest_edition_rust_proto::TestAllTypes as TestAllTypesEditions;
use unittest_proto3_optional_rust_proto::TestProto3Optional;
use unittest_proto3_rust_proto::TestAllTypes as TestAllTypesProto3;
use unittest_rust_proto::TestAllTypes as TestAllTypesProto2;
Expand Down
6 changes: 3 additions & 3 deletions rust/test/upb/BUILD
View file
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ rust_test(
},
deps = [
"//rust:protobuf_upb_export",
"//rust/test:unittest_proto3_upb_rust_proto",
"//src/google/protobuf:unittest_proto3_upb_rust_proto",
"@crate_index//:googletest",
],
)
Expand All @@ -45,8 +45,8 @@ rust_test(
deps = [
"//rust:protobuf_upb",
"//rust/test:map_unittest_upb_rust_proto",
"//rust/test:unittest_edition_upb_rust_proto",
"//rust/test:unittest_upb_rust_proto",
"//src/google/protobuf:edition_unittest_upb_rust_proto",
"//src/google/protobuf:unittest_upb_rust_proto",
"@crate_index//:googletest",
],
)

0 comments on commit 4834eb7

Please sign in to comment.