commit 29e4fadbfb55b7c5e96a032053635451bf969ffa
author Paul Yang <TeBoring@users.noreply.github.com> Tue Jul 23 12:42:30 2019 -0700
committer GitHub <noreply@github.com> Tue Jul 23 12:42:30 2019 -0700
tree da2c4bbe521685edf88c7fbdb811c2c77ba3a649
parent 180d3e3287bc236de67e92bed95c67c5dd78da18

Add binary conformance test case for bytes field (#6428)

* Add binary conformance test case for bytes field

* Add failed conformance test to php's failure list

conformance/binary_json_conformance_suite.cc

diff --git a/conformance/binary_json_conformance_suite.cc b/conformance/binary_json_conformance_suite.cc
index 4ce5379..96012a1 100644
--- a/conformance/binary_json_conformance_suite.cc
+++ b/conformance/binary_json_conformance_suite.cc
@@ -799,11 +799,15 @@
     {delim("\xF0\x9F\x98\x81"), "\"\xF0\x9F\x98\x81\""},  // emoji: 😁
     {delim(""), "\"\""},
   });
+  TestValidDataForType(FieldDescriptor::TYPE_BYTES, {
+    {delim("\x01\x02"), "\"\x01\x02\""},
+    {delim("\xfb"), "\"\xfb\""},
+    {delim(""), "\"\""},
+  });
 
   // TODO(haberman):
   // TestValidDataForType(FieldDescriptor::TYPE_GROUP
   // TestValidDataForType(FieldDescriptor::TYPE_MESSAGE
-  // TestValidDataForType(FieldDescriptor::TYPE_BYTES
   // TestValidDataForType(FieldDescriptor::TYPE_ENUM
 
   RunValidJsonTest("HelloWorld", REQUIRED,

conformance/failure_list_php_c.txt

diff --git a/conformance/failure_list_php_c.txt b/conformance/failure_list_php_c.txt
index 48a08a7..f436365 100644
--- a/conformance/failure_list_php_c.txt
+++ b/conformance/failure_list_php_c.txt
@@ -44,3 +44,5 @@
 Required.Proto3.JsonInput.RejectTopLevelNull
 Required.Proto3.ProtobufInput.ValidDataRepeated.STRING.JsonOutput
 Required.Proto3.ProtobufInput.ValidDataRepeated.STRING.ProtobufOutput
+Required.Proto3.ProtobufInput.ValidDataRepeated.BYTES.JsonOutput
+Required.Proto3.ProtobufInput.ValidDataRepeated.BYTES.ProtobufOutput