fix(lint): Fix linting issues

Signed-off-by: Thomas Poignant <[email protected]>
go-feature-flag · Dec 23, 2024 · aef919d · aef919d
1 parent 2dee5db
commit aef919d
Show file tree

Hide file tree

Showing 8 changed files with 36 additions and 31 deletions.
diff --git a/Sources/GOFeatureFlag/hook/data_collector_bool_hook.swift b/Sources/GOFeatureFlag/hook/data_collector_bool_hook.swift
@@ -66,7 +66,8 @@ class BooleanHook: Hook {
         self.dataCollectorMngr.appendFeatureEvent(event: event)
     }
 
-    func finally<HookValue>(ctx: HookContext<HookValue>, details: FlagEvaluationDetails<HookValue>, hints: [String: Any]){
+    func finally<HookValue>(
+        ctx: HookContext<HookValue>, details: FlagEvaluationDetails<HookValue>, hints: [String: Any]) {
         return
     }
 }
diff --git a/Sources/GOFeatureFlag/hook/data_collector_double_hook.swift b/Sources/GOFeatureFlag/hook/data_collector_double_hook.swift
@@ -67,7 +67,8 @@ class DoubleHook: Hook {
         self.dataCollectorMngr.appendFeatureEvent(event: event)
     }
 
-    func finally<HookValue>(ctx: HookContext<HookValue>, details: FlagEvaluationDetails<HookValue>, hints: [String: Any]){
+    func finally<HookValue>(
+        ctx: HookContext<HookValue>, details: FlagEvaluationDetails<HookValue>, hints: [String: Any]) {
         return
     }
 }
diff --git a/Sources/GOFeatureFlag/hook/data_collector_integer_hook.swift b/Sources/GOFeatureFlag/hook/data_collector_integer_hook.swift
@@ -63,7 +63,8 @@ class IntegerHook: Hook {
         self.dataCollectorMngr.appendFeatureEvent(event: event)
     }
 
-    func finally<HookValue>(ctx: HookContext<HookValue>, details: FlagEvaluationDetails<HookValue>, hints: [String: Any]){
+    func finally<HookValue>(
+        ctx: HookContext<HookValue>, details: FlagEvaluationDetails<HookValue>, hints: [String: Any]) {
         return
     }
 }
diff --git a/Sources/GOFeatureFlag/hook/data_collector_object_hook.swift b/Sources/GOFeatureFlag/hook/data_collector_object_hook.swift
@@ -65,8 +65,8 @@ class ObjectHook: Hook {
         self.dataCollectorMngr.appendFeatureEvent(event: event)
     }
 
-
-    func finally<HookValue>(ctx: HookContext<HookValue>, details: FlagEvaluationDetails<HookValue>, hints: [String: Any]){
+    func finally<HookValue>(
+        ctx: HookContext<HookValue>, details: FlagEvaluationDetails<HookValue>, hints: [String: Any]) {
         return
     }
 }
diff --git a/Sources/GOFeatureFlag/hook/data_collector_string_hook.swift b/Sources/GOFeatureFlag/hook/data_collector_string_hook.swift
@@ -66,7 +66,8 @@ class StringHook: Hook {
         self.dataCollectorMngr.appendFeatureEvent(event: event)
     }
 
-    func finally<HookValue>(ctx: HookContext<HookValue>, details: FlagEvaluationDetails<HookValue>, hints: [String: Any]){
+    func finally<HookValue>(
+        ctx: HookContext<HookValue>, details: FlagEvaluationDetails<HookValue>, hints: [String: Any]) {
         return
     }
 }
diff --git a/Tests/GOFeatureFlagTests/goff_api_tests.swift b/Tests/GOFeatureFlagTests/goff_api_tests.swift
@@ -30,7 +30,7 @@ class GoffApiTests: XCTestCase {
             FeatureEvent(kind: "feature", userKey: "981f2662-1fb4-4732-ac6d-8399d9205aa9", creationDate: Int64(Date().timeIntervalSince1970), key: "flag-1", variation: "enabled", value: JSONValue.bool(true), default: false, version: nil, source: "PROVIDER_CACHE")
         ]
         do {
-            let (response, _) = try await goffAPI.postDataCollector(events: events)
+            _ = try await goffAPI.postDataCollector(events: events)
             XCTFail("Expected to throw GoFeatureFlagError.apiUnauthorizedError, but no error was thrown.")
         } catch let error as GoFeatureFlagError {
             switch error {
@@ -52,7 +52,7 @@ class GoffApiTests: XCTestCase {
             FeatureEvent(kind: "feature", userKey: "981f2662-1fb4-4732-ac6d-8399d9205aa9", creationDate: Int64(Date().timeIntervalSince1970), key: "flag-1", variation: "enabled", value: JSONValue.bool(true), default: false, version: nil, source: "PROVIDER_CACHE")
         ]
         do {
-            let (response, _) = try await goffAPI.postDataCollector(events: events)
+            _ = try await goffAPI.postDataCollector(events: events)
             XCTFail("Expected to throw GoFeatureFlagError.forbiddenError, but no error was thrown.")
         } catch let error as GoFeatureFlagError {
             switch error {

diff --git a/Tests/GOFeatureFlagTests/provider_tests.swift b/Tests/GOFeatureFlagTests/provider_tests.swift
@@ -60,8 +60,8 @@ class GoFeatureFlagProviderTests: XCTestCase {
         _ = client.getIntegerDetails(key: "int-flag", defaultValue: 1)
 
         let expectation = self.expectation(description: "Waiting for delay")
-        DispatchQueue.global().asyncAfter(deadline: .now() + 3.0) { expectation.fulfill() }
-        await fulfillment(of: [expectation], timeout: 4.0)
+        DispatchQueue.global().asyncAfter(deadline: .now() + 4.0) { expectation.fulfill() }
+        await fulfillment(of: [expectation], timeout: 5.0)
 
         XCTAssertEqual(1, mockNetworkService.dataCollectorCallCounter)
         XCTAssertEqual(3, mockNetworkService.dataCollectorEventCounter)
@@ -71,8 +71,8 @@ class GoFeatureFlagProviderTests: XCTestCase {
         _ = client.getObjectDetails(key: "object-flag", defaultValue: Value.null)
 
         let expectation2 = self.expectation(description: "Waiting for delay")
-        DispatchQueue.global().asyncAfter(deadline: .now() + 3.0) { expectation2.fulfill() }
-        await fulfillment(of: [expectation2], timeout: 4.0)
+        DispatchQueue.global().asyncAfter(deadline: .now() + 4.0) { expectation2.fulfill() }
+        await fulfillment(of: [expectation2], timeout: 5.0)
 
         XCTAssertEqual(2, mockNetworkService.dataCollectorCallCounter)
         XCTAssertEqual(6, mockNetworkService.dataCollectorEventCounter)

diff --git a/Tests/OFREPTests/provider_tests.swift b/Tests/OFREPTests/provider_tests.swift
@@ -77,7 +77,7 @@ class ProviderTests: XCTestCase {
         let expectation = XCTestExpectation(description: "waiting 1st event")
         let cancellable = api.observe().sink{ event in
             if(event != ProviderEvent.error(errorCode: nil, message: "The operation couldn’t be completed. (OFREP.OfrepError error 3.)")){
-                XCTFail("If OFREP API returns a 429 we should receive an ERROR event, received: \(event)")
+                XCTFail("If OFREP API returns a 429 we should receive an ERROR event, received: \(String(describing: event)))")
             }
             expectation.fulfill()
         }
@@ -106,7 +106,7 @@ class ProviderTests: XCTestCase {
         let expectation = XCTestExpectation(description: "waiting 1st event")
         let cancellable = api.observe().sink{ event in
             if(event != ProviderEvent.error(errorCode: nil, message: "The operation couldn’t be completed. (OpenFeature.OpenFeatureError error 5.)")){
-                XCTFail("If OFREP API returns a 400 for TARGETING_KEY_MISSING we should receive an ERROR event, received: \(event)")
+                XCTFail("If OFREP API returns a 400 for TARGETING_KEY_MISSING we should receive an ERROR event, received: \(String(describing: event)))")
             }
             expectation.fulfill()
         }
@@ -134,7 +134,7 @@ class ProviderTests: XCTestCase {
 
         let cancellable = api.observe().sink{ event in
             if(event != ProviderEvent.error(errorCode: nil, message: "The operation couldn’t be completed. (OpenFeature.OpenFeatureError error 4.)")){
-                XCTFail("If OFREP API returns a 400 for INVALID_CONTEXT we should receive an ERROR event, received: \(event)")
+                XCTFail("If OFREP API returns a 400 for INVALID_CONTEXT we should receive an ERROR event, received: \(String(describing: event))")
             }
             expectation.fulfill()
         }
@@ -164,7 +164,7 @@ class ProviderTests: XCTestCase {
         let expectation = XCTestExpectation(description: "waiting 1st event")
         let cancellable = api.observe().sink{ event in
             if(event != ProviderEvent.error(errorCode: nil, message: "The operation couldn’t be completed. (OpenFeature.OpenFeatureError error 2.)")){
-                XCTFail("If OFREP API returns a 400 for PARSE_ERROR we should receive an ERROR event, received: \(event)")
+                XCTFail("If OFREP API returns a 400 for PARSE_ERROR we should receive an ERROR event, received: \(String(describing: event)))")
             }
             expectation.fulfill()
         }
@@ -187,7 +187,7 @@ class ProviderTests: XCTestCase {
         let expectation = XCTestExpectation(description: "waiting 1st event")
         let cancellable = api.observe().sink{ event in
             if(event != ProviderEvent.ready){
-                XCTFail("If OFREP API returns a 200 we should receive a ready event, received: \(event)")
+                XCTFail("If OFREP API returns a 200 we should receive a ready event, received: \(String(describing: event)))")
             }
             expectation.fulfill()
         }
@@ -212,7 +212,7 @@ class ProviderTests: XCTestCase {
         let expectation = XCTestExpectation(description: "waiting 1st event")
         let cancellable = api.observe().sink{ event in
             if(event != ProviderEvent.ready){
-                XCTFail("If OFREP API returns a 200 we should receive a ready event, received: \(event)")
+                XCTFail("If OFREP API returns a 200 we should receive a ready event, received: \(String(describing: event)))")
             }
             expectation.fulfill()
         }
@@ -264,7 +264,7 @@ class ProviderTests: XCTestCase {
         let expectation = XCTestExpectation(description: "waiting 1st event")
         let cancellable = api.observe().sink{ event in
             if(event != ProviderEvent.ready){
-                XCTFail("If OFREP API returns a 200 we should receive a ready event, received: \(event)")
+                XCTFail("If OFREP API returns a 200 we should receive a ready event, received: \(String(describing: event)))")
             }
             expectation.fulfill()
         }
@@ -300,7 +300,7 @@ class ProviderTests: XCTestCase {
             case .ready:
                 expect.fulfill()
             default:
-                XCTFail("If OFREP API returns a 200 we should receive a ready event, received: \(event)")
+                XCTFail("If OFREP API returns a 200 we should receive a ready event, received: \(String(describing: event)))")
                 expect.fulfill()
             }
         }
@@ -462,7 +462,7 @@ class ProviderTests: XCTestCase {
         let expectation = XCTestExpectation(description: "waiting 1st event")
         let cancellable = api.observe().sink{ event in
             if(event != ProviderEvent.ready){
-                XCTFail("If OFREP API returns a 200 we should receive a ready event, received: \(event)")
+                XCTFail("If OFREP API returns a 200 we should receive a ready event, received: \(String(describing: event)))")
             }
             expectation.fulfill()
         }
@@ -495,12 +495,13 @@ class ProviderTests: XCTestCase {
         let expectation = XCTestExpectation(description: "waiting 1st event")
         let cancellable = api.observe().sink{ event in
             if(event != ProviderEvent.ready){
-                XCTFail("If OFREP API returns a 200 we should receive a ready event, received: \(event)")
+                XCTFail("If OFREP API returns a 200 we should receive a ready event, received: \(String(describing: event)))")
             }
             expectation.fulfill()
         }
         await api.setProviderAndWait(provider: provider, initialContext: defaultEvaluationContext)
         await fulfillment(of: [expectation], timeout: 3)
+        cancellable.cancel()
 
         let client = api.getClient()
         let details = client.getIntegerDetails(key: "int-flag", defaultValue: 1)
@@ -528,7 +529,7 @@ class ProviderTests: XCTestCase {
         let expectation = XCTestExpectation(description: "waiting 1st event")
         let cancellable = api.observe().sink{ event in
             if(event != ProviderEvent.ready){
-                XCTFail("If OFREP API returns a 200 we should receive a ready event, received: \(event)")
+                XCTFail("If OFREP API returns a 200 we should receive a ready event, received: \(String(describing: event)))")
             }
             expectation.fulfill()
         }
@@ -559,7 +560,7 @@ class ProviderTests: XCTestCase {
         let expectation = XCTestExpectation(description: "waiting 1st event")
         let cancellable = api.observe().sink{ event in
             if(event != ProviderEvent.ready){
-                XCTFail("If OFREP API returns a 200 we should receive a ready event, received: \(event)")
+                XCTFail("If OFREP API returns a 200 we should receive a ready event, received: \(String(describing: event)))")
             }
             expectation.fulfill()
         }
@@ -590,7 +591,7 @@ class ProviderTests: XCTestCase {
         let expectation = XCTestExpectation(description: "waiting 1st event")
         let cancellable = api.observe().sink{ event in
             if(event != ProviderEvent.ready){
-                XCTFail("If OFREP API returns a 200 we should receive a ready event, received: \(event)")
+                XCTFail("If OFREP API returns a 200 we should receive a ready event, received: \(String(describing: event)))")
             }
             expectation.fulfill()
         }
@@ -621,7 +622,7 @@ class ProviderTests: XCTestCase {
         let expectation = XCTestExpectation(description: "waiting 1st event")
         let cancellable = api.observe().sink{ event in
             if(event != ProviderEvent.ready){
-                XCTFail("If OFREP API returns a 200 we should receive a ready event, received: \(event)")
+                XCTFail("If OFREP API returns a 200 we should receive a ready event, received: \(String(describing: event)))")
             }
             expectation.fulfill()
         }
@@ -652,7 +653,7 @@ class ProviderTests: XCTestCase {
         let expectation = XCTestExpectation(description: "waiting 1st event")
         let cancellable = api.observe().sink{ event in
             if(event != ProviderEvent.ready){
-                XCTFail("If OFREP API returns a 200 we should receive a ready event, received: \(event)")
+                XCTFail("If OFREP API returns a 200 we should receive a ready event, received: \(String(describing: event)))")
             }
             expectation.fulfill()
         }
@@ -677,7 +678,7 @@ class ProviderTests: XCTestCase {
         let expectation = XCTestExpectation(description: "waiting 1st event")
         let cancellable = api.observe().sink{ event in
             if(event != ProviderEvent.ready){
-                XCTFail("If OFREP API returns a 200 we should receive a ready event, received: \(event)")
+                XCTFail("If OFREP API returns a 200 we should receive a ready event, received: \(String(describing: event)))")
             }
             expectation.fulfill()
         }
@@ -702,7 +703,7 @@ class ProviderTests: XCTestCase {
         let expectation = XCTestExpectation(description: "waiting 1st event")
         let cancellable = api.observe().sink{ event in
             if(event != ProviderEvent.ready){
-                XCTFail("If OFREP API returns a 200 we should receive a ready event, received: \(event)")
+                XCTFail("If OFREP API returns a 200 we should receive a ready event, received: \(String(describing: event)))")
             }
             expectation.fulfill()
         }
@@ -727,7 +728,7 @@ class ProviderTests: XCTestCase {
         let expectation = XCTestExpectation(description: "waiting 1st event")
         let cancellable = api.observe().sink{ event in
             if(event != ProviderEvent.ready){
-                XCTFail("If OFREP API returns a 200 we should receive a ready event, received: \(event)")
+                XCTFail("If OFREP API returns a 200 we should receive a ready event, received: \(String(describing: event)))")
             }
             expectation.fulfill()
         }
@@ -752,7 +753,7 @@ class ProviderTests: XCTestCase {
         let expectation = XCTestExpectation(description: "waiting 1st event")
         let cancellable = api.observe().sink{ event in
             if(event != ProviderEvent.ready){
-                XCTFail("If OFREP API returns a 200 we should receive a ready event, received: \(event)")
+                XCTFail("If OFREP API returns a 200 we should receive a ready event, received: \(String(describing: event)))")
             }
             expectation.fulfill()
         }