Internal changes

PiperOrigin-RevId: 487447243

java/core/src/test/proto/com/google/protobuf/multiple_files_test.proto

@@ -38,8 +38,8 @@ syntax = "proto2";
 // See:  http://go/proto2-generic-services-default
 package protobuf_unittest;
 
-import "google/protobuf/unittest.proto";
 import "google/protobuf/descriptor.proto";
+import "google/protobuf/unittest.proto";
 
 option java_generic_services = true;  // auto-added
 option java_multiple_files = true;
@@ -49,7 +49,9 @@ message MessageWithNoOuter {
   message NestedMessage {
     optional int32 i = 1;
   }
-  enum NestedEnum { BAZ = 3; }
+  enum NestedEnum {
+    BAZ = 3;
+  }
   optional NestedMessage nested = 1;
   repeated TestAllTypes foreign = 2;
   optional NestedEnum nested_enum = 3;

python/google/protobuf/internal/descriptor_database_test.py

@@ -35,12 +35,12 @@ __author__ = 'matthewtoia@google.com (Matt Toia)'
 import unittest
 import warnings
 
-from google.protobuf import unittest_pb2
 from google.protobuf import descriptor_pb2
 from google.protobuf.internal import factory_test2_pb2
 from google.protobuf.internal import no_package_pb2
 from google.protobuf.internal import testing_refleaks
 from google.protobuf import descriptor_database
+from google.protobuf import unittest_pb2
 
 
 @testing_refleaks.TestCase
@@ -119,9 +119,9 @@ class DescriptorDatabaseTest(unittest.TestCase):
       self.assertIs(w[0].category, RuntimeWarning)
       self.assertIn('Conflict register for file "other_file2": ',
                     str(w[0].message))
-      self.assertIn('already defined in file '
+      self.assertIn(
-                    '"google/protobuf/unittest.proto"',
+          'already defined in file '
-                    str(w[0].message))
+          '"google/protobuf/unittest.proto"', str(w[0].message))
 
 if __name__ == '__main__':
   unittest.main()

python/google/protobuf/internal/descriptor_pool_test.py

@@ -36,9 +36,6 @@ import copy
 import unittest
 import warnings
 
-from google.protobuf import unittest_import_pb2
-from google.protobuf import unittest_import_public_pb2
-from google.protobuf import unittest_pb2
 from google.protobuf import descriptor_pb2
 from google.protobuf.internal import api_implementation
 from google.protobuf.internal import descriptor_pool_test1_pb2
@@ -54,6 +51,9 @@ from google.protobuf import descriptor_database
 from google.protobuf import descriptor_pool
 from google.protobuf import message_factory
 from google.protobuf import symbol_database
+from google.protobuf import unittest_import_pb2
+from google.protobuf import unittest_import_public_pb2
+from google.protobuf import unittest_pb2
 
 
 warnings.simplefilter('error', DeprecationWarning)

python/google/protobuf/internal/descriptor_test.py

@@ -35,8 +35,6 @@ __author__ = 'robinson@google.com (Will Robinson)'
 import unittest
 import warnings
 
-from google.protobuf import unittest_import_pb2
-from google.protobuf import unittest_pb2
 from google.protobuf import descriptor_pb2
 from google.protobuf.internal import api_implementation
 from google.protobuf.internal import test_util
@@ -45,6 +43,8 @@ from google.protobuf import descriptor_pool
 from google.protobuf import symbol_database
 from google.protobuf import text_format
 from google.protobuf import unittest_custom_options_pb2
+from google.protobuf import unittest_import_pb2
+from google.protobuf import unittest_pb2
 
 
 TEST_EMPTY_MESSAGE_DESCRIPTOR_ASCII = """

python/google/protobuf/internal/field_mask_test.py

@@ -33,11 +33,11 @@
 import unittest
 
 from google.protobuf import field_mask_pb2
-from google.protobuf import unittest_pb2
 from google.protobuf.internal import field_mask
 from google.protobuf.internal import test_util
 from google.protobuf import descriptor
 from google.protobuf import map_unittest_pb2
+from google.protobuf import unittest_pb2
 
 
 class FieldMaskTest(unittest.TestCase):

python/google/protobuf/internal/generator_test.py

@@ -42,13 +42,13 @@ __author__ = 'robinson@google.com (Will Robinson)'
 import unittest
 
 from google.protobuf.internal import test_bad_identifiers_pb2
+from google.protobuf import service
+from google.protobuf import symbol_database
 from google.protobuf import unittest_import_pb2
 from google.protobuf import unittest_import_public_pb2
 from google.protobuf import unittest_mset_pb2
 from google.protobuf import unittest_mset_wire_format_pb2
 from google.protobuf import unittest_pb2
-from google.protobuf import service
-from google.protobuf import symbol_database
 from google.protobuf import unittest_custom_options_pb2
 from google.protobuf import unittest_no_generic_services_pb2
 

python/google/protobuf/internal/json_format_test.py

@@ -44,12 +44,12 @@ from google.protobuf import field_mask_pb2
 from google.protobuf import struct_pb2
 from google.protobuf import timestamp_pb2
 from google.protobuf import wrappers_pb2
-from google.protobuf import unittest_mset_pb2
-from google.protobuf import unittest_pb2
 from google.protobuf.internal import test_proto3_optional_pb2
 from google.protobuf import descriptor_pool
 from google.protobuf import json_format
 from google.protobuf import any_test_pb2
+from google.protobuf import unittest_pb2
+from google.protobuf import unittest_mset_pb2
 from google.protobuf.util import json_format_pb2
 from google.protobuf.util import json_format_proto3_pb2
 

python/google/protobuf/internal/message_test.py

@@ -50,8 +50,7 @@ import warnings
 
 cmp = lambda x, y: (x > y) - (x < y)
 
-from google.protobuf import unittest_pb2  # pylint: disable=g-import-not-at-top
+from google.protobuf.internal import api_implementation # pylint: disable=g-import-not-at-top
-from google.protobuf.internal import api_implementation
 from google.protobuf.internal import encoder
 from google.protobuf.internal import more_extensions_pb2
 from google.protobuf.internal import packed_field_test_pb2
@@ -63,6 +62,7 @@ from google.protobuf import message
 from google.protobuf.internal import _parameterized
 from google.protobuf import map_proto2_unittest_pb2
 from google.protobuf import map_unittest_pb2
+from google.protobuf import unittest_pb2
 from google.protobuf import unittest_proto3_arena_pb2
 
 UCS2_MAXUNICODE = 65535

python/google/protobuf/internal/numpy_test.py

@@ -34,8 +34,8 @@ import unittest
 
 import numpy as np
 
-from google.protobuf import unittest_pb2
 from google.protobuf.internal import testing_refleaks
+from google.protobuf import unittest_pb2
 
 message = unittest_pb2.TestAllTypes()
 np_float_scalar = np.float64(0.0)

python/google/protobuf/internal/reflection_test.py

@@ -41,9 +41,6 @@ import sys
 import warnings
 import unittest
 
-from google.protobuf import unittest_import_pb2
-from google.protobuf import unittest_mset_pb2
-from google.protobuf import unittest_pb2
 from google.protobuf import descriptor_pb2
 from google.protobuf import descriptor
 from google.protobuf import message
@@ -58,6 +55,9 @@ from google.protobuf.internal import test_util
 from google.protobuf.internal import testing_refleaks
 from google.protobuf.internal import decoder
 from google.protobuf.internal import _parameterized
+from google.protobuf import unittest_import_pb2
+from google.protobuf import unittest_mset_pb2
+from google.protobuf import unittest_pb2
 from google.protobuf import unittest_proto3_arena_pb2
 
 

python/google/protobuf/internal/service_reflection_test.py

@@ -35,9 +35,9 @@ __author__ = 'petar@google.com (Petar Petrov)'
 
 import unittest
 
-from google.protobuf import unittest_pb2
 from google.protobuf import service_reflection
 from google.protobuf import service
+from google.protobuf import unittest_pb2
 
 
 class FooUnitTest(unittest.TestCase):

python/google/protobuf/internal/symbol_database_test.py

@@ -32,10 +32,10 @@
 
 import unittest
 
-from google.protobuf import unittest_pb2
 from google.protobuf import descriptor
 from google.protobuf import descriptor_pool
 from google.protobuf import symbol_database
+from google.protobuf import unittest_pb2
 
 
 class SymbolDatabaseTest(unittest.TestCase):

python/google/protobuf/internal/text_format_test.py

@@ -41,8 +41,6 @@ import unittest
 
 from google.protobuf import any_pb2
 from google.protobuf import struct_pb2
-from google.protobuf import unittest_mset_pb2
-from google.protobuf import unittest_pb2
 from google.protobuf import descriptor_pb2
 from google.protobuf.internal import any_test_pb2 as test_extend_any
 from google.protobuf.internal import api_implementation
@@ -54,7 +52,9 @@ from google.protobuf import text_format
 from google.protobuf.internal import _parameterized
 from google.protobuf import any_test_pb2
 from google.protobuf import map_unittest_pb2
+from google.protobuf import unittest_mset_pb2
 from google.protobuf import unittest_custom_options_pb2
+from google.protobuf import unittest_pb2
 from google.protobuf import unittest_proto3_arena_pb2
 # pylint: enable=g-import-not-at-top
 

python/google/protobuf/internal/unknown_fields_test.py

@@ -36,8 +36,6 @@ __author__ = 'bohdank@google.com (Bohdan Koval)'
 import sys
 import unittest
 
-from google.protobuf import unittest_mset_pb2
-from google.protobuf import unittest_pb2
 from google.protobuf.internal import api_implementation
 from google.protobuf.internal import encoder
 from google.protobuf.internal import message_set_extensions_pb2
@@ -49,6 +47,8 @@ from google.protobuf.internal import wire_format
 from google.protobuf import descriptor
 from google.protobuf import unknown_fields
 from google.protobuf import map_unittest_pb2
+from google.protobuf import unittest_mset_pb2
+from google.protobuf import unittest_pb2
 from google.protobuf import unittest_proto3_arena_pb2
 try:
   import tracemalloc  # pylint: disable=g-import-not-at-top

python/google/protobuf/internal/well_known_types_test.py

@@ -40,11 +40,11 @@ from google.protobuf import any_pb2
 from google.protobuf import duration_pb2
 from google.protobuf import struct_pb2
 from google.protobuf import timestamp_pb2
-from google.protobuf import unittest_pb2
 from google.protobuf.internal import any_test_pb2
 from google.protobuf.internal import well_known_types
 from google.protobuf import text_format
 from google.protobuf.internal import _parameterized
+from google.protobuf import unittest_pb2
 
 try:
   # New module in Python 3.9:

src/google/protobuf/any_test.cc

@@ -29,10 +29,10 @@
 // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 #include "google/protobuf/any.pb.h"
-#include "google/protobuf/unittest.pb.h"
 #include <gtest/gtest.h>
 #include "absl/strings/str_cat.h"
 #include "google/protobuf/any_test.pb.h"
+#include "google/protobuf/unittest.pb.h"
 
 
 // Must be included last.

src/google/protobuf/arena_unittest.cc

@@ -41,7 +41,6 @@
 
 #include "google/protobuf/stubs/logging.h"
 #include "google/protobuf/stubs/common.h"
-#include "google/protobuf/unittest.pb.h"
 #include <gmock/gmock.h>
 #include <gtest/gtest.h>
 #include "absl/strings/string_view.h"
@@ -55,6 +54,7 @@
 #include "google/protobuf/message_lite.h"
 #include "google/protobuf/repeated_field.h"
 #include "google/protobuf/test_util.h"
+#include "google/protobuf/unittest.pb.h"
 #include "google/protobuf/unittest_arena.pb.h"
 #include "google/protobuf/unknown_field_set.h"
 #include "google/protobuf/wire_format_lite.h"

src/google/protobuf/compiler/command_line_interface_unittest.cc

@@ -51,7 +51,6 @@
 #include "google/protobuf/testing/file.h"
 #include "google/protobuf/testing/file.h"
 #include "google/protobuf/any.pb.h"
-#include "google/protobuf/unittest.pb.h"
 #include "google/protobuf/descriptor.pb.h"
 #include "google/protobuf/testing/googletest.h"
 #include <gtest/gtest.h>
@@ -69,6 +68,7 @@
 #include "google/protobuf/io/printer.h"
 #include "google/protobuf/io/zero_copy_stream.h"
 #include "google/protobuf/test_util2.h"
+#include "google/protobuf/unittest.pb.h"
 #include "google/protobuf/unittest_custom_options.pb.h"
 
 // Must be included last.
@@ -2691,7 +2691,7 @@ TEST_P(EncodeDecodeTest, Encode) {
   std::string args;
   if (GetParam() != DESCRIPTOR_SET_IN) {
     args.append(
-        TestUtil::MaybeTranslatePath("net/proto2/internal/unittest.proto"));
+        TestUtil::MaybeTranslatePath("third_party/protobuf/unittest.proto"));
   }
   EXPECT_TRUE(Run(args + " --encode=protobuf_unittest.TestAllTypes"));
   ExpectStdoutMatchesBinaryFile(TestUtil::GetTestDataPath(
@@ -2703,7 +2703,7 @@ TEST_P(EncodeDecodeTest, Decode) {
   RedirectStdinFromFile(TestUtil::GetTestDataPath(
       "third_party/protobuf/testdata/golden_message_oneof_implemented"));
   EXPECT_TRUE(
-      Run(TestUtil::MaybeTranslatePath("net/proto2/internal/unittest.proto") +
+      Run(TestUtil::MaybeTranslatePath("third_party/protobuf/unittest.proto") +
           " --decode=protobuf_unittest.TestAllTypes"));
   ExpectStdoutMatchesTextFile(TestUtil::GetTestDataPath(
       "third_party/protobuf/"
@@ -2714,7 +2714,7 @@ TEST_P(EncodeDecodeTest, Decode) {
 TEST_P(EncodeDecodeTest, Partial) {
   RedirectStdinFromText("");
   EXPECT_TRUE(
-      Run(TestUtil::MaybeTranslatePath("net/proto2/internal/unittest.proto") +
+      Run(TestUtil::MaybeTranslatePath("third_party/protobuf/unittest.proto") +
           " --encode=protobuf_unittest.TestRequired"));
   ExpectStdoutMatchesText("");
   ExpectStderrMatchesText(
@@ -2738,7 +2738,7 @@ TEST_P(EncodeDecodeTest, DecodeRaw) {
 
 TEST_P(EncodeDecodeTest, UnknownType) {
   EXPECT_FALSE(
-      Run(TestUtil::MaybeTranslatePath("net/proto2/internal/unittest.proto") +
+      Run(TestUtil::MaybeTranslatePath("third_party/protobuf/unittest.proto") +
           " --encode=NoSuchType"));
   ExpectStdoutMatchesText("");
   ExpectStderrMatchesText("Type not defined: NoSuchType\n");
@@ -2760,7 +2760,7 @@ TEST_P(EncodeDecodeTest, EncodeDeterministicOutput) {
   std::string args;
   if (GetParam() != DESCRIPTOR_SET_IN) {
     args.append(
-        TestUtil::MaybeTranslatePath("net/proto2/internal/unittest.proto"));
+        TestUtil::MaybeTranslatePath("third_party/protobuf/unittest.proto"));
   }
   EXPECT_TRUE(Run(
       args + " --encode=protobuf_unittest.TestAllTypes --deterministic_output"));
@@ -2773,7 +2773,7 @@ TEST_P(EncodeDecodeTest, DecodeDeterministicOutput) {
   RedirectStdinFromFile(TestUtil::GetTestDataPath(
       "third_party/protobuf/testdata/golden_message_oneof_implemented"));
   EXPECT_FALSE(
-      Run(TestUtil::MaybeTranslatePath("net/proto2/internal/unittest.proto") +
+      Run(TestUtil::MaybeTranslatePath("third_party/protobuf/unittest.proto") +
           " --decode=protobuf_unittest.TestAllTypes --deterministic_output"));
   ExpectStderrMatchesText(
       "Can only use --deterministic_output with --encode.\n");

src/google/protobuf/compiler/cpp/message_size_unittest.cc

@@ -28,10 +28,10 @@
 // (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
 // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
-#include "google/protobuf/unittest.pb.h"
 #include <gmock/gmock.h>
 #include <gtest/gtest.h>
 #include "google/protobuf/descriptor.h"
+#include "google/protobuf/unittest.pb.h"
 
 namespace google {
 namespace protobuf {

src/google/protobuf/compiler/cpp/move_unittest.cc

@@ -29,9 +29,9 @@
 // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 #include "google/protobuf/stubs/common.h"
-#include "google/protobuf/unittest.pb.h"
 #include <gtest/gtest.h>
 #include "google/protobuf/test_util.h"
+#include "google/protobuf/unittest.pb.h"
 
 #if LANG_CXX11
 #include <type_traits>

src/google/protobuf/compiler/cpp/unittest.cc

@@ -33,7 +33,7 @@
 //  Sanjay Ghemawat, Jeff Dean, and others.
 //
 // To test the code generator, we actually use it to generate code for
-// net/proto2/internal/unittest.proto, then test that.  This means that we
+// third_party/protobuf/unittest.proto, then test that.  This means that we
 // are actually testing the parser and other parts of the system at the same
 // time, and that problems in the generator may show up as compile-time errors
 // rather than unittest failures, which may be surprising.  However, testing
@@ -46,10 +46,10 @@
 
 #include "google/protobuf/compiler/cpp/unittest.h"
 
+#include "google/protobuf/test_util.h"
 #include "google/protobuf/unittest.pb.h"
 #include "google/protobuf/unittest_embed_optimize_for.pb.h"
 #include "google/protobuf/unittest_optimize_for.pb.h"
-#include "google/protobuf/test_util.h"
 
 #define MESSAGE_TEST_NAME MessageTest
 #define GENERATED_DESCRIPTOR_TEST_NAME GeneratedDescriptorTest
@@ -59,7 +59,7 @@
 #define HELPERS_TEST_NAME HelpersTest
 #define DESCRIPTOR_INIT_TEST_NAME DescriptorInitializationTest
 
-#define UNITTEST_PROTO_PATH "net/proto2/internal/unittest.proto"
+#define UNITTEST_PROTO_PATH "third_party/protobuf/unittest.proto"
 #define UNITTEST ::protobuf_unittest
 #define UNITTEST_IMPORT ::protobuf_unittest_import
 

src/google/protobuf/compiler/cpp/unittest.inc

@@ -33,7 +33,7 @@
 //  Sanjay Ghemawat, Jeff Dean, and others.
 //
 // To test the code generator, we actually use it to generate code for
-// net/proto2/internal/unittest.proto, then test that.  This means that we
+// third_party/protobuf/unittest.proto, then test that.  This means that we
 // are actually testing the parser and other parts of the system at the same
 // time, and that problems in the generator may show up as compile-time errors
 // rather than unittest failures, which may be surprising.  However, testing

src/google/protobuf/compiler/parser_unittest.cc

@@ -40,9 +40,6 @@
 #include <vector>
 
 #include "google/protobuf/any.pb.h"
-#include "google/protobuf/unittest.pb.h"
-#include "google/protobuf/unittest_import.pb.h"
-#include "google/protobuf/unittest_import_public.pb.h"
 #include "google/protobuf/descriptor.pb.h"
 #include "google/protobuf/text_format.h"
 #include "google/protobuf/testing/googletest.h"
@@ -51,7 +48,10 @@
 #include "absl/strings/str_join.h"
 #include "absl/strings/substitute.h"
 #include "google/protobuf/test_util2.h"
+#include "google/protobuf/unittest.pb.h"
 #include "google/protobuf/unittest_custom_options.pb.h"
+#include "google/protobuf/unittest_import.pb.h"
+#include "google/protobuf/unittest_import_public.pb.h"
 #include "google/protobuf/wire_format.h"
 
 namespace google {
@@ -2323,7 +2323,7 @@ TEST_F(ParseDescriptorDebugTest, TestAllDescriptorTypes) {
   // need to link to a FileDecriptor, then output back to a proto. We'll
   // also need to give it the same name as the original.
   parsed.set_name(
-      TestUtil::MaybeTranslatePath("net/proto2/internal/unittest.proto"));
+      TestUtil::MaybeTranslatePath("third_party/protobuf/unittest.proto"));
   // We need the imported dependency before we can build our parsed proto
   const FileDescriptor* public_import =
       protobuf_unittest_import::PublicImportMessage::descriptor()->file();

src/google/protobuf/descriptor_unittest.cc

@@ -41,9 +41,9 @@
 #include "google/protobuf/any.pb.h"
 #include "google/protobuf/compiler/importer.h"
 #include "google/protobuf/compiler/parser.h"
-#include "google/protobuf/unittest.pb.h"
 #include "google/protobuf/descriptor.pb.h"
 #include "absl/strings/str_format.h"
+#include "google/protobuf/unittest.pb.h"
 #include "google/protobuf/unittest_custom_options.pb.h"
 #include "google/protobuf/stubs/common.h"
 #include "google/protobuf/stubs/logging.h"

src/google/protobuf/dynamic_message_unittest.cc

@@ -46,12 +46,12 @@
 
 #include "google/protobuf/stubs/logging.h"
 #include "google/protobuf/stubs/common.h"
-#include "google/protobuf/unittest.pb.h"
 #include "google/protobuf/descriptor.pb.h"
 #include "google/protobuf/descriptor.h"
 #include "google/protobuf/testing/googletest.h"
 #include <gtest/gtest.h>
 #include "google/protobuf/test_util.h"
+#include "google/protobuf/unittest.pb.h"
 #include "google/protobuf/unittest_no_field_presence.pb.h"
 
 namespace google {

src/google/protobuf/extension_set_unittest.cc

@@ -36,8 +36,6 @@
 
 #include "google/protobuf/stubs/logging.h"
 #include "google/protobuf/stubs/common.h"
-#include "google/protobuf/unittest.pb.h"
-#include "google/protobuf/unittest_mset.pb.h"
 #include "google/protobuf/io/coded_stream.h"
 #include "google/protobuf/io/zero_copy_stream_impl.h"
 #include "google/protobuf/descriptor.pb.h"
@@ -52,7 +50,10 @@
 #include "absl/strings/match.h"
 #include "google/protobuf/test_util.h"
 #include "google/protobuf/test_util2.h"
+#include "google/protobuf/unittest.pb.h"
+#include "google/protobuf/unittest_mset.pb.h"
 #include "google/protobuf/wire_format.h"
+#include "google/protobuf/wire_format_lite.h"
 
 
 // Must be included last.

src/google/protobuf/generated_message_reflection_unittest.cc

@@ -48,10 +48,6 @@
 
 #include "google/protobuf/stubs/logging.h"
 #include "google/protobuf/stubs/common.h"
-#include "google/protobuf/unittest.pb.h"
-#include "google/protobuf/unittest.pb.h"
-#include "google/protobuf/unittest_mset.pb.h"
-#include "google/protobuf/unittest_mset_wire_format.pb.h"
 #include "google/protobuf/arena.h"
 #include "google/protobuf/descriptor.h"
 #include "google/protobuf/testing/googletest.h"
@@ -60,6 +56,10 @@
 #include "google/protobuf/map_test_util.h"
 #include "google/protobuf/map_unittest.pb.h"
 #include "google/protobuf/test_util.h"
+#include "google/protobuf/unittest.pb.h"
+#include "google/protobuf/unittest.pb.h"
+#include "google/protobuf/unittest_mset.pb.h"
+#include "google/protobuf/unittest_mset_wire_format.pb.h"
 
 // Must be included last.
 #include "google/protobuf/port_def.inc"

src/google/protobuf/json/json_test.cc

@@ -42,7 +42,6 @@
 #include "google/protobuf/struct.pb.h"
 #include "google/protobuf/timestamp.pb.h"
 #include "google/protobuf/wrappers.pb.h"
-#include "google/protobuf/unittest.pb.h"
 #include <gmock/gmock.h>
 #include <gtest/gtest.h>
 #include "absl/status/status.h"
@@ -54,6 +53,7 @@
 #include "google/protobuf/io/zero_copy_stream_impl_lite.h"
 #include "google/protobuf/util/json_format.pb.h"
 #include "google/protobuf/util/json_format_proto3.pb.h"
+#include "google/protobuf/unittest.pb.h"
 #include "google/protobuf/util/type_resolver.h"
 #include "google/protobuf/util/type_resolver_util.h"
 #include "google/protobuf/stubs/status_macros.h"

src/google/protobuf/map_field_test.cc

@@ -33,7 +33,6 @@
 
 #include "google/protobuf/stubs/logging.h"
 #include "google/protobuf/stubs/common.h"
-#include "google/protobuf/unittest.pb.h"
 #include "google/protobuf/arena.h"
 #include "google/protobuf/map.h"
 #include "google/protobuf/map_field_inl.h"
@@ -45,6 +44,7 @@
 #include "google/protobuf/arena_test_util.h"
 #include "google/protobuf/map_test_util.h"
 #include "google/protobuf/map_unittest.pb.h"
+#include "google/protobuf/unittest.pb.h"
 
 // Must be included last.
 #include "google/protobuf/port_def.inc"

src/google/protobuf/map_test.cc

@@ -28,12 +28,12 @@
 // (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
 // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
-#include "google/protobuf/unittest.pb.h"
-#include "google/protobuf/unittest_import.pb.h"
 #include "absl/container/flat_hash_set.h"
 #include "google/protobuf/map_proto2_unittest.pb.h"
 #include "google/protobuf/map_unittest.pb.h"
 #include "google/protobuf/reflection_tester.h"
+#include "google/protobuf/unittest.pb.h"
+#include "google/protobuf/unittest_import.pb.h"
 
 
 #define BRIDGE_UNITTEST ::google::protobuf::bridge_unittest

src/google/protobuf/map_test_util.h

@@ -31,9 +31,9 @@
 #ifndef GOOGLE_PROTOBUF_MAP_TEST_UTIL_H__
 #define GOOGLE_PROTOBUF_MAP_TEST_UTIL_H__
 
-#include "google/protobuf/unittest.pb.h"
 #include "google/protobuf/map_unittest.pb.h"
 #include "google/protobuf/reflection_tester.h"
+#include "google/protobuf/unittest.pb.h"
 
 #define UNITTEST ::protobuf_unittest
 #define BRIDGE_UNITTEST ::google::protobuf::bridge_unittest

src/google/protobuf/no_field_presence_test.cc

@@ -30,10 +30,10 @@
 
 #include <string>
 
-#include "google/protobuf/unittest.pb.h"
 #include "google/protobuf/descriptor.pb.h"
 #include "google/protobuf/descriptor.h"
 #include <gtest/gtest.h>
+#include "google/protobuf/unittest.pb.h"
 #include "google/protobuf/unittest_no_field_presence.pb.h"
 
 namespace google {

src/google/protobuf/preserve_unknown_enum_test.cc

@@ -28,10 +28,10 @@
 // (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
 // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
-#include "google/protobuf/unittest.pb.h"
 #include "google/protobuf/descriptor.h"
 #include "google/protobuf/dynamic_message.h"
 #include <gtest/gtest.h>
+#include "google/protobuf/unittest.pb.h"
 #include "google/protobuf/unittest_preserve_unknown_enum.pb.h"
 #include "google/protobuf/unittest_preserve_unknown_enum2.pb.h"
 

src/google/protobuf/proto3_arena_unittest.cc

@@ -32,12 +32,12 @@
 #include <string>
 #include <vector>
 
-#include "google/protobuf/unittest.pb.h"
 #include "google/protobuf/arena.h"
 #include "google/protobuf/text_format.h"
 #include <gtest/gtest.h>
 #include "absl/strings/match.h"
 #include "google/protobuf/test_util.h"
+#include "google/protobuf/unittest.pb.h"
 #include "google/protobuf/unittest_proto3_arena.pb.h"
 #include "google/protobuf/unittest_proto3_optional.pb.h"
 

src/google/protobuf/reflection_ops_unittest.cc

@@ -36,11 +36,11 @@
 
 #include "google/protobuf/stubs/logging.h"
 #include "google/protobuf/stubs/common.h"
-#include "google/protobuf/unittest.pb.h"
 #include "google/protobuf/descriptor.h"
 #include <gtest/gtest.h>
 #include "absl/strings/str_join.h"
 #include "google/protobuf/test_util.h"
+#include "google/protobuf/unittest.pb.h"
 
 
 namespace google {

src/google/protobuf/repeated_field_reflection_unittest.cc

@@ -33,7 +33,6 @@
 // Test reflection methods for aggregate access to Repeated[Ptr]Fields.
 // This test proto2 methods on a proto2 layout.
 
-#include "google/protobuf/unittest.pb.h"
 #include "google/protobuf/dynamic_message.h"
 #include "google/protobuf/reflection.h"
 #include <gtest/gtest.h>
@@ -41,6 +40,7 @@
 #include "absl/strings/cord.h"
 #include "google/protobuf/port.h"
 #include "google/protobuf/test_util.h"
+#include "google/protobuf/unittest.pb.h"
 
 namespace google {
 namespace protobuf {

src/google/protobuf/repeated_field_unittest.cc

@@ -49,12 +49,12 @@
 
 #include "google/protobuf/stubs/logging.h"
 #include "google/protobuf/stubs/common.h"
-#include "google/protobuf/unittest.pb.h"
 #include <gmock/gmock.h>
 #include <gtest/gtest.h>
 #include "absl/numeric/bits.h"
 #include "absl/strings/cord.h"
 #include "absl/strings/str_cat.h"
+#include "google/protobuf/unittest.pb.h"
 
 
 // Must be included last.

src/google/protobuf/text_format_unittest.cc

@@ -47,9 +47,6 @@
 #include "google/protobuf/testing/file.h"
 #include "google/protobuf/testing/file.h"
 #include "google/protobuf/any.pb.h"
-#include "google/protobuf/unittest.pb.h"
-#include "google/protobuf/unittest_mset.pb.h"
-#include "google/protobuf/unittest_mset_wire_format.pb.h"
 #include <gmock/gmock.h>
 #include "google/protobuf/testing/googletest.h"
 #include <gtest/gtest.h>
@@ -64,6 +61,9 @@
 #include "google/protobuf/map_unittest.pb.h"
 #include "google/protobuf/test_util.h"
 #include "google/protobuf/test_util2.h"
+#include "google/protobuf/unittest.pb.h"
+#include "google/protobuf/unittest_mset.pb.h"
+#include "google/protobuf/unittest_mset_wire_format.pb.h"
 #include "google/protobuf/unittest_proto3.pb.h"
 
 

src/google/protobuf/unknown_field_set_unittest.cc

@@ -43,7 +43,6 @@
 #include "google/protobuf/stubs/callback.h"
 #include "google/protobuf/stubs/common.h"
 #include "google/protobuf/stubs/logging.h"
-#include "google/protobuf/unittest.pb.h"
 #include "google/protobuf/io/coded_stream.h"
 #include "google/protobuf/io/zero_copy_stream_impl.h"
 #include "google/protobuf/descriptor.h"
@@ -57,6 +56,7 @@
 #include "absl/time/clock.h"
 #include "absl/time/time.h"
 #include "google/protobuf/test_util.h"
+#include "google/protobuf/unittest.pb.h"
 #include "google/protobuf/unittest_lite.pb.h"
 #include "google/protobuf/wire_format.h"
 

src/google/protobuf/util/delimited_message_util_test.cc

@@ -35,10 +35,10 @@
 
 #include <sstream>
 
-#include "google/protobuf/unittest.pb.h"
 #include "google/protobuf/testing/googletest.h"
 #include <gtest/gtest.h>
 #include "google/protobuf/test_util.h"
+#include "google/protobuf/unittest.pb.h"
 
 namespace google {
 namespace protobuf {

src/google/protobuf/util/field_comparator_test.cc

@@ -34,9 +34,9 @@
 
 #include <limits>
 
-#include "google/protobuf/unittest.pb.h"
 #include "google/protobuf/descriptor.h"
 #include <gtest/gtest.h>
+#include "google/protobuf/unittest.pb.h"
 #include "google/protobuf/stubs/mathutil.h"
 
 namespace google {

src/google/protobuf/util/field_mask_util_test.cc

@@ -35,11 +35,11 @@
 #include <vector>
 
 #include "google/protobuf/field_mask.pb.h"
-#include "google/protobuf/unittest.pb.h"
 #include <gtest/gtest.h>
 #include "google/protobuf/stubs/logging.h"
 #include "google/protobuf/stubs/common.h"
 #include "google/protobuf/test_util.h"
+#include "google/protobuf/unittest.pb.h"
 
 namespace google {
 namespace protobuf {

src/google/protobuf/util/message_differencer_unittest.cc

@@ -43,7 +43,6 @@
 
 #include "google/protobuf/stubs/common.h"
 #include "google/protobuf/stubs/logging.h"
-#include "google/protobuf/unittest.pb.h"
 #include <gmock/gmock.h>
 #include "google/protobuf/testing/googletest.h"
 #include <gtest/gtest.h>
@@ -54,6 +53,7 @@
 #include "google/protobuf/map_unittest.pb.h"
 #include "google/protobuf/test_util.h"
 #include "google/protobuf/text_format.h"
+#include "google/protobuf/unittest.pb.h"
 #include "google/protobuf/util/field_comparator.h"
 #include "google/protobuf/util/message_differencer_unittest.pb.h"
 #include "google/protobuf/wire_format.h"

src/google/protobuf/util/type_resolver_util_test.cc

@@ -38,13 +38,13 @@
 
 #include "google/protobuf/type.pb.h"
 #include "google/protobuf/wrappers.pb.h"
-#include "google/protobuf/unittest.pb.h"
 #include "google/protobuf/util/type_resolver.h"
 #include "google/protobuf/testing/googletest.h"
 #include <gtest/gtest.h>
 #include "google/protobuf/util/json_format_proto3.pb.h"
 #include "google/protobuf/map_unittest.pb.h"
 #include "google/protobuf/test_util.h"
+#include "google/protobuf/unittest.pb.h"
 #include "google/protobuf/unittest_custom_options.pb.h"
 
 namespace google {