Skip to content
This repository was archived by the owner on Feb 24, 2025. It is now read-only.

Commit bc7c257

Browse files
make test more robust (#3831)
Task/Issue URL: https://app.asana.com/0/1204186595873227/1209184392573245/f **Description**: Fix Flaky test
1 parent e0a410b commit bc7c257

1 file changed

Lines changed: 8 additions & 8 deletions

File tree

‎DuckDuckGoTests/Configuration/ConfigurationManagerTests.swift‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -61,9 +61,8 @@ final class ConfigurationManagerTests: XCTestCase {
6161
// GIVEN
6262
mockFetcher.shouldFailPrivacyFetch = true
6363
operationLog.steps = []
64-
let expectedOrder: [ConfigurationStep] = [
65-
.fetchPrivacyConfigStarted,
66-
.fetchSurrogatesStarted,
64+
let expectedFirstTwoSteps: Set<ConfigurationStep> = [.fetchPrivacyConfigStarted, .fetchSurrogatesStarted]
65+
let expectedRemainingStepsOrder: [ConfigurationStep] = [
6766
.fetchTrackerDataSetStarted,
6867
.reloadPrivacyConfig,
6968
.reloadTrackerDataSet
@@ -73,15 +72,15 @@ final class ConfigurationManagerTests: XCTestCase {
7372
await configManager.fetchAndUpdateTrackerBlockingDependencies()
7473

7574
// THEN
76-
XCTAssertEqual(operationLog.steps, expectedOrder, "Operations did not occur in the expected order.")
75+
XCTAssertEqual(Set(operationLog.steps.prefix(2)), expectedFirstTwoSteps, "Steps do not match the expected order.")
76+
XCTAssertEqual(Array(operationLog.steps.dropFirst(2)), expectedRemainingStepsOrder, "Steps do not match the expected order.")
7777
}
7878

7979
func test_WhenRefreshNow_ThenPrivacyConfigFetchAndReloadBeforeTrackerDataSetFetch() async {
8080
// GIVEN
8181
operationLog.steps = []
82-
let expectedOrder: [ConfigurationStep] = [
83-
.fetchPrivacyConfigStarted,
84-
.fetchSurrogatesStarted,
82+
let expectedFirstTwoSteps: Set<ConfigurationStep> = [.fetchPrivacyConfigStarted, .fetchSurrogatesStarted]
83+
let expectedRemainingStepsOrder: [ConfigurationStep] = [
8584
.reloadPrivacyConfig,
8685
.fetchTrackerDataSetStarted,
8786
.reloadPrivacyConfig,
@@ -92,7 +91,8 @@ final class ConfigurationManagerTests: XCTestCase {
9291
await configManager.fetchAndUpdateTrackerBlockingDependencies()
9392

9493
// THEN
95-
XCTAssertEqual(operationLog.steps, expectedOrder, "Operations did not occur in the expected order.")
94+
XCTAssertEqual(Set(operationLog.steps.prefix(2)), expectedFirstTwoSteps, "Steps do not match the expected order.")
95+
XCTAssertEqual(Array(operationLog.steps.dropFirst(2)), expectedRemainingStepsOrder, "Steps do not match the expected order.")
9696
}
9797

9898
}

0 commit comments

Comments
 (0)