Added more tests, and the whole suit runs successfully

getsentry · Jul 6, 2022 · 8ce9385 · 8ce9385
1 parent bc9d991
commit 8ce9385
Show file tree

Hide file tree

Showing 2 changed files with 41 additions and 7 deletions.
diff --git a/Sources/Sentry/SentrySystemEventBreadcrumbs.m b/Sources/Sentry/SentrySystemEventBreadcrumbs.m
@@ -207,7 +207,7 @@ - (void)initTimezoneObserver
 
     if (storedTimezoneOffset == nil) {
         [self updateStoredTimezone];
-    } else if (storedTimezoneOffset.doubleValue != [NSTimeZone localTimeZone].secondsFromGMT) {
+    } else if (storedTimezoneOffset.doubleValue != self.currentDateProvider.timezoneOffset) {
         [self timezoneEventTriggered:storedTimezoneOffset];
     }
 
@@ -228,13 +228,17 @@ - (void)timezoneEventTriggered:(NSNumber *)storedTimezoneOffset
     if (storedTimezoneOffset == nil) {
         storedTimezoneOffset = [self.fileManager readTimezoneOffset];
     }
+
     SentryBreadcrumb *crumb = [[SentryBreadcrumb alloc] initWithLevel:kSentryLevelInfo
                                                              category:@"device.event"];
+
+    NSInteger offset = self.currentDateProvider.timezoneOffset;
+
     crumb.type = @"system";
     crumb.data = @{
         @"action" : @"TIMEZONE_CHANGE",
         @"previous_seconds_from_gmt" : storedTimezoneOffset,
-        @"current_seconds_from_gmt" : @(self.currentDateProvider.timezoneOffset)
+        @"current_seconds_from_gmt" : @(offset)
     };
     [SentrySDK addBreadcrumb:crumb];
 

diff --git a/Tests/SentryTests/Integrations/Breadcrumbs/SentrySystemEventBreadcrumbsTest.swift b/Tests/SentryTests/Integrations/Breadcrumbs/SentrySystemEventBreadcrumbsTest.swift
@@ -13,7 +13,7 @@ class SentrySystemEventBreadcrumbsTest: XCTestCase {
 
         init() {
             options = Options()
-            options.dsn = TestConstants.dsnAsString(username: "SentrySessionTrackerTests")
+            options.dsn = TestConstants.dsnAsString(username: "SentrySystemEventBreadcrumbsTest")
             options.releaseName = "SentrySessionTrackerIntegrationTests"
             options.sessionTrackingIntervalMillis = 10_000
             options.environment = "debug"
@@ -60,6 +60,8 @@ class SentrySystemEventBreadcrumbsTest: XCTestCase {
     override func tearDown() {
         super.tearDown()
         clearTestState()
+        fixture.fileManager.deleteTimezoneOffset()
+        sut.stop()
     }
 
     func testBatteryLevelBreadcrumb() {
@@ -228,13 +230,32 @@ class SentrySystemEventBreadcrumbsTest: XCTestCase {
         assertBreadcrumbAction(scope: scope, action: "UIApplicationUserDidTakeScreenshotNotification")
     }
 
-    func testTimezoneChangeBreadcrumb() {
-        fixture.fileManager.deleteTimezoneOffset()
-        fixture.currentDateProvider.timezoneOffsetValue = 0
+    func testTimezoneFirstTimeNilNoBreadcrumb() {
+        fixture.currentDateProvider.timezoneOffsetValue = 7200
 
         let scope = Scope()
         sut = fixture.getSut(scope: scope, currentDevice: nil)
 
+        assertNoBreadcrumbAction(scope: scope, action: "TIMEZONE_CHANGE")
+    }
+
+    func testTimezoneChangeInitialBreadcrumb() {
+        fixture.fileManager.storeTimezoneOffset(0)
+        fixture.currentDateProvider.timezoneOffsetValue = 7200
+
+        let scope = Scope()
+        sut = fixture.getSut(scope: scope, currentDevice: nil)
+
+        assertBreadcrumbAction(scope: scope, action: "TIMEZONE_CHANGE") { data in
+            XCTAssertEqual(data["previous_seconds_from_gmt"] as? Int, 0)
+            XCTAssertEqual(data["current_seconds_from_gmt"] as? Int, 7200)
+        }
+    }
+
+    func testTimezoneChangeNoticiationBreadcrumb() {
+        let scope = Scope()
+        sut = fixture.getSut(scope: scope, currentDevice: nil)
+
         fixture.currentDateProvider.timezoneOffsetValue = 7200
 
         NotificationCenter.default.post(Notification(name: NSNotification.Name.NSSystemTimeZoneDidChange))
@@ -243,7 +264,7 @@ class SentrySystemEventBreadcrumbsTest: XCTestCase {
             XCTAssertEqual(data["current_seconds_from_gmt"] as? Int, 7200)
         }
     }
-    
+
     private func assertBreadcrumbAction(scope: Scope, action: String, checks: (([String: Any]) -> Void)? = nil) {
         let ser = scope.serialize()
         if let breadcrumbs = ser["breadcrumbs"] as? [[String: Any]] {
@@ -265,6 +286,15 @@ class SentrySystemEventBreadcrumbsTest: XCTestCase {
             XCTFail("no scope.breadcrumbs")
         }
     }
+
+    private func assertNoBreadcrumbAction(scope: Scope, action: String) {
+        let ser = scope.serialize()
+        if let breadcrumbs = ser["breadcrumbs"] as? [[String: Any]] {
+            if let crumb = breadcrumbs.first, let data = crumb["data"] as? [String: Any], data["action"] as? String == action {
+                XCTFail("unwanted breadcrumb found")
+            }
+        }
+    }
 
     #endif
 }