Skip to content

Cherry-picked fix for SR-2332 from master into swift-3.0-branch. #157

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
Aug 16, 2016
Merged

Cherry-picked fix for SR-2332 from master into swift-3.0-branch. #157

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
28 changes: 12 additions & 16 deletions Tests/Functional/Asynchronous/Predicates/Expectations/main.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
// RUN: %{swiftc} %s -o %T/Asynchronous-Predicates
// RUN: %T/Asynchronous-Predicates > %t || true
// Disabled due to: https://bugs.swift.org/browse/SR-2332
// xxx: %{xctest_checker} %t %s
// RUN: %{xctest_checker} %t %s

#if os(Linux) || os(FreeBSD)
import XCTest
Expand Down Expand Up @@ -38,29 +37,26 @@ class PredicateExpectationsTestCase: XCTestCase {
// CHECK: Test Case 'PredicateExpectationsTestCase.test_delayedTruePredicateAndObject_passes' started at \d+:\d+:\d+\.\d+
// CHECK: Test Case 'PredicateExpectationsTestCase.test_delayedTruePredicateAndObject_passes' passed \(\d+\.\d+ seconds\).
func test_delayedTruePredicateAndObject_passes() {
let halfSecLaterDate = NSDate(timeIntervalSinceNow: 0.01)
let predicate = Predicate(block: {
evaluatedObject, bindings in
if let evaluatedDate = evaluatedObject as? NSDate {
return evaluatedDate.compare(Date()) == ComparisonResult.orderedAscending
}
return false
var didEvaluate = false
let predicate = Predicate(block: { evaluatedObject, bindings in
defer { didEvaluate = true }
return didEvaluate
})
expectation(for: predicate, evaluatedWith: halfSecLaterDate)
expectation(for: predicate, evaluatedWith: NSObject())
waitForExpectations(timeout: 0.1)
}

// CHECK: Test Case 'PredicateExpectationsTestCase.test_immediatelyTrueDelayedFalsePredicateAndObject_passes' started at \d+:\d+:\d+\.\d+
// CHECK: Test Case 'PredicateExpectationsTestCase.test_immediatelyTrueDelayedFalsePredicateAndObject_passes' passed \(\d+\.\d+ seconds\).
func test_immediatelyTrueDelayedFalsePredicateAndObject_passes() {
let halfSecLaterDate = NSDate(timeIntervalSinceNow: 0.01)
var didEvaluate = false
let predicate = Predicate(block: { evaluatedObject, bindings in
if let evaluatedDate = evaluatedObject as? NSDate {
return evaluatedDate.compare(Date()) == ComparisonResult.orderedDescending
}
return false
defer { didEvaluate = true }
return !didEvaluate
})
expectation(for: predicate, evaluatedWith: halfSecLaterDate)
expectation(for: predicate, evaluatedWith: NSObject())
XCTAssertTrue(didEvaluate)

waitForExpectations(timeout: 0.1)
}

Expand Down