Skip to content

Commit 66beea1

Browse files
jescribajescriba
committed
Format code and resolve lint issues
1 parent 2eabc10 commit 66beea1

File tree

6 files changed

+123
-73
lines changed

6 files changed

+123
-73
lines changed

‎Sources/OpenFeature/Provider/ProviderEvaluation.swift‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,4 +23,4 @@ public struct ProviderEvaluation<T> {
2323
self.errorCode = errorCode
2424
self.errorMessage = errorMessage
2525
}
26-
}
26+
}

‎Sources/OpenFeature/Provider/ProviderEventDetails.swift‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,5 +18,4 @@ public struct ProviderEventDetails: Equatable {
1818
self.errorCode = errorCode
1919
self.eventMetadata = eventMetadata
2020
}
21-
2221
}

‎Tests/OpenFeatureTests/EvalContextTests.swift‎

Lines changed: 12 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -144,10 +144,12 @@ final class EvalContextTests: XCTestCase {
144144
originalContext.add(key: "integer", value: .integer(42))
145145
originalContext.add(key: "boolean", value: .boolean(true))
146146
originalContext.add(key: "list", value: .list([.string("item1"), .integer(100)]))
147-
originalContext.add(key: "structure", value: .structure([
148-
"nested-string": .string("nested-value"),
149-
"nested-int": .integer(200),
150-
]))
147+
originalContext.add(
148+
key: "structure",
149+
value: .structure([
150+
"nested-string": .string("nested-value"),
151+
"nested-int": .integer(200),
152+
]))
151153

152154
guard let copiedContext = originalContext.deepCopy() as? MutableContext else {
153155
XCTFail("Failed to cast to MutableContext")
@@ -207,10 +209,12 @@ final class EvalContextTests: XCTestCase {
207209
originalContext.add(key: "double", value: .double(3.14159))
208210
originalContext.add(key: "date", value: .date(date))
209211
originalContext.add(key: "list", value: .list([.string("list-item"), .integer(999)]))
210-
originalContext.add(key: "structure", value: .structure([
211-
"struct-key": .string("struct-value"),
212-
"struct-number": .integer(777),
213-
]))
212+
originalContext.add(
213+
key: "structure",
214+
value: .structure([
215+
"struct-key": .string("struct-value"),
216+
"struct-number": .integer(777),
217+
]))
214218

215219
guard let copiedContext = originalContext.deepCopy() as? MutableContext else {
216220
XCTFail("Failed to cast to MutableContext")

‎Tests/OpenFeatureTests/Helpers/MockProvider.swift‎

Lines changed: 37 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -25,11 +25,41 @@ class MockProvider: FeatureProvider {
2525
init(
2626
onContextSet: @escaping (EvaluationContext?, EvaluationContext) async throws -> Void = { _, _ in },
2727
initialize: @escaping (EvaluationContext?) async throws -> Void = { _ in },
28-
getBooleanEvaluation: @escaping (String, Bool, EvaluationContext?) throws -> ProviderEvaluation<Bool> = { _, fallback, _ in return ProviderEvaluation(value: fallback, flagMetadata: [:]) },
29-
getStringEvaluation: @escaping (String, String, EvaluationContext?) throws -> ProviderEvaluation<String> = { _, fallback, _ in return ProviderEvaluation(value: fallback, flagMetadata: [:]) },
30-
getIntegerEvaluation: @escaping (String, Int64, EvaluationContext?) throws -> ProviderEvaluation<Int64> = { _, fallback, _ in return ProviderEvaluation(value: fallback, flagMetadata: [:]) },
31-
getDoubleEvaluation: @escaping (String, Double, EvaluationContext?) throws -> ProviderEvaluation<Double> = { _, fallback, _ in return ProviderEvaluation(value: fallback, flagMetadata: [:]) },
32-
getObjectEvaluation: @escaping (String, Value, EvaluationContext?) throws -> ProviderEvaluation<Value> = { _, fallback, _ in return ProviderEvaluation(value: fallback, flagMetadata: [:]) },
28+
getBooleanEvaluation: @escaping (
29+
String,
30+
Bool,
31+
EvaluationContext?
32+
) throws -> ProviderEvaluation<Bool> = { _, fallback, _ in
33+
return ProviderEvaluation(value: fallback, flagMetadata: [:])
34+
},
35+
getStringEvaluation: @escaping (
36+
String,
37+
String,
38+
EvaluationContext?
39+
) throws -> ProviderEvaluation<String> = { _, fallback, _ in
40+
return ProviderEvaluation(value: fallback, flagMetadata: [:])
41+
},
42+
getIntegerEvaluation: @escaping (
43+
String,
44+
Int64,
45+
EvaluationContext?
46+
) throws -> ProviderEvaluation<Int64> = { _, fallback, _ in
47+
return ProviderEvaluation(value: fallback, flagMetadata: [:])
48+
},
49+
getDoubleEvaluation: @escaping (
50+
String,
51+
Double,
52+
EvaluationContext?
53+
) throws -> ProviderEvaluation<Double> = { _, fallback, _ in
54+
return ProviderEvaluation(value: fallback, flagMetadata: [:])
55+
},
56+
getObjectEvaluation: @escaping (
57+
String,
58+
Value,
59+
EvaluationContext?
60+
) throws -> ProviderEvaluation<Value> = { _, fallback, _ in
61+
return ProviderEvaluation(value: fallback, flagMetadata: [:])
62+
},
3363
observe: @escaping () -> AnyPublisher<ProviderEvent?, Never> = { Just(nil).eraseToAnyPublisher() }
3464
) {
3565
self._onContextSet = onContextSet
@@ -59,7 +89,7 @@ class MockProvider: FeatureProvider {
5989
func getStringEvaluation(key: String, defaultValue: String, context: EvaluationContext?) throws
6090
-> ProviderEvaluation<String>
6191
{
62-
try _getStringEvaluation(key, defaultValue, context)
92+
try _getStringEvaluation(key, defaultValue, context)
6393
}
6494

6595
func getIntegerEvaluation(key: String, defaultValue: Int64, context: EvaluationContext?) throws
@@ -94,7 +124,7 @@ extension MockProvider {
94124
extension MockProvider {
95125
enum MockProviderError: LocalizedError {
96126
case message(String)
97-
127+
98128
var errorDescription: String? {
99129
switch self {
100130
case .message(let message):

‎Tests/OpenFeatureTests/ImmutableContextTests.swift‎

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
import XCTest
2+
23
@testable import OpenFeature
34

45
final class ImmutableContextTests: XCTestCase {
@@ -97,7 +98,7 @@ final class ImmutableContextTests: XCTestCase {
9798

9899
// For null values, we need to check the unwrapped value
99100
let nullValue = objectMap["null"]
100-
XCTAssertNil(nullValue as? AnyHashable) // But the unwrapped value is nil
101+
XCTAssertNil(nullValue as? AnyHashable) // But the unwrapped value is nil
101102
}
102103

103104
func testImmutableContextWithTargetingKey() {
@@ -182,7 +183,8 @@ final class ImmutableContextTests: XCTestCase {
182183
expectation.expectedFulfillmentCount = 10
183184

184185
DispatchQueue.concurrentPerform(iterations: 10) { index in
185-
let modified = original
186+
let modified =
187+
original
186188
.withAttribute(key: "thread", value: .integer(Int64(index)))
187189
.withAttribute(key: "timestamp", value: .double(Double(index)))
188190

‎Tests/OpenFeatureTests/ProviderEventTests.swift‎

Lines changed: 69 additions & 54 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,6 @@ import OpenFeature
44
import XCTest
55

66
final class ProviderEventTests: XCTestCase {
7-
87
func testObservingProviderEventInitialization() {
98
let mockEventHandler = EventHandler()
109
let provider = MockProvider(
@@ -15,7 +14,9 @@ final class ProviderEventTests: XCTestCase {
1514
let api = OpenFeatureAPI()
1615
api.setProvider(provider: provider)
1716
let expectation = XCTestExpectation(description: "Error")
18-
api.observe().sink { event in
17+
api
18+
.observe()
19+
.sink { event in
1920
switch event {
2021
case .error(let details):
2122
if let details {
@@ -33,7 +34,7 @@ final class ProviderEventTests: XCTestCase {
3334
wait(for: [expectation], timeout: 5)
3435
cancellables.removeAll()
3536
}
36-
37+
3738
func testObservingProviderEventsWithDetails() {
3839
let mockEventHandler = EventHandler()
3940
let provider = MockProvider(
@@ -44,7 +45,9 @@ final class ProviderEventTests: XCTestCase {
4445
let api = OpenFeatureAPI()
4546
api.setProvider(provider: provider)
4647
let readyExpectation = XCTestExpectation(description: "Ready")
47-
api.observe().sink { event in
48+
api
49+
.observe()
50+
.sink { event in
4851
switch event {
4952
case .ready:
5053
readyExpectation.fulfill()
@@ -55,24 +58,27 @@ final class ProviderEventTests: XCTestCase {
5558
.store(in: &cancellables)
5659
api.setProvider(provider: provider)
5760
wait(for: [readyExpectation], timeout: 5)
58-
61+
5962
let eventsExpectation = XCTestExpectation(description: "Events")
6063
var receivedEvents: [ProviderEvent] = []
6164
let mockEvents = [mockReady]
62-
api.observe().sink { event in
65+
api
66+
.observe()
67+
.sink { event in
6368
if let event {
6469
receivedEvents.append(event)
6570
}
6671
receivedEvents.count == mockEvents.count ? eventsExpectation.fulfill() : nil
67-
}.store(in: &cancellables)
72+
}
73+
.store(in: &cancellables)
6874
mockEvents.forEach { event in
6975
mockEventHandler.send(event)
7076
}
7177
wait(for: [eventsExpectation], timeout: 5)
7278
XCTAssertEqual(receivedEvents, mockEvents)
7379
cancellables.removeAll()
7480
}
75-
81+
7682
func testProviderEventDetails() throws {
7783
let mockFlags = ["Flag1", "Flag2"]
7884
let mockMessage = "Mock Message"
@@ -81,15 +87,15 @@ final class ProviderEventTests: XCTestCase {
8187
"Bool": .boolean(true),
8288
"Int": .integer(42),
8389
"Double": .double(10.5),
84-
"String": .string("Hello World")
90+
"String": .string("Hello World"),
8591
]
8692
let eventDetails = ProviderEventDetails(
8793
flagsChanged: mockFlags,
8894
message: mockMessage,
8995
errorCode: mockError,
9096
eventMetadata: mockMetadata
9197
)
92-
98+
9399
let event = ProviderEvent.configurationChanged(eventDetails)
94100
switch event {
95101
case .configurationChanged(let details):
@@ -101,54 +107,63 @@ final class ProviderEventTests: XCTestCase {
101107
// Validate metadata types and values
102108
XCTAssertTrue(mockMetadata["Bool"]?.asBoolean() == true)
103109
XCTAssertTrue(mockMetadata["Int"]?.asInteger() == 42)
104-
XCTAssertTrue(mockMetadata["Double"]?.asDouble() == 10.5)
110+
XCTAssertTrue(mockMetadata["Double"]?.asDouble() == 10.5)
105111
XCTAssertTrue(mockMetadata["String"]?.asString() == "Hello World")
106112
default:
107113
XCTFail("Unexpected event type")
108114
}
109115
}
110-
111-
// MARK: - Helpers for Provider Events
112-
var mockReady: ProviderEvent = .ready(ProviderEventDetails(
113-
flagsChanged: nil,
114-
message: nil,
115-
errorCode: nil,
116-
eventMetadata: [:]
117-
))
118-
var mockError: ProviderEvent = .error(ProviderEventDetails(
119-
flagsChanged: nil,
120-
message: "general error message",
121-
errorCode: .general,
122-
eventMetadata: [:]
123-
))
124-
var mockConfigurationChanged: ProviderEvent = .configurationChanged(ProviderEventDetails(
125-
flagsChanged: ["Flag1", "Flag2"],
126-
message: nil,
127-
errorCode: nil,
128-
eventMetadata: [
129-
"Mock String": .string("some details"),
130-
"Mock Bool": .boolean(true),
131-
"Mock Double": .double(10),
132-
"Mock Integer": .integer(100)
133-
]
134-
))
135-
var mockStale: ProviderEvent = .stale(ProviderEventDetails(
136-
flagsChanged: nil,
137-
message: nil,
138-
errorCode: nil,
139-
eventMetadata: [:]
140-
))
141-
var mockReconciling: ProviderEvent = .reconciling(ProviderEventDetails(
142-
flagsChanged: nil,
143-
message: nil,
144-
errorCode: nil,
145-
eventMetadata: [:]
146-
))
147-
var mockContextChanged: ProviderEvent = .contextChanged(ProviderEventDetails(
148-
flagsChanged: nil,
149-
message: nil,
150-
errorCode: nil,
151-
eventMetadata: [:]
152-
))
153116

117+
// MARK: - Helpers for Provider Events
118+
var mockReady: ProviderEvent = .ready(
119+
ProviderEventDetails(
120+
flagsChanged: nil,
121+
message: nil,
122+
errorCode: nil,
123+
eventMetadata: [:]
124+
))
125+
var mockError: ProviderEvent = .error(
126+
ProviderEventDetails(
127+
flagsChanged: nil,
128+
message: "general error message",
129+
errorCode: .general,
130+
eventMetadata: [:]
131+
))
132+
var mockConfigurationChanged: ProviderEvent = .configurationChanged(
133+
ProviderEventDetails(
134+
flagsChanged: ["Flag1", "Flag2"],
135+
message: nil,
136+
errorCode: nil,
137+
eventMetadata: [
138+
"Mock String": .string("some details"),
139+
"Mock Bool": .boolean(true),
140+
"Mock Double": .double(10),
141+
"Mock Integer": .integer(100),
142+
]
143+
)
144+
)
145+
var mockStale: ProviderEvent = .stale(
146+
ProviderEventDetails(
147+
flagsChanged: nil,
148+
message: nil,
149+
errorCode: nil,
150+
eventMetadata: [:]
151+
)
152+
)
153+
var mockReconciling: ProviderEvent = .reconciling(
154+
ProviderEventDetails(
155+
flagsChanged: nil,
156+
message: nil,
157+
errorCode: nil,
158+
eventMetadata: [:]
159+
)
160+
)
161+
var mockContextChanged: ProviderEvent = .contextChanged(
162+
ProviderEventDetails(
163+
flagsChanged: ["Flag1", "Flag2"],
164+
message: nil,
165+
errorCode: nil,
166+
eventMetadata: [:]
167+
)
168+
)
154169
}

0 commit comments

Comments
 (0)