fix conformance test for text format
diff --git a/conformance/conformance_nodejs.js b/conformance/conformance_nodejs.js
index 5d3955f..4d96a38 100755
--- a/conformance/conformance_nodejs.js
+++ b/conformance/conformance_nodejs.js
@@ -76,6 +76,10 @@
response.setSkipped("JSON not supported.");
return response;
+ case conformance.ConformanceRequest.PayloadCase.TEXT_PAYLOAD:
+ response.setSkipped("Text format not supported.");
+ return response;
+
case conformance.ConformanceRequest.PayloadCase.PAYLOAD_NOT_SET:
response.setRuntimeError("Request didn't have payload");
return response;
diff --git a/conformance/conformance_php.php b/conformance/conformance_php.php
index 2eeaa63..9eef0c5 100755
--- a/conformance/conformance_php.php
+++ b/conformance/conformance_php.php
@@ -57,7 +57,10 @@
$response->setParseError($e->getMessage());
return $response;
}
- } else {
+ } elseif ($request->getPayload() == "text_payload") {
+ $response->setSkipped("PHP doesn't support text format yet");
+ return $response;
+ } else {
trigger_error("Request didn't have payload.", E_USER_ERROR);
}
diff --git a/conformance/conformance_ruby.rb b/conformance/conformance_ruby.rb
index 0e2126e..79d8d3d 100755
--- a/conformance/conformance_ruby.rb
+++ b/conformance/conformance_ruby.rb
@@ -66,6 +66,12 @@
response.parse_error = err.message.encode('utf-8')
return response
end
+
+ when :text_payload
+ begin
+ response.skipped = "Ruby doesn't support proto2"
+ return response
+ end
when nil
fail "Request didn't have payload"
diff --git a/csharp/src/Google.Protobuf.Conformance/Program.cs b/csharp/src/Google.Protobuf.Conformance/Program.cs
index 0d281e4..f5e1dad 100644
--- a/csharp/src/Google.Protobuf.Conformance/Program.cs
+++ b/csharp/src/Google.Protobuf.Conformance/Program.cs
@@ -109,6 +109,10 @@
}
break;
}
+ case ConformanceRequest.PayloadOneofCase.TextPayload:
+ {
+ return new ConformanceResponse { Skipped = "CSharp doesn't support text format" };
+ }
default:
throw new Exception("Unsupported request payload: " + request.PayloadCase);
}
