Skip to content

Commit f9b339e

Browse files
authored
Rename Predicate to Matcher (#1090)
* Rename Predicate to Matcher Because I couldn't think of a better name, This re-uses the name of the old Matcher API (removed since Nimble 10.0). This change is due to the 2023 Apple Platforms release renaming NSPredicate to Predicate, which causes friction for developers creating custom matchers. * Add typealias AsyncPredicate = AsyncMatcher
1 parent 67aca90 commit f9b339e

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

62 files changed

+1417
-1381
lines changed

Nimble.xcodeproj/project.pbxproj

Lines changed: 20 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -204,9 +204,9 @@
204204
1F925F12195C190B00ED456B /* BeGreaterThanOrEqualToTest.swift in Sources */ = {isa = PBXBuildFile; fileRef = 1F925F10195C190B00ED456B /* BeGreaterThanOrEqualToTest.swift */; };
205205
1F9DB8FB1A74E793002E96AD /* ObjCBeEmptyTest.m in Sources */ = {isa = PBXBuildFile; fileRef = 1F9DB8FA1A74E793002E96AD /* ObjCBeEmptyTest.m */; };
206206
1F9DB8FC1A74E793002E96AD /* ObjCBeEmptyTest.m in Sources */ = {isa = PBXBuildFile; fileRef = 1F9DB8FA1A74E793002E96AD /* ObjCBeEmptyTest.m */; };
207-
1FA0C3FF1E30B14500623165 /* Predicate.swift in Sources */ = {isa = PBXBuildFile; fileRef = 1FA0C3FE1E30B14500623165 /* Predicate.swift */; };
208-
1FA0C4001E30B14500623165 /* Predicate.swift in Sources */ = {isa = PBXBuildFile; fileRef = 1FA0C3FE1E30B14500623165 /* Predicate.swift */; };
209-
1FA0C4011E30B14500623165 /* Predicate.swift in Sources */ = {isa = PBXBuildFile; fileRef = 1FA0C3FE1E30B14500623165 /* Predicate.swift */; };
207+
1FA0C3FF1E30B14500623165 /* Matcher.swift in Sources */ = {isa = PBXBuildFile; fileRef = 1FA0C3FE1E30B14500623165 /* Matcher.swift */; };
208+
1FA0C4001E30B14500623165 /* Matcher.swift in Sources */ = {isa = PBXBuildFile; fileRef = 1FA0C3FE1E30B14500623165 /* Matcher.swift */; };
209+
1FA0C4011E30B14500623165 /* Matcher.swift in Sources */ = {isa = PBXBuildFile; fileRef = 1FA0C3FE1E30B14500623165 /* Matcher.swift */; };
210210
1FB90098195EC4B8001D7FAE /* BeIdenticalToTest.swift in Sources */ = {isa = PBXBuildFile; fileRef = 1FB90097195EC4B8001D7FAE /* BeIdenticalToTest.swift */; };
211211
1FB90099195EC4B8001D7FAE /* BeIdenticalToTest.swift in Sources */ = {isa = PBXBuildFile; fileRef = 1FB90097195EC4B8001D7FAE /* BeIdenticalToTest.swift */; };
212212
1FC494AA1C29CBA40010975C /* NimbleEnvironment.swift in Sources */ = {isa = PBXBuildFile; fileRef = 1FC494A91C29CBA40010975C /* NimbleEnvironment.swift */; };
@@ -389,10 +389,10 @@
389389
89C297D32A92E814002A143F /* AsyncPromiseTest.swift in Sources */ = {isa = PBXBuildFile; fileRef = 89C297CD2A92AB34002A143F /* AsyncPromiseTest.swift */; };
390390
89C297D42A92E815002A143F /* AsyncPromiseTest.swift in Sources */ = {isa = PBXBuildFile; fileRef = 89C297CD2A92AB34002A143F /* AsyncPromiseTest.swift */; };
391391
89C297D52A92E816002A143F /* AsyncPromiseTest.swift in Sources */ = {isa = PBXBuildFile; fileRef = 89C297CD2A92AB34002A143F /* AsyncPromiseTest.swift */; };
392-
89EEF5A52A03293100988224 /* AsyncPredicate.swift in Sources */ = {isa = PBXBuildFile; fileRef = 89EEF5A42A03293100988224 /* AsyncPredicate.swift */; };
393-
89EEF5A62A03293100988224 /* AsyncPredicate.swift in Sources */ = {isa = PBXBuildFile; fileRef = 89EEF5A42A03293100988224 /* AsyncPredicate.swift */; };
394-
89EEF5A72A03293100988224 /* AsyncPredicate.swift in Sources */ = {isa = PBXBuildFile; fileRef = 89EEF5A42A03293100988224 /* AsyncPredicate.swift */; };
395-
89EEF5A82A03293100988224 /* AsyncPredicate.swift in Sources */ = {isa = PBXBuildFile; fileRef = 89EEF5A42A03293100988224 /* AsyncPredicate.swift */; };
392+
89EEF5A52A03293100988224 /* AsyncMatcher.swift in Sources */ = {isa = PBXBuildFile; fileRef = 89EEF5A42A03293100988224 /* AsyncMatcher.swift */; };
393+
89EEF5A62A03293100988224 /* AsyncMatcher.swift in Sources */ = {isa = PBXBuildFile; fileRef = 89EEF5A42A03293100988224 /* AsyncMatcher.swift */; };
394+
89EEF5A72A03293100988224 /* AsyncMatcher.swift in Sources */ = {isa = PBXBuildFile; fileRef = 89EEF5A42A03293100988224 /* AsyncMatcher.swift */; };
395+
89EEF5A82A03293100988224 /* AsyncMatcher.swift in Sources */ = {isa = PBXBuildFile; fileRef = 89EEF5A42A03293100988224 /* AsyncMatcher.swift */; };
396396
89EEF5B72A032C3200988224 /* AsyncPredicateTest.swift in Sources */ = {isa = PBXBuildFile; fileRef = 89EEF5B22A032C2500988224 /* AsyncPredicateTest.swift */; };
397397
89EEF5B82A032C3300988224 /* AsyncPredicateTest.swift in Sources */ = {isa = PBXBuildFile; fileRef = 89EEF5B22A032C2500988224 /* AsyncPredicateTest.swift */; };
398398
89EEF5B92A032C3300988224 /* AsyncPredicateTest.swift in Sources */ = {isa = PBXBuildFile; fileRef = 89EEF5B22A032C2500988224 /* AsyncPredicateTest.swift */; };
@@ -605,7 +605,7 @@
605605
D95F8970267EA20A004B1B4D /* MatcherProtocols.swift in Sources */ = {isa = PBXBuildFile; fileRef = 1FD8CD1D1968AB07008ED995 /* MatcherProtocols.swift */; };
606606
D95F8971267EA20A004B1B4D /* PostNotification.swift in Sources */ = {isa = PBXBuildFile; fileRef = 1FCF91521C61C8A400B15DCB /* PostNotification.swift */; };
607607
D95F8972267EA20A004B1B4D /* Match.swift in Sources */ = {isa = PBXBuildFile; fileRef = DDB4D5EC19FE43C200E9D9FE /* Match.swift */; };
608-
D95F8973267EA20A004B1B4D /* Predicate.swift in Sources */ = {isa = PBXBuildFile; fileRef = 1FA0C3FE1E30B14500623165 /* Predicate.swift */; };
608+
D95F8973267EA20A004B1B4D /* Matcher.swift in Sources */ = {isa = PBXBuildFile; fileRef = 1FA0C3FE1E30B14500623165 /* Matcher.swift */; };
609609
D95F8974267EA20A004B1B4D /* RaisesException.swift in Sources */ = {isa = PBXBuildFile; fileRef = 1FD8CD1E1968AB07008ED995 /* RaisesException.swift */; };
610610
D95F8975267EA20A004B1B4D /* BeIdenticalTo.swift in Sources */ = {isa = PBXBuildFile; fileRef = 1FD8CD141968AB07008ED995 /* BeIdenticalTo.swift */; };
611611
D95F8976267EA20A004B1B4D /* BeGreaterThanOrEqualTo.swift in Sources */ = {isa = PBXBuildFile; fileRef = 1FD8CD131968AB07008ED995 /* BeGreaterThanOrEqualTo.swift */; };
@@ -747,7 +747,7 @@
747747
1F925F0D195C18F500ED456B /* BeLessThanOrEqualToTest.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = BeLessThanOrEqualToTest.swift; sourceTree = "<group>"; };
748748
1F925F10195C190B00ED456B /* BeGreaterThanOrEqualToTest.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = BeGreaterThanOrEqualToTest.swift; sourceTree = "<group>"; };
749749
1F9DB8FA1A74E793002E96AD /* ObjCBeEmptyTest.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = ObjCBeEmptyTest.m; sourceTree = "<group>"; };
750-
1FA0C3FE1E30B14500623165 /* Predicate.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = Predicate.swift; sourceTree = "<group>"; };
750+
1FA0C3FE1E30B14500623165 /* Matcher.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = Matcher.swift; sourceTree = "<group>"; };
751751
1FB90097195EC4B8001D7FAE /* BeIdenticalToTest.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = BeIdenticalToTest.swift; sourceTree = "<group>"; };
752752
1FC494A91C29CBA40010975C /* NimbleEnvironment.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = NimbleEnvironment.swift; sourceTree = "<group>"; };
753753
1FCF914E1C61C85A00B15DCB /* PostNotificationTest.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = PostNotificationTest.swift; sourceTree = "<group>"; };
@@ -809,7 +809,7 @@
809809
899441F32902EF0900C1FAF9 /* DSL+AsyncAwait.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "DSL+AsyncAwait.swift"; sourceTree = "<group>"; };
810810
89C297CB2A911CDA002A143F /* AsyncTimerSequenceTest.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AsyncTimerSequenceTest.swift; sourceTree = "<group>"; };
811811
89C297CD2A92AB34002A143F /* AsyncPromiseTest.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AsyncPromiseTest.swift; sourceTree = "<group>"; };
812-
89EEF5A42A03293100988224 /* AsyncPredicate.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AsyncPredicate.swift; sourceTree = "<group>"; };
812+
89EEF5A42A03293100988224 /* AsyncMatcher.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AsyncMatcher.swift; sourceTree = "<group>"; };
813813
89EEF5B22A032C2500988224 /* AsyncPredicateTest.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AsyncPredicateTest.swift; sourceTree = "<group>"; };
814814
89EEF5BB2A06210D00988224 /* AsyncHelpers.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AsyncHelpers.swift; sourceTree = "<group>"; };
815815
89F5E06C290765BB001F9377 /* PollingTest.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = PollingTest.swift; sourceTree = "<group>"; };
@@ -1100,7 +1100,7 @@
11001100
children = (
11011101
DDB1BC781A92235600F743C3 /* AllPass.swift */,
11021102
896962402A5FABD000A7929D /* AsyncAllPass.swift */,
1103-
89EEF5A42A03293100988224 /* AsyncPredicate.swift */,
1103+
89EEF5A42A03293100988224 /* AsyncMatcher.swift */,
11041104
1FD8CD0E1968AB07008ED995 /* BeAKindOf.swift */,
11051105
1FD8CD0D1968AB07008ED995 /* BeAnInstanceOf.swift */,
11061106
1FD8CD0F1968AB07008ED995 /* BeCloseTo.swift */,
@@ -1129,7 +1129,7 @@
11291129
1FD8CD1D1968AB07008ED995 /* MatcherProtocols.swift */,
11301130
AE7ADE441C80BF8000B94CD3 /* MatchError.swift */,
11311131
1FCF91521C61C8A400B15DCB /* PostNotification.swift */,
1132-
1FA0C3FE1E30B14500623165 /* Predicate.swift */,
1132+
1FA0C3FE1E30B14500623165 /* Matcher.swift */,
11331133
1FD8CD1E1968AB07008ED995 /* RaisesException.swift */,
11341134
A8F6B5BC2070186D00FCB5ED /* SatisfyAllOf.swift */,
11351135
7B5358BD1C38479700A23FAA /* SatisfyAnyOf.swift */,
@@ -1726,9 +1726,9 @@
17261726
1FD8CD3A1968AB07008ED995 /* FailureMessage.swift in Sources */,
17271727
891A04722AB0164500B46613 /* AsyncTimerSequence.swift in Sources */,
17281728
CDFB6A4C1F7E082500AD8CC7 /* mach_excServer.c in Sources */,
1729-
89EEF5A62A03293100988224 /* AsyncPredicate.swift in Sources */,
1729+
89EEF5A62A03293100988224 /* AsyncMatcher.swift in Sources */,
17301730
472FD1351B9E085700C7B8DA /* HaveCount.swift in Sources */,
1731-
1FA0C4001E30B14500623165 /* Predicate.swift in Sources */,
1731+
1FA0C4001E30B14500623165 /* Matcher.swift in Sources */,
17321732
964CFEFD1C4FF48900513336 /* ThrowAssertion.swift in Sources */,
17331733
);
17341734
runOnlyForDeploymentPostprocessing = 0;
@@ -1861,7 +1861,7 @@
18611861
1F5DF1851BDCA0F500C3A531 /* Equal.swift in Sources */,
18621862
F8A1BE311CB3710900031679 /* XCTestObservationCenter+Register.m in Sources */,
18631863
1FE661591E6574E30035F243 /* ExpectationMessage.swift in Sources */,
1864-
1FA0C4011E30B14500623165 /* Predicate.swift in Sources */,
1864+
1FA0C4011E30B14500623165 /* Matcher.swift in Sources */,
18651865
1F5DF1711BDCA0F500C3A531 /* DSL+Wait.swift in Sources */,
18661866
1F1871D61CA89EEF00A34BF2 /* DSL.m in Sources */,
18671867
1F5DF17D1BDCA0F500C3A531 /* BeGreaterThanOrEqualTo.swift in Sources */,
@@ -1888,7 +1888,7 @@
18881888
CDD80B851F20307B0002CD65 /* MatcherProtocols.swift in Sources */,
18891889
1F5DF1721BDCA0F500C3A531 /* Expectation.swift in Sources */,
18901890
7B5358C01C38479700A23FAA /* SatisfyAnyOf.swift in Sources */,
1891-
89EEF5A72A03293100988224 /* AsyncPredicate.swift in Sources */,
1891+
89EEF5A72A03293100988224 /* AsyncMatcher.swift in Sources */,
18921892
0477153723B740B800402D4E /* NimbleTimeInterval.swift in Sources */,
18931893
7B13BA0C1DD361D300C9098C /* ContainElementSatisfying.swift in Sources */,
18941894
1F5DF1871BDCA0F500C3A531 /* Match.swift in Sources */,
@@ -2055,9 +2055,9 @@
20552055
1FD8CD391968AB07008ED995 /* Expression.swift in Sources */,
20562056
891A04712AB0164500B46613 /* AsyncTimerSequence.swift in Sources */,
20572057
CDFB6A4B1F7E082500AD8CC7 /* mach_excServer.c in Sources */,
2058-
89EEF5A52A03293100988224 /* AsyncPredicate.swift in Sources */,
2058+
89EEF5A52A03293100988224 /* AsyncMatcher.swift in Sources */,
20592059
1FD8CD3B1968AB07008ED995 /* FailureMessage.swift in Sources */,
2060-
1FA0C3FF1E30B14500623165 /* Predicate.swift in Sources */,
2060+
1FA0C3FF1E30B14500623165 /* Matcher.swift in Sources */,
20612061
472FD1391B9E0A9700C7B8DA /* HaveCount.swift in Sources */,
20622062
);
20632063
runOnlyForDeploymentPostprocessing = 0;
@@ -2164,7 +2164,7 @@
21642164
D95F8988267EA20E004B1B4D /* Errors.swift in Sources */,
21652165
D95F8926267EA1CA004B1B4D /* XCTestObservationCenter+Register.m in Sources */,
21662166
D95F8967267EA20A004B1B4D /* SatisfyAnyOf.swift in Sources */,
2167-
D95F8973267EA20A004B1B4D /* Predicate.swift in Sources */,
2167+
D95F8973267EA20A004B1B4D /* Matcher.swift in Sources */,
21682168
D95F8976267EA20A004B1B4D /* BeGreaterThanOrEqualTo.swift in Sources */,
21692169
89F5E08F290B8D22001F9377 /* AsyncAwait.swift in Sources */,
21702170
D95F8958267EA1F7004B1B4D /* AssertionRecorder.swift in Sources */,
@@ -2217,7 +2217,7 @@
22172217
D95F8975267EA20A004B1B4D /* BeIdenticalTo.swift in Sources */,
22182218
D95F8984267EA20E004B1B4D /* SourceLocation.swift in Sources */,
22192219
D95F8929267EA1CA004B1B4D /* DSL.m in Sources */,
2220-
89EEF5A82A03293100988224 /* AsyncPredicate.swift in Sources */,
2220+
89EEF5A82A03293100988224 /* AsyncMatcher.swift in Sources */,
22212221
D95F896B267EA20A004B1B4D /* BeEmpty.swift in Sources */,
22222222
D95F896E267EA20A004B1B4D /* BeVoid.swift in Sources */,
22232223
D95F8957267EA1F7004B1B4D /* AdapterProtocols.swift in Sources */,

0 commit comments

Comments
 (0)