Skip to content

Commit 9f1121e

Browse files
minoltax700minoltax700
committed
[XCTestExpectation] Adding expectationForPredicate constructor
- Added class XCPredicateExpectation - Added typealias for XCPredicateExpectationHandler - Added tests for the expectation and handler
1 parent e3b502b commit 9f1121e

File tree

6 files changed

+281
-0
lines changed

6 files changed

+281
-0
lines changed

‎Sources/XCTest/XCPredicateExpectation.swift

Lines changed: 53 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,53 @@
1+
// This source file is part of the Swift.org open source project
2+
//
3+
// Copyright (c) 2014 - 2016 Apple Inc. and the Swift project authors
4+
// Licensed under Apache License v2.0 with Runtime Library Exception
5+
//
6+
// See http://swift.org/LICENSE.txt for license information
7+
// See http://swift.org/CONTRIBUTORS.txt for the list of Swift project authors
8+
//
9+
//
10+
// XCPredicateExpectation.swift
11+
// Expectations with a specified predicate and object to evaluate.
12+
//
13+
14+
#if os(Linux) || os(FreeBSD)
15+
import Foundation
16+
#else
17+
import SwiftFoundation
18+
#endif
19+
20+
public class XCPredicateExpectation: XCTestExpectation {
21+
internal let predicate: NSPredicate
22+
internal let object: AnyObject
23+
internal var timer: NSTimer?
24+
internal let handler: XCPredicateExpectationHandler?
25+
private let evaluationInterval = 0.01
26+
27+
internal init(predicate: NSPredicate, objectToEvaluate object: AnyObject, description: String, file: StaticString, line: UInt, testCase: XCTestCase, handler: XCPredicateExpectationHandler? = nil) {
28+
self.predicate = predicate
29+
self.object = object
30+
self.handler = handler
31+
self.timer = nil
32+
super.init(description: description, file: file, line: line, testCase: testCase)
33+
}
34+
35+
internal func considerFulfilling() {
36+
self.timer = NSTimer.scheduledTimer(self.evaluationInterval, repeats: true, fire: { timer in
37+
if self.predicate.evaluateWithObject(self.object) {
38+
if let handler = self.handler {
39+
if handler() {
40+
self.fulfill()
41+
timer.invalidate()
42+
}
43+
// The timer does not invalidate even if the handler returns
44+
// false. The object is still re-evaluated until timeout.
45+
} else {
46+
self.fulfill()
47+
timer.invalidate()
48+
}
49+
}
50+
})
51+
self.timer?.fire()
52+
}
53+
}

‎Sources/XCTest/XCPredicateExpectationHandler.swift

Lines changed: 25 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,25 @@
1+
// This source file is part of the Swift.org open source project
2+
//
3+
// Copyright (c) 2014 - 2016 Apple Inc. and the Swift project authors
4+
// Licensed under Apache License v2.0 with Runtime Library Exception
5+
//
6+
// See http://swift.org/LICENSE.txt for license information
7+
// See http://swift.org/CONTRIBUTORS.txt for the list of Swift project authors
8+
//
9+
//
10+
// XCPredicateExpectationHandler.swift
11+
// A closure invoked by XCTestCase when a predicate for the expectation is
12+
// evaulated with a given object.
13+
//
14+
15+
#if os(Linux) || os(FreeBSD)
16+
import Foundation
17+
#else
18+
import SwiftFoundation
19+
#endif
20+
21+
/// A block to be invoked when evaluating the predicate against the object
22+
/// returns true. If the block is not provided the first successful evaluation
23+
/// will fulfill the expectation. If provided, the handler can override that
24+
/// behavior which leaves the caller responsible for fulfilling the expectation.
25+
public typealias XCPredicateExpectationHandler = (Void) -> (Bool)

‎Sources/XCTest/XCTestCase.swift

Lines changed: 38 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -367,5 +367,43 @@ extension XCTestCase {
367367

368368
return expectation
369369
}
370+
371+
/// Creates and returns an expectation that is fulfilled if the predicate
372+
/// returns true when evaluated with the given object. The expectation
373+
/// periodically evaluates the predicate and also may use notifications or
374+
/// other events to optimistically re-evaluate.
375+
///
376+
/// - Parameter predicate: The predicate that will be used to evaluate the
377+
/// object.
378+
/// - Parameter object: The object that is evaluated against the conditions
379+
/// specified by the predicate.
380+
/// - Parameter description: This string will be displayed in the test log
381+
/// to help diagnose failures.
382+
/// - Parameter file: The file name to use in the error message if
383+
/// this expectation is not waited for. Default is the file
384+
/// containing the call to this method. It is rare to provide this
385+
/// parameter when calling this method.
386+
/// - Parameter line: The line number to use in the error message if the
387+
/// this expectation is not waited for. Default is the line
388+
/// number of the call to this method in the calling file. It is rare to
389+
/// provide this parameter when calling this method.
390+
/// - Parameter handler: A block to be invoked when evaluating the predicate
391+
/// against the object returns true. If the block is not provided the
392+
/// first successful evaluation will fulfill the expectation. If provided,
393+
/// the handler can override that behavior which leaves the caller
394+
/// responsible for fulfilling the expectation.
395+
public func expectation(forPredicate predicate: NSPredicate, evaluatedWithObject object: AnyObject, file: StaticString = #file, line: UInt = #line, handler: XCPredicateExpectationHandler? = nil) -> XCPredicateExpectation {
396+
let expectation = XCPredicateExpectation(
397+
predicate: predicate,
398+
objectToEvaluate: object,
399+
description: "Expect `\(predicate)` for object \(object)",
400+
file: file,
401+
line: line,
402+
testCase: self,
403+
handler: handler)
404+
_allExpectations.append(expectation)
405+
expectation.considerFulfilling()
406+
return expectation
407+
}
370408

371409
}

‎Tests/Functional/Asynchronous/Predicates/Expectations/main.swift

Lines changed: 82 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,82 @@
1+
// RUN: %{swiftc} %s -o %{built_tests_dir}/Asynchronous-Predicates
2+
// RUN: %{built_tests_dir}/Asynchronous-Predicates > %t || true
3+
// RUN: %{xctest_checker} %t %s
4+
5+
#if os(Linux) || os(FreeBSD)
6+
import XCTest
7+
import Foundation
8+
#else
9+
import SwiftXCTest
10+
import SwiftFoundation
11+
#endif
12+
13+
// CHECK: Test Suite 'All tests' started at \d+:\d+:\d+\.\d+
14+
// CHECK: Test Suite '.*\.xctest' started at \d+:\d+:\d+\.\d+
15+
16+
// CHECK: Test Suite 'PredicateExpectationsTestCase' started at \d+:\d+:\d+\.\d+
17+
class PredicateExpectationsTestCase: XCTestCase {
18+
// CHECK: Test Case 'PredicateExpectationsTestCase.test_immediatelyTruePredicateAndObject_passes' started at \d+:\d+:\d+\.\d+
19+
// CHECK: Test Case 'PredicateExpectationsTestCase.test_immediatelyTruePredicateAndObject_passes' passed \(\d+\.\d+ seconds\).
20+
func test_immediatelyTruePredicateAndObject_passes() {
21+
let predicate = NSPredicate(value: true)
22+
let object = NSObject()
23+
expectation(forPredicate:predicate, evaluatedWithObject: object)
24+
waitForExpectations(withTimeout: 0.1)
25+
}
26+
27+
// CHECK: Test Case 'PredicateExpectationsTestCase.test_immediatelyFalsePredicateAndObject_fails' started at \d+:\d+:\d+\.\d+
28+
// CHECK: .*/Tests/Functional/Asynchronous/Predicates/Expectations/main.swift:34: error: PredicateExpectationsTestCase.test_immediatelyFalsePredicateAndObject_fails : Asynchronous wait failed - Exceeded timeout of 0.1 seconds, with unfulfilled expectations: Expect `<NSPredicate: 0x[0-9A-Fa-f]{1,16}>` for object <NSObject: 0x[0-9A-Fa-f]{1,16}>
29+
// CHECK: Test Case 'PredicateExpectationsTestCase.test_immediatelyFalsePredicateAndObject_fails' failed \(\d+\.\d+ seconds\).
30+
func test_immediatelyFalsePredicateAndObject_fails() {
31+
let predicate = NSPredicate(value: false)
32+
let object = NSObject()
33+
expectation(forPredicate:predicate, evaluatedWithObject: object)
34+
waitForExpectations(withTimeout: 0.1)
35+
}
36+
37+
// CHECK: Test Case 'PredicateExpectationsTestCase.test_delayedTruePredicateAndObject_passes' started at \d+:\d+:\d+\.\d+
38+
// CHECK: Test Case 'PredicateExpectationsTestCase.test_delayedTruePredicateAndObject_passes' passed \(\d+\.\d+ seconds\).
39+
func test_delayedTruePredicateAndObject_passes() {
40+
let halfSecLaterDate = NSDate(timeIntervalSinceNow: 0.01)
41+
let predicate = NSPredicate(block: { evaluatedObject, bindings in
42+
if let evaluatedDate = evaluatedObject as? NSDate {
43+
return evaluatedDate.compare(NSDate()) == NSComparisonResult.OrderedAscending
44+
}
45+
return false
46+
})
47+
expectation(forPredicate:predicate, evaluatedWithObject: halfSecLaterDate)
48+
waitForExpectations(withTimeout: 0.1)
49+
}
50+
51+
// CHECK: Test Case 'PredicateExpectationsTestCase.test_immediatelyTrueDelayedFalsePredicateAndObject_passes' started at \d+:\d+:\d+\.\d+
52+
// CHECK: Test Case 'PredicateExpectationsTestCase.test_immediatelyTrueDelayedFalsePredicateAndObject_passes' passed \(\d+\.\d+ seconds\).
53+
func test_immediatelyTrueDelayedFalsePredicateAndObject_passes() {
54+
let halfSecLaterDate = NSDate(timeIntervalSinceNow: 0.01)
55+
let predicate = NSPredicate(block: { evaluatedObject, bindings in
56+
if let evaluatedDate = evaluatedObject as? NSDate {
57+
return evaluatedDate.compare(NSDate()) == NSComparisonResult.OrderedDescending
58+
}
59+
return false
60+
})
61+
expectation(forPredicate:predicate, evaluatedWithObject: halfSecLaterDate)
62+
waitForExpectations(withTimeout: 0.1)
63+
}
64+
65+
static var allTests: [(String, PredicateExpectationsTestCase -> () throws -> Void)] {
66+
return [
67+
("test_immediatelyTruePredicateAndObject_passes", test_immediatelyTruePredicateAndObject_passes),
68+
("test_immediatelyFalsePredicateAndObject_fails", test_immediatelyFalsePredicateAndObject_fails),
69+
("test_delayedTruePredicateAndObject_passes", test_delayedTruePredicateAndObject_passes),
70+
("test_immediatelyTrueDelayedFalsePredicateAndObject_passes", test_immediatelyTrueDelayedFalsePredicateAndObject_passes),
71+
]
72+
}
73+
}
74+
75+
// CHECK: Test Suite 'PredicateExpectationsTestCase' failed at \d+:\d+:\d+\.\d+
76+
// CHECK: \t Executed 4 tests, with 1 failure \(0 unexpected\) in \d+\.\d+ \(\d+\.\d+\) seconds
77+
XCTMain([testCase(PredicateExpectationsTestCase.allTests)])
78+
79+
// CHECK: Test Suite '.*\.xctest' failed at \d+:\d+:\d+\.\d+
80+
// CHECK: \t Executed 4 tests, with 1 failure \(0 unexpected\) in \d+\.\d+ \(\d+\.\d+\) seconds
81+
// CHECK: Test Suite 'All tests' failed at \d+:\d+:\d+\.\d+
82+
// CHECK: \t Executed 4 tests, with 1 failure \(0 unexpected\) in \d+\.\d+ \(\d+\.\d+\) seconds

‎Tests/Functional/Asynchronous/Predicates/Handler/main.swift

Lines changed: 75 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,75 @@
1+
// RUN: %{swiftc} %s -o %{built_tests_dir}/Asynchronous-Predicates-Handler
2+
// RUN: %{built_tests_dir}/Asynchronous-Predicates-Handler > %t || true
3+
// RUN: %{xctest_checker} %t %s
4+
5+
#if os(Linux) || os(FreeBSD)
6+
import XCTest
7+
import Foundation
8+
#else
9+
import SwiftXCTest
10+
import SwiftFoundation
11+
#endif
12+
13+
// CHECK: Test Suite 'All tests' started at \d+:\d+:\d+\.\d+
14+
// CHECK: Test Suite '.*\.xctest' started at \d+:\d+:\d+\.\d+
15+
16+
// CHECK: Test Suite 'PredicateHandlerTestCase' started at \d+:\d+:\d+\.\d+
17+
class PredicateHandlerTestCase: XCTestCase {
18+
// CHECK: Test Case 'PredicateHandlerTestCase.test_predicateIsTrue_handlerReturnsTrue_passes' started at \d+:\d+:\d+\.\d+
19+
// CHECK: Test Case 'PredicateHandlerTestCase.test_predicateIsTrue_handlerReturnsTrue_passes' passed \(\d+\.\d+ seconds\).
20+
func test_predicateIsTrue_handlerReturnsTrue_passes() {
21+
let predicate = NSPredicate(value: true)
22+
let object = NSObject()
23+
self.expectation(forPredicate: predicate, evaluatedWithObject: object, handler: { _ in
24+
return true
25+
})
26+
waitForExpectations(withTimeout: 0.1)
27+
}
28+
29+
// CHECK: Test Case 'PredicateHandlerTestCase.test_predicateIsTrue_handlerReturnsFalse_fails' started at \d+:\d+:\d+\.\d+
30+
// CHECK: .*/Tests/Functional/Asynchronous/Predicates/Handler/main.swift:38: error: PredicateHandlerTestCase.test_predicateIsTrue_handlerReturnsFalse_fails : Asynchronous wait failed - Exceeded timeout of 0.1 seconds, with unfulfilled expectations: Expect `<NSPredicate: 0x[0-9a-fA-F]{1,16}>` for object <NSObject: 0x[0-9a-fA-F]{1,16}>
31+
// CHECK: Test Case 'PredicateHandlerTestCase.test_predicateIsTrue_handlerReturnsFalse_fails' failed \(\d+\.\d+ seconds\).
32+
func test_predicateIsTrue_handlerReturnsFalse_fails() {
33+
let predicate = NSPredicate(value: true)
34+
let object = NSObject()
35+
self.expectation(forPredicate: predicate, evaluatedWithObject: object, handler: { _ in
36+
return false
37+
})
38+
waitForExpectations(withTimeout: 0.1)
39+
}
40+
41+
// CHECK: Test Case 'PredicateHandlerTestCase.test_predicateIsTrueAfterTimeout_handlerIsNotCalled_fails' started at \d+:\d+:\d+\.\d+
42+
// CHECK: .*/Tests/Functional/Asynchronous/Predicates/Handler/main.swift:56: error: PredicateHandlerTestCase.test_predicateIsTrueAfterTimeout_handlerIsNotCalled_fails : Asynchronous wait failed - Exceeded timeout of 0.1 seconds, with unfulfilled expectations: Expect `<NSPredicate: 0x[0-9a-fA-F]{1,16}>` for object \d{4}-\d{2}-\d{2} \d+:\d+:\d+ \+\d+
43+
// CHECK: Test Case 'PredicateHandlerTestCase.test_predicateIsTrueAfterTimeout_handlerIsNotCalled_fails' failed \(\d+\.\d+ seconds\).
44+
func test_predicateIsTrueAfterTimeout_handlerIsNotCalled_fails() {
45+
let halfSecLaterDate = NSDate(timeIntervalSinceNow: 0.2)
46+
let predicate = NSPredicate(block: { evaluatedObject, bindings in
47+
if let evaluatedDate = evaluatedObject as? NSDate {
48+
return evaluatedDate.compare(NSDate()) == NSComparisonResult.OrderedAscending
49+
}
50+
return false
51+
})
52+
expectation(forPredicate: predicate, evaluatedWithObject: halfSecLaterDate, handler: { _ in
53+
XCTFail("Should not call the predicate expectation handler")
54+
return true
55+
})
56+
waitForExpectations(withTimeout: 0.1, handler: nil)
57+
}
58+
59+
static var allTests: [(String, PredicateHandlerTestCase -> () throws -> Void)] {
60+
return [
61+
("test_predicateIsTrue_handlerReturnsTrue_passes", test_predicateIsTrue_handlerReturnsTrue_passes),
62+
("test_predicateIsTrue_handlerReturnsFalse_fails", test_predicateIsTrue_handlerReturnsFalse_fails),
63+
("test_predicateIsTrueAfterTimeout_handlerIsNotCalled_fails", test_predicateIsTrueAfterTimeout_handlerIsNotCalled_fails),
64+
]
65+
}
66+
}
67+
68+
// CHECK: Test Suite 'PredicateHandlerTestCase' failed at \d+:\d+:\d+\.\d+
69+
// CHECK: \t Executed 3 tests, with 2 failures \(0 unexpected\) in \d+\.\d+ \(\d+\.\d+\) seconds
70+
XCTMain([testCase(PredicateHandlerTestCase.allTests)])
71+
72+
// CHECK: Test Suite '.*\.xctest' failed at \d+:\d+:\d+\.\d+
73+
// CHECK: \t Executed 3 tests, with 2 failures \(0 unexpected\) in \d+\.\d+ \(\d+\.\d+\) seconds
74+
// CHECK: Test Suite 'All tests' failed at \d+:\d+:\d+\.\d+
75+
// CHECK: \t Executed 3 tests, with 2 failures \(0 unexpected\) in \d+\.\d+ \(\d+\.\d+\) seconds

‎XCTest.xcodeproj/project.pbxproj

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,8 @@
99
/* Begin PBXBuildFile section */
1010
510957A91CA878410091D1A1 /* XCNotificationExpectationHandler.swift in Sources */ = {isa = PBXBuildFile; fileRef = 510957A81CA878410091D1A1 /* XCNotificationExpectationHandler.swift */; };
1111
AE33888B1CD3D72500C39B1C /* XCTestCaseSuite.swift in Sources */ = {isa = PBXBuildFile; fileRef = AE33888A1CD3D72500C39B1C /* XCTestCaseSuite.swift */; };
12+
51DA1EA41CC19C9000F75EB7 /* XCPredicateExpectation.swift in Sources */ = {isa = PBXBuildFile; fileRef = 51DA1EA31CC19C9000F75EB7 /* XCPredicateExpectation.swift */; };
13+
5A3952F11CC173380053159C /* XCPredicateExpectationHandler.swift in Sources */ = {isa = PBXBuildFile; fileRef = 5A3952F01CC173380053159C /* XCPredicateExpectationHandler.swift */; };
1214
AE7DD6091C8E81A0006FC722 /* ArgumentParser.swift in Sources */ = {isa = PBXBuildFile; fileRef = AE7DD6071C8E81A0006FC722 /* ArgumentParser.swift */; };
1315
AE7DD60A1C8E81A0006FC722 /* TestFiltering.swift in Sources */ = {isa = PBXBuildFile; fileRef = AE7DD6081C8E81A0006FC722 /* TestFiltering.swift */; };
1416
AE7DD60C1C8F0513006FC722 /* XCTestObservation.swift in Sources */ = {isa = PBXBuildFile; fileRef = AE7DD60B1C8F0513006FC722 /* XCTestObservation.swift */; };
@@ -41,6 +43,8 @@
4143

4244
/* Begin PBXFileReference section */
4345
510957A81CA878410091D1A1 /* XCNotificationExpectationHandler.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = XCNotificationExpectationHandler.swift; sourceTree = "<group>"; };
46+
51DA1EA31CC19C9000F75EB7 /* XCPredicateExpectation.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = XCPredicateExpectation.swift; sourceTree = "<group>"; };
47+
5A3952F01CC173380053159C /* XCPredicateExpectationHandler.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = XCPredicateExpectationHandler.swift; sourceTree = "<group>"; };
4448
5B5D86DB1BBC74AD00234F36 /* SwiftXCTest.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = SwiftXCTest.framework; sourceTree = BUILT_PRODUCTS_DIR; };
4549
AE33888A1CD3D72500C39B1C /* XCTestCaseSuite.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = XCTestCaseSuite.swift; sourceTree = "<group>"; };
4650
AE7DD6061C8DC6C0006FC722 /* Functional */ = {isa = PBXFileReference; lastKnownFileType = folder; path = Functional; sourceTree = "<group>"; };
@@ -136,12 +140,14 @@
136140
DA7714FA1CA87DFB001EA745 /* XCTestCaseRun.swift */,
137141
AED59FF51CB5394800F49260 /* XCTestErrors.swift */,
138142
DADB979B1C51BDA2005E68B6 /* XCTestExpectation.swift */,
143+
51DA1EA31CC19C9000F75EB7 /* XCPredicateExpectation.swift */,
139144
C265F66C1C3AEB6A00520CF9 /* XCTestMain.swift */,
140145
AE7DD60B1C8F0513006FC722 /* XCTestObservation.swift */,
141146
AE9596E01C9692B8001A9EF0 /* XCTestObservationCenter.swift */,
142147
DACC94411C8B87B900EC85F5 /* XCWaitCompletionHandler.swift */,
143148
510957A81CA878410091D1A1 /* XCNotificationExpectationHandler.swift */,
144149
AE33888A1CD3D72500C39B1C /* XCTestCaseSuite.swift */,
150+
5A3952F01CC173380053159C /* XCPredicateExpectationHandler.swift */,
145151
);
146152
path = XCTest;
147153
sourceTree = "<group>";
@@ -278,8 +284,10 @@
278284
DA7FB38F1CA4EE3800F024F9 /* XCAbstractTest.swift in Sources */,
279285
C265F6701C3AEB6A00520CF9 /* XCTestCase.swift in Sources */,
280286
DADB979C1C51BDA2005E68B6 /* XCTestExpectation.swift in Sources */,
287+
51DA1EA41CC19C9000F75EB7 /* XCPredicateExpectation.swift in Sources */,
281288
DA7714FD1CA8D057001EA745 /* PrintObserver.swift in Sources */,
282289
AE7DD60A1C8E81A0006FC722 /* TestFiltering.swift in Sources */,
290+
5A3952F11CC173380053159C /* XCPredicateExpectationHandler.swift in Sources */,
283291
AE7DD6091C8E81A0006FC722 /* ArgumentParser.swift in Sources */,
284292
DA7732481CA87278007E31FD /* XCTestRun.swift in Sources */,
285293
AE9596E11C9692B8001A9EF0 /* XCTestObservationCenter.swift in Sources */,

0 commit comments

Comments
 (0)