Move Rust unit tests to use reduced forks of TestAllTypes messages.

PiperOrigin-RevId: 691931930
pull/19065/head
Protobuf Team Bot 3 months ago committed by Copybara-Service
parent 2f505a7aa1
commit 3a40367686
  1. 132
      rust/test/BUILD
  2. 119
      rust/test/map_unittest.proto
  3. 74
      rust/test/shared/BUILD
  4. 4
      rust/test/shared/accessors_test.rs
  5. 15
      rust/test/shared/gtest_matchers_test.rs
  6. 17
      rust/test/shared/serialization_test.rs
  7. 1937
      rust/test/unittest.proto
  8. 36
      rust/test/unittest_import.proto
  9. 268
      rust/test/unittest_proto3.proto
  10. 90
      rust/test/unittest_proto3_optional.proto
  11. 5
      rust/test/upb/BUILD

@ -10,6 +10,10 @@ load(
"rust_upb_proto_library",
)
package(
default_visibility = ["//rust/test:__subpackages__"],
)
proto_library(
name = "parent_proto",
srcs = ["parent.proto"],
@ -26,28 +30,24 @@ proto_library(
rust_upb_proto_library(
name = "parent_upb_rust_proto",
testonly = True,
visibility = ["//rust/test/shared:__subpackages__"],
deps = [":parent_proto"],
)
rust_upb_proto_library(
name = "child_upb_rust_proto",
testonly = True,
visibility = ["//rust/test/shared:__subpackages__"],
deps = [":child_proto"],
)
rust_cc_proto_library(
name = "parent_cpp_rust_proto",
testonly = True,
visibility = ["//rust/test/shared:__subpackages__"],
deps = [":parent_proto"],
)
rust_cc_proto_library(
name = "child_cpp_rust_proto",
testonly = True,
visibility = ["//rust/test/shared:__subpackages__"],
deps = [":child_proto"],
)
@ -60,14 +60,12 @@ proto_library(
rust_cc_proto_library(
name = "dots_in_package_cpp_rust_proto",
testonly = True,
visibility = ["//rust/test/shared:__subpackages__"],
deps = [":dots_in_package_proto"],
)
rust_upb_proto_library(
name = "dots_in_package_upb_rust_proto",
testonly = True,
visibility = ["//rust/test/shared:__subpackages__"],
deps = [":dots_in_package_proto"],
)
@ -81,14 +79,12 @@ proto_library(
rust_cc_proto_library(
name = "edition2023_cpp_rust_proto",
testonly = True,
visibility = ["//rust/test/shared:__subpackages__"],
deps = [":edition2023_proto"],
)
rust_upb_proto_library(
name = "edition2023_upb_rust_proto",
testonly = True,
visibility = ["//rust/test/shared:__subpackages__"],
deps = [":edition2023_proto"],
)
@ -101,14 +97,12 @@ proto_library(
rust_cc_proto_library(
name = "enums_cpp_rust_proto",
testonly = True,
visibility = ["//rust/test/shared:__subpackages__"],
deps = [":enums_proto"],
)
rust_upb_proto_library(
name = "enums_upb_rust_proto",
testonly = True,
visibility = ["//rust/test/shared:__subpackages__"],
deps = [":enums_proto"],
)
@ -155,14 +149,12 @@ proto_library(
rust_cc_proto_library(
name = "import_public_cpp_rust_proto",
testonly = True,
visibility = ["//rust/test/shared:__subpackages__"],
deps = [":import_public_proto"],
)
rust_upb_proto_library(
name = "import_public_upb_rust_proto",
testonly = True,
visibility = ["//rust/test/shared:__subpackages__"],
deps = [":import_public_proto"],
)
@ -190,14 +182,12 @@ proto_library(
rust_cc_proto_library(
name = "no_package_cpp_rust_proto",
testonly = True,
visibility = ["//rust/test/shared:__subpackages__"],
deps = [":no_package_proto"],
)
rust_upb_proto_library(
name = "no_package_upb_rust_proto",
testonly = True,
visibility = ["//rust/test/shared:__subpackages__"],
deps = [":no_package_proto"],
)
@ -222,14 +212,12 @@ proto_library(
rust_cc_proto_library(
name = "package_cpp_rust_proto",
testonly = True,
visibility = ["//rust/test/shared:__subpackages__"],
deps = [":package_proto"],
)
rust_upb_proto_library(
name = "package_upb_rust_proto",
testonly = True,
visibility = ["//rust/test/shared:__subpackages__"],
deps = [":package_proto"],
)
@ -246,14 +234,12 @@ proto_library(
rust_upb_proto_library(
name = "package_disabiguation_upb_rust_proto",
testonly = True,
visibility = ["//rust/test/shared:__subpackages__"],
deps = [":package_disabiguation_proto"],
)
rust_cc_proto_library(
name = "package_disabiguation_cpp_rust_proto",
testonly = True,
visibility = ["//rust/test/shared:__subpackages__"],
deps = [":package_disabiguation_proto"],
)
@ -266,14 +252,12 @@ proto_library(
rust_cc_proto_library(
name = "bad_names_cpp_rust_proto",
testonly = True,
visibility = ["//rust/test/shared:__subpackages__"],
deps = [":bad_names_proto"],
)
rust_upb_proto_library(
name = "bad_names_upb_rust_proto",
testonly = True,
visibility = ["//rust/test/shared:__subpackages__"],
deps = [":bad_names_proto"],
)
@ -286,37 +270,35 @@ proto_library(
rust_cc_proto_library(
name = "nested_cpp_rust_proto",
testonly = True,
visibility = [
"//rust/test/cpp:__subpackages__",
"//rust/test/shared:__subpackages__",
],
deps = [":nested_proto"],
)
rust_upb_proto_library(
name = "nested_upb_rust_proto",
testonly = True,
visibility = ["//rust/test/shared:__subpackages__"],
deps = [":nested_proto"],
)
proto_library(
name = "map_unittest_proto",
srcs = [
"map_unittest.proto",
],
deps = [
":unittest_proto",
],
)
rust_cc_proto_library(
name = "map_unittest_cpp_rust_proto",
testonly = True,
visibility = [
"//rust/test/shared:__subpackages__",
],
deps = ["//src/google/protobuf:map_unittest_proto"],
deps = [":map_unittest_proto"],
)
rust_upb_proto_library(
name = "map_unittest_upb_rust_proto",
testonly = True,
visibility = [
"//rust/test/shared:__subpackages__",
"//rust/test/upb:__subpackages__",
],
deps = ["//src/google/protobuf:map_unittest_proto"],
deps = [":map_unittest_proto"],
)
proto_library(
@ -328,18 +310,12 @@ proto_library(
rust_cc_proto_library(
name = "imported_types_cpp_rust_proto",
testonly = True,
visibility = [
"//rust/test/shared:__subpackages__",
],
deps = [":imported_types_proto"],
)
rust_upb_proto_library(
name = "imported_types_upb_rust_proto",
testonly = True,
visibility = [
"//rust/test/shared:__subpackages__",
],
deps = [":imported_types_proto"],
)
@ -354,17 +330,81 @@ proto_library(
rust_cc_proto_library(
name = "fields_with_imported_types_cpp_rust_proto",
testonly = True,
visibility = [
"//rust/test/shared:__subpackages__",
],
deps = [":fields-with-imported-types_proto"],
)
rust_upb_proto_library(
name = "fields_with_imported_types_upb_rust_proto",
testonly = True,
visibility = [
"//rust/test/shared:__subpackages__",
],
deps = [":fields-with-imported-types_proto"],
)
proto_library(
name = "unittest_proto",
srcs = ["unittest.proto"],
deps = [":unittest_import_proto"],
)
rust_upb_proto_library(
name = "unittest_upb_rust_proto",
testonly = True,
deps = [":unittest_proto"],
)
rust_cc_proto_library(
name = "unittest_cpp_rust_proto",
testonly = True,
deps = ["unittest_proto"],
)
proto_library(
name = "unittest_import_proto",
srcs = ["unittest_import.proto"],
)
rust_upb_proto_library(
name = "unittest_import_upb_rust_proto",
testonly = True,
deps = [":unittest_import_proto"],
)
rust_cc_proto_library(
name = "unittest_import_cpp_rust_proto",
testonly = True,
deps = ["unittest_import_proto"],
)
proto_library(
name = "unittest_proto3_proto",
srcs = ["unittest_proto3.proto"],
deps = [":unittest_import_proto"],
)
rust_upb_proto_library(
name = "unittest_proto3_upb_rust_proto",
testonly = True,
deps = [":unittest_proto3_proto"],
)
rust_cc_proto_library(
name = "unittest_proto3_cpp_rust_proto",
testonly = True,
deps = ["unittest_proto3_proto"],
)
proto_library(
name = "unittest_proto3_optional_proto",
srcs = ["unittest_proto3_optional.proto"],
)
rust_upb_proto_library(
name = "unittest_proto3_optional_upb_rust_proto",
testonly = True,
deps = [":unittest_proto3_optional_proto"],
)
rust_cc_proto_library(
name = "unittest_proto3_optional_cpp_rust_proto",
testonly = True,
deps = ["unittest_proto3_optional_proto"],
)

@ -0,0 +1,119 @@
// Protocol Buffers - Google's data interchange format
// Copyright 2008 Google Inc. All rights reserved.
//
// Use of this source code is governed by a BSD-style
// license that can be found in the LICENSE file or at
// https://developers.google.com/open-source/licenses/bsd
syntax = "proto3";
package rust_unittest;
import "rust/test/unittest.proto";
option cc_enable_arenas = true;
// Tests maps.
message TestMap {
map<int32, int32> map_int32_int32 = 1;
map<int64, int64> map_int64_int64 = 2;
map<uint32, uint32> map_uint32_uint32 = 3;
map<uint64, uint64> map_uint64_uint64 = 4;
map<sint32, sint32> map_sint32_sint32 = 5;
map<sint64, sint64> map_sint64_sint64 = 6;
map<fixed32, fixed32> map_fixed32_fixed32 = 7;
map<fixed64, fixed64> map_fixed64_fixed64 = 8;
map<sfixed32, sfixed32> map_sfixed32_sfixed32 = 9;
map<sfixed64, sfixed64> map_sfixed64_sfixed64 = 10;
map<int32, float> map_int32_float = 11;
map<int32, double> map_int32_double = 12;
map<bool, bool> map_bool_bool = 13;
map<string, string> map_string_string = 14;
map<int32, bytes> map_int32_bytes = 15;
map<int32, MapEnum> map_int32_enum = 16;
map<int32, ForeignMessage> map_int32_foreign_message = 17;
map<string, ForeignMessage> map_string_foreign_message = 18;
map<int32, TestAllTypes> map_int32_all_types = 19;
}
message TestMapWithMessages {
map<int32, TestAllTypes> map_int32_all_types = 1;
map<int64, TestAllTypes> map_int64_all_types = 2;
map<uint32, TestAllTypes> map_uint32_all_types = 3;
map<uint64, TestAllTypes> map_uint64_all_types = 4;
map<sint32, TestAllTypes> map_sint32_all_types = 5;
map<sint64, TestAllTypes> map_sint64_all_types = 6;
map<fixed32, TestAllTypes> map_fixed32_all_types = 7;
map<fixed64, TestAllTypes> map_fixed64_all_types = 8;
map<sfixed32, TestAllTypes> map_sfixed32_all_types = 9;
map<sfixed64, TestAllTypes> map_sfixed64_all_types = 10;
map<bool, TestAllTypes> map_bool_all_types = 11;
map<string, TestAllTypes> map_string_all_types = 12;
}
message TestMapSubmessage {
TestMap test_map = 1;
}
message TestMessageMap {
map<int32, TestAllTypes> map_int32_message = 1;
}
// Two map fields share the same entry default instance.
message TestSameTypeMap {
map<int32, int32> map1 = 1;
map<int32, int32> map2 = 2;
}
enum MapEnum {
MAP_ENUM_FOO = 0;
MAP_ENUM_BAR = 1;
MAP_ENUM_BAZ = 2;
}
// Test embedded message with required fields
message TestRequiredMessageMap {
map<int32, TestRequired> map_field = 1;
}
message TestArenaMap {
map<int32, int32> map_int32_int32 = 1;
map<int64, int64> map_int64_int64 = 2;
map<uint32, uint32> map_uint32_uint32 = 3;
map<uint64, uint64> map_uint64_uint64 = 4;
map<sint32, sint32> map_sint32_sint32 = 5;
map<sint64, sint64> map_sint64_sint64 = 6;
map<fixed32, fixed32> map_fixed32_fixed32 = 7;
map<fixed64, fixed64> map_fixed64_fixed64 = 8;
map<sfixed32, sfixed32> map_sfixed32_sfixed32 = 9;
map<sfixed64, sfixed64> map_sfixed64_sfixed64 = 10;
map<int32, float> map_int32_float = 11;
map<int32, double> map_int32_double = 12;
map<bool, bool> map_bool_bool = 13;
map<string, string> map_string_string = 14;
map<int32, bytes> map_int32_bytes = 15;
map<int32, MapEnum> map_int32_enum = 16;
map<int32, ForeignMessage> map_int32_foreign_message = 17;
}
// Previously, message containing enum called Type cannot be used as value of
// map field.
message MessageContainingEnumCalledType {
enum Type {
TYPE_FOO = 0;
}
map<string, MessageContainingEnumCalledType> type = 1;
}
// Previously, message cannot contain map field called "entry".
message MessageContainingMapCalledEntry {
map<int32, int32> entry = 1;
}
message TestRecursiveMapMessage {
map<string, TestRecursiveMapMessage> a = 1;
}
message TestI32StrMap {
map<int32, string> m_32_str = 1;
}

@ -24,7 +24,7 @@ rust_test(
},
deps = [
"//rust:protobuf_upb_export",
"//src/google/protobuf:unittest_upb_rust_proto",
"//rust/test:unittest_upb_rust_proto",
"@crate_index//:googletest",
],
)
@ -37,7 +37,7 @@ rust_test(
},
deps = [
"//rust:protobuf_cpp_export",
"//src/google/protobuf:unittest_cpp_rust_proto",
"//rust/test:unittest_cpp_rust_proto",
"@crate_index//:googletest",
],
)
@ -97,7 +97,7 @@ rust_test(
deps = [
"//rust:protobuf_cpp_export",
"//rust/test:enums_cpp_rust_proto",
"//src/google/protobuf:unittest_cpp_rust_proto",
"//rust/test:unittest_cpp_rust_proto",
"@crate_index//:googletest",
],
)
@ -111,7 +111,7 @@ rust_test(
deps = [
"//rust:protobuf_upb_export",
"//rust/test:enums_upb_rust_proto",
"//src/google/protobuf:unittest_upb_rust_proto",
"//rust/test:unittest_upb_rust_proto",
"@crate_index//:googletest",
],
)
@ -173,7 +173,7 @@ rust_test(
srcs = ["bad_names_test.rs"],
deps = [
"//rust/test:bad_names_cpp_rust_proto",
"//src/google/protobuf:unittest_cpp_rust_proto",
"//rust/test:unittest_cpp_rust_proto",
"@crate_index//:googletest",
],
)
@ -186,7 +186,7 @@ rust_test(
# deps = [
# "@crate_index//:googletest",
# "//rust/test:bad_names_upb_rust_proto",
# "//src/google/protobuf:unittest_upb_rust_proto",
# "//rust/test:unittest_upb_rust_proto",
# ],
# )
@ -194,7 +194,7 @@ rust_test(
name = "nested_types_cpp_test",
srcs = ["nested_types_test.rs"],
deps = [
"//src/google/protobuf:unittest_cpp_rust_proto",
"//rust/test:unittest_cpp_rust_proto",
"@crate_index//:googletest",
],
)
@ -203,7 +203,7 @@ rust_test(
name = "nested_types_upb_test",
srcs = ["nested_types_test.rs"],
deps = [
"//src/google/protobuf:unittest_upb_rust_proto",
"//rust/test:unittest_upb_rust_proto",
"@crate_index//:googletest",
],
)
@ -219,7 +219,8 @@ rust_test(
],
deps = [
"//rust:protobuf_cpp_export",
"//src/google/protobuf:unittest_cpp_rust_proto",
"//rust/test:unittest_cpp_rust_proto",
"//rust/test:unittest_import_cpp_rust_proto",
"@crate_index//:googletest",
],
)
@ -235,7 +236,8 @@ rust_test(
],
deps = [
"//rust:protobuf_upb_export",
"//src/google/protobuf:unittest_upb_rust_proto",
"//rust/test:unittest_import_upb_rust_proto",
"//rust/test:unittest_upb_rust_proto",
"@crate_index//:googletest",
],
)
@ -248,8 +250,8 @@ rust_test(
},
deps = [
"//rust:protobuf_cpp_export",
"//src/google/protobuf:unittest_proto3_cpp_rust_proto",
"//src/google/protobuf:unittest_proto3_optional_cpp_rust_proto",
"//rust/test:unittest_proto3_cpp_rust_proto",
"//rust/test:unittest_proto3_optional_cpp_rust_proto",
"@crate_index//:googletest",
],
)
@ -262,8 +264,8 @@ rust_test(
},
deps = [
"//rust:protobuf_upb_export",
"//src/google/protobuf:unittest_proto3_optional_upb_rust_proto",
"//src/google/protobuf:unittest_proto3_upb_rust_proto",
"//rust/test:unittest_proto3_optional_upb_rust_proto",
"//rust/test:unittest_proto3_upb_rust_proto",
"@crate_index//:googletest",
],
)
@ -279,10 +281,9 @@ rust_test(
],
deps = [
"//rust:protobuf_upb_export",
"//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",
"//rust/test:unittest_proto3_optional_upb_rust_proto",
"//rust/test:unittest_proto3_upb_rust_proto",
"//rust/test:unittest_upb_rust_proto",
"@crate_index//:googletest",
],
)
@ -298,10 +299,9 @@ rust_test(
],
deps = [
"//rust:protobuf_cpp_export",
"//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",
"//rust/test:unittest_cpp_rust_proto",
"//rust/test:unittest_proto3_cpp_rust_proto",
"//rust/test:unittest_proto3_optional_cpp_rust_proto",
"@crate_index//:googletest",
],
)
@ -343,7 +343,7 @@ rust_test(
],
deps = [
"//rust:protobuf_cpp_export",
"//src/google/protobuf:unittest_cpp_rust_proto",
"//rust/test:unittest_cpp_rust_proto",
"@crate_index//:googletest",
],
)
@ -359,7 +359,7 @@ rust_test(
],
deps = [
"//rust:protobuf_upb_export",
"//src/google/protobuf:unittest_upb_rust_proto",
"//rust/test:unittest_upb_rust_proto",
"@crate_index//:googletest",
],
)
@ -377,7 +377,7 @@ rust_test(
"//rust:protobuf_cpp_export",
"//rust/test:enums_cpp_rust_proto",
"//rust/test:map_unittest_cpp_rust_proto",
"//src/google/protobuf:unittest_cpp_rust_proto",
"//rust/test:unittest_cpp_rust_proto",
"@crate_index//:googletest",
],
)
@ -395,7 +395,7 @@ rust_test(
"//rust:protobuf_upb_export",
"//rust/test:enums_upb_rust_proto",
"//rust/test:map_unittest_upb_rust_proto",
"//src/google/protobuf:unittest_upb_rust_proto",
"//rust/test:unittest_upb_rust_proto",
"@crate_index//:googletest",
],
)
@ -430,7 +430,7 @@ rust_test(
},
deps = [
"//rust:protobuf_cpp",
"//src/google/protobuf:unittest_cpp_rust_proto",
"//rust/test:unittest_cpp_rust_proto",
"@crate_index//:googletest",
],
)
@ -443,7 +443,7 @@ rust_test(
},
deps = [
"//rust:protobuf_upb",
"//src/google/protobuf:unittest_upb_rust_proto",
"//rust/test:unittest_upb_rust_proto",
"@crate_index//:googletest",
],
)
@ -457,7 +457,7 @@ rust_test(
deps = [
"//rust:protobuf_cpp",
"//rust/test:map_unittest_cpp_rust_proto",
"//src/google/protobuf:unittest_cpp_rust_proto",
"//rust/test:unittest_cpp_rust_proto",
"@crate_index//:googletest",
],
)
@ -473,7 +473,7 @@ rust_test(
"//rust:protobuf_gtest_matchers_upb",
"//rust:protobuf_upb",
"//rust/test:map_unittest_upb_rust_proto",
"//src/google/protobuf:unittest_upb_rust_proto",
"//rust/test:unittest_upb_rust_proto",
"@crate_index//:googletest",
],
)
@ -491,10 +491,9 @@ rust_test(
deps = [
"//rust:protobuf_cpp",
"//rust:protobuf_gtest_matchers_cpp",
"//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",
"//rust/test:unittest_cpp_rust_proto",
"//rust/test:unittest_proto3_cpp_rust_proto",
"//rust/test:unittest_proto3_optional_cpp_rust_proto",
"@crate_index//:googletest",
],
)
@ -512,10 +511,9 @@ rust_test(
deps = [
"//rust:protobuf_gtest_matchers_upb",
"//rust:protobuf_upb",
"//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",
"//rust/test:unittest_proto3_optional_upb_rust_proto",
"//rust/test:unittest_proto3_upb_rust_proto",
"//rust/test:unittest_upb_rust_proto",
"@crate_index//:googletest",
],
)

@ -733,7 +733,7 @@ fn test_default_foreign_enum_accessors() {
#[gtest]
fn test_optional_import_enum_accessors() {
use unittest_rust_proto::ImportEnum;
use unittest_import_rust_proto::ImportEnum;
let mut msg = TestAllTypes::new();
assert_that!(msg.optional_import_enum_opt(), eq(Optional::Unset(ImportEnum::ImportFoo)));
@ -750,7 +750,7 @@ fn test_optional_import_enum_accessors() {
#[gtest]
fn test_default_import_enum_accessors() {
use unittest_rust_proto::ImportEnum;
use unittest_import_rust_proto::ImportEnum;
let mut msg = TestAllTypes::new();
assert_that!(msg.default_import_enum(), eq(ImportEnum::ImportBar));

@ -9,12 +9,11 @@ google3::import! {
"//third_party/protobuf/rust:protobuf_gtest_matchers";
}
use edition_unittest_rust_proto::TestAllTypes as TestAllTypesEditions;
use googletest::prelude::*;
use paste::paste;
use protobuf_gtest_matchers::proto_eq;
use unittest_proto3_rust_proto::TestAllTypes as TestAllTypesProto3;
use unittest_rust_proto::TestAllTypes as TestAllTypesProto2;
use unittest_rust_proto::TestAllTypes;
macro_rules! generate_eq_msgs_tests {
($(($type: ident, $name_ext: ident)),*) => {
@ -50,14 +49,6 @@ macro_rules! generate_not_eq_msgs_tests {
}
}
generate_eq_msgs_tests!(
(TestAllTypesEditions, editions),
(TestAllTypesProto3, proto3),
(TestAllTypesProto2, proto2)
);
generate_eq_msgs_tests!((TestAllTypes, editions), (TestAllTypesProto3, proto3));
generate_not_eq_msgs_tests!(
(TestAllTypesEditions, editions),
(TestAllTypesProto3, proto3),
(TestAllTypesProto2, proto2)
);
generate_not_eq_msgs_tests!((TestAllTypes, editions), (TestAllTypesProto3, proto3));

@ -9,11 +9,10 @@ use googletest::prelude::*;
use protobuf::prelude::*;
use protobuf::View;
use edition_unittest_rust_proto::TestAllTypes as TestAllTypesEditions;
use paste::paste;
use unittest_proto3_optional_rust_proto::TestProto3Optional;
use unittest_proto3_rust_proto::TestAllTypes as TestAllTypesProto3;
use unittest_rust_proto::TestAllTypes as TestAllTypesProto2;
use unittest_rust_proto::TestAllTypes;
macro_rules! generate_parameterized_serialization_test {
($(($type: ident, $name_ext: ident)),*) => {
@ -94,9 +93,8 @@ macro_rules! generate_parameterized_serialization_test {
}
generate_parameterized_serialization_test!(
(TestAllTypesProto2, proto2),
(TestAllTypes, editions),
(TestAllTypesProto3, proto3),
(TestAllTypesEditions, editions),
(TestProto3Optional, proto3_optional)
);
@ -124,10 +122,9 @@ macro_rules! generate_parameterized_int32_byte_size_test {
}
generate_parameterized_int32_byte_size_test!(
(TestAllTypesProto2, proto2),
(TestProto3Optional, proto3_optional), /* Test would fail if we were to use
* TestAllTypesProto3: optional_int32 follows "no
* presence" semantics and setting it to 0 (default
* value) will cause it to not be serialized */
(TestAllTypesEditions, editions)
(TestAllTypes, editions),
(TestProto3Optional, proto3_optional) /* Test would fail if we were to use
* TestAllTypesProto3: optional_int32 follows "no
* presence" semantics and setting it to 0 (default
* value) will cause it to not be serialized */
);

File diff suppressed because it is too large Load Diff

@ -0,0 +1,36 @@
// Protocol Buffers - Google's data interchange format
// Copyright 2008 Google Inc. All rights reserved.
//
// Use of this source code is governed by a BSD-style
// license that can be found in the LICENSE file or at
// https://developers.google.com/open-source/licenses/bsd
// Author: kenton@google.com (Kenton Varda)
// Based on original Protocol Buffers design by
// Sanjay Ghemawat, Jeff Dean, and others.
//
// A proto file which is imported by unittest.proto to test importing.
syntax = "proto2";
package rust_unittest_import;
option optimize_for = SPEED;
option cc_enable_arenas = true;
message ImportMessage {
optional int32 d = 1;
}
enum ImportEnum {
IMPORT_FOO = 7;
IMPORT_BAR = 8;
IMPORT_BAZ = 9;
}
// To use an enum in a map, it must has the first value as 0.
enum ImportEnumForMap {
UNKNOWN = 0;
FOO = 1;
BAR = 2;
}

@ -0,0 +1,268 @@
// Protocol Buffers - Google's data interchange format
// Copyright 2008 Google Inc. All rights reserved.
//
// Use of this source code is governed by a BSD-style
// license that can be found in the LICENSE file or at
// https://developers.google.com/open-source/licenses/bsd
syntax = "proto3";
package rust_proto3_unittest;
import "rust/test/unittest_import.proto";
option optimize_for = SPEED;
// This proto includes every type of field in both singular and repeated
// forms.
message TestAllTypes {
message NestedMessage {
// The field name "b" fails to compile in proto1 because it conflicts with
// a local variable named "b" in one of the generated methods. Doh.
// This file needs to compile in proto1 to test backwards-compatibility.
int32 bb = 1;
}
enum NestedEnum {
ZERO = 0;
FOO = 1;
BAR = 2;
BAZ = 3;
NEG = -1; // Intentionally negative.
}
// Singular
int32 optional_int32 = 1;
int64 optional_int64 = 2;
uint32 optional_uint32 = 3;
uint64 optional_uint64 = 4;
sint32 optional_sint32 = 5;
sint64 optional_sint64 = 6;
fixed32 optional_fixed32 = 7;
fixed64 optional_fixed64 = 8;
sfixed32 optional_sfixed32 = 9;
sfixed64 optional_sfixed64 = 10;
float optional_float = 11;
double optional_double = 12;
bool optional_bool = 13;
string optional_string = 14;
bytes optional_bytes = 15;
optional NestedMessage optional_nested_message = 18;
ForeignMessage optional_foreign_message = 19;
rust_unittest_import.ImportMessage optional_import_message = 20;
NestedEnum optional_nested_enum = 21;
ForeignEnum optional_foreign_enum = 22;
string optional_string_piece = 24 [ctype = STRING_PIECE];
string optional_cord = 25 [ctype = CORD];
NestedMessage optional_lazy_message = 27 [lazy = true];
rust_unittest_import.ImportMessage optional_lazy_import_message = 115
[lazy = true];
// Repeated
repeated int32 repeated_int32 = 31;
repeated int64 repeated_int64 = 32;
repeated uint32 repeated_uint32 = 33;
repeated uint64 repeated_uint64 = 34;
repeated sint32 repeated_sint32 = 35;
repeated sint64 repeated_sint64 = 36;
repeated fixed32 repeated_fixed32 = 37;
repeated fixed64 repeated_fixed64 = 38;
repeated sfixed32 repeated_sfixed32 = 39;
repeated sfixed64 repeated_sfixed64 = 40;
repeated float repeated_float = 41;
repeated double repeated_double = 42;
repeated bool repeated_bool = 43;
repeated string repeated_string = 44;
repeated bytes repeated_bytes = 45;
// Groups are not allowed in proto3.
// repeated group RepeatedGroup = 46 {
// optional int32 a = 47;
// }
repeated NestedMessage repeated_nested_message = 48;
repeated ForeignMessage repeated_foreign_message = 49;
repeated rust_unittest_import.ImportMessage repeated_import_message = 50;
repeated NestedEnum repeated_nested_enum = 51;
repeated ForeignEnum repeated_foreign_enum = 52;
// Omitted (compared to unittest.proto) because proto2 enums are not allowed
// inside proto2 messages.
//
// repeated rust_unittest_import.ImportEnum repeated_import_enum = 53;
repeated string repeated_string_piece = 54 [ctype = STRING_PIECE];
repeated string repeated_cord = 55 [ctype = CORD];
repeated NestedMessage repeated_lazy_message = 57;
oneof oneof_field {
uint32 oneof_uint32 = 111;
NestedMessage oneof_nested_message = 112;
string oneof_string = 113;
bytes oneof_bytes = 114;
}
}
// Test messages for packed fields
message TestPackedTypes {
repeated int32 packed_int32 = 90 [packed = true];
repeated int64 packed_int64 = 91 [packed = true];
repeated uint32 packed_uint32 = 92 [packed = true];
repeated uint64 packed_uint64 = 93 [packed = true];
repeated sint32 packed_sint32 = 94 [packed = true];
repeated sint64 packed_sint64 = 95 [packed = true];
repeated fixed32 packed_fixed32 = 96 [packed = true];
repeated fixed64 packed_fixed64 = 97 [packed = true];
repeated sfixed32 packed_sfixed32 = 98 [packed = true];
repeated sfixed64 packed_sfixed64 = 99 [packed = true];
repeated float packed_float = 100 [packed = true];
repeated double packed_double = 101 [packed = true];
repeated bool packed_bool = 102 [packed = true];
repeated ForeignEnum packed_enum = 103 [packed = true];
}
// Explicitly set packed to false
message TestUnpackedTypes {
repeated int32 repeated_int32 = 1 [packed = false];
repeated int64 repeated_int64 = 2 [packed = false];
repeated uint32 repeated_uint32 = 3 [packed = false];
repeated uint64 repeated_uint64 = 4 [packed = false];
repeated sint32 repeated_sint32 = 5 [packed = false];
repeated sint64 repeated_sint64 = 6 [packed = false];
repeated fixed32 repeated_fixed32 = 7 [packed = false];
repeated fixed64 repeated_fixed64 = 8 [packed = false];
repeated sfixed32 repeated_sfixed32 = 9 [packed = false];
repeated sfixed64 repeated_sfixed64 = 10 [packed = false];
repeated float repeated_float = 11 [packed = false];
repeated double repeated_double = 12 [packed = false];
repeated bool repeated_bool = 13 [packed = false];
repeated TestAllTypes.NestedEnum repeated_nested_enum = 14 [packed = false];
}
// This proto includes a recursively nested message.
message NestedTestAllTypes {
NestedTestAllTypes child = 1;
TestAllTypes payload = 2;
}
// Define these after TestAllTypes to make sure the compiler can handle
// that.
message ForeignMessage {
int32 c = 1;
}
enum ForeignEnum {
FOREIGN_ZERO = 0;
FOREIGN_FOO = 4;
FOREIGN_BAR = 5;
FOREIGN_BAZ = 6;
FOREIGN_LARGE = 123456; // Large enough to escape the Boxed Integer cache.
}
// TestEmptyMessage is used to test behavior of unknown fields.
message TestEmptyMessage {}
// TestMessageWithDummy is also used to test behavior of unknown fields.
message TestMessageWithDummy {
// This field is only here for triggering copy-on-write; it's not intended to
// be serialized.
bool dummy = 536870911;
}
// Same layout as TestOneof2 in unittest.proto to test unknown enum value
// parsing behavior in oneof.
message TestOneof2 {
oneof foo {
NestedEnum foo_enum = 6;
}
enum NestedEnum {
UNKNOWN = 0;
FOO = 1;
BAR = 2;
BAZ = 3;
}
}
// If bool fields are incorrectly assumed to have hasbits, InternalSwap would
// result in swapping N more 32bit hasbits incorrectly. Considering padding, we
// need many bool fields to stress this.
message TestHasbits {
bool b1 = 1;
bool b2 = 2;
bool b3 = 3;
bool b4 = 4;
bool b5 = 5;
bool b6 = 6;
bool b7 = 7;
bool b8 = 8;
bool b9 = 9;
bool b10 = 10;
bool b11 = 11;
bool b12 = 12;
bool b13 = 13;
bool b14 = 14;
bool b15 = 15;
bool b16 = 16;
bool b17 = 17;
bool b18 = 18;
bool b19 = 19;
bool b20 = 20;
bool b21 = 21;
bool b22 = 22;
bool b23 = 23;
bool b24 = 24;
bool b25 = 25;
bool b26 = 26;
bool b27 = 27;
bool b28 = 28;
bool b29 = 29;
bool b30 = 30;
bool b31 = 31;
bool b32 = 32;
bool b33 = 33;
bool b34 = 34;
bool b35 = 35;
bool b36 = 36;
bool b37 = 37;
bool b38 = 38;
bool b39 = 39;
bool b40 = 40;
bool b41 = 41;
bool b42 = 42;
bool b43 = 43;
bool b44 = 44;
bool b45 = 45;
bool b46 = 46;
bool b47 = 47;
bool b48 = 48;
bool b49 = 49;
bool b50 = 50;
bool b51 = 51;
bool b52 = 52;
bool b53 = 53;
bool b54 = 54;
bool b55 = 55;
bool b56 = 56;
bool b57 = 57;
bool b58 = 58;
bool b59 = 59;
bool b60 = 60;
bool b61 = 61;
bool b62 = 62;
bool b63 = 63;
bool b64 = 64;
bool b65 = 65;
bool b66 = 66;
bool b67 = 67;
bool b68 = 68;
bool b69 = 69;
TestAllTypes child = 100;
}

@ -0,0 +1,90 @@
// Protocol Buffers - Google's data interchange format
// Copyright 2008 Google Inc. All rights reserved.
// https://developers.google.com/protocol-buffers/
//
// Redistribution and use in source and binary forms, with or without
// modification, are permitted provided that the following conditions are
// met:
//
// * Redistributions of source code must retain the above copyright
// notice, this list of conditions and the following disclaimer.
// * Redistributions in binary form must reproduce the above
// copyright notice, this list of conditions and the following disclaimer
// in the documentation and/or other materials provided with the
// distribution.
// * Neither the name of Google Inc. nor the names of its
// contributors may be used to endorse or promote products derived from
// this software without specific prior written permission.
//
// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
edition = "2023";
package rust_unittest_proto3_optional;
option java_multiple_files = true;
option java_package = "com.google.protobuf.testing.proto";
message TestProto3Optional {
message NestedMessage {
// The field name "b" fails to compile in proto1 because it conflicts with
// a local variable named "b" in one of the generated methods. Doh.
// This file needs to compile in proto1 to test backwards-compatibility.
int32 bb = 1;
}
enum NestedEnum {
UNSPECIFIED = 0;
FOO = 1;
BAR = 2;
BAZ = 3;
NEG = -1; // Intentionally negative.
}
// Singular
int32 optional_int32 = 1;
int64 optional_int64 = 2;
uint32 optional_uint32 = 3;
uint64 optional_uint64 = 4;
sint32 optional_sint32 = 5;
sint64 optional_sint64 = 6;
fixed32 optional_fixed32 = 7;
fixed64 optional_fixed64 = 8;
sfixed32 optional_sfixed32 = 9;
sfixed64 optional_sfixed64 = 10;
float optional_float = 11;
double optional_double = 12;
bool optional_bool = 13;
string optional_string = 14;
bytes optional_bytes = 15;
string optional_cord = 16 [ctype = CORD];
NestedMessage optional_nested_message = 18;
NestedMessage lazy_nested_message = 19 [lazy = true];
NestedEnum optional_nested_enum = 21;
// Add some non-optional fields to verify we can mix them.
int32 singular_int32 = 22 [features.field_presence = IMPLICIT];
int64 singular_int64 = 23 [features.field_presence = IMPLICIT];
}
message TestProto3OptionalMessage {
message NestedMessage {
string s = 1 [features.field_presence = IMPLICIT];
}
NestedMessage nested_message = 1;
NestedMessage optional_nested_message = 2;
}

@ -32,7 +32,7 @@ rust_test(
},
deps = [
"//rust:protobuf_upb_export",
"//src/google/protobuf:unittest_proto3_upb_rust_proto",
"//rust/test:unittest_proto3_upb_rust_proto",
"@crate_index//:googletest",
],
)
@ -45,8 +45,7 @@ rust_test(
deps = [
"//rust:protobuf_upb",
"//rust/test:map_unittest_upb_rust_proto",
"//src/google/protobuf:edition_unittest_upb_rust_proto",
"//src/google/protobuf:unittest_upb_rust_proto",
"//rust/test:unittest_upb_rust_proto",
"@crate_index//:googletest",
],
)

Loading…
Cancel
Save