diff options
author | Jan Tattermusch <jtattermusch@google.com> | 2015-07-15 20:33:59 -0700 |
---|---|---|
committer | Jan Tattermusch <jtattermusch@google.com> | 2015-07-15 20:33:59 -0700 |
commit | 11002e70c607255cf91fea0f998fe945ca6ddc5e (patch) | |
tree | eadc17fc1043b12cccdd5868e775bc540faa9841 /conformance/conformance.proto | |
parent | 385baaa87c52abf5339b0be7dccf8a4131667117 (diff) | |
parent | fde6e89f99eda04a4f1b8677bcea07e6c2040405 (diff) | |
download | protobuf-11002e70c607255cf91fea0f998fe945ca6ddc5e.tar.gz protobuf-11002e70c607255cf91fea0f998fe945ca6ddc5e.tar.bz2 protobuf-11002e70c607255cf91fea0f998fe945ca6ddc5e.zip |
Merge remote-tracking branch 'upstream/master' into csharp-experimental
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; } } |