diff options
| author | Josh Haberman <jhaberman@gmail.com> | 2015-06-04 15:04:00 -0700 |
|---|---|---|
| committer | Josh Haberman <jhaberman@gmail.com> | 2015-06-04 15:04:00 -0700 |
| commit | 23bf3b566f4bd1c5d73a5d093e2d0a45ee81ff27 (patch) | |
| tree | a7c08a7874fe602bab8d0f466443712d68e2c18a /conformance/conformance.proto | |
| parent | d2b67389b30d1bff1080be3a3d8d7cfb0b81b867 (diff) | |
| download | protobuf-23bf3b566f4bd1c5d73a5d093e2d0a45ee81ff27.tar.gz protobuf-23bf3b566f4bd1c5d73a5d093e2d0a45ee81ff27.tar.bz2 protobuf-23bf3b566f4bd1c5d73a5d093e2d0a45ee81ff27.zip | |
Removed test_name from conformance.proto.
Change-Id: I382dcda97fa123a6da4ff5faad5d7ece95853f33
Diffstat (limited to 'conformance/conformance.proto')
| -rw-r--r-- | conformance/conformance.proto | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/conformance/conformance.proto b/conformance/conformance.proto index 892db380..39eafdbb 100644 --- a/conformance/conformance.proto +++ b/conformance/conformance.proto @@ -57,13 +57,11 @@ option java_package = "com.google.protobuf.conformance"; // 2. parse the protobuf or JSON payload in "payload" (which may fail) // 3. if the parse succeeded, serialize the message in the requested format. message ConformanceRequest { - string test_name = 1; - // The payload (whether protobuf of JSON) is always for a TestAllTypes proto // (see below). oneof payload { - bytes protobuf_payload = 2; - string json_payload = 3; + bytes protobuf_payload = 1; + string json_payload = 2; } enum RequestedOutput { @@ -73,7 +71,7 @@ message ConformanceRequest { } // Which format should the testee serialize its message to? - RequestedOutput requested_output = 4; + RequestedOutput requested_output = 3; } // Represents a single test case's output. |