From 37305f925e46adc80ae161729e796846c8da4a4d Mon Sep 17 00:00:00 2001 From: Matias Pequeno Date: Fri, 16 Aug 2024 12:15:53 -0300 Subject: [PATCH] Bumped version to 3.3.2 --- CHANGELOG.md | 5 + .../RollbarDemo.xcodeproj/project.pbxproj | 4 +- Rollbar.podspec | 2 +- RollbarAUL.podspec | 2 +- RollbarCocoaLumberjack.podspec | 2 +- RollbarCommon.podspec | 2 +- RollbarCrash.podspec | 2 +- RollbarDeploys.podspec | 2 +- RollbarNotifier.podspec | 2 +- .../Recording/RollbarCrashReportVersion.h | 2 +- .../RollbarNotifier/DTOs/RollbarConfig.m | 2 +- .../RollbarNotifierTests-ObjC/DTOsTests.m | 122 ++++++------- .../RollbarNotifierDTOsTests.swift | 168 +++++++++--------- RollbarReport.podspec | 2 +- 14 files changed, 162 insertions(+), 157 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 9a475d10..a5435ac7 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -2,6 +2,11 @@ ## Release Notes +### 3.3.2 + +- Fixes a compilation issue introduced in Xcode 16 Beta 5. +- Fixes some warnings in our Swift code. + ### 3.3.1 - Fixes a compilation issue present in Xcode 16 beta. diff --git a/Examples/RollbarDemo/RollbarDemo.xcodeproj/project.pbxproj b/Examples/RollbarDemo/RollbarDemo.xcodeproj/project.pbxproj index 082fa168..c403ec95 100644 --- a/Examples/RollbarDemo/RollbarDemo.xcodeproj/project.pbxproj +++ b/Examples/RollbarDemo/RollbarDemo.xcodeproj/project.pbxproj @@ -286,7 +286,7 @@ ASSETCATALOG_COMPILER_GLOBAL_ACCENT_COLOR_NAME = AccentColor; CODE_SIGN_ENTITLEMENTS = RollbarDemo/RollbarDemo.entitlements; CODE_SIGN_STYLE = Automatic; - CURRENT_PROJECT_VERSION = 75; + CURRENT_PROJECT_VERSION = 90; DEAD_CODE_STRIPPING = YES; DEVELOPMENT_ASSET_PATHS = "\"RollbarDemo/Preview Content\""; DEVELOPMENT_TEAM = 9P5JVC2F34; @@ -320,7 +320,7 @@ ASSETCATALOG_COMPILER_GLOBAL_ACCENT_COLOR_NAME = AccentColor; CODE_SIGN_ENTITLEMENTS = RollbarDemo/RollbarDemo.entitlements; CODE_SIGN_STYLE = Automatic; - CURRENT_PROJECT_VERSION = 75; + CURRENT_PROJECT_VERSION = 90; DEAD_CODE_STRIPPING = YES; DEVELOPMENT_ASSET_PATHS = "\"RollbarDemo/Preview Content\""; DEVELOPMENT_TEAM = 9P5JVC2F34; diff --git a/Rollbar.podspec b/Rollbar.podspec index f7966f66..f565c156 100644 --- a/Rollbar.podspec +++ b/Rollbar.podspec @@ -1,6 +1,6 @@ Pod::Spec.new do |s| s.name = "Rollbar" - s.version = "3.3.1" + s.version = "3.3.2" s.summary = "Application or client side SDK for interacting with the Rollbar API Server." s.description = <<-DESC Find, fix, and resolve errors with Rollbar. diff --git a/RollbarAUL.podspec b/RollbarAUL.podspec index 09af3eb9..89330c8a 100644 --- a/RollbarAUL.podspec +++ b/RollbarAUL.podspec @@ -1,6 +1,6 @@ Pod::Spec.new do |s| s.name = "RollbarAUL" - s.version = "3.3.1" + s.version = "3.3.2" s.summary = "Application or client side SDK for interacting with the Rollbar API Server." s.description = <<-DESC Find, fix, and resolve errors with Rollbar. diff --git a/RollbarCocoaLumberjack.podspec b/RollbarCocoaLumberjack.podspec index 28d7b2b8..b9d13d7f 100644 --- a/RollbarCocoaLumberjack.podspec +++ b/RollbarCocoaLumberjack.podspec @@ -1,6 +1,6 @@ Pod::Spec.new do |s| s.name = "RollbarCocoaLumberjack" - s.version = "3.3.1" + s.version = "3.3.2" s.summary = "Application or client side SDK for interacting with the Rollbar API Server." s.description = <<-DESC Find, fix, and resolve errors with Rollbar. diff --git a/RollbarCommon.podspec b/RollbarCommon.podspec index 773b7df0..be00c331 100644 --- a/RollbarCommon.podspec +++ b/RollbarCommon.podspec @@ -1,6 +1,6 @@ Pod::Spec.new do |s| s.name = "RollbarCommon" - s.version = "3.3.1" + s.version = "3.3.2" s.summary = "Application or client side SDK for interacting with the Rollbar API Server." s.description = <<-DESC Find, fix, and resolve errors with Rollbar. diff --git a/RollbarCrash.podspec b/RollbarCrash.podspec index 6c8e5f11..13b1c358 100644 --- a/RollbarCrash.podspec +++ b/RollbarCrash.podspec @@ -1,6 +1,6 @@ Pod::Spec.new do |s| s.name = "RollbarCrash" - s.version = "3.3.1" + s.version = "3.3.2" s.summary = "Application or client side SDK for interacting with the Rollbar API Server." s.description = <<-DESC Find, fix, and resolve errors with Rollbar. diff --git a/RollbarDeploys.podspec b/RollbarDeploys.podspec index f87cfaa7..46114efd 100644 --- a/RollbarDeploys.podspec +++ b/RollbarDeploys.podspec @@ -1,6 +1,6 @@ Pod::Spec.new do |s| s.name = "RollbarDeploys" - s.version = "3.3.1" + s.version = "3.3.2" s.summary = "Application or client side SDK for interacting with the Rollbar API Server." s.description = <<-DESC Find, fix, and resolve errors with Rollbar. diff --git a/RollbarNotifier.podspec b/RollbarNotifier.podspec index 22140142..bc3c2645 100644 --- a/RollbarNotifier.podspec +++ b/RollbarNotifier.podspec @@ -1,6 +1,6 @@ Pod::Spec.new do |s| s.name = "RollbarNotifier" - s.version = "3.3.1" + s.version = "3.3.2" s.summary = "Application or client side SDK for interacting with the Rollbar API Server." s.description = <<-DESC Find, fix, and resolve errors with Rollbar. diff --git a/RollbarNotifier/Sources/RollbarCrash/Recording/RollbarCrashReportVersion.h b/RollbarNotifier/Sources/RollbarCrash/Recording/RollbarCrashReportVersion.h index a3d5fb2e..9743d300 100644 --- a/RollbarNotifier/Sources/RollbarCrash/Recording/RollbarCrashReportVersion.h +++ b/RollbarNotifier/Sources/RollbarCrash/Recording/RollbarCrashReportVersion.h @@ -27,6 +27,6 @@ #ifndef HDR_RollbarCrashReportVersion_h #define HDR_RollbarCrashReportVersion_h -#define RollbarCrashCRASH_REPORT_VERSION "3.3.1" +#define RollbarCrashCRASH_REPORT_VERSION "3.3.2" #endif /* HDR_RollbarCrashReportVersion_h */ diff --git a/RollbarNotifier/Sources/RollbarNotifier/DTOs/RollbarConfig.m b/RollbarNotifier/Sources/RollbarNotifier/DTOs/RollbarConfig.m index c8556fde..c4f453d0 100644 --- a/RollbarNotifier/Sources/RollbarNotifier/DTOs/RollbarConfig.m +++ b/RollbarNotifier/Sources/RollbarNotifier/DTOs/RollbarConfig.m @@ -14,7 +14,7 @@ #pragma mark - constants -static NSString * const NOTIFIER_VERSION = @"3.3.1"; +static NSString * const NOTIFIER_VERSION = @"3.3.2"; static NSString * const NOTIFIER_NAME = @"rollbar-apple"; diff --git a/RollbarNotifier/Tests/RollbarNotifierTests-ObjC/DTOsTests.m b/RollbarNotifier/Tests/RollbarNotifierTests-ObjC/DTOsTests.m index 4ed165dd..3cd7622e 100644 --- a/RollbarNotifier/Tests/RollbarNotifierTests-ObjC/DTOsTests.m +++ b/RollbarNotifier/Tests/RollbarNotifierTests-ObjC/DTOsTests.m @@ -53,7 +53,7 @@ - (void)testBasicDTOInitializationWithJSONString { XCTAssertTrue([payload hasSameDefinedPropertiesAs:payloadAtOnce], @"Two RollbarPayload DTOs do not have same defined properties" ); - + XCTAssertTrue([payloadAtOnce isEqual:payload], @"Two RollbarPayload DTOs are expected to be equal" ); @@ -70,7 +70,7 @@ -(void)testRollbarProxyDTO { BOOL proxyEnabled = NO; NSUInteger proxyPort = 3000; NSString *proxyUrl = @"PROXY_URL"; - RollbarProxy *dto = [[RollbarProxy alloc] initWithEnabled:proxyEnabled proxyUrl:proxyUrl proxyPort:proxyPort]; + RollbarProxy *dto = [[RollbarProxy alloc] initWithEnabled:proxyEnabled proxyUrl:proxyUrl proxyPort:proxyPort]; XCTAssertTrue(dto.enabled == proxyEnabled, @"Enabled." ); @@ -93,12 +93,12 @@ - (void)testRollbarScrubbingOptionsDTO { XCTAssertTrue(dto.safeListFields.count == 0, @"Has NO whitelist fields" ); - + dto.safeListFields = [@[@"tf1", @"tf2", @"tf3"] mutableCopy]; XCTAssertTrue(dto.safeListFields.count == 3, @"Has some whitelist fields" ); - + dto.enabled = NO; XCTAssertTrue(!dto.enabled, @"Expected to be disabled" @@ -140,13 +140,13 @@ - (void)testRollbarServerConfigDTO { XCTAssertTrue(NSOrderedSame == [dto.codeVersion compare:@"3.2.5"], @"Proper new code version" ); - - + + RollbarMutableConfig *rc = [RollbarMutableConfig new]; rc.destination.accessToken = @"ACCESSTOKEN"; rc.destination.environment = @"ENVIRONMENT"; rc.destination.endpoint = @"ENDPOINT"; - + dto = rc.server; NSString *branchValue = dto.branch; XCTAssertNil(branchValue, @@ -185,7 +185,7 @@ - (void)testRollbarPersonDTO { XCTAssertTrue(NSOrderedSame == [dto.email compare:@"EMAIL1"], @"Proper email" ); - + dto = [[RollbarMutablePerson alloc] initWithID:@"ID007"]; XCTAssertTrue(NSOrderedSame == [dto.ID compare:@"ID007"], @"Proper ID" @@ -213,8 +213,8 @@ - (void)testRollbarModuleDTO { XCTAssertTrue([dto.name isEqualToString:@"MN1"], @"Proper name" ); - dto.version = @"v3.3.1"; - XCTAssertTrue([dto.version isEqualToString:@"v3.3.1"], + dto.version = @"v3.3.2"; + XCTAssertTrue([dto.version isEqualToString:@"v3.3.2"], @"Proper version" ); @@ -256,7 +256,7 @@ - (void)testRollbarTelemetryOptionsDTO { XCTAssertTrue(dto.viewInputsScrubber.safeListFields.count == 3, @"Proper view inputs scrubber white list fields count" ); - + dto = [[RollbarMutableTelemetryOptions alloc] init]; XCTAssertTrue(!dto.enabled, @"Proper enabled" @@ -288,7 +288,7 @@ - (void)testRollbarLoggingOptionsDTO { dto.codeVersion = @"CODEVERSION"; dto.framework = @"FRAMEWORK"; dto.requestId = @"REQUESTID"; - + XCTAssertTrue(dto.logLevel == RollbarLevel_Error, @"Proper log level" ); @@ -310,7 +310,7 @@ - (void)testRollbarLoggingOptionsDTO { XCTAssertTrue([dto.requestId isEqualToString:@"REQUESTID"], @"Proper request ID" ); - + dto = [[RollbarMutableLoggingOptions alloc] init]; XCTAssertTrue(dto.logLevel == RollbarLevel_Debug, @"Proper default log level" @@ -343,16 +343,16 @@ - (void)testRollbarConfigDTO { rc.destination.environment = @"ENVIRONMENT"; rc.destination.endpoint = @"ENDPOINT"; //rc.logLevel = RollbarDebug; - + [rc setPersonId:@"PERSONID" username:@"PERSONUSERNAME" email:@"PERSONEMAIL"]; [rc setServerHost:@"SERVERHOST" root:@"SERVERROOT" branch:@"SERVERBRANCH" codeVersion:@"SERVERCODEVERSION"]; [rc setNotifierName:@"NOTIFIERNAME" version:@"NOTIFIERVERSION"]; - + RollbarMutableConfig *rcClone = [[RollbarMutableConfig alloc] initWithJSONString:[rc serializeToJSONString]]; - + // id scrubList = rc.scrubFields; // id scrubListClone = rcClone.scrubFields; - + XCTAssertTrue([rc isEqual:rcClone], @"Two DTOs are expected to be equal" ); @@ -386,7 +386,7 @@ - (void)testRollbarMessageDTO { NSString *messageBody = @"Test message"; RollbarMessage *dto = [[RollbarMessage alloc] initWithBody:messageBody]; XCTAssertEqual(messageBody, dto.body); - + NSError *error = [NSError errorWithDomain:@"ERROR_DOMAIN" code:100 userInfo:nil]; dto = [[RollbarMessage alloc] initWithNSError:error]; XCTAssertNotNil(dto); @@ -430,7 +430,7 @@ - (void)testRollbarServerDTO { root:root branch:branch codeVersion:codeVersion]; - + XCTAssertNotNil(dto); XCTAssertNotNil(dto.cpu); @@ -466,7 +466,7 @@ - (void)testRollbarRequestDTO { postParams:postParams postBody:postBody userIP:userIP]; - + XCTAssertNotNil(dto); XCTAssertNotNil(dto.headers); @@ -497,7 +497,7 @@ - (void)testRollbarExceptionDTO { RollbarException *dto = [[RollbarException alloc] initWithExceptionClass:exceptionClass exceptionMessage:exceptionMessage exceptionDescription:exceptionDescription]; - + XCTAssertNotNil(dto); XCTAssertNotNil(dto.exceptionClass); @@ -515,7 +515,7 @@ - (void)testRollbarCallStackFrameContextDTO { RollbarCallStackFrameContext *dto = [[RollbarCallStackFrameContext alloc] initWithPreCodeLines:pre postCodeLines:post]; - + XCTAssertNotNil(dto); XCTAssertNotNil(dto.preCodeLines); @@ -535,7 +535,7 @@ - (void)testRollbarCallStackFrameDTO { NSNumber *colno = @111; NSNumber *lineno = @222; - + NSArray *pre = @[@"CODE_PR1", @"CODE_PR2"]; NSArray *post = nil; RollbarCallStackFrameContext *codeContext = [[RollbarCallStackFrameContext alloc] initWithPreCodeLines:pre @@ -555,7 +555,7 @@ - (void)testRollbarCallStackFrameDTO { NSArray *argspec = @[]; NSArray *varargspec = @[@"VARARG1"]; NSArray *keywordspec = @[@"KW1", @"KW2"]; - + RollbarCallStackFrame *dto = [[RollbarCallStackFrame alloc] initWithFileName:filename]; XCTAssertNotNil(dto); XCTAssertNotNil(dto.filename); @@ -590,7 +590,7 @@ - (void)testRollbarCallStackFrameDTO { XCTAssertTrue([dto.context.preCodeLines containsObject:pre[0]]); XCTAssertTrue([dto.context.preCodeLines containsObject:pre[1]]); XCTAssertNil(dto.context.postCodeLines); - + XCTAssertNil(dto.locals); dto.locals = locals; XCTAssertNotNil(dto.locals); @@ -600,7 +600,7 @@ - (void)testRollbarCallStackFrameDTO { dto.argspec = argspec; XCTAssertNotNil(dto.argspec); XCTAssertEqual(dto.argspec.count, argspec.count); - + XCTAssertNil(dto.varargspec); dto.varargspec = varargspec; XCTAssertNotNil(dto.varargspec); @@ -610,11 +610,11 @@ - (void)testRollbarCallStackFrameDTO { dto.keywordspec = keywordspec; XCTAssertNotNil(dto.keywordspec); XCTAssertEqual(dto.keywordspec.count, keywordspec.count); - + } - (void)testRollbarTraceDTO { - + NSString *exceptionClass = @"EXCEPTION_CLASS"; NSString *exceptionMessage = @"EXCEPTIION_MESSAGE"; NSString *exceptionDescription = nil; @@ -640,7 +640,7 @@ - (void)testRollbarTraceDTO { NSArray *argspec = @[]; NSArray *varargspec = @[@"VARARG1"]; NSArray *keywordspec = @[@"KW1", @"KW2"]; - + RollbarCallStackFrame *frameDto = [[RollbarCallStackFrame alloc] initWithFileName:filename]; frameDto.className = className; frameDto.code = code; @@ -652,7 +652,7 @@ - (void)testRollbarTraceDTO { frameDto.argspec = argspec; frameDto.varargspec = varargspec; frameDto.keywordspec = keywordspec; - + RollbarTrace *dto = [[RollbarTrace alloc] initWithRollbarException:exceptionDto rollbarCallStackFrames:@[frameDto, frameDto]]; XCTAssertNotNil(dto); @@ -666,14 +666,14 @@ - (void)testRollbarTraceDTO { // if/when we do allow a trace side-by-side with the crash report uncomment this test: //-(void)testRollbarBodyDTO { -// +// // RollbarBody *body = [[RollbarBody alloc] initWithCrashReport:CRASH_REPORT_PLCRASH_SYMBOLICATED]; -// +// // XCTAssertNotNil(body.crashReport); // XCTAssertNotNil(body.trace); // XCTAssertNil(body.traceChain); // XCTAssertNil(body.message); -// +// // XCTAssertNotNil(body.crashReport.rawCrashReport); // XCTAssertTrue(body.crashReport.rawCrashReport.length > 0); // @@ -687,12 +687,12 @@ - (void)testRollbarTraceDTO { //} -(void)testRollbarTelemetryEventDTO_properBodyBasedOnType { - + RollbarLevel level = RollbarLevel_Warning; RollbarSource source = RollbarSource_Server; RollbarTelemetryType type; RollbarTelemetryEvent *event = nil; - + type = RollbarTelemetryType_Log; event = [[RollbarTelemetryEvent alloc] initWithLevel:level telemetryType:type @@ -712,7 +712,7 @@ -(void)testRollbarTelemetryEventDTO_properBodyBasedOnType { XCTAssertEqual(event.type, type); XCTAssertNotNil(event.body); XCTAssertTrue([event.body isKindOfClass:[RollbarTelemetryViewBody class]]); - + type = RollbarTelemetryType_Error; event = [[RollbarTelemetryEvent alloc] initWithLevel:level telemetryType:type @@ -722,7 +722,7 @@ -(void)testRollbarTelemetryEventDTO_properBodyBasedOnType { XCTAssertEqual(event.type, type); XCTAssertNotNil(event.body); XCTAssertTrue([event.body isKindOfClass:[RollbarTelemetryErrorBody class]]); - + type = RollbarTelemetryType_Navigation; event = [[RollbarTelemetryEvent alloc] initWithLevel:level telemetryType:type @@ -732,7 +732,7 @@ -(void)testRollbarTelemetryEventDTO_properBodyBasedOnType { XCTAssertEqual(event.type, type); XCTAssertNotNil(event.body); XCTAssertTrue([event.body isKindOfClass:[RollbarTelemetryNavigationBody class]]); - + type = RollbarTelemetryType_Network; event = [[RollbarTelemetryEvent alloc] initWithLevel:level telemetryType:type @@ -742,7 +742,7 @@ -(void)testRollbarTelemetryEventDTO_properBodyBasedOnType { XCTAssertEqual(event.type, type); XCTAssertNotNil(event.body); XCTAssertTrue([event.body isKindOfClass:[RollbarTelemetryNetworkBody class]]); - + type = RollbarTelemetryType_Connectivity; event = [[RollbarTelemetryEvent alloc] initWithLevel:level telemetryType:type @@ -752,7 +752,7 @@ -(void)testRollbarTelemetryEventDTO_properBodyBasedOnType { XCTAssertEqual(event.type, type); XCTAssertNotNil(event.body); XCTAssertTrue([event.body isKindOfClass:[RollbarTelemetryConnectivityBody class]]); - + type = RollbarTelemetryType_Manual; event = [[RollbarTelemetryEvent alloc] initWithLevel:level telemetryType:type @@ -765,7 +765,7 @@ -(void)testRollbarTelemetryEventDTO_properBodyBasedOnType { } -(void)testRollbarTelemetryEventDTO_Log { - + RollbarLevel level = RollbarLevel_Warning; RollbarSource source = RollbarSource_Server; NSDictionary *extra = @{ @@ -773,11 +773,11 @@ -(void)testRollbarTelemetryEventDTO_Log { @"EXTRA2":@"extra_2", }; RollbarTelemetryEvent *event = nil; - + NSString *logMessage = @"log message"; RollbarTelemetryBody *body = [[RollbarTelemetryLogBody alloc] initWithMessage:logMessage extraData:extra]; - + event = [[RollbarTelemetryEvent alloc] initWithLevel:level source:source body:body]; @@ -794,7 +794,7 @@ -(void)testRollbarTelemetryEventDTO_Log { } -(void)testRollbarTelemetryEventDTO_View { - + RollbarLevel level = RollbarLevel_Warning; RollbarSource source = RollbarSource_Server; NSDictionary *extra = @{ @@ -802,11 +802,11 @@ -(void)testRollbarTelemetryEventDTO_View { @"EXTRA2":@"extra_2", }; RollbarTelemetryEvent *event = nil; - + NSString *viewElement = @"The element"; RollbarTelemetryBody *body = [[RollbarTelemetryViewBody alloc] initWithElement:viewElement extraData:extra]; - + event = [[RollbarTelemetryEvent alloc] initWithLevel:level source:source body:body]; @@ -823,7 +823,7 @@ -(void)testRollbarTelemetryEventDTO_View { } -(void)testRollbarTelemetryEventDTO_Error { - + RollbarLevel level = RollbarLevel_Warning; RollbarSource source = RollbarSource_Server; NSDictionary *extra = @{ @@ -831,11 +831,11 @@ -(void)testRollbarTelemetryEventDTO_Error { @"EXTRA2":@"extra_2", }; RollbarTelemetryEvent *event = nil; - + NSString *logMessage = @"error message"; RollbarTelemetryBody *body = [[RollbarTelemetryErrorBody alloc] initWithMessage:logMessage extraData:extra]; - + event = [[RollbarTelemetryEvent alloc] initWithLevel:level source:source body:body]; @@ -852,7 +852,7 @@ -(void)testRollbarTelemetryEventDTO_Error { } -(void)testRollbarTelemetryEventDTO_Navigation { - + RollbarLevel level = RollbarLevel_Warning; RollbarSource source = RollbarSource_Server; NSDictionary *extra = @{ @@ -860,13 +860,13 @@ -(void)testRollbarTelemetryEventDTO_Navigation { @"EXTRA2":@"extra_2", }; RollbarTelemetryEvent *event = nil; - + NSString *from = @"FROM"; NSString *to = @"TO"; RollbarTelemetryBody *body = [[RollbarTelemetryNavigationBody alloc] initWithFromLocation:from toLocation:to extraData:extra]; - + event = [[RollbarTelemetryEvent alloc] initWithLevel:level source:source body:body]; @@ -884,7 +884,7 @@ -(void)testRollbarTelemetryEventDTO_Navigation { } -(void)testRollbarTelemetryEventDTO_Network { - + RollbarLevel level = RollbarLevel_Warning; RollbarSource source = RollbarSource_Server; NSDictionary *extra = @{ @@ -892,7 +892,7 @@ -(void)testRollbarTelemetryEventDTO_Network { @"EXTRA2":@"extra_2", }; RollbarTelemetryEvent *event = nil; - + RollbarHttpMethod method = RollbarHttpMethod_Patch; NSString *url = @"URL"; NSString *statusCode = @"STATUS_CODE"; @@ -900,7 +900,7 @@ -(void)testRollbarTelemetryEventDTO_Network { url:url statusCode:statusCode extraData:extra]; - + event = [[RollbarTelemetryEvent alloc] initWithLevel:level source:source body:body]; @@ -919,7 +919,7 @@ -(void)testRollbarTelemetryEventDTO_Network { } -(void)testRollbarTelemetryEventDTO_Connectivity { - + RollbarLevel level = RollbarLevel_Warning; RollbarSource source = RollbarSource_Server; NSDictionary *extra = @{ @@ -927,11 +927,11 @@ -(void)testRollbarTelemetryEventDTO_Connectivity { @"EXTRA2":@"extra_2", }; RollbarTelemetryEvent *event = nil; - + NSString *status = @"STATUS_GOOD"; RollbarTelemetryBody *body = [[RollbarTelemetryConnectivityBody alloc] initWithStatus:status extraData:extra]; - + event = [[RollbarTelemetryEvent alloc] initWithLevel:level source:source body:body]; @@ -948,7 +948,7 @@ -(void)testRollbarTelemetryEventDTO_Connectivity { } -(void)testRollbarTelemetryEventDTO_Manual { - + RollbarLevel level = RollbarLevel_Warning; RollbarSource source = RollbarSource_Server; NSDictionary *extra = @{ @@ -956,9 +956,9 @@ -(void)testRollbarTelemetryEventDTO_Manual { @"EXTRA2":@"extra_2", }; RollbarTelemetryEvent *event = nil; - + RollbarTelemetryBody *body = [[RollbarTelemetryManualBody alloc] initWithDictionary:extra]; - + event = [[RollbarTelemetryEvent alloc] initWithLevel:level source:source body:body]; diff --git a/RollbarNotifier/Tests/RollbarNotifierTests/RollbarNotifierDTOsTests.swift b/RollbarNotifier/Tests/RollbarNotifierTests/RollbarNotifierDTOsTests.swift index 455d5494..6e9e2306 100644 --- a/RollbarNotifier/Tests/RollbarNotifierTests/RollbarNotifierDTOsTests.swift +++ b/RollbarNotifier/Tests/RollbarNotifierTests/RollbarNotifierDTOsTests.swift @@ -4,15 +4,15 @@ import Foundation @testable import RollbarNotifier final class RollbarNotifierDTOsTests: XCTestCase { - + override func setUp() { } - + override func tearDown() { } - + func testBasicDTOInitializationWithJSONString() { - + let jsonString = "{\"access_token\":\"ACCESS_TOKEN\", \"data\":{\"environment\":\"ENV\"}}"; let jsonPayload = "{\"access_token\":\"ACCESS_TOKEN\"}"; let jsonData = "{\"environment\":\"ENV\"}"; @@ -44,7 +44,7 @@ final class RollbarNotifierDTOsTests: XCTestCase { XCTAssertTrue(payload.hasSameDefinedProperties(as: payloadAtOnce), "Two RollbarPayload DTOs do not have same defined properties" ); - + XCTAssertEqual(payloadAtOnce, payload, "Two RollbarPayload DTOs are expected to be equal" ); @@ -58,7 +58,7 @@ final class RollbarNotifierDTOsTests: XCTestCase { } func testRollbarProxyDTO() { - + let proxyEnabled = false; let proxyPort = UInt(3000); let proxyUrl = "PROXY_URL"; @@ -73,9 +73,9 @@ final class RollbarNotifierDTOsTests: XCTestCase { "Proxy URL." ); } - + func testRollbarScrubbingOptionsDTO() { - + let dto = RollbarMutableScrubbingOptions(scrubFields: ["field1", "field2"]); XCTAssertTrue(dto.enabled, "Enabled by default" @@ -86,12 +86,12 @@ final class RollbarNotifierDTOsTests: XCTestCase { XCTAssertTrue(dto.safeListFields.count == 0, "Has NO whitelist fields" ); - + dto.safeListFields = ["tf1", "tf2", "tf3"]; XCTAssertTrue(dto.safeListFields.count == 3, "Has some whitelist fields" ); - + dto.enabled = false; XCTAssertTrue(!dto.enabled, "Expected to be disabled" @@ -99,9 +99,9 @@ final class RollbarNotifierDTOsTests: XCTestCase { } func testRollbarServerConfigDTO() { - + var dto = RollbarMutableServerConfig(host: "HOST", root: "ROOT", branch: "BRANCH", codeVersion: "1.2.3"); - + XCTAssertTrue(.orderedSame == dto.host!.compare("HOST"), "Proper host" ); @@ -131,13 +131,13 @@ final class RollbarNotifierDTOsTests: XCTestCase { XCTAssertTrue(.orderedSame == dto.codeVersion!.compare("3.2.5"), "Proper new code version" ); - - + + let rc = RollbarMutableConfig(); rc.destination.accessToken = "ACCESSTOKEN"; rc.destination.environment = "ENVIRONMENT"; rc.destination.endpoint = "ENDPOINT"; - + dto = rc.server; let branchValue = dto.branch; XCTAssertNil(branchValue, @@ -150,7 +150,7 @@ final class RollbarNotifierDTOsTests: XCTestCase { } func testRollbarPersonDTO() { - + var dto = RollbarMutablePerson(id: "ID", username: "USERNAME", email: "EMAIL"); XCTAssertTrue(.orderedSame == dto.id.compare("ID"), @@ -175,7 +175,7 @@ final class RollbarNotifierDTOsTests: XCTestCase { XCTAssertTrue(.orderedSame == dto.email!.compare("EMAIL1"), "Proper email" ); - + dto = RollbarMutablePerson(id: "ID007"); XCTAssertTrue(.orderedSame == dto.id.compare("ID007"), "Proper ID" @@ -186,7 +186,7 @@ final class RollbarNotifierDTOsTests: XCTestCase { XCTAssertNil(dto.email, "Proper default email" ); - + dto = RollbarMutablePerson(id: "nil", username: "USERNAME", email: "EMAIL"); XCTAssertTrue(.orderedSame == dto.id.compare("nil"), "Proper initial ID" @@ -195,7 +195,7 @@ final class RollbarNotifierDTOsTests: XCTestCase { XCTAssertTrue(.orderedSame == dto.id.compare("ID"), "Proper reassigned ID" ); - + let personJson = dto.serializeToJSONString(); XCTAssertNotNil(personJson, "Json serialization works."); XCTAssertTrue(.orderedSame == personJson!.compare("{\n \"email\" : \"EMAIL\",\n \"id\" : \"ID\",\n \"username\" : \"USERNAME\"\n}"), @@ -204,9 +204,9 @@ final class RollbarNotifierDTOsTests: XCTestCase { } func testRollbarModuleDTO() { - + var dto = RollbarMutableModule(name: "ModuleName", version: "v1.2.3"); - + XCTAssertTrue(.orderedSame == dto.name!.compare("ModuleName"), "Proper name" ); @@ -218,8 +218,8 @@ final class RollbarNotifierDTOsTests: XCTestCase { XCTAssertTrue(.orderedSame == dto.name!.compare("MN1"), "Proper name" ); - dto.version = "v3.3.1"; - XCTAssertTrue(.orderedSame == dto.version!.compare("v3.3.1"), + dto.version = "v3.3.2"; + XCTAssertTrue(.orderedSame == dto.version!.compare("v3.3.2"), "Proper version" ); @@ -231,9 +231,9 @@ final class RollbarNotifierDTOsTests: XCTestCase { "Proper version" ); } - + func testRollbarTelemetryOptionsDTO() { - + let scrubber = RollbarScrubbingOptions( enabled: true, scrubFields: ["one", "two"], @@ -245,7 +245,7 @@ final class RollbarNotifierDTOsTests: XCTestCase { captureConnectivity: true, viewInputsScrubber: scrubber ); - + XCTAssertTrue(dto.enabled, "Proper enabled" ); @@ -264,7 +264,7 @@ final class RollbarNotifierDTOsTests: XCTestCase { XCTAssertTrue(dto.viewInputsScrubber.safeListFields.count == 3, "Proper view inputs scrubber white list fields count" ); - + dto = RollbarMutableTelemetryOptions(); XCTAssertTrue(!dto.enabled, "Proper enabled" @@ -286,9 +286,9 @@ final class RollbarNotifierDTOsTests: XCTestCase { ); } - + func testRollbarLoggingOptionsDTO() { - + var dto = RollbarMutableLoggingOptions( logLevel: .error, crash: .info, @@ -299,7 +299,7 @@ final class RollbarNotifierDTOsTests: XCTestCase { dto.codeVersion = "CODEVERSION"; dto.framework = "FRAMEWORK"; dto.requestId = "REQUESTID"; - + XCTAssertTrue(dto.logLevel == .error, "Proper log level" ); @@ -321,7 +321,7 @@ final class RollbarNotifierDTOsTests: XCTestCase { XCTAssertTrue(.orderedSame == dto.requestId!.compare("REQUESTID"), "Proper request ID" ); - + dto = RollbarMutableLoggingOptions(); XCTAssertTrue(dto.logLevel == .debug, "Proper default log level" @@ -348,25 +348,25 @@ final class RollbarNotifierDTOsTests: XCTestCase { "Proper request ID" ); } - + func testRollbarConfigDTO() { - + let rc = RollbarMutableConfig(); //id destination = rc.destination; rc.destination.accessToken = "ACCESSTOKEN"; rc.destination.environment = "ENVIRONMENT"; rc.destination.endpoint = "ENDPOINT"; //rc.logLevel = RollbarDebug; - + rc.setPersonId("PERSONID", username: "PERSONUSERNAME", email: "PERSONEMAIL"); rc.setServerHost("SERVERHOST", root:"SERVERROOT", branch: "SERVERBRANCH", codeVersion: "SERVERCODEVERSION"); rc.setNotifierName("NOTIFIERNAME", version: "NOTIFIERVERSION"); - + var rcClone = RollbarMutableConfig(jsonString: rc.serializeToJSONString()!); - + // id scrubList = rc.scrubFields; // id scrubListClone = rcClone.scrubFields; - + XCTAssertTrue(rc.isEqual(rcClone), "Two DTOs are expected to be equal" ); @@ -397,11 +397,11 @@ final class RollbarNotifierDTOsTests: XCTestCase { } func testRollbarMessageDTO() { - + let messageBody = "Test message"; var dto = RollbarMessage(body: messageBody); XCTAssertEqual(messageBody, dto.body); - + let error = NSError(domain: "ERROR_DOMAIN", code: Int(100), userInfo: nil); dto = RollbarMessage(nsError: error); XCTAssertNotNil(dto); @@ -410,7 +410,7 @@ final class RollbarNotifierDTOsTests: XCTestCase { } func testMessageRollbarBodyDTO() { - + let message = "Test message"; let dto = RollbarBody(message: message); XCTAssertNotNil(dto); @@ -423,7 +423,7 @@ final class RollbarNotifierDTOsTests: XCTestCase { } func testCrashReportRollbarBodyDTO() { - + let data = "RAW_CRASH_REPORT_CONTENT"; let dto = RollbarBody(crashReport: data); XCTAssertNotNil(dto); @@ -436,7 +436,7 @@ final class RollbarNotifierDTOsTests: XCTestCase { } func testRollbarServerDTO() { - + let cpu = "CPU"; let host = "HOST"; let root = "ROOT"; @@ -450,7 +450,7 @@ final class RollbarNotifierDTOsTests: XCTestCase { branch: branch, codeVersion: nil ); - + XCTAssertNotNil(dto); XCTAssertNotNil(dto.cpu); @@ -489,7 +489,7 @@ final class RollbarNotifierDTOsTests: XCTestCase { postBody: nil, userIP: userIP ); - + XCTAssertNotNil(dto); XCTAssertNotNil(dto.headers); @@ -511,9 +511,9 @@ final class RollbarNotifierDTOsTests: XCTestCase { XCTAssertEqual(dto.postBody, nil); XCTAssertEqual(dto.userIP, userIP); } - + func testRollbarExceptionDTO() { - + let exceptionClass = "EXCEPTION_CLASS"; let exceptionMessage = "EXCEPTIION_MESSAGE"; //let exceptionDescription = String(); @@ -523,7 +523,7 @@ final class RollbarNotifierDTOsTests: XCTestCase { exceptionMessage: exceptionMessage, exceptionDescription: nil ); - + XCTAssertNotNil(dto); XCTAssertNotNil(dto.exceptionClass); @@ -536,7 +536,7 @@ final class RollbarNotifierDTOsTests: XCTestCase { } func testRollbarCallStackFrameContextDTO() { - + let pre = ["CODE_PR1", "CODE_PR2"]; //let post = [String](); @@ -544,7 +544,7 @@ final class RollbarNotifierDTOsTests: XCTestCase { preCodeLines: pre, postCodeLines: nil ); - + XCTAssertNotNil(dto); XCTAssertNotNil(dto.preCodeLines); @@ -556,7 +556,7 @@ final class RollbarNotifierDTOsTests: XCTestCase { } func testRollbarCallStackFrameDTO() { - + let filename = "FILENAME"; let className = "CLASSNAME"; @@ -565,14 +565,14 @@ final class RollbarNotifierDTOsTests: XCTestCase { let colno = UInt(111); let lineno = UInt(222); - + let pre = ["CODE_PR1", "CODE_PR2"]; //let post = [String](); let codeContext = RollbarCallStackFrameContext( preCodeLines: pre, postCodeLines: nil ); - + XCTAssertNotNil(codeContext); XCTAssertNotNil(codeContext.preCodeLines); XCTAssertNil(codeContext.postCodeLines); @@ -588,7 +588,7 @@ final class RollbarNotifierDTOsTests: XCTestCase { let argspec = [String](); let varargspec = ["VARARG1"]; let keywordspec = ["KW1", "KW2"]; - + let dto = RollbarCallStackFrame(fileName: filename); XCTAssertNotNil(dto); XCTAssertNotNil(dto.filename); @@ -623,7 +623,7 @@ final class RollbarNotifierDTOsTests: XCTestCase { XCTAssertTrue(dto.context!.preCodeLines!.contains(pre[0])); XCTAssertTrue(dto.context!.preCodeLines!.contains(pre[1])); XCTAssertNil(dto.context!.postCodeLines); - + XCTAssertNil(dto.locals); dto.locals = locals; XCTAssertNotNil(dto.locals); @@ -633,7 +633,7 @@ final class RollbarNotifierDTOsTests: XCTestCase { dto.argspec = argspec; XCTAssertNotNil(dto.argspec); XCTAssertEqual(dto.argspec!.count, argspec.count); - + XCTAssertNil(dto.varargspec); dto.varargspec = varargspec; XCTAssertNotNil(dto.varargspec); @@ -643,11 +643,11 @@ final class RollbarNotifierDTOsTests: XCTestCase { dto.keywordspec = keywordspec; XCTAssertNotNil(dto.keywordspec); XCTAssertEqual(dto.keywordspec!.count, keywordspec.count); - + } - + func testRollbarTraceDTO() { - + let exceptionClass = "EXCEPTION_CLASS"; let exceptionMessage = "EXCEPTIION_MESSAGE"; //let exceptionDescription = String(); @@ -677,7 +677,7 @@ final class RollbarNotifierDTOsTests: XCTestCase { //let argspec = [String](); let varargspec = ["VARARG1"]; let keywordspec = ["KW1", "KW2"]; - + let frameDto = RollbarCallStackFrame(fileName: filename); frameDto.className = className; frameDto.code = code; @@ -689,7 +689,7 @@ final class RollbarNotifierDTOsTests: XCTestCase { frameDto.argspec = nil; frameDto.varargspec = varargspec; frameDto.keywordspec = keywordspec; - + let dto = RollbarTrace( rollbarException: exceptionDto, rollbarCallStackFrames: [frameDto, frameDto] @@ -702,14 +702,14 @@ final class RollbarNotifierDTOsTests: XCTestCase { XCTAssertEqual(dto.frames[0].filename, filename); XCTAssertEqual(dto.frames[1].filename, filename); } - + func testRollbarTelemetryEventDTO_properBodyBasedOnType() { - + let level = RollbarLevel.warning; let source = RollbarSource.server; var type: RollbarTelemetryType; var event: RollbarTelemetryEvent; - + type = .log; event = RollbarTelemetryEvent( level: level, @@ -733,7 +733,7 @@ final class RollbarNotifierDTOsTests: XCTestCase { XCTAssertEqual(event.type, type); XCTAssertNotNil(event.body); XCTAssertTrue(event.body is RollbarTelemetryViewBody); - + type = .error; event = RollbarTelemetryEvent( level: level, @@ -745,7 +745,7 @@ final class RollbarNotifierDTOsTests: XCTestCase { XCTAssertEqual(event.type, type); XCTAssertNotNil(event.body); XCTAssertTrue(event.body is RollbarTelemetryErrorBody); - + type = .navigation; event = RollbarTelemetryEvent( level: level, @@ -757,7 +757,7 @@ final class RollbarNotifierDTOsTests: XCTestCase { XCTAssertEqual(event.type, type); XCTAssertNotNil(event.body); XCTAssertTrue(event.body is RollbarTelemetryNavigationBody); - + type = .network; event = RollbarTelemetryEvent( level: level, @@ -769,7 +769,7 @@ final class RollbarNotifierDTOsTests: XCTestCase { XCTAssertEqual(event.type, type); XCTAssertNotNil(event.body); XCTAssertTrue(event.body is RollbarTelemetryNetworkBody); - + type = .connectivity; event = RollbarTelemetryEvent( level: level, @@ -781,7 +781,7 @@ final class RollbarNotifierDTOsTests: XCTestCase { XCTAssertEqual(event.type, type); XCTAssertNotNil(event.body); XCTAssertTrue(event.body is RollbarTelemetryConnectivityBody); - + type = .manual; event = RollbarTelemetryEvent( level: level, @@ -794,9 +794,9 @@ final class RollbarNotifierDTOsTests: XCTestCase { XCTAssertNotNil(event.body); XCTAssertTrue(event.body is RollbarTelemetryManualBody); } - + func testRollbarTelemetryEventDTO_Log() { - + let level: RollbarLevel = .warning; let source: RollbarSource = .server; let extra = [ @@ -810,7 +810,7 @@ final class RollbarNotifierDTOsTests: XCTestCase { message: logMessage, extraData: extra ); - + event = RollbarTelemetryEvent( level: level, source: source, @@ -829,7 +829,7 @@ final class RollbarNotifierDTOsTests: XCTestCase { } func testRollbarTelemetryEventDTO_View() { - + let level: RollbarLevel = .warning; let source: RollbarSource = .server; let extra = [ @@ -843,7 +843,7 @@ final class RollbarNotifierDTOsTests: XCTestCase { element: viewElement, extraData: extra ); - + event = RollbarTelemetryEvent( level: level, source: source, @@ -862,7 +862,7 @@ final class RollbarNotifierDTOsTests: XCTestCase { } func testRollbarTelemetryEventDTO_Error() { - + let level: RollbarLevel = .warning; let source: RollbarSource = .server; let extra = [ @@ -876,7 +876,7 @@ final class RollbarNotifierDTOsTests: XCTestCase { message: error, extraData: extra ); - + event = RollbarTelemetryEvent( level: level, source: source, @@ -895,7 +895,7 @@ final class RollbarNotifierDTOsTests: XCTestCase { } func testRollbarTelemetryEventDTO_Navigation() { - + let level: RollbarLevel = .warning; let source: RollbarSource = .server; let extra = [ @@ -911,7 +911,7 @@ final class RollbarNotifierDTOsTests: XCTestCase { toLocation: to, extraData: extra ); - + event = RollbarTelemetryEvent( level: level, source: source, @@ -931,7 +931,7 @@ final class RollbarNotifierDTOsTests: XCTestCase { } func testRollbarTelemetryEventDTO_Network() { - + let level: RollbarLevel = .warning; let source: RollbarSource = .server; let extra = [ @@ -949,7 +949,7 @@ final class RollbarNotifierDTOsTests: XCTestCase { statusCode: statusCode, extraData: extra ); - + event = RollbarTelemetryEvent( level: level, source: source, @@ -970,7 +970,7 @@ final class RollbarNotifierDTOsTests: XCTestCase { } func testRollbarTelemetryEventDTO_Connectivity() { - + let level: RollbarLevel = .warning; let source: RollbarSource = .server; let extra = [ @@ -981,7 +981,7 @@ final class RollbarNotifierDTOsTests: XCTestCase { let status = "STATUS_GOOD"; let body = RollbarTelemetryConnectivityBody(status: status, extraData: extra); - + event = RollbarTelemetryEvent( level: level, source: source, @@ -1000,7 +1000,7 @@ final class RollbarNotifierDTOsTests: XCTestCase { } func testRollbarTelemetryEventDTO_Manual() { - + let level: RollbarLevel = .warning; let source: RollbarSource = .server; let extra = [ @@ -1008,9 +1008,9 @@ final class RollbarNotifierDTOsTests: XCTestCase { "EXTRA2": "extra_2", ]; var event: RollbarTelemetryEvent; - + let body = RollbarTelemetryManualBody(dictionary: extra); - + event = RollbarTelemetryEvent( level: level, source: source, diff --git a/RollbarReport.podspec b/RollbarReport.podspec index 1d1d9cd6..0c4d8682 100644 --- a/RollbarReport.podspec +++ b/RollbarReport.podspec @@ -1,6 +1,6 @@ Pod::Spec.new do |s| s.name = "RollbarReport" - s.version = "3.3.1" + s.version = "3.3.2" s.summary = "Application or client side SDK for interacting with the Rollbar API Server." s.description = <<-DESC Find, fix, and resolve errors with Rollbar.