Chiebot-Mirror
/
protobuf
mirror of https://github.com/protocolbuffers/protobuf.git
8
0
Fork 0
Code Issues Projects Releases Wiki Activity

Internal change

Browse Source 
PiperOrigin-RevId: 485191150
pull/10855/head
Mike Kruskal 2 years ago committed by Copybara-Service
parent 9b028ececf
commit 0890984ce6
11 changed files with 24 additions and 22 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 2
      python/google/protobuf/internal/field_mask_test.py
  2. 10
      python/google/protobuf/internal/message_test.py
  3. 2
      python/google/protobuf/internal/text_format_test.py
  4. 2
      python/google/protobuf/internal/unknown_fields_test.py
  5. 2
      src/google/protobuf/generated_message_reflection_unittest.cc
  6. 2
      src/google/protobuf/map_field_test.cc
  7. 7
      src/google/protobuf/map_test.cc
  8. 3
      src/google/protobuf/map_test_util.h
  9. 2
      src/google/protobuf/text_format_unittest.cc
  10. 12
      src/google/protobuf/util/message_differencer_unittest.cc
  11. 2
      src/google/protobuf/util/type_resolver_util_test.cc

2
python/google/protobuf/internal/field_mask_test.py
Unescape View File

@ -33,11 +33,11 @@
import unittest
from google.protobuf import field_mask_pb2
from google.protobuf import map_unittest_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
class FieldMaskTest(unittest.TestCase):

10
python/google/protobuf/internal/message_test.py
Unescape View File

@ -50,20 +50,20 @@ import warnings
cmp = lambda x, y: (x > y) - (x < y)
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_pb2 # pylint: disable=g-import-not-at-top
from google.protobuf import unittest_proto3_arena_pb2
from google.protobuf import descriptor
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
from google.protobuf.internal import test_util
from google.protobuf.internal import test_proto3_optional_pb2
from google.protobuf.internal import test_util
from google.protobuf.internal import testing_refleaks
from google.protobuf import descriptor
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
UCS2_MAXUNICODE = 65535

2
python/google/protobuf/internal/text_format_test.py
Unescape View File

@ -41,7 +41,6 @@ import unittest
from google.protobuf import any_pb2
from google.protobuf import struct_pb2
from google.protobuf import map_unittest_pb2
from google.protobuf import unittest_custom_options_pb2
from google.protobuf import unittest_mset_pb2
from google.protobuf import unittest_pb2
@ -56,6 +55,7 @@ from google.protobuf import descriptor_pool
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
# pylint: enable=g-import-not-at-top

2
python/google/protobuf/internal/unknown_fields_test.py
Unescape View File

@ -36,7 +36,6 @@ __author__ = 'bohdank@google.com (Bohdan Koval)'
import sys
import unittest
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
@ -50,6 +49,7 @@ from google.protobuf.internal import type_checkers
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
try:
import tracemalloc # pylint: disable=g-import-not-at-top
except ImportError:

2
src/google/protobuf/generated_message_reflection_unittest.cc
Unescape View File

@ -48,7 +48,6 @@
#include "google/protobuf/stubs/logging.h"
#include "google/protobuf/stubs/common.h"
#include "google/protobuf/map_unittest.pb.h"
#include "google/protobuf/unittest.pb.h"
#include "google/protobuf/unittest.pb.h"
#include "google/protobuf/unittest_mset.pb.h"
@ -59,6 +58,7 @@
#include <gtest/gtest.h>
#include "absl/strings/cord.h"
#include "google/protobuf/map_test_util.h"
#include "google/protobuf/map_unittest.pb.h"
#include "google/protobuf/test_util.h"
// Must be included last.

2
src/google/protobuf/map_field_test.cc
Unescape View File

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

7
src/google/protobuf/map_test.cc
Unescape View File

@ -28,11 +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/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"
#include "absl/container/flat_hash_set.h"
#include "google/protobuf/test_util2.h"
#include "google/protobuf/map_proto2_unittest.pb.h"
#include "google/protobuf/map_unittest.pb.h"
#define BRIDGE_UNITTEST ::google::protobuf::bridge_unittest

3
src/google/protobuf/map_test_util.h
Unescape View File

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

2
src/google/protobuf/text_format_unittest.cc
Unescape View File

@ -47,7 +47,6 @@
#include "google/protobuf/testing/file.h"
#include "google/protobuf/testing/file.h"
#include "google/protobuf/any.pb.h"
#include "google/protobuf/map_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"
@ -63,6 +62,7 @@
#include "absl/strings/str_format.h"
#include "absl/strings/str_replace.h"
#include "absl/strings/substitute.h"
#include "google/protobuf/map_unittest.pb.h"
#include "google/protobuf/test_util.h"
#include "google/protobuf/test_util2.h"

12
src/google/protobuf/util/message_differencer_unittest.cc
Unescape View File

@ -43,20 +43,20 @@
#include "google/protobuf/stubs/common.h"
#include "google/protobuf/stubs/logging.h"
#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/text_format.h"
#include "google/protobuf/wire_format.h"
#include "google/protobuf/util/field_comparator.h"
#include <gmock/gmock.h>
#include "google/protobuf/testing/googletest.h"
#include <gtest/gtest.h>
#include "absl/functional/bind_front.h"
#include "absl/strings/str_split.h"
#include "google/protobuf/any_test.pb.h"
#include "google/protobuf/map_test_util.h"
#include "google/protobuf/map_unittest.pb.h"
#include "google/protobuf/test_util.h"
#include "google/protobuf/text_format.h"
#include "google/protobuf/util/field_comparator.h"
#include "google/protobuf/util/message_differencer_unittest.pb.h"
#include "google/protobuf/wire_format.h"
namespace google {

2
src/google/protobuf/util/type_resolver_util_test.cc
Unescape View File

@ -38,7 +38,6 @@
#include "google/protobuf/type.pb.h"
#include "google/protobuf/wrappers.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"
@ -46,6 +45,7 @@
#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"
namespace google {
namespace protobuf {

Write Preview
Loading…
Cancel
Save