Skip to content

Commit e4f1ef5

Browse files
timostammtimostamm
authored
Update to Protobuf conformance v32.0 (#1226)
1 parent 5b5f1a9 commit e4f1ef5

14 files changed

+92
-10
lines changed

‎package-lock.json‎

Lines changed: 4 additions & 4 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎packages/protobuf-conformance/failing_tests_text_format.txt‎

Lines changed: 40 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -826,3 +826,43 @@ Required.Proto3.TextFormatInput.ClosedEnumFieldByNumber.ProtobufOutput # Failed
826826
Required.Proto3.TextFormatInput.ClosedEnumFieldByNumber.TextFormatOutput # Failed to parse input or produce output.
827827
Required.Proto3.TextFormatInput.ClosedEnumFieldWithUnknownNumber.ProtobufOutput # Failed to parse input or produce output.
828828
Required.Proto3.TextFormatInput.ClosedEnumFieldWithUnknownNumber.TextFormatOutput # Failed to parse input or produce output.
829+
Required.Editions_Proto3.TextFormatInput.ReservedFieldName.Boolean.ProtobufOutput # Failed to parse input or produce output.
830+
Required.Editions_Proto3.TextFormatInput.ReservedFieldName.Boolean.TextFormatOutput # Failed to parse input or produce output.
831+
Required.Editions_Proto3.TextFormatInput.ReservedFieldName.Enum.ProtobufOutput # Failed to parse input or produce output.
832+
Required.Editions_Proto3.TextFormatInput.ReservedFieldName.Enum.TextFormatOutput # Failed to parse input or produce output.
833+
Required.Editions_Proto3.TextFormatInput.ReservedFieldName.Float.ProtobufOutput # Failed to parse input or produce output.
834+
Required.Editions_Proto3.TextFormatInput.ReservedFieldName.Float.TextFormatOutput # Failed to parse input or produce output.
835+
Required.Editions_Proto3.TextFormatInput.ReservedFieldName.Integer.ProtobufOutput # Failed to parse input or produce output.
836+
Required.Editions_Proto3.TextFormatInput.ReservedFieldName.Integer.TextFormatOutput # Failed to parse input or produce output.
837+
Required.Editions_Proto3.TextFormatInput.ReservedFieldName.Message.ProtobufOutput # Failed to parse input or produce output.
838+
Required.Editions_Proto3.TextFormatInput.ReservedFieldName.Message.TextFormatOutput # Failed to parse input or produce output.
839+
Required.Editions_Proto3.TextFormatInput.ReservedFieldName.MessageAngleBrackets.ProtobufOutput # Failed to parse input or produce output.
840+
Required.Editions_Proto3.TextFormatInput.ReservedFieldName.MessageAngleBrackets.TextFormatOutput # Failed to parse input or produce output.
841+
Required.Editions_Proto3.TextFormatInput.ReservedFieldName.RepeatedFloat.ProtobufOutput # Failed to parse input or produce output.
842+
Required.Editions_Proto3.TextFormatInput.ReservedFieldName.RepeatedFloat.TextFormatOutput # Failed to parse input or produce output.
843+
Required.Editions_Proto3.TextFormatInput.ReservedFieldName.RepeatedInteger.ProtobufOutput # Failed to parse input or produce output.
844+
Required.Editions_Proto3.TextFormatInput.ReservedFieldName.RepeatedInteger.TextFormatOutput # Failed to parse input or produce output.
845+
Required.Editions_Proto3.TextFormatInput.ReservedFieldName.RepeatedString.ProtobufOutput # Failed to parse input or produce output.
846+
Required.Editions_Proto3.TextFormatInput.ReservedFieldName.RepeatedString.TextFormatOutput # Failed to parse input or produce output.
847+
Required.Editions_Proto3.TextFormatInput.ReservedFieldName.String.ProtobufOutput # Failed to parse input or produce output.
848+
Required.Editions_Proto3.TextFormatInput.ReservedFieldName.String.TextFormatOutput # Failed to parse input or produce output.
849+
Required.Proto3.TextFormatInput.ReservedFieldName.Boolean.ProtobufOutput # Failed to parse input or produce output.
850+
Required.Proto3.TextFormatInput.ReservedFieldName.Boolean.TextFormatOutput # Failed to parse input or produce output.
851+
Required.Proto3.TextFormatInput.ReservedFieldName.Enum.ProtobufOutput # Failed to parse input or produce output.
852+
Required.Proto3.TextFormatInput.ReservedFieldName.Enum.TextFormatOutput # Failed to parse input or produce output.
853+
Required.Proto3.TextFormatInput.ReservedFieldName.Float.ProtobufOutput # Failed to parse input or produce output.
854+
Required.Proto3.TextFormatInput.ReservedFieldName.Float.TextFormatOutput # Failed to parse input or produce output.
855+
Required.Proto3.TextFormatInput.ReservedFieldName.Integer.ProtobufOutput # Failed to parse input or produce output.
856+
Required.Proto3.TextFormatInput.ReservedFieldName.Integer.TextFormatOutput # Failed to parse input or produce output.
857+
Required.Proto3.TextFormatInput.ReservedFieldName.Message.ProtobufOutput # Failed to parse input or produce output.
858+
Required.Proto3.TextFormatInput.ReservedFieldName.Message.TextFormatOutput # Failed to parse input or produce output.
859+
Required.Proto3.TextFormatInput.ReservedFieldName.MessageAngleBrackets.ProtobufOutput # Failed to parse input or produce output.
860+
Required.Proto3.TextFormatInput.ReservedFieldName.MessageAngleBrackets.TextFormatOutput # Failed to parse input or produce output.
861+
Required.Proto3.TextFormatInput.ReservedFieldName.RepeatedFloat.ProtobufOutput # Failed to parse input or produce output.
862+
Required.Proto3.TextFormatInput.ReservedFieldName.RepeatedFloat.TextFormatOutput # Failed to parse input or produce output.
863+
Required.Proto3.TextFormatInput.ReservedFieldName.RepeatedInteger.ProtobufOutput # Failed to parse input or produce output.
864+
Required.Proto3.TextFormatInput.ReservedFieldName.RepeatedInteger.TextFormatOutput # Failed to parse input or produce output.
865+
Required.Proto3.TextFormatInput.ReservedFieldName.RepeatedString.ProtobufOutput # Failed to parse input or produce output.
866+
Required.Proto3.TextFormatInput.ReservedFieldName.RepeatedString.TextFormatOutput # Failed to parse input or produce output.
867+
Required.Proto3.TextFormatInput.ReservedFieldName.String.ProtobufOutput # Failed to parse input or produce output.
868+
Required.Proto3.TextFormatInput.ReservedFieldName.String.TextFormatOutput # Failed to parse input or produce output.

‎packages/protobuf-conformance/failing_tests_with_bigint.txt‎

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,14 @@
1+
# Because Protobuf-ES uses JSON.parse, it cannot fail on duplicate properties as expected.
2+
# See https://github.com/protocolbuffers/protobuf/pull/21873 and https://github.com/bufbuild/protobuf-es/pull/1132
3+
Recommended.Editions_Proto2.JsonInput.FieldNameDuplicate # Should have failed to parse, but didn't.
4+
Recommended.Editions_Proto2.JsonInput.FieldNameDuplicateDifferentCasing1 # Should have failed to parse, but didn't.
5+
Recommended.Editions_Proto2.JsonInput.FieldNameDuplicateDifferentCasing2 # Should have failed to parse, but didn't.
6+
Recommended.Editions_Proto3.JsonInput.FieldNameDuplicate # Should have failed to parse, but didn't.
7+
Recommended.Editions_Proto3.JsonInput.FieldNameDuplicateDifferentCasing1 # Should have failed to parse, but didn't.
8+
Recommended.Editions_Proto3.JsonInput.FieldNameDuplicateDifferentCasing2 # Should have failed to parse, but didn't.
9+
Recommended.Proto2.JsonInput.FieldNameDuplicate # Should have failed to parse, but didn't.
10+
Recommended.Proto2.JsonInput.FieldNameDuplicateDifferentCasing1 # Should have failed to parse, but didn't.
11+
Recommended.Proto2.JsonInput.FieldNameDuplicateDifferentCasing2 # Should have failed to parse, but didn't.
12+
Recommended.Proto3.JsonInput.FieldNameDuplicate # Should have failed to parse, but didn't.
13+
Recommended.Proto3.JsonInput.FieldNameDuplicateDifferentCasing1 # Should have failed to parse, but didn't.
14+
Recommended.Proto3.JsonInput.FieldNameDuplicateDifferentCasing2 # Should have failed to parse, but didn't.

‎packages/protobuf-conformance/failing_tests_without_bigint.txt‎

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -42,3 +42,18 @@ Required.Editions_Proto2.JsonInput.Uint64FieldTooLarge
4242
Required.Editions_Proto3.JsonInput.Int64FieldTooLarge
4343
Required.Editions_Proto3.JsonInput.Int64FieldTooSmall
4444
Required.Editions_Proto3.JsonInput.Uint64FieldTooLarge
45+
46+
# Because Protobuf-ES uses JSON.parse, it cannot fail on duplicate properties as expected.
47+
# See https://github.com/protocolbuffers/protobuf/pull/21873 and https://github.com/bufbuild/protobuf-es/pull/1132
48+
Recommended.Editions_Proto2.JsonInput.FieldNameDuplicate # Should have failed to parse, but didn't.
49+
Recommended.Editions_Proto2.JsonInput.FieldNameDuplicateDifferentCasing1 # Should have failed to parse, but didn't.
50+
Recommended.Editions_Proto2.JsonInput.FieldNameDuplicateDifferentCasing2 # Should have failed to parse, but didn't.
51+
Recommended.Editions_Proto3.JsonInput.FieldNameDuplicate # Should have failed to parse, but didn't.
52+
Recommended.Editions_Proto3.JsonInput.FieldNameDuplicateDifferentCasing1 # Should have failed to parse, but didn't.
53+
Recommended.Editions_Proto3.JsonInput.FieldNameDuplicateDifferentCasing2 # Should have failed to parse, but didn't.
54+
Recommended.Proto2.JsonInput.FieldNameDuplicate # Should have failed to parse, but didn't.
55+
Recommended.Proto2.JsonInput.FieldNameDuplicateDifferentCasing1 # Should have failed to parse, but didn't.
56+
Recommended.Proto2.JsonInput.FieldNameDuplicateDifferentCasing2 # Should have failed to parse, but didn't.
57+
Recommended.Proto3.JsonInput.FieldNameDuplicate # Should have failed to parse, but didn't.
58+
Recommended.Proto3.JsonInput.FieldNameDuplicateDifferentCasing1 # Should have failed to parse, but didn't.
59+
Recommended.Proto3.JsonInput.FieldNameDuplicateDifferentCasing2 # Should have failed to parse, but didn't.

‎packages/protobuf-conformance/package.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,6 @@
2626
"@bufbuild/buf": "^1.56.0",
2727
"@bufbuild/protobuf": "2.7.0",
2828
"@bufbuild/protoc-gen-es": "2.7.0",
29-
"protobuf-conformance": "31.1.0"
29+
"protobuf-conformance": "32.0.0"
3030
}
3131
}

‎packages/protobuf-conformance/proto/google/protobuf/test_messages_proto2.proto‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -255,6 +255,9 @@ message TestAllTypesProto2 {
255255
optional ExtensionWithOneof extension_with_oneof = 123456789;
256256
}
257257
}
258+
259+
reserved "reserved_field";
260+
reserved 999999;
258261
}
259262

260263
message ForeignMessageProto2 {

‎packages/protobuf-conformance/proto/google/protobuf/test_messages_proto2_editions.proto‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -356,6 +356,10 @@ message TestAllTypesProto2 {
356356
ExtensionWithOneof extension_with_oneof = 123456789;
357357
}
358358
}
359+
360+
reserved reserved_field;
361+
362+
reserved 999999;
359363
}
360364

361365
message ForeignMessageProto2 {

‎packages/protobuf-conformance/proto/google/protobuf/test_messages_proto3.proto‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -244,6 +244,9 @@ message TestAllTypesProto3 {
244244

245245
// Reserved for testing unknown fields
246246
reserved 501 to 510;
247+
248+
reserved "reserved_field";
249+
reserved 999999;
247250
}
248251

249252
message ForeignMessage {

‎packages/protobuf-conformance/proto/google/protobuf/test_messages_proto3_editions.proto‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -286,6 +286,10 @@ message TestAllTypesProto3 {
286286

287287
// Reserved for testing unknown fields
288288
reserved 501 to 510;
289+
290+
reserved reserved_field;
291+
292+
reserved 999999;
289293
}
290294

291295
message ForeignMessage {

‎packages/protobuf-conformance/src/gen/google/protobuf/test_messages_proto2_editions_pb.ts‎

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)