Internal change

PiperOrigin-RevId: 693891307
pull/19163/head
Protobuf Team Bot 3 weeks ago committed by Copybara-Service
parent 074e475472
commit 064b50e8e9
  1. 5
      src/google/protobuf/compiler/cpp/test_bad_identifiers.proto
  2. 2
      src/google/protobuf/compiler/cpp/unittest.cc

@ -170,8 +170,9 @@ message TestConflictingSymbolNames {
// For clashing local variables in Serialize and ByteSize calculation. // For clashing local variables in Serialize and ByteSize calculation.
optional string target = 38; optional string target = 38;
extensions 1000 to max // clang-format off
[verification = UNVERIFIED]; // NO_PROTO3 extensions 1000 to max [verification = UNVERIFIED]; // NO_PROTO3
// clang-format on
} }
// Special names as above, but at file scope. // Special names as above, but at file scope.

@ -28,6 +28,7 @@
#include "google/protobuf/unittest_embed_optimize_for.pb.h" #include "google/protobuf/unittest_embed_optimize_for.pb.h"
#include "google/protobuf/unittest_optimize_for.pb.h" #include "google/protobuf/unittest_optimize_for.pb.h"
#define MESSAGE_TEST_NAME MessageTest #define MESSAGE_TEST_NAME MessageTest
#define GENERATED_DESCRIPTOR_TEST_NAME GeneratedDescriptorTest #define GENERATED_DESCRIPTOR_TEST_NAME GeneratedDescriptorTest
#define GENERATED_MESSAGE_TEST_NAME GeneratedMessageTest #define GENERATED_MESSAGE_TEST_NAME GeneratedMessageTest
@ -75,6 +76,7 @@ TEST(GENERATED_MESSAGE_TEST_NAME, TestConflictingSymbolNames) {
EXPECT_EQ(123, message.GetExtension(ExtensionMessage::repeated_int32_ext, 0)); EXPECT_EQ(123, message.GetExtension(ExtensionMessage::repeated_int32_ext, 0));
} }
TEST(GENERATED_MESSAGE_TEST_NAME, TestSwapNameIsNotMangledForFields) { TEST(GENERATED_MESSAGE_TEST_NAME, TestSwapNameIsNotMangledForFields) {
// For backwards compatibility we do not mangle `swap`. It works thanks to // For backwards compatibility we do not mangle `swap`. It works thanks to
// overload resolution. // overload resolution.

Loading…
Cancel
Save