Skip to content

Replace deprecated Predicate.matches(_:failureMessage:) and Predicate.doesNotMatch(_:failureMessage:) #664

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
merged 1 commit into from
Jun 5, 2019
Merged

Replace deprecated Predicate.matches(_:failureMessage:) and Predicate.doesNotMatch(_:failureMessage:) #664

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
12 changes: 8 additions & 4 deletions Sources/Nimble/Matchers/BeCloseTo.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -51,10 +51,12 @@ public class NMBObjCBeCloseToMatcher: NSObject, NMBMatcher {
return actualExpression() as? NMBDoubleConvertible
})
let expr = Expression(expression: actualBlock, location: location)
let matcher = beCloseTo(self._expected, within: self._delta)
let predicate = beCloseTo(self._expected, within: self._delta)

do {
return try matcher.matches(expr, failureMessage: failureMessage)
let result = try predicate.satisfies(expr)
result.message.update(failureMessage: failureMessage)
return result.toBoolean(expectation: .toMatch)
} catch let error {
failureMessage.stringValue = "unexpected error thrown: <\(error)>"
return false
Expand All @@ -66,10 +68,12 @@ public class NMBObjCBeCloseToMatcher: NSObject, NMBMatcher {
return actualExpression() as? NMBDoubleConvertible
})
let expr = Expression(expression: actualBlock, location: location)
let matcher = beCloseTo(self._expected, within: self._delta)
let predicate = beCloseTo(self._expected, within: self._delta)

do {
return try matcher.doesNotMatch(expr, failureMessage: failureMessage)
let result = try predicate.satisfies(expr)
result.message.update(failureMessage: failureMessage)
return result.toBoolean(expectation: .toNotMatch)
} catch let error {
failureMessage.stringValue = "unexpected error thrown: <\(error)>"
return false
Expand Down
14 changes: 9 additions & 5 deletions Sources/Nimble/Matchers/PostNotification.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -51,14 +51,18 @@ public func postNotifications(
_ = try actualExpression.evaluate()
}

let failureMessage = FailureMessage()
let match = try predicate.matches(collectorNotificationsExpression, failureMessage: failureMessage)
let actualValue: String
if collector.observedNotifications.isEmpty {
failureMessage.actualValue = "no notifications"
actualValue = "no notifications"
} else {
failureMessage.actualValue = "<\(stringify(collector.observedNotifications))>"
actualValue = "<\(stringify(collector.observedNotifications))>"
}
return PredicateResult(bool: match, message: failureMessage.toExpectationMessage())

var result = try predicate.satisfies(collectorNotificationsExpression)
result.message = result.message.replacedExpectation { message in
return .expectedCustomValueTo(message.expectedMessage, actualValue)
}
return result
}
}

Expand Down