[LOOP-4349] corrected loop not looping rescheduling (#532)

* corrected identifier for loop not looping notifications

* updated test to run for both DIY and Tidepool

Author: nhamming

Loop/Managers/Alerts/AlertManager.swift

@@ -203,7 +203,7 @@ public final class AlertManager {
             )
 
             let request = UNNotificationRequest(
-                identifier: "\(LoopNotificationCategory.loopNotRunning.rawValue)\(failureInterval)",
+                identifier: "\(LoopNotificationCategory.loopNotRunning.rawValue)\(minutes)",
                 content: notificationContent,
                 trigger: trigger
             )

LoopTests/Managers/Alerts/AlertManagerTests.swift

@@ -481,7 +481,8 @@ class AlertManagerTests: XCTestCase {
         alertManager.loopDidComplete(lastLoopDate)
         alertManager.alertMuter.configuration.startTime = Date()
         alertManager.alertMuter.configuration.duration = .hours(4)
-
+        waitOnMain()
+        
         let testExpectation = expectation(description: #function)
         var loopNotRunningRequests: [UNNotificationRequest] = []
         UNUserNotificationCenter.current().getPendingNotificationRequests() { notificationRequests in
@@ -492,8 +493,21 @@ class AlertManagerTests: XCTestCase {
         }
 
         wait(for: [testExpectation], timeout: 1)
-        XCTAssertNil(loopNotRunningRequests.first(where: { $0.content.interruptionLevel == .timeSensitive })!.content.sound)
-        XCTAssertEqual(loopNotRunningRequests.first(where: { $0.content.interruptionLevel == .critical })!.content.sound, .defaultCriticalSound(withAudioVolume: 0))
+        if #available(iOS 15.0, *) {
+            XCTAssertNil(loopNotRunningRequests.first(where: { $0.content.interruptionLevel == .timeSensitive })?.content.sound)
+            if let request = loopNotRunningRequests.first(where: { $0.content.interruptionLevel == .critical }) {
+                XCTAssertEqual(request.content.sound, .defaultCriticalSound(withAudioVolume: 0))
+            }
+        } else if FeatureFlags.criticalAlertsEnabled {
+            for request in loopNotRunningRequests {
+                let sound = request.content.sound
+                XCTAssertTrue(sound == nil || sound == .defaultCriticalSound(withAudioVolume: 0.0))
+            }
+        } else {
+            for request in loopNotRunningRequests {
+                XCTAssertNil(request.content.sound)
+            }
+        }
     }
 }