From 9440422f2ead3488c437cef5f52dad465cc8b2cb Mon Sep 17 00:00:00 2001 From: "Benjamin Scholtysik (Reimold)" Date: Fri, 18 Nov 2016 12:47:43 -0800 Subject: [PATCH] Reset BITSafeJsonEventsString instead of assigning NULL --- Support/HockeySDKTests/BITChannelTests.m | 16 ++++++++++------ 1 file changed, 10 insertions(+), 6 deletions(-) diff --git a/Support/HockeySDKTests/BITChannelTests.m b/Support/HockeySDKTests/BITChannelTests.m index 5011ef82c7..22e584a125 100644 --- a/Support/HockeySDKTests/BITChannelTests.m +++ b/Support/HockeySDKTests/BITChannelTests.m @@ -28,7 +28,7 @@ BITTelemetryContext *mockContext = mock(BITTelemetryContext.class); _sut = [[BITChannel alloc]initWithTelemetryContext:mockContext persistence:_mockPersistence]; - BITSafeJsonEventsString = NULL; + bit_resetSafeJsonStream(&BITSafeJsonEventsString); } #pragma mark - Setup Tests @@ -87,14 +87,16 @@ #pragma clang diagnostic ignored "-Wnonnull" bit_appendStringToSafeJsonStream(nil, 0); #pragma clang diagnostic pop - XCTAssertTrue(BITSafeJsonEventsString == NULL); + XCTAssertEqual(strcmp(BITSafeJsonEventsString,""), 0); - BITSafeJsonEventsString = NULL; +// BITSafeJsonEventsString = NULL; + bit_resetSafeJsonStream(&BITSafeJsonEventsString); + #pragma clang diagnostic push #pragma clang diagnostic ignored "-Wnonnull" bit_appendStringToSafeJsonStream(nil, &BITSafeJsonEventsString); #pragma clang diagnostic pop - XCTAssertTrue(BITSafeJsonEventsString == NULL); + XCTAssertEqual(strcmp(BITSafeJsonEventsString,""), 0); bit_appendStringToSafeJsonStream(@"", &BITSafeJsonEventsString); XCTAssertEqual(strcmp(BITSafeJsonEventsString,""), 0); @@ -107,12 +109,14 @@ bit_resetSafeJsonStream(&BITSafeJsonEventsString); XCTAssertEqual(strcmp(BITSafeJsonEventsString,""), 0); - BITSafeJsonEventsString = NULL; +// BITSafeJsonEventsString = NULL; + bit_resetSafeJsonStream(&BITSafeJsonEventsString); + #pragma clang diagnostic push #pragma clang diagnostic ignored "-Wnonnull" bit_resetSafeJsonStream(nil); #pragma clang diagnostic pop - XCTAssertEqual(BITSafeJsonEventsString, NULL); + XCTAssertEqual(strcmp(BITSafeJsonEventsString,""), 0); BITSafeJsonEventsString = strdup("test string"); bit_resetSafeJsonStream(&BITSafeJsonEventsString);