Chiebot-Mirror
/
grpc
mirror of https://github.com/grpc/grpc.git
8
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge pull request #13507 from muxi/fix-objc-c++-syntax

Browse Source 
Fix ObjC C++ syntax error
pull/13510/head
Muxi Yan 7 years ago committed by GitHub
parent b3a35623e3 32318b05e3
commit 62a53ee55a
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 52 additions and 52 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 96
      src/objective-c/tests/CoreCronetEnd2EndTests/CoreCronetEnd2EndTests.mm
  2. 8
      src/objective-c/tests/Tests.xcodeproj/project.pbxproj

96
src/objective-c/tests/CoreCronetEnd2EndTests/CoreCronetEnd2EndTests.m → src/objective-c/tests/CoreCronetEnd2EndTests/CoreCronetEnd2EndTests.mm
Unescape View File

@ -58,7 +58,7 @@ static grpc_end2end_test_fixture chttp2_create_fixture_secure_fullstack(
grpc_end2end_test_fixture f; grpc_end2end_test_fixture f;
int port = grpc_pick_unused_port_or_die(); int port = grpc_pick_unused_port_or_die();
fullstack_secure_fixture_data *ffd = fullstack_secure_fixture_data *ffd =
gpr_malloc(sizeof(fullstack_secure_fixture_data)); (fullstack_secure_fixture_data*)gpr_malloc(sizeof(fullstack_secure_fixture_data));
memset(&f, 0, sizeof(f)); memset(&f, 0, sizeof(f));
gpr_join_host_port(&ffd->localaddr, "127.0.0.1", port); gpr_join_host_port(&ffd->localaddr, "127.0.0.1", port);
@ -81,7 +81,7 @@ static void process_auth_failure(void *state, grpc_auth_context *ctx,
static void cronet_init_client_secure_fullstack(grpc_end2end_test_fixture *f, static void cronet_init_client_secure_fullstack(grpc_end2end_test_fixture *f,
grpc_channel_args *client_args, grpc_channel_args *client_args,
stream_engine *cronetEngine) { stream_engine *cronetEngine) {
fullstack_secure_fixture_data *ffd = f->fixture_data; fullstack_secure_fixture_data *ffd = (fullstack_secure_fixture_data *)f->fixture_data;
f->client = grpc_cronet_secure_channel_create(cronetEngine, ffd->localaddr, f->client = grpc_cronet_secure_channel_create(cronetEngine, ffd->localaddr,
client_args, NULL); client_args, NULL);
GPR_ASSERT(f->client != NULL); GPR_ASSERT(f->client != NULL);
@ -90,7 +90,7 @@ static void cronet_init_client_secure_fullstack(grpc_end2end_test_fixture *f,
static void chttp2_init_server_secure_fullstack( static void chttp2_init_server_secure_fullstack(
grpc_end2end_test_fixture *f, grpc_channel_args *server_args, grpc_end2end_test_fixture *f, grpc_channel_args *server_args,
grpc_server_credentials *server_creds) { grpc_server_credentials *server_creds) {
fullstack_secure_fixture_data *ffd = f->fixture_data; fullstack_secure_fixture_data *ffd = (fullstack_secure_fixture_data *)f->fixture_data;
if (f->server) { if (f->server) {
grpc_server_destroy(f->server); grpc_server_destroy(f->server);
} }
@ -103,7 +103,7 @@ static void chttp2_init_server_secure_fullstack(
} }
static void chttp2_tear_down_secure_fullstack(grpc_end2end_test_fixture *f) { static void chttp2_tear_down_secure_fullstack(grpc_end2end_test_fixture *f) {
fullstack_secure_fixture_data *ffd = f->fixture_data; fullstack_secure_fixture_data *ffd = (fullstack_secure_fixture_data *)f->fixture_data;
gpr_free(ffd->localaddr); gpr_free(ffd->localaddr);
gpr_free(ffd); gpr_free(ffd);
} }
@ -171,7 +171,7 @@ static char *roots_filename;
FILE *roots_file; FILE *roots_file;
size_t roots_size = strlen(test_root_cert); size_t roots_size = strlen(test_root_cert);
char *argv[] = {"CoreCronetEnd2EndTests"}; char *argv[] = {(char *)"CoreCronetEnd2EndTests"};
grpc_test_init(1, argv); grpc_test_init(1, argv);
grpc_end2end_tests_pre_init(); grpc_end2end_tests_pre_init();
@ -207,7 +207,7 @@ static char *roots_filename;
} }
- (void)testIndividualCase:(char *)test_case { - (void)testIndividualCase:(char *)test_case {
char *argv[] = {"h2_ssl", test_case}; char *argv[] = {(char *)"h2_ssl", test_case};
for (int i = 0; i < sizeof(configs) / sizeof(*configs); i++) { for (int i = 0; i < sizeof(configs) / sizeof(*configs); i++) {
grpc_end2end_tests(sizeof(argv) / sizeof(argv[0]), argv, configs[i]); grpc_end2end_tests(sizeof(argv) / sizeof(argv[0]), argv, configs[i]);
@ -217,182 +217,182 @@ static char *roots_filename;
// TODO(mxyan): Use NSStringFromSelector(_cmd) to acquire test name from the // TODO(mxyan): Use NSStringFromSelector(_cmd) to acquire test name from the
// test case method name, so that bodies of test cases can stay identical // test case method name, so that bodies of test cases can stay identical
- (void)testAuthorityNotSupported { - (void)testAuthorityNotSupported {
[self testIndividualCase:"authority_not_supported"]; [self testIndividualCase:(char *)"authority_not_supported"];
} }
- (void)testBadHostname { - (void)testBadHostname {
[self testIndividualCase:"bad_hostname"]; [self testIndividualCase:(char *)"bad_hostname"];
} }
- (void)testBinaryMetadata { - (void)testBinaryMetadata {
// NOT SUPPORTED // NOT SUPPORTED
//[self testIndividualCase:"binary_metadata"]; //[self testIndividualCase:(char *)"binary_metadata"];
} }
- (void)testCallCreds { - (void)testCallCreds {
// NOT SUPPORTED // NOT SUPPORTED
// [self testIndividualCase:"call_creds"]; // [self testIndividualCase:(char *)"call_creds"];
} }
- (void)testCancelAfterAccept { - (void)testCancelAfterAccept {
[self testIndividualCase:"cancel_after_accept"]; [self testIndividualCase:(char *)"cancel_after_accept"];
} }
- (void)testCancelAfterClientDone { - (void)testCancelAfterClientDone {
[self testIndividualCase:"cancel_after_client_done"]; [self testIndividualCase:(char *)"cancel_after_client_done"];
} }
- (void)testCancelAfterInvoke { - (void)testCancelAfterInvoke {
[self testIndividualCase:"cancel_after_invoke"]; [self testIndividualCase:(char *)"cancel_after_invoke"];
} }
- (void)testCancelAfterRoundTrip { - (void)testCancelAfterRoundTrip {
[self testIndividualCase:"cancel_after_round_trip"]; [self testIndividualCase:(char *)"cancel_after_round_trip"];
} }
- (void)testCancelBeforeInvoke { - (void)testCancelBeforeInvoke {
[self testIndividualCase:"cancel_before_invoke"]; [self testIndividualCase:(char *)"cancel_before_invoke"];
} }
- (void)testCancelInAVacuum { - (void)testCancelInAVacuum {
[self testIndividualCase:"cancel_in_a_vacuum"]; [self testIndividualCase:(char *)"cancel_in_a_vacuum"];
} }
- (void)testCancelWithStatus { - (void)testCancelWithStatus {
[self testIndividualCase:"cancel_with_status"]; [self testIndividualCase:(char *)"cancel_with_status"];
} }
- (void)testCompressedPayload { - (void)testCompressedPayload {
[self testIndividualCase:"compressed_payload"]; [self testIndividualCase:(char *)"compressed_payload"];
} }
- (void)testConnectivity { - (void)testConnectivity {
// NOT SUPPORTED // NOT SUPPORTED
// [self testIndividualCase:"connectivity"]; // [self testIndividualCase:(char *)"connectivity"];
} }
- (void)testDefaultHost { - (void)testDefaultHost {
[self testIndividualCase:"default_host"]; [self testIndividualCase:(char *)"default_host"];
} }
- (void)testDisappearingServer { - (void)testDisappearingServer {
[self testIndividualCase:"disappearing_server"]; [self testIndividualCase:(char *)"disappearing_server"];
} }
- (void)testEmptyBatch { - (void)testEmptyBatch {
[self testIndividualCase:"empty_batch"]; [self testIndividualCase:(char *)"empty_batch"];
} }
- (void)testFilterCausesClose { - (void)testFilterCausesClose {
// NOT SUPPORTED // NOT SUPPORTED
// [self testIndividualCase:"filter_causes_close"]; // [self testIndividualCase:(char *)"filter_causes_close"];
} }
- (void)testGracefulServerShutdown { - (void)testGracefulServerShutdown {
[self testIndividualCase:"graceful_server_shutdown"]; [self testIndividualCase:(char *)"graceful_server_shutdown"];
} }
- (void)testHighInitialSeqno { - (void)testHighInitialSeqno {
[self testIndividualCase:"high_initial_seqno"]; [self testIndividualCase:(char *)"high_initial_seqno"];
} }
- (void)testHpackSize { - (void)testHpackSize {
// NOT SUPPORTED // NOT SUPPORTED
// [self testIndividualCase:"hpack_size"]; // [self testIndividualCase:(char *)"hpack_size"];
} }
- (void)testIdempotentRequest { - (void)testIdempotentRequest {
// NOT SUPPORTED // NOT SUPPORTED
// [self testIndividualCase:"idempotent_request"]; // [self testIndividualCase:(char *)"idempotent_request"];
} }
- (void)testInvokeLargeRequest { - (void)testInvokeLargeRequest {
// NOT SUPPORTED (frame size) // NOT SUPPORTED (frame size)
// [self testIndividualCase:"invoke_large_request"]; // [self testIndividualCase:(char *)"invoke_large_request"];
} }
- (void)testLargeMetadata { - (void)testLargeMetadata {
// NOT SUPPORTED // NOT SUPPORTED
// [self testIndividualCase:"large_metadata"]; // [self testIndividualCase:(char *)"large_metadata"];
} }
- (void)testMaxConcurrentStreams { - (void)testMaxConcurrentStreams {
[self testIndividualCase:"max_concurrent_streams"]; [self testIndividualCase:(char *)"max_concurrent_streams"];
} }
- (void)testMaxMessageLength { - (void)testMaxMessageLength {
// NOT SUPPORTED (close_error) // NOT SUPPORTED (close_error)
// [self testIndividualCase:"max_message_length"]; // [self testIndividualCase:(char *)"max_message_length"];
} }
- (void)testNegativeDeadline { - (void)testNegativeDeadline {
[self testIndividualCase:"negative_deadline"]; [self testIndividualCase:(char *)"negative_deadline"];
} }
- (void)testNetworkStatusChange { - (void)testNetworkStatusChange {
[self testIndividualCase:"network_status_change"]; [self testIndividualCase:(char *)"network_status_change"];
} }
- (void)testNoOp { - (void)testNoOp {
[self testIndividualCase:"no_op"]; [self testIndividualCase:(char *)"no_op"];
} }
- (void)testPayload { - (void)testPayload {
[self testIndividualCase:"payload"]; [self testIndividualCase:(char *)"payload"];
} }
- (void)testPing { - (void)testPing {
// NOT SUPPORTED // NOT SUPPORTED
// [self testIndividualCase:"ping"]; // [self testIndividualCase:(char *)"ping"];
} }
- (void)testPingPongStreaming { - (void)testPingPongStreaming {
[self testIndividualCase:"ping_pong_streaming"]; [self testIndividualCase:(char *)"ping_pong_streaming"];
} }
- (void)testRegisteredCall { - (void)testRegisteredCall {
[self testIndividualCase:"registered_call"]; [self testIndividualCase:(char *)"registered_call"];
} }
- (void)testRequestWithFlags { - (void)testRequestWithFlags {
// NOT SUPPORTED // NOT SUPPORTED
// [self testIndividualCase:"request_with_flags"]; // [self testIndividualCase:(char *)"request_with_flags"];
} }
- (void)testRequestWithPayload { - (void)testRequestWithPayload {
[self testIndividualCase:"request_with_payload"]; [self testIndividualCase:(char *)"request_with_payload"];
} }
- (void)testServerFinishesRequest { - (void)testServerFinishesRequest {
[self testIndividualCase:"server_finishes_request"]; [self testIndividualCase:(char *)"server_finishes_request"];
} }
- (void)testShutdownFinishesCalls { - (void)testShutdownFinishesCalls {
[self testIndividualCase:"shutdown_finishes_calls"]; [self testIndividualCase:(char *)"shutdown_finishes_calls"];
} }
- (void)testShutdownFinishesTags { - (void)testShutdownFinishesTags {
[self testIndividualCase:"shutdown_finishes_tags"]; [self testIndividualCase:(char *)"shutdown_finishes_tags"];
} }
- (void)testSimpleDelayedRequest { - (void)testSimpleDelayedRequest {
[self testIndividualCase:"simple_delayed_request"]; [self testIndividualCase:(char *)"simple_delayed_request"];
} }
- (void)testSimpleMetadata { - (void)testSimpleMetadata {
[self testIndividualCase:"simple_metadata"]; [self testIndividualCase:(char *)"simple_metadata"];
} }
- (void)testSimpleRequest { - (void)testSimpleRequest {
[self testIndividualCase:"simple_request"]; [self testIndividualCase:(char *)"simple_request"];
} }
- (void)testStreamingErrorResponse { - (void)testStreamingErrorResponse {
[self testIndividualCase:"streaming_error_response"]; [self testIndividualCase:(char *)"streaming_error_response"];
} }
- (void)testTrailingMetadata { - (void)testTrailingMetadata {
[self testIndividualCase:"trailing_metadata"]; [self testIndividualCase:(char *)"trailing_metadata"];
} }
@end @end

8
src/objective-c/tests/Tests.xcodeproj/project.pbxproj
Unescape View File

@ -14,7 +14,7 @@
20DFDF829DD993A4A00D5662 /* libPods-RxLibraryUnitTests.a in Frameworks */ = {isa = PBXBuildFile; fileRef = A58BE6DF1C62D1739EBB2C78 /* libPods-RxLibraryUnitTests.a */; }; 20DFDF829DD993A4A00D5662 /* libPods-RxLibraryUnitTests.a in Frameworks */ = {isa = PBXBuildFile; fileRef = A58BE6DF1C62D1739EBB2C78 /* libPods-RxLibraryUnitTests.a */; };
333E8FC01C8285B7C547D799 /* libPods-InteropTestsLocalCleartext.a in Frameworks */ = {isa = PBXBuildFile; fileRef = FD346DB2C23F676C4842F3FF /* libPods-InteropTestsLocalCleartext.a */; }; 333E8FC01C8285B7C547D799 /* libPods-InteropTestsLocalCleartext.a in Frameworks */ = {isa = PBXBuildFile; fileRef = FD346DB2C23F676C4842F3FF /* libPods-InteropTestsLocalCleartext.a */; };
3D7C85F6AA68C4A205E3BA16 /* libPods-Tests.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 20DFF2F3C97EF098FE5A3171 /* libPods-Tests.a */; }; 3D7C85F6AA68C4A205E3BA16 /* libPods-Tests.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 20DFF2F3C97EF098FE5A3171 /* libPods-Tests.a */; };
5E8A5DA71D3840B4000F8BC4 /* CoreCronetEnd2EndTests.m in Sources */ = {isa = PBXBuildFile; fileRef = 5E8A5DA61D3840B4000F8BC4 /* CoreCronetEnd2EndTests.m */; }; 5E8A5DA71D3840B4000F8BC4 /* CoreCronetEnd2EndTests.mm in Sources */ = {isa = PBXBuildFile; fileRef = 5E8A5DA61D3840B4000F8BC4 /* CoreCronetEnd2EndTests.mm */; };
5E8A5DA91D3840B4000F8BC4 /* libTests.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 635697C71B14FC11007A7283 /* libTests.a */; }; 5E8A5DA91D3840B4000F8BC4 /* libTests.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 635697C71B14FC11007A7283 /* libTests.a */; };
5EAD6D271E27047400002378 /* CronetUnitTests.m in Sources */ = {isa = PBXBuildFile; fileRef = 5EAD6D261E27047400002378 /* CronetUnitTests.m */; }; 5EAD6D271E27047400002378 /* CronetUnitTests.m in Sources */ = {isa = PBXBuildFile; fileRef = 5EAD6D261E27047400002378 /* CronetUnitTests.m */; };
5EAD6D291E27047400002378 /* libTests.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 635697C71B14FC11007A7283 /* libTests.a */; }; 5EAD6D291E27047400002378 /* libTests.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 635697C71B14FC11007A7283 /* libTests.a */; };
@ -140,7 +140,7 @@
573450F334B331D0BED8B961 /* Pods-CoreCronetEnd2EndTests.cronet.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-CoreCronetEnd2EndTests.cronet.xcconfig"; path = "Pods/Target Support Files/Pods-CoreCronetEnd2EndTests/Pods-CoreCronetEnd2EndTests.cronet.xcconfig"; sourceTree = "<group>"; }; 573450F334B331D0BED8B961 /* Pods-CoreCronetEnd2EndTests.cronet.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-CoreCronetEnd2EndTests.cronet.xcconfig"; path = "Pods/Target Support Files/Pods-CoreCronetEnd2EndTests/Pods-CoreCronetEnd2EndTests.cronet.xcconfig"; sourceTree = "<group>"; };
5761E98978DDDF136A58CB7E /* Pods-AllTests.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-AllTests.release.xcconfig"; path = "Pods/Target Support Files/Pods-AllTests/Pods-AllTests.release.xcconfig"; sourceTree = "<group>"; }; 5761E98978DDDF136A58CB7E /* Pods-AllTests.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-AllTests.release.xcconfig"; path = "Pods/Target Support Files/Pods-AllTests/Pods-AllTests.release.xcconfig"; sourceTree = "<group>"; };
5E8A5DA41D3840B4000F8BC4 /* CoreCronetEnd2EndTests.xctest */ = {isa = PBXFileReference; explicitFileType = wrapper.cfbundle; includeInIndex = 0; path = CoreCronetEnd2EndTests.xctest; sourceTree = BUILT_PRODUCTS_DIR; }; 5E8A5DA41D3840B4000F8BC4 /* CoreCronetEnd2EndTests.xctest */ = {isa = PBXFileReference; explicitFileType = wrapper.cfbundle; includeInIndex = 0; path = CoreCronetEnd2EndTests.xctest; sourceTree = BUILT_PRODUCTS_DIR; };
5E8A5DA61D3840B4000F8BC4 /* CoreCronetEnd2EndTests.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = CoreCronetEnd2EndTests.m; sourceTree = "<group>"; }; 5E8A5DA61D3840B4000F8BC4 /* CoreCronetEnd2EndTests.mm */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.objcpp; path = CoreCronetEnd2EndTests.mm; sourceTree = "<group>"; };
5EAD6D241E27047400002378 /* CronetUnitTests.xctest */ = {isa = PBXFileReference; explicitFileType = wrapper.cfbundle; includeInIndex = 0; path = CronetUnitTests.xctest; sourceTree = BUILT_PRODUCTS_DIR; }; 5EAD6D241E27047400002378 /* CronetUnitTests.xctest */ = {isa = PBXFileReference; explicitFileType = wrapper.cfbundle; includeInIndex = 0; path = CronetUnitTests.xctest; sourceTree = BUILT_PRODUCTS_DIR; };
5EAD6D261E27047400002378 /* CronetUnitTests.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = CronetUnitTests.m; sourceTree = "<group>"; }; 5EAD6D261E27047400002378 /* CronetUnitTests.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = CronetUnitTests.m; sourceTree = "<group>"; };
5EAD6D281E27047400002378 /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = "<group>"; }; 5EAD6D281E27047400002378 /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = "<group>"; };
@ -343,7 +343,7 @@
5E8A5DA51D3840B4000F8BC4 /* CoreCronetEnd2EndTests */ = { 5E8A5DA51D3840B4000F8BC4 /* CoreCronetEnd2EndTests */ = {
isa = PBXGroup; isa = PBXGroup;
children = ( children = (
5E8A5DA61D3840B4000F8BC4 /* CoreCronetEnd2EndTests.m */, 5E8A5DA61D3840B4000F8BC4 /* CoreCronetEnd2EndTests.mm */,
); );
path = CoreCronetEnd2EndTests; path = CoreCronetEnd2EndTests;
sourceTree = "<group>"; sourceTree = "<group>";
@ -1196,7 +1196,7 @@
isa = PBXSourcesBuildPhase; isa = PBXSourcesBuildPhase;
buildActionMask = 2147483647; buildActionMask = 2147483647;
files = ( files = (
5E8A5DA71D3840B4000F8BC4 /* CoreCronetEnd2EndTests.m in Sources */, 5E8A5DA71D3840B4000F8BC4 /* CoreCronetEnd2EndTests.mm in Sources */,
); );
runOnlyForDeploymentPostprocessing = 0; runOnlyForDeploymentPostprocessing = 0;
}; };

Write Preview
Loading…
Cancel
Save