aboutsummaryrefslogtreecommitdiff
path: root/conformance/conformance_test.cc
diff options
context:
space:
mode:
authorJoshua Haberman <jhaberman@gmail.com>2017-06-19 15:13:24 -0700
committerPaul Yang <TeBoring@users.noreply.github.com>2017-06-19 15:13:24 -0700
commit13255889820dbd56f1574d9730465ca834c22bd2 (patch)
tree20bbbb0cf71543b7e59b2fc693d8cb1ab7669137 /conformance/conformance_test.cc
parentc2fdef05cf9236984744060ace4a16fe1036fd99 (diff)
downloadprotobuf-13255889820dbd56f1574d9730465ca834c22bd2.tar.gz
protobuf-13255889820dbd56f1574d9730465ca834c22bd2.tar.bz2
protobuf-13255889820dbd56f1574d9730465ca834c22bd2.zip
Updated upb to fix JSON conformance issues. (#3206)
* Fixed a bunch of Ruby conformance errors. * Fixed some more Ruby conformance errors in JSON.
Diffstat (limited to 'conformance/conformance_test.cc')
-rw-r--r--conformance/conformance_test.cc2
1 files changed, 1 insertions, 1 deletions
diff --git a/conformance/conformance_test.cc b/conformance/conformance_test.cc
index a899435d..67c90397 100644
--- a/conformance/conformance_test.cc
+++ b/conformance/conformance_test.cc
@@ -1233,7 +1233,7 @@ bool ConformanceTestSuite::RunSuite(ConformanceTestRunner* runner,
"Int32FieldNegativeWithLeadingZero", REQUIRED,
R"({"optionalInt32": -01})");
// String values must follow the same syntax rule. Specifically leading
- // or traling spaces are not allowed.
+ // or trailing spaces are not allowed.
ExpectParseFailureForJson(
"Int32FieldLeadingSpace", REQUIRED,
R"({"optionalInt32": " 1"})");