Internal change PiperOrigin-RevId: 567664389
diff --git a/rust/upb_kernel/BUILD b/rust/upb_kernel/BUILD index 653063c..dc65231 100644 --- a/rust/upb_kernel/BUILD +++ b/rust/upb_kernel/BUILD
@@ -8,6 +8,6 @@ "//rust:__subpackages__", ], deps = [ - "//upb", + "//upb:mem", ], )
diff --git a/upb/protos/protos_extension_lock_test.cc b/upb/protos/protos_extension_lock_test.cc index bdc76cc..0d591b7 100644 --- a/upb/protos/protos_extension_lock_test.cc +++ b/upb/protos/protos_extension_lock_test.cc
@@ -35,8 +35,8 @@ #include <string> #include <thread> -#include "gmock/gmock.h" -#include "gtest/gtest.h" +#include <gmock/gmock.h> +#include <gtest/gtest.h> #include "absl/hash/hash.h" #include "absl/log/absl_check.h" #include "upb/protos/protos.h"
diff --git a/upb/protos/protos_internal_test.cc b/upb/protos/protos_internal_test.cc index a2f426b..ac65963 100644 --- a/upb/protos/protos_internal_test.cc +++ b/upb/protos/protos_internal_test.cc
@@ -30,8 +30,8 @@ #include "upb/protos/protos_internal.h" -#include "gmock/gmock.h" -#include "gtest/gtest.h" +#include <gmock/gmock.h> +#include <gtest/gtest.h> #include "upb/protos_generator/tests/test_model.upb.h" #include "upb/protos_generator/tests/test_model.upb.proto.h" #include "upb/upb/mem/arena.h"
diff --git a/upb/protos/repeated_field_iterator_test.cc b/upb/protos/repeated_field_iterator_test.cc index 645efea..a8db041 100644 --- a/upb/protos/repeated_field_iterator_test.cc +++ b/upb/protos/repeated_field_iterator_test.cc
@@ -38,8 +38,8 @@ #include <utility> #include <vector> -#include "gmock/gmock.h" -#include "gtest/gtest.h" +#include <gmock/gmock.h> +#include <gtest/gtest.h> using ::testing::ElementsAre;
diff --git a/upb/protos_generator/tests/test_generated.cc b/upb/protos_generator/tests/test_generated.cc index dabf45c..4d0cf80 100644 --- a/upb/protos_generator/tests/test_generated.cc +++ b/upb/protos_generator/tests/test_generated.cc
@@ -34,8 +34,8 @@ #include <utility> #include <vector> -#include "gmock/gmock.h" -#include "gtest/gtest.h" +#include <gmock/gmock.h> +#include <gtest/gtest.h> #include "absl/status/statusor.h" #include "absl/strings/string_view.h" #include "upb/protos/protos.h"
diff --git a/upb/upb/collections/array_test.cc b/upb/upb/collections/array_test.cc index 87090b4..08fcfe7 100644 --- a/upb/upb/collections/array_test.cc +++ b/upb/upb/collections/array_test.cc
@@ -30,7 +30,7 @@ #include "upb/upb/collections/array.h" -#include "gtest/gtest.h" +#include <gtest/gtest.h> #include "upb/upb/base/status.hpp" #include "upb/upb/mem/arena.hpp"
diff --git a/upb/upb/collections/map_test.cc b/upb/upb/collections/map_test.cc index 440d89c..1a30456 100644 --- a/upb/upb/collections/map_test.cc +++ b/upb/upb/collections/map_test.cc
@@ -30,7 +30,7 @@ #include "upb/upb/collections/map.h" -#include "gtest/gtest.h" +#include <gtest/gtest.h> #include "upb/upb/base/string_view.h" #include "upb/upb/mem/arena.hpp"
diff --git a/upb/upb/hash/test.cc b/upb/upb/hash/test.cc index a079e67..f0dcbee 100644 --- a/upb/upb/hash/test.cc +++ b/upb/upb/hash/test.cc
@@ -16,7 +16,7 @@ #include <string> #include <vector> -#include "gtest/gtest.h" +#include <gtest/gtest.h> #include "absl/container/flat_hash_map.h" #include "upb/upb/hash/int_table.h" #include "upb/upb/hash/str_table.h"
diff --git a/upb/upb/io/string_test.cc b/upb/upb/io/string_test.cc index 70d0af6..36f48c6 100644 --- a/upb/upb/io/string_test.cc +++ b/upb/upb/io/string_test.cc
@@ -9,7 +9,7 @@ #include <string.h> -#include "gtest/gtest.h" +#include <gtest/gtest.h> #include "upb/upb/mem/arena.hpp" TEST(StringTest, Append) {
diff --git a/upb/upb/io/tokenizer_test.cc b/upb/upb/io/tokenizer_test.cc index c486700..e7c24f7 100644 --- a/upb/upb/io/tokenizer_test.cc +++ b/upb/upb/io/tokenizer_test.cc
@@ -7,7 +7,7 @@ #include "upb/upb/io/tokenizer.h" -#include "gtest/gtest.h" +#include <gtest/gtest.h> #include "absl/strings/escaping.h" #include "absl/strings/str_format.h" #include "upb/upb/io/chunked_input_stream.h" @@ -18,7 +18,8 @@ // Must be last. #include "upb/upb/port/def.inc" -namespace proto2 { +namespace google { +namespace protobuf { namespace io { namespace { @@ -34,10 +35,10 @@ // Data-Driven Test Infrastructure // TODO: This is copied from coded_stream_unittest. This is -// temporary until these features are integrated into gUnit itself. +// temporary until these features are integrated into gTest itself. // TEST_1D and TEST_2D are macros I'd eventually like to see added to -// gUnit. These macros can be used to declare tests which should be +// gTest. These macros can be used to declare tests which should be // run multiple times, once for each item in some input array. TEST_1D // tests all cases in a single input array. TEST_2D tests all // combinations of cases from two arrays. The arrays must be statically @@ -1230,4 +1231,5 @@ } // namespace } // namespace io -} // namespace proto2 +} // namespace protobuf +} // namespace google
diff --git a/upb/upb/io/zero_copy_stream_test.cc b/upb/upb/io/zero_copy_stream_test.cc index df005f7..991e7dd 100644 --- a/upb/upb/io/zero_copy_stream_test.cc +++ b/upb/upb/io/zero_copy_stream_test.cc
@@ -14,7 +14,7 @@ // process is run with a variety of block sizes for both the input and // the output. -#include "gtest/gtest.h" +#include <gtest/gtest.h> #include "upb/upb/base/status.hpp" #include "upb/upb/io/chunked_input_stream.h" #include "upb/upb/io/chunked_output_stream.h"
diff --git a/upb/upb/json/decode_test.cc b/upb/upb/json/decode_test.cc index 481fed2..1f4df2d 100644 --- a/upb/upb/json/decode_test.cc +++ b/upb/upb/json/decode_test.cc
@@ -31,7 +31,7 @@ #include "upb/upb/json/decode.h" #include "google/protobuf/struct.upb.h" -#include "gtest/gtest.h" +#include <gtest/gtest.h> #include "upb/upb/json/test.upb.h" #include "upb/upb/json/test.upbdefs.h" #include "upb/upb/mem/arena.hpp"
diff --git a/upb/upb/json/encode_test.cc b/upb/upb/json/encode_test.cc index 7445560..c7c48b2 100644 --- a/upb/upb/json/encode_test.cc +++ b/upb/upb/json/encode_test.cc
@@ -31,7 +31,7 @@ #include "upb/upb/json/encode.h" #include "google/protobuf/struct.upb.h" -#include "gtest/gtest.h" +#include <gtest/gtest.h> #include "upb/upb/base/status.hpp" #include "upb/upb/json/test.upb.h" #include "upb/upb/json/test.upbdefs.h"
diff --git a/upb/upb/lex/atoi_test.cc b/upb/upb/lex/atoi_test.cc index 2e91f2c..c0608d8 100644 --- a/upb/upb/lex/atoi_test.cc +++ b/upb/upb/lex/atoi_test.cc
@@ -7,7 +7,7 @@ #include "upb/upb/lex/atoi.h" -#include "gtest/gtest.h" +#include <gtest/gtest.h> #include "absl/strings/str_cat.h" TEST(AtoiTest, Uint64) {
diff --git a/upb/upb/mem/arena_test.cc b/upb/upb/mem/arena_test.cc index e9f743c..392c7be 100644 --- a/upb/upb/mem/arena_test.cc +++ b/upb/upb/mem/arena_test.cc
@@ -12,8 +12,8 @@ #include <thread> #include <vector> -#include "gmock/gmock.h" -#include "gtest/gtest.h" +#include <gmock/gmock.h> +#include <gtest/gtest.h> #include "absl/random/distributions.h" #include "absl/random/random.h" #include "absl/synchronization/notification.h"
diff --git a/upb/upb/message/accessors_test.cc b/upb/upb/message/accessors_test.cc index 4d54ca9..a25df5f 100644 --- a/upb/upb/message/accessors_test.cc +++ b/upb/upb/message/accessors_test.cc
@@ -15,7 +15,7 @@ #include <string> -#include "gtest/gtest.h" +#include <gtest/gtest.h> #include "google/protobuf/test_messages_proto2.upb.h" #include "google/protobuf/test_messages_proto3.upb.h" #include "upb/upb/base/string_view.h"
diff --git a/upb/upb/message/copy_test.cc b/upb/upb/message/copy_test.cc index 85609d0..1d17c86 100644 --- a/upb/upb/message/copy_test.cc +++ b/upb/upb/message/copy_test.cc
@@ -19,7 +19,7 @@ #include <string> #include <vector> -#include "gtest/gtest.h" +#include <gtest/gtest.h> #include "google/protobuf/test_messages_proto2.upb.h" #include "upb/upb/base/string_view.h" #include "upb/upb/collections/map.h"
diff --git a/upb/upb/message/promote_test.cc b/upb/upb/message/promote_test.cc index 3101e21..3887ef3 100644 --- a/upb/upb/message/promote_test.cc +++ b/upb/upb/message/promote_test.cc
@@ -15,7 +15,7 @@ #include <string> -#include "gtest/gtest.h" +#include <gtest/gtest.h> #include "google/protobuf/test_messages_proto2.upb.h" #include "google/protobuf/test_messages_proto3.upb.h" #include "upb/upb/base/string_view.h"
diff --git a/upb/upb/message/test.cc b/upb/upb/message/test.cc index e23fd93..3ab560f 100644 --- a/upb/upb/message/test.cc +++ b/upb/upb/message/test.cc
@@ -8,8 +8,8 @@ #include <string> #include <string_view> -#include "gmock/gmock.h" -#include "gtest/gtest.h" +#include <gmock/gmock.h> +#include <gtest/gtest.h> #include "google/protobuf/test_messages_proto3.upb.h" #include "upb/upb/base/status.hpp" #include "upb/upb/json/decode.h"
diff --git a/upb/upb/message/utf8_test.cc b/upb/upb/message/utf8_test.cc index 8146922..a6e3109 100644 --- a/upb/upb/message/utf8_test.cc +++ b/upb/upb/message/utf8_test.cc
@@ -30,7 +30,7 @@ #include <stdlib.h> -#include "gtest/gtest.h" +#include <gtest/gtest.h> #include "upb/upb/base/string_view.h" #include "upb/upb/mem/arena.h" #include "upb/upb/mem/arena.hpp"
diff --git a/upb/upb/mini_descriptor/internal/encode_test.cc b/upb/upb/mini_descriptor/internal/encode_test.cc index 42a6f72..13a9e16 100644 --- a/upb/upb/mini_descriptor/internal/encode_test.cc +++ b/upb/upb/mini_descriptor/internal/encode_test.cc
@@ -10,8 +10,8 @@ #include <string_view> #include <vector> -#include "gmock/gmock.h" -#include "gtest/gtest.h" +#include <gmock/gmock.h> +#include <gtest/gtest.h> #include "absl/container/flat_hash_set.h" #include "google/protobuf/descriptor.h" #include "upb/upb/base/status.hpp"
diff --git a/upb/upb/reflection/internal/def_builder_test.cc b/upb/upb/reflection/internal/def_builder_test.cc index e208762..cd955b7 100644 --- a/upb/upb/reflection/internal/def_builder_test.cc +++ b/upb/upb/reflection/internal/def_builder_test.cc
@@ -7,7 +7,7 @@ #include "upb/upb/reflection/internal/def_builder.h" -#include "gtest/gtest.h" +#include <gtest/gtest.h> #include "absl/strings/string_view.h" #include "upb/upb/mem/arena.hpp"
diff --git a/upb/upb/test/parse_text_proto.h b/upb/upb/test/parse_text_proto.h index 96e7396..e8b3fcb 100644 --- a/upb/upb/test/parse_text_proto.h +++ b/upb/upb/test/parse_text_proto.h
@@ -10,7 +10,7 @@ #include <string> -#include "gtest/gtest.h" +#include <gtest/gtest.h> #include "google/protobuf/message.h" #include "google/protobuf/text_format.h"
diff --git a/upb/upb/test/proto3_test.cc b/upb/upb/test/proto3_test.cc index b22160d..c76864e 100644 --- a/upb/upb/test/proto3_test.cc +++ b/upb/upb/test/proto3_test.cc
@@ -5,7 +5,7 @@ // license that can be found in the LICENSE file or at // https://developers.google.com/open-source/licenses/bsd -#include "gtest/gtest.h" +#include <gtest/gtest.h> #include "upb/upb/reflection/def.hpp" #include "upb/upb/test/proto3_test.upb.h" #include "upb/upb/test/proto3_test.upbdefs.h"
diff --git a/upb/upb/test/test_cpp.cc b/upb/upb/test/test_cpp.cc index db9f195..bfb436a 100644 --- a/upb/upb/test/test_cpp.cc +++ b/upb/upb/test/test_cpp.cc
@@ -16,7 +16,7 @@ #include "google/protobuf/timestamp.upb.h" #include "google/protobuf/timestamp.upbdefs.h" -#include "gtest/gtest.h" +#include <gtest/gtest.h> #include "upb/upb/json/decode.h" #include "upb/upb/json/encode.h" #include "upb/upb/reflection/def.h"
diff --git a/upb/upb/test/test_generated_code.cc b/upb/upb/test/test_generated_code.cc index 66247aa..b5bee71 100644 --- a/upb/upb/test/test_generated_code.cc +++ b/upb/upb/test/test_generated_code.cc
@@ -13,7 +13,7 @@ #include <cstddef> #include <cstdint> -#include "gtest/gtest.h" +#include <gtest/gtest.h> #include "google/protobuf/test_messages_proto2.upb.h" #include "google/protobuf/test_messages_proto3.upb.h" #include "upb/upb/base/status.h"
diff --git a/upb/upb/test/test_import_empty_srcs.cc b/upb/upb/test/test_import_empty_srcs.cc index c0a65cf..1624bcd 100644 --- a/upb/upb/test/test_import_empty_srcs.cc +++ b/upb/upb/test/test_import_empty_srcs.cc
@@ -5,7 +5,7 @@ // license that can be found in the LICENSE file or at // https://developers.google.com/open-source/licenses/bsd -#include "gtest/gtest.h" +#include <gtest/gtest.h> #include "upb/upb/test/test_import_empty_srcs.upb.h" TEST(Test, Reexport) {
diff --git a/upb/upb/test/test_mini_table_oneof.cc b/upb/upb/test/test_mini_table_oneof.cc index 91551f5..88eec15 100644 --- a/upb/upb/test/test_mini_table_oneof.cc +++ b/upb/upb/test/test_mini_table_oneof.cc
@@ -5,7 +5,7 @@ // license that can be found in the LICENSE file or at // https://developers.google.com/open-source/licenses/bsd -#include "gtest/gtest.h" +#include <gtest/gtest.h> #include "google/protobuf/test_messages_proto2.upb.h" #include "google/protobuf/test_messages_proto3.upb.h" #include "upb/upb/mini_table/field.h"
diff --git a/upb/upb/util/compare_test.cc b/upb/upb/util/compare_test.cc index 57ed02c..75e59c0 100644 --- a/upb/upb/util/compare_test.cc +++ b/upb/upb/util/compare_test.cc
@@ -37,7 +37,7 @@ #include <variant> #include <vector> -#include "gtest/gtest.h" +#include <gtest/gtest.h> #include "upb/upb/wire/internal/swap.h" #include "upb/upb/wire/types.h"
diff --git a/upb/upb/util/def_to_proto_fuzz_test.cc b/upb/upb/util/def_to_proto_fuzz_test.cc index 0c5c9ed..6ac731d 100644 --- a/upb/upb/util/def_to_proto_fuzz_test.cc +++ b/upb/upb/util/def_to_proto_fuzz_test.cc
@@ -30,8 +30,8 @@ #include <string> -#include "google/protobuf/descriptor.proto.h" -#include "gtest/gtest.h" +#include "google/protobuf/descriptor.pb.h" +#include <gtest/gtest.h> #include "testing/fuzzing/fuzztest.h" #include "upb/upb/util/def_to_proto_test.h"
diff --git a/upb/upb/util/def_to_proto_test.cc b/upb/upb/util/def_to_proto_test.cc index ee2df3a..035c868 100644 --- a/upb/upb/util/def_to_proto_test.cc +++ b/upb/upb/util/def_to_proto_test.cc
@@ -35,8 +35,8 @@ #include "google/protobuf/descriptor.pb.h" #include "google/protobuf/descriptor.upbdefs.h" -#include "gmock/gmock.h" -#include "gtest/gtest.h" +#include <gmock/gmock.h> +#include <gtest/gtest.h> #include "google/protobuf/dynamic_message.h" #include "google/protobuf/util/message_differencer.h" #include "upb/upb/mem/arena.hpp"
diff --git a/upb/upb/util/def_to_proto_test.h b/upb/upb/util/def_to_proto_test.h index f1f90e8..7965198 100644 --- a/upb/upb/util/def_to_proto_test.h +++ b/upb/upb/util/def_to_proto_test.h
@@ -35,8 +35,8 @@ #include "google/protobuf/descriptor.pb.h" #include "google/protobuf/descriptor.upb.h" -#include "gmock/gmock.h" -#include "gtest/gtest.h" +#include <gmock/gmock.h> +#include <gtest/gtest.h> #include "google/protobuf/descriptor.h" #include "google/protobuf/dynamic_message.h" #include "google/protobuf/util/field_comparator.h"
diff --git a/upb/upb/util/required_fields_test.cc b/upb/upb/util/required_fields_test.cc index 39555bd..fdacf77 100644 --- a/upb/upb/util/required_fields_test.cc +++ b/upb/upb/util/required_fields_test.cc
@@ -32,8 +32,8 @@ #include <stdlib.h> -#include "gmock/gmock.h" -#include "gtest/gtest.h" +#include <gmock/gmock.h> +#include <gtest/gtest.h> #include "absl/strings/string_view.h" #include "upb/upb/base/status.hpp" #include "upb/upb/json/decode.h"
diff --git a/upb/upb/wire/eps_copy_input_stream_test.cc b/upb/upb/wire/eps_copy_input_stream_test.cc index 9ca757c..7807b59 100644 --- a/upb/upb/wire/eps_copy_input_stream_test.cc +++ b/upb/upb/wire/eps_copy_input_stream_test.cc
@@ -34,7 +34,7 @@ #include <string> -#include "gtest/gtest.h" +#include <gtest/gtest.h> #include "upb/upb/mem/arena.hpp" // begin:google_only // #include "testing/fuzzing/fuzztest.h"