Skip to content

Fix manager state observation and associated tests #55

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
dcaunt merged 1 commit into from
Aug 8, 2024
Merged

Fix manager state observation and associated tests #55

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 3 additions & 2 deletions Sources/UID2/UID2Manager.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -60,8 +60,9 @@ public final actor UID2Manager {
identityStatus = .noIdentity
}

queue.enqueue {
await self.broadcaster.send(self.state)
// Capture the current value in the queue operation
queue.enqueue { [state] in
await self.broadcaster.send(state)
}
}
}
Expand Down
125 changes: 65 additions & 60 deletions Tests/UID2Tests/UID2ManagerTests.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -175,33 +175,39 @@ final class UID2ManagerTests: XCTestCase {
sdkVersion: (1, 0, 0),
log: .disabled
)
var values: [UID2Manager.State?] = []
let task = Task {
for await state in await manager.stateValues() {
values.append(state)
}
}

let establishedIdentity = UID2Identity(
advertisingToken: "a",
refreshToken: "r",
identityExpires: Date().millisecondsSince1970 + 100000,
refreshFrom: Date().millisecondsSince1970 + 100000,
refreshExpires: Date().millisecondsSince1970 + 100000,
refreshResponseKey: ""
)
// test after initialization to observe after initial state configuration
let expectation = XCTestExpectation()
await manager.addInitializationListener {
// Initialize the streams now so that observers are attached
let stateValues = await manager.stateValues().prefix(3)

// Observe streams asynchronously
async let allStates = stateValues.reduce(into: []) { $0.append($1) }

let establishedIdentity = UID2Identity(
advertisingToken: "a",
refreshToken: "r",
identityExpires: Date().millisecondsSince1970 + 100000,
refreshFrom: Date().millisecondsSince1970 + 100000,
refreshExpires: Date().millisecondsSince1970 + 100000,
refreshResponseKey: ""
)

// Emit state changes
await manager.resetIdentity()
await manager.setIdentity(establishedIdentity)
await manager.resetIdentity()
task.cancel()

XCTAssertEqual(values, [
nil,
.established(establishedIdentity),
nil,
])
// Emit state changes
await manager.resetIdentity()
await manager.setIdentity(establishedIdentity)
await manager.resetIdentity()

let states = await allStates
XCTAssertEqual(states, [
nil,
.established(establishedIdentity),
nil,
])
expectation.fulfill()
}
await fulfillment(of: [expectation], timeout: 1)
}

@MainActor
Expand All @@ -213,43 +219,42 @@ final class UID2ManagerTests: XCTestCase {
sdkVersion: (1, 0, 0),
log: .disabled
)
var values: [UID2Manager.State?] = []
let task = Task {
for await state in await manager.stateValues() {
values.append(state)
}
}

let establishedIdentity = UID2Identity.established()
let expiredIdentity = UID2Identity.expired()

// Emit a state change
await manager.resetIdentity()

// Start observing after one value emitted
var values1: [UID2Manager.State?] = []
let task1 = Task {
for await state in await manager.stateValues() {
values1.append(state)
}
// test after initialization to observe after initial state configuration
let expectation = XCTestExpectation()
await manager.addInitializationListener {
// Initialize the streams now so that observers are attached
let stateValuesA = await manager.stateValues().prefix(4)
let stateValuesB = await manager.stateValues().prefix(4)

// Observe streams asynchronously
async let allStatesA = stateValuesA.reduce(into: []) { $0.append($1) }
async let allStatesB = stateValuesB.reduce(into: []) { $0.append($1) }

let establishedIdentity = UID2Identity.established()
let expiredIdentity = UID2Identity.expired()

// Emit state changes
await manager.resetIdentity()
await manager.setIdentity(establishedIdentity)
await manager.resetIdentity()
await manager.setIdentity(expiredIdentity)

let statesA = await allStatesA
let statesB = await allStatesB
XCTAssertEqual(statesA, statesB)
XCTAssertEqual(
statesA,
[
nil,
.established(establishedIdentity),
nil,
.refreshExpired
]
)
expectation.fulfill()
}

// Emit three more state changes
await manager.setIdentity(establishedIdentity)
await manager.resetIdentity()
await manager.setIdentity(expiredIdentity)
task.cancel()
task1.cancel()

XCTAssertEqual(values, [
nil,
.established(establishedIdentity),
nil,
.refreshExpired
])

// All observers see all values.
XCTAssertEqual(Array(values.dropFirst()), values1)
await fulfillment(of: [expectation], timeout: 1)
}

// MARK: Internal
Expand Down