diff options
Diffstat (limited to 'conformance')
| -rw-r--r-- | conformance/conformance_test.cc | 7 | ||||
| -rw-r--r-- | conformance/failure_list_php.txt | 2 | ||||
| -rw-r--r-- | conformance/failure_list_python.txt | 2 | ||||
| -rw-r--r-- | conformance/failure_list_python_cpp.txt | 2 | ||||
| -rw-r--r-- | conformance/failure_list_ruby.txt | 2 |
5 files changed, 12 insertions, 3 deletions
diff --git a/conformance/conformance_test.cc b/conformance/conformance_test.cc index 4630729a..b1ff6883 100644 --- a/conformance/conformance_test.cc +++ b/conformance/conformance_test.cc @@ -1605,9 +1605,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_php.txt b/conformance/failure_list_php.txt index e06d07a1..9bb85089 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.Proto3.JsonInput.DurationHas3FractionalDigits.Validator Recommended.Proto3.JsonInput.DurationHas6FractionalDigits.Validator Recommended.Proto3.JsonInput.DurationHas9FractionalDigits.Validator diff --git a/conformance/failure_list_python.txt b/conformance/failure_list_python.txt index 7b010178..3501e461 100644 --- a/conformance/failure_list_python.txt +++ b/conformance/failure_list_python.txt @@ -1,3 +1,5 @@ +Recommended.JsonInput.BytesFieldBase64Url.JsonOutput +Recommended.JsonInput.BytesFieldBase64Url.ProtobufOutput Recommended.Proto3.JsonInput.DoubleFieldInfinityNotQuoted Recommended.Proto3.JsonInput.DoubleFieldNanNotQuoted Recommended.Proto3.JsonInput.DoubleFieldNegativeInfinityNotQuoted diff --git a/conformance/failure_list_python_cpp.txt b/conformance/failure_list_python_cpp.txt index ab946d9d..d25912a9 100644 --- a/conformance/failure_list_python_cpp.txt +++ b/conformance/failure_list_python_cpp.txt @@ -7,6 +7,8 @@ # 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.Proto3.JsonInput.DoubleFieldInfinityNotQuoted Recommended.Proto3.JsonInput.DoubleFieldNanNotQuoted Recommended.Proto3.JsonInput.DoubleFieldNegativeInfinityNotQuoted diff --git a/conformance/failure_list_ruby.txt b/conformance/failure_list_ruby.txt index a8d2e3f5..f9af9db9 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.Proto3.JsonInput.DurationHas3FractionalDigits.Validator Recommended.Proto3.JsonInput.DurationHas6FractionalDigits.Validator Recommended.Proto3.JsonInput.DurationHas9FractionalDigits.Validator |