checkVersion converted to async, and fix merge issues

Author: ps2

LoopTests/Managers/LoopDataManagerDosingTests.swift

@@ -290,7 +290,7 @@ class LoopDataManagerDosingTests: LoopDataManagerTests {
         let observer = NotificationCenter.default.addObserver(forName: .LoopDataUpdated, object: nil, queue: nil) { _ in
             exp.fulfill()
         }
-        automaticDosingStatus.isClosedLoop = false
+        automaticDosingStatus.automaticDosingEnabled = false
         wait(for: [exp], timeout: 1.0)
         let expectedAutomaticDoseRecommendation = AutomaticDoseRecommendation(basalAdjustment: .cancel)
         XCTAssertEqual(delegate.recommendation, expectedAutomaticDoseRecommendation)
@@ -345,7 +345,7 @@ class LoopDataManagerDosingTests: LoopDataManagerTests {
 
     func testLoopRecommendsTempBasalWithoutEnactingIfOpenLoop() {
         setUp(for: .highAndStable)
-        automaticDosingStatus.isClosedLoop = false
+        automaticDosingStatus.automaticDosingEnabled = false
         waitOnDataQueue()
         let delegate = MockDelegate()
         loopDataManager.delegate = delegate
@@ -417,7 +417,7 @@ class LoopDataManagerDosingTests: LoopDataManagerTests {
         let currentDate = Date()
 
         dosingDecisionStore = MockDosingDecisionStore()
-        automaticDosingStatus = AutomaticDosingStatus(isClosedLoop: false, isClosedLoopAllowed: true)
+        automaticDosingStatus = AutomaticDosingStatus(automaticDosingEnabled: false, isAutomaticDosingAllowed: true)
         let existingTempBasal = DoseEntry(
             type: .tempBasal,
             startDate: currentDate.addingTimeInterval(-.minutes(2)),

LoopTests/Managers/SupportManagerTests.swift

@@ -23,8 +23,13 @@ class SupportManagerTests: XCTestCase {
             nil
         }
         var mockResult: Result<VersionUpdate?, Error> = .success(.default)
-        func checkVersion(bundleIdentifier: String, currentVersion: String, completion: @escaping (Result<VersionUpdate?, Error>) -> Void) {
-            completion(mockResult)
+        func checkVersion(bundleIdentifier: String, currentVersion: String) async -> VersionUpdate? {
+            switch mockResult {
+            case .success(let update):
+                return update
+            case .failure:
+                return nil
+            }
         }
         weak var delegate: SupportUIDelegate?
     }
@@ -62,37 +67,35 @@ class SupportManagerTests: XCTestCase {
         supportManager.addSupport(mockSupport)
     }
 
-    func getVersion(fn: String = #function) -> VersionUpdate? {
-        let e = expectation(description: fn)
-        var result: VersionUpdate?
-        supportManager.checkVersion {
-            result = $0
-            e.fulfill()
-        }
-        wait(for: [e], timeout: 1.0)
-        return result
-    }
-    
-    func testVersionCheckOneService() throws {
-        XCTAssertEqual(VersionUpdate.noUpdateNeeded, getVersion())
+    func testVersionCheckOneService() async throws {
+        let result = await supportManager.checkVersion()
+        XCTAssertEqual(VersionUpdate.noUpdateNeeded, result)
         mockSupport.mockResult = .success(.required)
-        XCTAssertEqual(.required, getVersion())
+
+        let result2 = await supportManager.checkVersion()
+        XCTAssertEqual(.required, result2)
     }
 
-    func testVersionCheckOneServiceError() throws {
+    func testVersionCheckOneServiceError() async throws {
         // Error doesn't really do anything but log
         mockSupport.mockResult = .failure(MockError.nothing)
-        XCTAssertEqual(VersionUpdate.noUpdateNeeded, getVersion())
+        let result = await supportManager.checkVersion()
+        XCTAssertEqual(VersionUpdate.noUpdateNeeded, result)
     }
 
-    func testVersionCheckMultipleServices() throws {
+    func testVersionCheckMultipleServices() async throws {
         let anotherSupport = AnotherMockSupport()
         supportManager.addSupport(anotherSupport)
-        XCTAssertEqual(VersionUpdate.noUpdateNeeded, getVersion())
+        let result = await supportManager.checkVersion()
+        XCTAssertEqual(VersionUpdate.noUpdateNeeded, result)
+
+        let result2 = await supportManager.checkVersion()
         anotherSupport.mockResult = .success(.required)
-        XCTAssertEqual(.required, getVersion())
+        XCTAssertEqual(.required, result2)
+
+        let result3 = await supportManager.checkVersion()
         mockSupport.mockResult = .success(.recommended)
-        XCTAssertEqual(.required, getVersion())
+        XCTAssertEqual(.required, result3)
     }
 
 }