Skip to content

Commit bc99ca2

Browse files
protobuf-github-botzhangskz
protobuf-github-bot
authored and
zhangskz
committed
Stop using including_default_value_fields as a positional argument in json_format_test.py
PiperOrigin-RevId: 603713528
1 parent 043191b commit bc99ca2

File tree

1 file changed

+116
-26
lines changed

1 file changed

+116
-26
lines changed

‎python/google/protobuf/internal/json_format_test.py‎

Lines changed: 116 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -269,7 +269,11 @@ def testJsonEscapeString(self):
269269
def testAlwaysSeriliaze(self):
270270
message = json_format_proto3_pb2.TestMessage(string_value='foo')
271271
self.assertEqual(
272-
json.loads(json_format.MessageToJson(message, True)),
272+
json.loads(
273+
json_format.MessageToJson(
274+
message, including_default_value_fields=True
275+
)
276+
),
273277
json.loads(
274278
'{'
275279
'"repeatedStringValue": [],'
@@ -417,7 +421,11 @@ def testIntegersRepresentedAsFloat(self):
417421
def testMapFields(self):
418422
message = json_format_proto3_pb2.TestNestedMap()
419423
self.assertEqual(
420-
json.loads(json_format.MessageToJson(message, True)),
424+
json.loads(
425+
json_format.MessageToJson(
426+
message, including_default_value_fields=True
427+
)
428+
),
421429
json.loads(
422430
'{'
423431
'"boolMap": {},'
@@ -444,7 +452,11 @@ def testMapFields(self):
444452
message.string_map['null'] = 3
445453
message.map_map['1'].bool_map[True] = 3
446454
self.assertEqual(
447-
json.loads(json_format.MessageToJson(message, False)),
455+
json.loads(
456+
json_format.MessageToJson(
457+
message, including_default_value_fields=False
458+
)
459+
),
448460
json.loads(
449461
'{'
450462
'"boolMap": {"false": 2, "true": 1},'
@@ -463,10 +475,14 @@ def testMapFields(self):
463475
def testOneofFields(self):
464476
message = json_format_proto3_pb2.TestOneof()
465477
# Always print does not affect oneof fields.
466-
self.assertEqual(json_format.MessageToJson(message, True), '{}')
478+
self.assertEqual(
479+
json_format.MessageToJson(message, including_default_value_fields=True),
480+
'{}',
481+
)
467482
message.oneof_int32_value = 0
468483
self.assertEqual(
469-
json_format.MessageToJson(message, True), '{\n "oneofInt32Value": 0\n}'
484+
json_format.MessageToJson(message, including_default_value_fields=True),
485+
'{\n "oneofInt32Value": 0\n}',
470486
)
471487
parsed_message = json_format_proto3_pb2.TestOneof()
472488
self.CheckParseBack(message, parsed_message)
@@ -508,7 +524,11 @@ def testTimestampMessage(self):
508524
message.repeated_value.add().seconds = -62135596800
509525
message.repeated_value[4].nanos = 0
510526
self.assertEqual(
511-
json.loads(json_format.MessageToJson(message, True)),
527+
json.loads(
528+
json_format.MessageToJson(
529+
message, including_default_value_fields=True
530+
)
531+
),
512532
json.loads(
513533
'{'
514534
'"value": "1970-01-01T00:00:00Z",'
@@ -548,7 +568,11 @@ def testDurationMessage(self):
548568
message.repeated_value.add().seconds = -315576000000
549569
message.repeated_value.add().seconds = 315576000000
550570
self.assertEqual(
551-
json.loads(json_format.MessageToJson(message, True)),
571+
json.loads(
572+
json_format.MessageToJson(
573+
message, including_default_value_fields=True
574+
)
575+
),
552576
json.loads(
553577
'{'
554578
'"value": "1s",'
@@ -570,15 +594,16 @@ def testFieldMaskMessage(self):
570594
message.value.paths.append('foo.bar')
571595
message.value.paths.append('bar')
572596
self.assertEqual(
573-
json_format.MessageToJson(message, True),
597+
json_format.MessageToJson(message, including_default_value_fields=True),
574598
'{\n "value": "foo.bar,bar"\n}',
575599
)
576600
parsed_message = json_format_proto3_pb2.TestFieldMask()
577601
self.CheckParseBack(message, parsed_message)
578602

579603
message.value.Clear()
580604
self.assertEqual(
581-
json_format.MessageToJson(message, True), '{\n "value": ""\n}'
605+
json_format.MessageToJson(message, including_default_value_fields=True),
606+
'{\n "value": ""\n}',
582607
)
583608
self.CheckParseBack(message, parsed_message)
584609

@@ -592,7 +617,11 @@ def testWrapperMessage(self):
592617
message.repeated_bool_value.add().value = False
593618
message.repeated_int32_value.add()
594619
self.assertEqual(
595-
json.loads(json_format.MessageToJson(message, True)),
620+
json.loads(
621+
json_format.MessageToJson(
622+
message, including_default_value_fields=True
623+
)
624+
),
596625
json.loads(
597626
'{\n'
598627
' "int32Value": 0,'
@@ -630,7 +659,11 @@ def testStructMessage(self):
630659
message.repeated_value.add()['age'] = 11
631660
message.repeated_value.add()
632661
self.assertEqual(
633-
json.loads(json_format.MessageToJson(message, False)),
662+
json.loads(
663+
json_format.MessageToJson(
664+
message, including_default_value_fields=False
665+
)
666+
),
634667
json.loads(
635668
'{'
636669
' "value": {'
@@ -663,7 +696,11 @@ def testValueMessage(self):
663696
message.repeated_value.add().bool_value = False
664697
message.repeated_value.add().null_value = 0
665698
self.assertEqual(
666-
json.loads(json_format.MessageToJson(message, False)),
699+
json.loads(
700+
json_format.MessageToJson(
701+
message, including_default_value_fields=False
702+
)
703+
),
667704
json.loads(
668705
'{ "value": "hello", "repeatedValue": [11.1, false, null]}'
669706
),
@@ -673,7 +710,11 @@ def testValueMessage(self):
673710
# Can't parse back if the Value message is not set.
674711
message.repeated_value.add()
675712
self.assertEqual(
676-
json.loads(json_format.MessageToJson(message, False)),
713+
json.loads(
714+
json_format.MessageToJson(
715+
message, including_default_value_fields=False
716+
)
717+
),
677718
json.loads(
678719
'{ "value": "hello", "repeatedValue": [11.1, false, null, null]}'
679720
),
@@ -711,7 +752,11 @@ def testListValueMessage(self):
711752
message.repeated_value.add().values.add().number_value = 1
712753
message.repeated_value.add()
713754
self.assertEqual(
714-
json.loads(json_format.MessageToJson(message, False)),
755+
json.loads(
756+
json_format.MessageToJson(
757+
message, including_default_value_fields=False
758+
)
759+
),
715760
json.loads(
716761
'{"value": [11.1, null, true, "hello", {"name": "Jim"}]\n,'
717762
'"repeatedValue": [[1], []]}'
@@ -746,7 +791,11 @@ def testAnyMessage(self):
746791
message.repeated_value.add().Pack(value2)
747792
message.repeated_value.add()
748793
self.assertEqual(
749-
json.loads(json_format.MessageToJson(message, True)),
794+
json.loads(
795+
json_format.MessageToJson(
796+
message, including_default_value_fields=True
797+
)
798+
),
750799
json.loads(
751800
'{\n'
752801
' "repeatedValue": [ {\n'
@@ -779,7 +828,9 @@ def testAnyMessage(self):
779828
message.Clear()
780829
message.value.Pack(test_message)
781830
self.assertEqual(
782-
json_format.MessageToJson(message, False)[0:68],
831+
json_format.MessageToJson(
832+
message, including_default_value_fields=False
833+
)[0:68],
783834
'{\n'
784835
' "value": {\n'
785836
' "@type": "type.googleapis.com/proto3.TestMessage"',
@@ -792,7 +843,11 @@ def testAnyMessageDescriptorPoolMissingType(self):
792843
message.any_value.Pack(packed_message)
793844
empty_pool = descriptor_pool.DescriptorPool()
794845
with self.assertRaises(TypeError) as cm:
795-
json_format.MessageToJson(message, True, descriptor_pool=empty_pool)
846+
json_format.MessageToJson(
847+
message,
848+
including_default_value_fields=True,
849+
descriptor_pool=empty_pool,
850+
)
796851
self.assertEqual(
797852
'Can not find message descriptor by type_url:'
798853
' type.googleapis.com/protobuf_unittest.OneString',
@@ -805,7 +860,11 @@ def testWellKnownInAnyMessage(self):
805860
int32_value.value = 1234
806861
message.Pack(int32_value)
807862
self.assertEqual(
808-
json.loads(json_format.MessageToJson(message, True)),
863+
json.loads(
864+
json_format.MessageToJson(
865+
message, including_default_value_fields=True
866+
)
867+
),
809868
json.loads(
810869
'{\n'
811870
' "@type": "type.googleapis.com/google.protobuf.Int32Value",\n'
@@ -819,7 +878,11 @@ def testWellKnownInAnyMessage(self):
819878
timestamp = timestamp_pb2.Timestamp()
820879
message.Pack(timestamp)
821880
self.assertEqual(
822-
json.loads(json_format.MessageToJson(message, True)),
881+
json.loads(
882+
json_format.MessageToJson(
883+
message, including_default_value_fields=True
884+
)
885+
),
823886
json.loads(
824887
'{\n'
825888
' "@type": "type.googleapis.com/google.protobuf.Timestamp",\n'
@@ -833,7 +896,11 @@ def testWellKnownInAnyMessage(self):
833896
duration.seconds = 1
834897
message.Pack(duration)
835898
self.assertEqual(
836-
json.loads(json_format.MessageToJson(message, True)),
899+
json.loads(
900+
json_format.MessageToJson(
901+
message, including_default_value_fields=True
902+
)
903+
),
837904
json.loads(
838905
'{\n'
839906
' "@type": "type.googleapis.com/google.protobuf.Duration",\n'
@@ -848,7 +915,11 @@ def testWellKnownInAnyMessage(self):
848915
field_mask.paths.append('bar')
849916
message.Pack(field_mask)
850917
self.assertEqual(
851-
json.loads(json_format.MessageToJson(message, True)),
918+
json.loads(
919+
json_format.MessageToJson(
920+
message, including_default_value_fields=True
921+
)
922+
),
852923
json.loads(
853924
'{\n'
854925
' "@type": "type.googleapis.com/google.protobuf.FieldMask",\n'
@@ -862,7 +933,11 @@ def testWellKnownInAnyMessage(self):
862933
struct_message['name'] = 'Jim'
863934
message.Pack(struct_message)
864935
self.assertEqual(
865-
json.loads(json_format.MessageToJson(message, True)),
936+
json.loads(
937+
json_format.MessageToJson(
938+
message, including_default_value_fields=True
939+
)
940+
),
866941
json.loads(
867942
'{\n'
868943
' "@type": "type.googleapis.com/google.protobuf.Struct",\n'
@@ -877,7 +952,11 @@ def testWellKnownInAnyMessage(self):
877952
nested_any.Pack(int32_value)
878953
message.Pack(nested_any)
879954
self.assertEqual(
880-
json.loads(json_format.MessageToJson(message, True)),
955+
json.loads(
956+
json_format.MessageToJson(
957+
message, including_default_value_fields=True
958+
)
959+
),
881960
json.loads(
882961
'{\n'
883962
' "@type": "type.googleapis.com/google.protobuf.Any",\n'
@@ -1408,17 +1487,28 @@ def testPreservingProtoFieldNames(self):
14081487
)
14091488
self.assertEqual(
14101489
'{\n "int32_value": 12345\n}',
1411-
json_format.MessageToJson(message, False, True),
1490+
json_format.MessageToJson(
1491+
message,
1492+
including_default_value_fields=False,
1493+
preserving_proto_field_name=True,
1494+
),
14121495
)
14131496
# When including_default_value_fields is True.
14141497
message = json_format_proto3_pb2.TestTimestamp()
14151498
self.assertEqual(
14161499
'{\n "repeatedValue": []\n}',
1417-
json_format.MessageToJson(message, True, False),
1500+
json_format.MessageToJson(
1501+
message,
1502+
including_default_value_fields=True,
1503+
),
14181504
)
14191505
self.assertEqual(
14201506
'{\n "repeated_value": []\n}',
1421-
json_format.MessageToJson(message, True, True),
1507+
json_format.MessageToJson(
1508+
message,
1509+
including_default_value_fields=True,
1510+
preserving_proto_field_name=True,
1511+
),
14221512
)
14231513

14241514
# Parsers accept both original proto field names and lowerCamelCase names.

0 commit comments

Comments
 (0)