diff options
author | Joshua Haberman <jhaberman@gmail.com> | 2015-07-13 09:50:01 -0700 |
---|---|---|
committer | Joshua Haberman <jhaberman@gmail.com> | 2015-07-13 09:50:01 -0700 |
commit | a3ca1fa4bf4d3e4b0958f96034c9be9d82c7a1d2 (patch) | |
tree | da6aab20d86574dee821130e36741d02ccfd83c2 /conformance/conformance.proto | |
parent | fe50044041e8b8bc6b8d8183e8d043ed6dba403e (diff) | |
parent | b0500b37b231b8f93a5b1b95e23d13830e11eb07 (diff) | |
download | protobuf-a3ca1fa4bf4d3e4b0958f96034c9be9d82c7a1d2.tar.gz protobuf-a3ca1fa4bf4d3e4b0958f96034c9be9d82c7a1d2.tar.bz2 protobuf-a3ca1fa4bf4d3e4b0958f96034c9be9d82c7a1d2.zip |
Merge pull request #588 from haberman/conformance-json
Added support for JSON and valid input to conformance tests.
Diffstat (limited to 'conformance/conformance.proto')
-rw-r--r-- | conformance/conformance.proto | 18 |
1 files changed, 11 insertions, 7 deletions
diff --git a/conformance/conformance.proto b/conformance/conformance.proto index 39eafdbb..714cbe78 100644 --- a/conformance/conformance.proto +++ b/conformance/conformance.proto @@ -51,6 +51,12 @@ option java_package = "com.google.protobuf.conformance"; // - running as a sub-process may be more tricky in unusual environments like // iOS apps, where fork/stdin/stdout are not available. +enum WireFormat { + UNSPECIFIED = 0; + PROTOBUF = 1; + JSON = 2; +} + // Represents a single test case's input. The testee should: // // 1. parse this proto (which should always succeed) @@ -64,14 +70,8 @@ message ConformanceRequest { string json_payload = 2; } - enum RequestedOutput { - UNSPECIFIED = 0; - PROTOBUF = 1; - JSON = 2; - } - // Which format should the testee serialize its message to? - RequestedOutput requested_output = 3; + WireFormat requested_output_format = 3; } // Represents a single test case's output. @@ -96,6 +96,10 @@ message ConformanceResponse { // If the input was successfully parsed and the requested output was JSON, // serialize to JSON and set it in this field. string json_payload = 4; + + // For when the testee skipped the test, likely because a certain feature + // wasn't supported, like JSON input/output. + string skipped = 5; } } |