diff options
Diffstat (limited to 'conformance')
| -rw-r--r-- | conformance/conformance_test.cc | 7 | ||||
| -rw-r--r-- | conformance/failure_list_cpp.txt | 2 | ||||
| -rw-r--r-- | conformance/failure_list_csharp.txt | 2 | ||||
| -rw-r--r-- | conformance/failure_list_php.txt | 2 | ||||
| -rw-r--r-- | conformance/failure_list_python.txt | 3 | ||||
| -rw-r--r-- | conformance/failure_list_python_cpp.txt | 3 | ||||
| -rw-r--r-- | conformance/failure_list_ruby.txt | 2 |
7 files changed, 16 insertions, 5 deletions
diff --git a/conformance/conformance_test.cc b/conformance/conformance_test.cc index 8fa9f53c..91b6101f 100644 --- a/conformance/conformance_test.cc +++ b/conformance/conformance_test.cc @@ -1517,9 +1517,10 @@ bool ConformanceTestSuite::RunSuite(ConformanceTestRunner* runner, "BytesField", REQUIRED, R"({"optionalBytes": "AQI="})", R"(optional_bytes: "\x01\x02")"); - ExpectParseFailureForJson( - "BytesFieldInvalidBase64Characters", REQUIRED, - R"({"optionalBytes": "-_=="})"); + RunValidJsonTest( + "BytesFieldBase64Url", RECOMMENDED, + R"({"optionalBytes": "-_"})", + R"(optional_bytes: "\xfb")"); // Message fields. RunValidJsonTest( diff --git a/conformance/failure_list_cpp.txt b/conformance/failure_list_cpp.txt index 8a4fa7eb..4308dac3 100644 --- a/conformance/failure_list_cpp.txt +++ b/conformance/failure_list_cpp.txt @@ -12,6 +12,8 @@ Recommended.FieldMaskPathsDontRoundTrip.JsonOutput Recommended.FieldMaskTooManyUnderscore.JsonOutput Recommended.JsonInput.BoolFieldDoubleQuotedFalse Recommended.JsonInput.BoolFieldDoubleQuotedTrue +Recommended.JsonInput.BytesFieldBase64Url.JsonOutput +Recommended.JsonInput.BytesFieldBase64Url.ProtobufOutput Recommended.JsonInput.FieldMaskInvalidCharacter Recommended.JsonInput.FieldNameDuplicate Recommended.JsonInput.FieldNameDuplicateDifferentCasing1 diff --git a/conformance/failure_list_csharp.txt b/conformance/failure_list_csharp.txt index 922db94c..d70c3b69 100644 --- a/conformance/failure_list_csharp.txt +++ b/conformance/failure_list_csharp.txt @@ -1,3 +1,5 @@ +Recommended.JsonInput.BytesFieldBase64Url.JsonOutput +Recommended.JsonInput.BytesFieldBase64Url.ProtobufOutput Required.ProtobufInput.IllegalZeroFieldNum_Case_0 Required.ProtobufInput.IllegalZeroFieldNum_Case_1 Required.ProtobufInput.IllegalZeroFieldNum_Case_2 diff --git a/conformance/failure_list_php.txt b/conformance/failure_list_php.txt index 2bf9bb12..8bba4959 100644 --- a/conformance/failure_list_php.txt +++ b/conformance/failure_list_php.txt @@ -1,6 +1,8 @@ Recommended.FieldMaskNumbersDontRoundTrip.JsonOutput Recommended.FieldMaskPathsDontRoundTrip.JsonOutput Recommended.FieldMaskTooManyUnderscore.JsonOutput +Recommended.JsonInput.BytesFieldBase64Url.JsonOutput +Recommended.JsonInput.BytesFieldBase64Url.ProtobufOutput Recommended.JsonInput.DurationHas3FractionalDigits.Validator Recommended.JsonInput.DurationHas6FractionalDigits.Validator Recommended.JsonInput.DurationHas9FractionalDigits.Validator diff --git a/conformance/failure_list_python.txt b/conformance/failure_list_python.txt index 965b8212..96f9def6 100644 --- a/conformance/failure_list_python.txt +++ b/conformance/failure_list_python.txt @@ -1,10 +1,11 @@ +Recommended.JsonInput.BytesFieldBase64Url.JsonOutput +Recommended.JsonInput.BytesFieldBase64Url.ProtobufOutput Recommended.JsonInput.DoubleFieldInfinityNotQuoted Recommended.JsonInput.DoubleFieldNanNotQuoted Recommended.JsonInput.DoubleFieldNegativeInfinityNotQuoted Recommended.JsonInput.FloatFieldInfinityNotQuoted Recommended.JsonInput.FloatFieldNanNotQuoted Recommended.JsonInput.FloatFieldNegativeInfinityNotQuoted -Required.JsonInput.BytesFieldInvalidBase64Characters Required.JsonInput.DoubleFieldTooSmall Required.JsonInput.EnumFieldUnknownValue.Validator Required.JsonInput.FloatFieldTooLarge diff --git a/conformance/failure_list_python_cpp.txt b/conformance/failure_list_python_cpp.txt index 92404d2f..be259bf8 100644 --- a/conformance/failure_list_python_cpp.txt +++ b/conformance/failure_list_python_cpp.txt @@ -7,13 +7,14 @@ # TODO(haberman): insert links to corresponding bugs tracking the issue. # Should we use GitHub issues or the Google-internal bug tracker? +Recommended.JsonInput.BytesFieldBase64Url.JsonOutput +Recommended.JsonInput.BytesFieldBase64Url.ProtobufOutput Recommended.JsonInput.DoubleFieldInfinityNotQuoted Recommended.JsonInput.DoubleFieldNanNotQuoted Recommended.JsonInput.DoubleFieldNegativeInfinityNotQuoted Recommended.JsonInput.FloatFieldInfinityNotQuoted Recommended.JsonInput.FloatFieldNanNotQuoted Recommended.JsonInput.FloatFieldNegativeInfinityNotQuoted -Required.JsonInput.BytesFieldInvalidBase64Characters Required.JsonInput.DoubleFieldTooSmall Required.JsonInput.EnumFieldUnknownValue.Validator Required.JsonInput.FloatFieldTooLarge diff --git a/conformance/failure_list_ruby.txt b/conformance/failure_list_ruby.txt index d899ee40..dd31e76e 100644 --- a/conformance/failure_list_ruby.txt +++ b/conformance/failure_list_ruby.txt @@ -1,6 +1,8 @@ Recommended.FieldMaskNumbersDontRoundTrip.JsonOutput Recommended.FieldMaskPathsDontRoundTrip.JsonOutput Recommended.FieldMaskTooManyUnderscore.JsonOutput +Recommended.JsonInput.BytesFieldBase64Url.JsonOutput +Recommended.JsonInput.BytesFieldBase64Url.ProtobufOutput Recommended.JsonInput.DurationHas3FractionalDigits.Validator Recommended.JsonInput.DurationHas6FractionalDigits.Validator Recommended.JsonInput.DurationHas9FractionalDigits.Validator |