diff options
| author |  Jisi Liu <jisi.liu@gmail.com> | 2017-08-18 16:25:35 -0700 |
|---|---|---|
| committer | Jisi Liu <jisi.liu@gmail.com> | 2017-08-18 16:25:35 -0700 |
| commit | 139775ccc040a07e07c5407e34834dab27928cbc (patch) | |
| tree | c500f4eabfea9d2e059f18b7d612c6e2a2db3ad5 /conformance/conformance_test.cc | |
| parent | 1825d6d8f0aedcd7966c5c137a71e46ae650b3da (diff) | |
| parent | 26ac3e8e242f1cd6de15291a9973905a14b546ba (diff) | |
Merge remote-tracking branch 'origin/3.4.x' into mergemaster
Diffstat (limited to 'conformance/conformance_test.cc')
| -rw-r--r-- | conformance/conformance_test.cc | 7 |
1 files changed, 4 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( |