diff --git a/Tests/LayoutTests/Support/NimbleMatchers.swift b/Tests/LayoutTests/Support/NimbleMatchers.swift index 42a7ac76..4c83aa96 100644 --- a/Tests/LayoutTests/Support/NimbleMatchers.swift +++ b/Tests/LayoutTests/Support/NimbleMatchers.swift @@ -14,29 +14,29 @@ import XCTest extension XCTestCase { - internal func haveUnambiguousLayout() -> Nimble.Predicate { - Predicate { expression in + internal func haveUnambiguousLayout() -> Matcher { + Matcher { expression in guard let view: UIView = try expression.evaluate() - else { return PredicateResult(status: .fail, message: .expectedTo("not be nil, got ")) } + else { return MatcherResult(status: .fail, message: .expectedTo("not be nil, got ")) } guard !view.hasAmbiguousLayout - else { return PredicateResult(status: .fail, message: .fail("expected view to not have ambiguous layout")) } - return PredicateResult(bool: true, message: .fail("")) + else { return MatcherResult(status: .fail, message: .fail("expected view to not have ambiguous layout")) } + return MatcherResult(bool: true, message: .fail("")) } } // swiftlint:disable:next cyclomatic_complexity - internal func match(_ expectedConstraint: NSLayoutConstraint) -> Nimble.Predicate { + internal func match(_ expectedConstraint: NSLayoutConstraint) -> Matcher { // swiftlint:disable:next closure_body_length - Predicate { expression in + Matcher { expression in guard let constraint: NSLayoutConstraint = try expression.evaluate() - else { return PredicateResult(status: .fail, message: .expectedTo("not be nil, got ")) } + else { return MatcherResult(status: .fail, message: .expectedTo("not be nil, got ")) } guard constraint.isActive == expectedConstraint.isActive else { let message: String = """ match `isActive` <\(expectedConstraint.isActive)>, \ got <\(constraint.isActive)> """ - return PredicateResult(status: .fail, message: .expectedTo(message)) + return MatcherResult(status: .fail, message: .expectedTo(message)) } guard constraint.firstItem === expectedConstraint.firstItem else { @@ -44,7 +44,7 @@ extension XCTestCase { match `firstItem` <\(expectedConstraint.firstItem.stringValue)>, \ got <\(constraint.firstItem.stringValue)> """ - return PredicateResult(status: .fail, message: .expectedTo(message)) + return MatcherResult(status: .fail, message: .expectedTo(message)) } guard constraint.firstAttribute == expectedConstraint.firstAttribute else { @@ -52,7 +52,7 @@ extension XCTestCase { match `firstAttribute` <\(expectedConstraint.firstAttribute)>, \ got <\(constraint.firstAttribute)> """ - return PredicateResult(status: .fail, message: .expectedTo(message)) + return MatcherResult(status: .fail, message: .expectedTo(message)) } guard constraint.relation == expectedConstraint.relation else { @@ -60,7 +60,7 @@ extension XCTestCase { match `relation` <\(expectedConstraint.relation)>, \ got <\(constraint.relation)> """ - return PredicateResult(status: .fail, message: .expectedTo(message)) + return MatcherResult(status: .fail, message: .expectedTo(message)) } guard constraint.secondItem === expectedConstraint.secondItem else { @@ -68,7 +68,7 @@ extension XCTestCase { match `secondItem` <\(expectedConstraint.secondItem.stringValue)>, \ got <\(constraint.secondItem.stringValue)> """ - return PredicateResult(status: .fail, message: .expectedTo(message)) + return MatcherResult(status: .fail, message: .expectedTo(message)) } guard constraint.secondAttribute == expectedConstraint.secondAttribute else { @@ -76,7 +76,7 @@ extension XCTestCase { match `secondAttribute` <\(expectedConstraint.secondAttribute)>, \ got <\(constraint.secondAttribute)> """ - return PredicateResult(status: .fail, message: .expectedTo(message)) + return MatcherResult(status: .fail, message: .expectedTo(message)) } guard constraint.multiplier == expectedConstraint.multiplier else { @@ -84,7 +84,7 @@ extension XCTestCase { match `multiplier` <\(expectedConstraint.multiplier)>, \ got <\(constraint.multiplier)> """ - return PredicateResult(status: .fail, message: .expectedTo(message)) + return MatcherResult(status: .fail, message: .expectedTo(message)) } guard constraint.constant == expectedConstraint.constant else { @@ -92,7 +92,7 @@ extension XCTestCase { match `constant` <\(expectedConstraint.constant)>, \ got <\(constraint.constant)> """ - return PredicateResult(status: .fail, message: .expectedTo(message)) + return MatcherResult(status: .fail, message: .expectedTo(message)) } guard constraint.firstAnchor === expectedConstraint.firstAnchor else { @@ -100,7 +100,7 @@ extension XCTestCase { match `firstAnchor` <\(expectedConstraint.firstAnchor)>, \ got <\(constraint.firstAnchor)> """ - return PredicateResult(status: .fail, message: .expectedTo(message)) + return MatcherResult(status: .fail, message: .expectedTo(message)) } guard constraint.secondAnchor === expectedConstraint.secondAnchor else { @@ -108,7 +108,7 @@ extension XCTestCase { match `secondAnchor` <\(expectedConstraint.secondAnchor.stringValue)>, \ got <\(constraint.secondAnchor.stringValue)> """ - return PredicateResult(status: .fail, message: .expectedTo(message)) + return MatcherResult(status: .fail, message: .expectedTo(message)) } guard constraint.priority == expectedConstraint.priority else { @@ -116,7 +116,7 @@ extension XCTestCase { match `priority` <\(expectedConstraint.priority)>, \ got <\(constraint.priority)> """ - return PredicateResult(status: .fail, message: .expectedTo(message)) + return MatcherResult(status: .fail, message: .expectedTo(message)) } guard constraint.identifier == expectedConstraint.identifier else { @@ -124,7 +124,7 @@ extension XCTestCase { match `identifier` <\(expectedConstraint.identifier.stringValue)>, \ got <\(constraint.identifier.stringValue)> """ - return PredicateResult(status: .fail, message: .expectedTo(message)) + return MatcherResult(status: .fail, message: .expectedTo(message)) } guard constraint.shouldBeArchived == expectedConstraint.shouldBeArchived else { @@ -132,10 +132,10 @@ extension XCTestCase { match `shouldBeArchived` <\(expectedConstraint.shouldBeArchived)>, \ got <\(constraint.shouldBeArchived)> """ - return PredicateResult(status: .fail, message: .expectedTo(message)) + return MatcherResult(status: .fail, message: .expectedTo(message)) } - return PredicateResult(bool: true, message: .fail("")) + return MatcherResult(bool: true, message: .fail("")) } } }