dnrops
/
Cuckoo
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix description texts from last commit.

This commit is contained in:
Tadeas Kriz 2016-06-07 20:57:15 +02:00
parent c72e91b311
commit 598be22967
2 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
Source/Matching/MatcherFunctions.swift
View File

@ -18,7 +18,7 @@ private func describeCallMismatch(calls: [StubCall], description: Description) {
@warn_unused_result @warn_unused_result
public func times(count: Int) -> AnyMatcher<[StubCall]> { public func times(count: Int) -> AnyMatcher<[StubCall]> {
return FunctionMatcher(function: compareCalls(count, using: ==), describeMismatch: describeCallMismatch) { return FunctionMatcher(function: compareCalls(count, using: ==), describeMismatch: describeCallMismatch) {
$0.append(text: "Expected to be called ").append(value: count).append(text: " times ") $0.append(text: "to be called ").append(value: count).append(text: " times ")
}.typeErased() }.typeErased()
} }
@ -38,7 +38,7 @@ public func atLeastOnce() -> AnyMatcher<[StubCall]> {
@warn_unused_result @warn_unused_result
public func atLeast(count: Int) -> AnyMatcher<[StubCall]> { public func atLeast(count: Int) -> AnyMatcher<[StubCall]> {
return FunctionMatcher(function: compareCalls(count, using: >=), describeMismatch: describeCallMismatch) { return FunctionMatcher(function: compareCalls(count, using: >=), describeMismatch: describeCallMismatch) {
$0.append(text: "Expected to be called at least ").append(value: count).append(text: " times ") $0.append(text: "to be called at least ").append(value: count).append(text: " times ")
}.typeErased() }.typeErased()
} }
@ -46,7 +46,7 @@ public func atLeast(count: Int) -> AnyMatcher<[StubCall]> {
@warn_unused_result @warn_unused_result
public func atMost(count: Int) -> AnyMatcher<[StubCall]> { public func atMost(count: Int) -> AnyMatcher<[StubCall]> {
return FunctionMatcher(function: compareCalls(count, whenNil: true, using: <=), describeMismatch: describeCallMismatch) { return FunctionMatcher(function: compareCalls(count, whenNil: true, using: <=), describeMismatch: describeCallMismatch) {
$0.append(text: "Expected to be called at most ").append(value: count).append(text: " times ") $0.append(text: "to be called at most ").append(value: count).append(text: " times ")
}.typeErased() }.typeErased()
} }
@ -84,7 +84,7 @@ public func equalTo<T: AnyObject>(value: T) -> AnyMatcher<T> {
@warn_unused_result @warn_unused_result
public func equalTo<T>(value: T, equalWhen equalityFunction: (T, T) -> Bool) -> AnyMatcher<T> { public func equalTo<T>(value: T, equalWhen equalityFunction: (T, T) -> Bool) -> AnyMatcher<T> {
return FunctionMatcher(original: value, function: equalityFunction) { return FunctionMatcher(original: value, function: equalityFunction) {
$0.append(text: "Expected to be equal to ").append(value: value).append(character: " ") $0.append(text: "to be equal to ").append(value: value).append(character: " ")
}.typeErased() }.typeErased()
} }

8
Tests/MatcherDescriptionsTest.swift
View File

@ -23,27 +23,27 @@ class MatcherDescriptionsTest: XCTestCase {
equalTo(10).describeTo(stringDescription) equalTo(10).describeTo(stringDescription)
equalTo(10).describeMismatch(20, to: stringDescription) equalTo(10).describeMismatch(20, to: stringDescription)
XCTAssertEqual(stringDescription.description, "Expected to be equal to <10> was <20>") XCTAssertEqual(stringDescription.description, "to be equal to <10> was <20>")
} }
func testCalledTimes() { func testCalledTimes() {
times(10).describeTo(stringDescription) times(10).describeTo(stringDescription)
times(10).describeMismatch([], to: stringDescription) times(10).describeMismatch([], to: stringDescription)
XCTAssertEqual(stringDescription.description, "Expected to be called <10> times was called <0> times") XCTAssertEqual(stringDescription.description, "to be called <10> times was called <0> times")
} }
func testCalledAtLest() { func testCalledAtLest() {
atLeast(10).describeTo(stringDescription) atLeast(10).describeTo(stringDescription)
atLeast(10).describeMismatch([], to: stringDescription) atLeast(10).describeMismatch([], to: stringDescription)
XCTAssertEqual(stringDescription.description, "Expected to be called at least <10> times was called <0> times") XCTAssertEqual(stringDescription.description, "to be called at least <10> times was called <0> times")
} }
func testCalledAtMost() { func testCalledAtMost() {
atMost(10).describeTo(stringDescription) atMost(10).describeTo(stringDescription)
atMost(10).describeMismatch([], to: stringDescription) atMost(10).describeMismatch([], to: stringDescription)
XCTAssertEqual(stringDescription.description, "Expected to be called at most <10> times was called <0> times") XCTAssertEqual(stringDescription.description, "to be called at most <10> times was called <0> times")
} }
} }