From 092a14fbe72e35562c6ef941a4cb3ec02653cb9b Mon Sep 17 00:00:00 2001
From: Deanna Garcia <deannagarcia@google.com>
Date: Thu, 20 May 2021 21:32:01 +0000
Subject: [PATCH] Experimenting to get tests to pass.

---
 .../generated_message_reflection_unittest.cc  | 40 -------------------
 1 file changed, 40 deletions(-)

diff --git a/src/google/protobuf/generated_message_reflection_unittest.cc b/src/google/protobuf/generated_message_reflection_unittest.cc
index d5c68db61..8ceb913a4 100644
--- a/src/google/protobuf/generated_message_reflection_unittest.cc
+++ b/src/google/protobuf/generated_message_reflection_unittest.cc
@@ -483,46 +483,6 @@ TEST(GeneratedMessageReflectionTest, SwapFieldsOneof) {
   TestUtil::ExpectOneofSet1(message2);
 }
 
-TEST(GeneratedMessageReflectionTest, UnsafeShallowSwapFieldsOneof) {
-  Arena arena;
-  auto* message1 = Arena::CreateMessage<unittest::TestOneof2>(&arena);
-  auto* message2 = Arena::CreateMessage<unittest::TestOneof2>(&arena);
-  TestUtil::SetOneof1(message1);
-
-  std::vector<const FieldDescriptor*> fields;
-  const Descriptor* descriptor = message1->GetDescriptor();
-  for (int i = 0; i < descriptor->field_count(); i++) {
-    fields.push_back(descriptor->field(i));
-  }
-  GeneratedMessageReflectionTestHelper::UnsafeShallowSwapFields(
-      message1, message2, fields);
-
-  TestUtil::ExpectOneofClear(*message1);
-  TestUtil::ExpectOneofSet1(*message2);
-}
-
-TEST(GeneratedMessageReflectionTest,
-     UnsafeShallowSwapFieldsOneofExpectShallow) {
-  Arena arena;
-  auto* message1 = Arena::CreateMessage<unittest::TestOneof2>(&arena);
-  auto* message2 = Arena::CreateMessage<unittest::TestOneof2>(&arena);
-  TestUtil::SetOneof1(message1);
-  message1->mutable_foo_message()->set_qux_int(1000);
-  auto* kept_foo_ptr = message1->mutable_foo_message();
-
-  std::vector<const FieldDescriptor*> fields;
-  const Descriptor* descriptor = message1->GetDescriptor();
-  for (int i = 0; i < descriptor->field_count(); i++) {
-    fields.push_back(descriptor->field(i));
-  }
-  GeneratedMessageReflectionTestHelper::UnsafeShallowSwapFields(
-      message1, message2, fields);
-
-  EXPECT_TRUE(message2->has_foo_message());
-  EXPECT_EQ(message2->foo_message().qux_int(), 1000);
-  EXPECT_EQ(kept_foo_ptr, message2->mutable_foo_message());
-}
-
 TEST(GeneratedMessageReflectionTest, RemoveLast) {
   unittest::TestAllTypes message;
   TestUtil::ReflectionTester reflection_tester(