Skip to content

Commit 01f3cd7

Browse files
wip: fix uint test
1 parent 247d0eb commit 01f3cd7

File tree

2 files changed

+16
-16
lines changed

2 files changed

+16
-16
lines changed

Sources/Data Model/ProjectConfig.swift

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -176,12 +176,12 @@ class ProjectConfig {
176176
var updatedFlag = flag
177177
var holdoutIds = [String]()
178178
for holdout in project.holdouts ?? [] {
179-
if let includedFlags = holdout.includedFlags, !includedFlags.isEmpty {
180-
if includedFlags.contains(flag.id) {
179+
if !holdout.includedFlags.isEmpty {
180+
if holdout.includedFlags.contains(flag.id) {
181181
holdoutIds.append(holdout.id)
182182
}
183-
} else if let excludedFlags = holdout.excludedFlags, !excludedFlags.isEmpty {
184-
if !excludedFlags.contains(flag.id) {
183+
} else if !holdout.excludedFlags.isEmpty {
184+
if !holdout.excludedFlags.contains(flag.id) {
185185
holdoutIds.append(holdout.id)
186186
}
187187
} else {

Tests/OptimizelyTests-DataModel/ProjectConfigTests.swift

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -121,8 +121,8 @@ class ProjectConfigTests: XCTestCase {
121121
feature2["id"] = "2002"
122122
feature2["key"] = "key_2002"
123123

124-
feature2["id"] = "2003"
125-
feature2["key"] = "key_2003"
124+
feature3["id"] = "2003"
125+
feature3["key"] = "key_2003"
126126

127127
feature0["experimentIds"] = ["1000"]
128128
feature1["experimentIds"] = ["1000", "1001", "1002"]
@@ -131,7 +131,7 @@ class ProjectConfigTests: XCTestCase {
131131

132132
var projectData = ProjectTests.sampleData
133133
projectData["experiments"] = [exp0, exp1, exp2, exp3, exp4]
134-
projectData["featureFlags"] = [feature0, feature1, feature2]
134+
projectData["featureFlags"] = [feature0, feature1, feature2, feature3]
135135
projectData["holdouts"] = [holdout0, holdout1, holdout2, holdout3, holdout4]
136136

137137
// check experimentFeatureMap extracted properly
@@ -142,20 +142,20 @@ class ProjectConfigTests: XCTestCase {
142142

143143
let holdoutIdMap = projectConfig.holdoutIdMap
144144

145-
XCTAssertEqual(holdoutIdMap["3000"]?.includedFlags, nil)
146-
XCTAssertEqual(holdoutIdMap["3000"]?.excludedFlags, nil)
145+
XCTAssertEqual(holdoutIdMap["3000"]?.includedFlags, [])
146+
XCTAssertEqual(holdoutIdMap["3000"]?.excludedFlags, [])
147147

148-
XCTAssertEqual(holdoutIdMap["3001"]?.includedFlags, nil)
149-
XCTAssertEqual(holdoutIdMap["3001"]?.excludedFlags, nil)
148+
XCTAssertEqual(holdoutIdMap["3001"]?.includedFlags, [])
149+
XCTAssertEqual(holdoutIdMap["3001"]?.excludedFlags, [])
150150

151-
XCTAssertEqual(holdoutIdMap["3002"]?.includedFlags, nil)
152-
XCTAssertEqual(holdoutIdMap["3002"]?.excludedFlags, nil)
151+
XCTAssertEqual(holdoutIdMap["3002"]?.includedFlags, [])
152+
XCTAssertEqual(holdoutIdMap["3002"]?.excludedFlags, [])
153153

154154
XCTAssertEqual(holdoutIdMap["3003"]?.includedFlags, ["2000", "2002"])
155-
XCTAssertEqual(holdoutIdMap["3003"]?.excludedFlags, nil)
155+
XCTAssertEqual(holdoutIdMap["3003"]?.excludedFlags, [])
156156

157157

158-
XCTAssertEqual(holdoutIdMap["3004"]?.includedFlags, nil)
158+
XCTAssertEqual(holdoutIdMap["3004"]?.includedFlags, [])
159159
XCTAssertEqual(holdoutIdMap["3004"]?.excludedFlags, ["2001"])
160160

161161
let featureFlagKeyMap = projectConfig.featureFlagKeyMap
@@ -168,7 +168,7 @@ class ProjectConfigTests: XCTestCase {
168168
XCTAssertEqual(featureFlagKeyMap["key_2001"]?.holdoutIds, ["3000", "3001", "3002"])
169169

170170
/// Test Global holdout
171-
XCTAssertEqual(featureFlagKeyMap["key_2003"]?.holdoutIds, ["3000", "3001", "3002", "3003", "3004"])
171+
XCTAssertEqual(featureFlagKeyMap["key_2003"]?.holdoutIds, ["3000", "3001", "3002", "3004"])
172172
}
173173

174174
func testFlagVariations() {

0 commit comments

Comments
 (0)