diff options
author | Jon Skeet <skeet@pobox.com> | 2015-07-16 07:11:40 +0100 |
---|---|---|
committer | Jon Skeet <skeet@pobox.com> | 2015-07-16 07:11:40 +0100 |
commit | 19cf9d1e0044e18067ac4f444e3d91a5d939e84e (patch) | |
tree | eadc17fc1043b12cccdd5868e775bc540faa9841 /conformance/ConformanceJava.java | |
parent | 385baaa87c52abf5339b0be7dccf8a4131667117 (diff) | |
parent | 11002e70c607255cf91fea0f998fe945ca6ddc5e (diff) | |
download | protobuf-19cf9d1e0044e18067ac4f444e3d91a5d939e84e.tar.gz protobuf-19cf9d1e0044e18067ac4f444e3d91a5d939e84e.tar.bz2 protobuf-19cf9d1e0044e18067ac4f444e3d91a5d939e84e.zip |
Merge pull request #606 from jtattermusch/csharp-experimental-merged
Update csharp-experimental with changes from upstream/master
Diffstat (limited to 'conformance/ConformanceJava.java')
-rw-r--r-- | conformance/ConformanceJava.java | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/conformance/ConformanceJava.java b/conformance/ConformanceJava.java index c1a53141..25646b85 100644 --- a/conformance/ConformanceJava.java +++ b/conformance/ConformanceJava.java @@ -54,7 +54,7 @@ class ConformanceJava { break; } case JSON_PAYLOAD: { - return Conformance.ConformanceResponse.newBuilder().setRuntimeError("JSON not yet supported.").build(); + return Conformance.ConformanceResponse.newBuilder().setSkipped("JSON not yet supported.").build(); } case PAYLOAD_NOT_SET: { throw new RuntimeException("Request didn't have payload."); @@ -65,7 +65,7 @@ class ConformanceJava { } } - switch (request.getRequestedOutput()) { + switch (request.getRequestedOutputFormat()) { case UNSPECIFIED: throw new RuntimeException("Unspecified output format."); @@ -73,7 +73,7 @@ class ConformanceJava { return Conformance.ConformanceResponse.newBuilder().setProtobufPayload(testMessage.toByteString()).build(); case JSON: - return Conformance.ConformanceResponse.newBuilder().setRuntimeError("JSON not yet supported.").build(); + return Conformance.ConformanceResponse.newBuilder().setSkipped("JSON not yet supported.").build(); default: { throw new RuntimeException("Unexpected request output."); |