Skip to content
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

DBP: Fix unreliable date tests #1981

Merged
merged 1 commit into from
Dec 18, 2023
Merged

DBP: Fix unreliable date tests #1981

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
20 changes: 16 additions & 4 deletions ...Protection/Sources/DataBrokerProtection/Operations/OperationPreferredDateCalculator.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,16 @@

import Foundation

protocol DateProtocol {
var now: Date { get }
}

struct SystemDate: DateProtocol {
var now: Date {
return Date()
}
}

samsymons marked this conversation as resolved.
Show resolved Hide resolved
struct OperationPreferredDateCalculator {

func dateForScanOperation(currentPreferredRunDate: Date?,
Expand Down Expand Up @@ -52,7 +62,8 @@ struct OperationPreferredDateCalculator {
func dateForOptOutOperation(currentPreferredRunDate: Date?,
historyEvents: [HistoryEvent],
extractedProfileID: Int64?,
schedulingConfig: DataBrokerScheduleConfig) throws -> Date? {
schedulingConfig: DataBrokerScheduleConfig,
date: DateProtocol = SystemDate()) throws -> Date? {

guard let lastEvent = historyEvents.last else {
throw DataBrokerProtectionError.cantCalculatePreferredRunDate
Expand All @@ -63,12 +74,12 @@ struct OperationPreferredDateCalculator {
if let extractedProfileID = extractedProfileID, shouldScheduleNewOptOut(events: historyEvents,
extractedProfileId: extractedProfileID,
schedulingConfig: schedulingConfig) {
return Date()
return date.now
} else {
return currentPreferredRunDate
}
case .error:
return Date().addingTimeInterval(schedulingConfig.retryError.hoursToSeconds)
return date.now.addingTimeInterval(schedulingConfig.retryError.hoursToSeconds)
case .optOutStarted, .scanStarted, .noMatchFound:
return currentPreferredRunDate
case .optOutConfirmed, .optOutRequested:
Expand All @@ -84,6 +95,7 @@ struct OperationPreferredDateCalculator {
return false
}

return lastRemovalEvent.date.addingTimeInterval(schedulingConfig.maintenanceScan.hoursToSeconds) < Date()
let lastRemovalEventDate = lastRemovalEvent.date.addingTimeInterval(schedulingConfig.maintenanceScan.hoursToSeconds)
return lastRemovalEventDate < Date()
}
}
23 changes: 16 additions & 7 deletions ...kerProtection/Tests/DataBrokerProtectionTests/OperationPreferredDateCalculatorTests.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -273,9 +273,9 @@ final class OperationPreferredDateCalculatorTests: XCTestCase {
}

func testMatchFoundWithExpiredProfile_thenOptOutDateIsNow() throws {
let expiredDate = Date().addingTimeInterval(-schedulingConfig.maintenanceScan.hoursToSeconds)
let expiredDate = Date(timeIntervalSince1970: 0).addingTimeInterval(-schedulingConfig.maintenanceScan.hoursToSeconds * 2)

let expectedOptOutDate = Date()
let expectedOptOutDate = Date(timeIntervalSince1970: 0)

let historyEvents = [
HistoryEvent(extractedProfileId: 1,
Expand All @@ -293,7 +293,8 @@ final class OperationPreferredDateCalculatorTests: XCTestCase {
let actualOptOutDate = try calculator.dateForOptOutOperation(currentPreferredRunDate: nil,
historyEvents: historyEvents,
extractedProfileID: 1,
schedulingConfig: schedulingConfig)
schedulingConfig: schedulingConfig,
date: MockDate())

XCTAssertTrue(areDatesEqualIgnoringSeconds(date1: expectedOptOutDate, date2: actualOptOutDate))
}
Expand Down Expand Up @@ -476,10 +477,10 @@ final class OperationPreferredDateCalculatorTests: XCTestCase {
/*
If the time elapsed since the last profile removal exceeds the current date plus maintenance period (expired), we should proceed with scheduling a new opt-out request as the broker has failed to honor the previous one.
*/
func skipMatchFoundWithExpiredProfileWithRecentDate_thenOptOutDateDoesNotChange() throws {
let expiredDate = Date().addingTimeInterval(-schedulingConfig.maintenanceScan.hoursToSeconds)
func testMatchFoundWithExpiredProfileWithRecentDate_thenOptOutDateDoesNotChange() throws {
let expiredDate = Date(timeIntervalSince1970: 0).addingTimeInterval(-schedulingConfig.maintenanceScan.hoursToSeconds)

let expectedOptOutDate = Date()
let expectedOptOutDate = Date(timeIntervalSince1970: 0)

let historyEvents = [
HistoryEvent(extractedProfileId: 1,
Expand All @@ -491,13 +492,15 @@ final class OperationPreferredDateCalculatorTests: XCTestCase {
brokerId: 1,
profileQueryId: 1,
type: .matchesFound(count: 1))]
let dateProtocol = MockDate()

let calculator = OperationPreferredDateCalculator()

let actualOptOutDate = try calculator.dateForOptOutOperation(currentPreferredRunDate: nil,
historyEvents: historyEvents,
extractedProfileID: 1,
schedulingConfig: schedulingConfig)
schedulingConfig: schedulingConfig,
date: dateProtocol)

XCTAssertTrue(areDatesEqualIgnoringSeconds(date1: expectedOptOutDate, date2: actualOptOutDate))
}
Expand Down Expand Up @@ -601,3 +604,9 @@ final class OperationPreferredDateCalculatorTests: XCTestCase {
XCTAssertTrue(areDatesEqualIgnoringSeconds(date1: expectedOptOutDate, date2: actualOptOutDate))
}
}

struct MockDate: DateProtocol {
var now: Date {
return Date(timeIntervalSince1970: 0)
}
}
Loading