From 343bea6b54f7ebf7a2f19e351bff8e39e4d07193 Mon Sep 17 00:00:00 2001 From: murgatroid99 <mlumish@google.com> Date: Fri, 15 May 2015 14:52:57 -0700 Subject: [PATCH] Fixed cancellation tests --- .../examples/Sample/SampleTests/RemoteProtoTests.m | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/src/objective-c/examples/Sample/SampleTests/RemoteProtoTests.m b/src/objective-c/examples/Sample/SampleTests/RemoteProtoTests.m index 6313e32483..ee9e287966 100644 --- a/src/objective-c/examples/Sample/SampleTests/RemoteProtoTests.m +++ b/src/objective-c/examples/Sample/SampleTests/RemoteProtoTests.m @@ -31,9 +31,12 @@ * */ +#include <grpc/status.h> + #import <UIKit/UIKit.h> #import <XCTest/XCTest.h> +#import <gRPC/ProtoRPC.h> #import <gRPC/GRXWriter+Immediate.h> #import <RemoteTest/Messages.pb.h> #import <RemoteTest/Test.pb.h> @@ -177,11 +180,12 @@ __weak XCTestExpectation *expectation = [self expectationWithDescription:@"CancelAfterBegin"]; ProtoRPC *call = [_service RPCToStreamingInputCallWithRequestsWriter:[GRXWriter writerWithContainer:@[]] handler:^(RMTStreamingInputCallResponse *response, NSError *error) { - // TODO(mlumish): check for actual CANCELLED error code - XCTAssertEqualObjects(error, nil); + XCTAssertEqual([error code], GRPC_STATUS_CANCELLED); + [expectation fulfill]; }]; [call start]; [call cancel]; + [self waitForExpectationsWithTimeout:4 handler:nil]; } @end -- GitLab