aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorThomas Van Lenten <thomasvl@google.com>2019-05-29 15:03:24 -0400
committerThomas Van Lenten <thomasvl@google.com>2019-05-29 15:58:09 -0400
commitbeaeaeda34e97a6ff9735b33a66e011102ab506b (patch)
tree45e5437e627b61852e51823733fd71c7d3a94f70
parent37297b25f64885708039aa757e90fba513535aa5 (diff)
downloadprotobuf-beaeaeda34e97a6ff9735b33a66e011102ab506b.tar.gz
Use runtime_error vs just exiting for some issues.
release notes: no
-rw-r--r--conformance/conformance_objc.m11
1 files changed, 8 insertions, 3 deletions
diff --git a/conformance/conformance_objc.m b/conformance/conformance_objc.m
index 60b2ac59e..1d677034e 100644
--- a/conformance/conformance_objc.m
+++ b/conformance/conformance_objc.m
@@ -68,7 +68,8 @@ static ConformanceResponse *DoTest(ConformanceRequest *request) {
switch (request.payloadOneOfCase) {
case ConformanceRequest_Payload_OneOfCase_GPBUnsetOneOfCase:
- Die(@"Request didn't have a payload: %@", request);
+ response.runtimeError =
+ [NSString stringWithFormat:@"Request didn't have a payload: %@", request];
break;
case ConformanceRequest_Payload_OneOfCase_ProtobufPayload: {
@@ -78,7 +79,10 @@ static ConformanceResponse *DoTest(ConformanceRequest *request) {
} else if ([request.messageType isEqual:@"protobuf_test_messages.proto2.TestAllTypesProto2"]) {
msgClass = [TestAllTypesProto2 class];
} else {
- Die(@"Protobuf request had an unknown message_type: %@", request.messageType);
+ response.runtimeError =
+ [NSString stringWithFormat:
+ @"Protobuf request had an unknown message_type: %@", request.messageType];
+ break;
}
NSError *error = nil;
testMessage = [msgClass parseFromData:request.protobufPayload error:&error];
@@ -108,7 +112,8 @@ static ConformanceResponse *DoTest(ConformanceRequest *request) {
switch (request.requestedOutputFormat) {
case WireFormat_GPBUnrecognizedEnumeratorValue:
case WireFormat_Unspecified:
- Die(@"Unrecognized/unspecified output format: %@", request);
+ response.runtimeError =
+ [NSString stringWithFormat:@"Unrecognized/unspecified output format: %@", request];
break;
case WireFormat_Protobuf: