Permalink
Browse files

Replaced vendored Hamcrest with the latest version using CocoaPods.

  • Loading branch information...
1 parent c18fe17 commit 8800ffc8f1d86ef0c7252f07d95a4977d2302217 @lukeredpath committed Mar 4, 2012
Showing with 94 additions and 5,090 deletions.
  1. +3 −0 .gitignore
  2. +2 −0 Gemfile
  3. +22 −0 Gemfile.lock
  4. +49 −380 Mocky.xcodeproj/project.pbxproj
  5. +1 −0 Mocky.xcworkspace/contents.xcworkspacedata
  6. BIN Mocky.xcworkspace/xcuserdata/luke.xcuserdatad/UserInterfaceState.xcuserstate
  7. +10 −0 Mocky.xcworkspace/xcuserdata/luke.xcuserdatad/WorkspaceSettings.xcsettings
  8. +2 −0 Podfile
  9. +5 −0 Podfile.lock
  10. +0 −52 Vendor/Hamcrest/Core/Core/HCAllOf.h
  11. +0 −96 Vendor/Hamcrest/Core/Core/HCAllOf.mm
  12. +0 −52 Vendor/Hamcrest/Core/Core/HCAnyOf.h
  13. +0 −80 Vendor/Hamcrest/Core/Core/HCAnyOf.mm
  14. +0 −56 Vendor/Hamcrest/Core/Core/HCDescribedAs.h
  15. +0 −150 Vendor/Hamcrest/Core/Core/HCDescribedAs.mm
  16. +0 −66 Vendor/Hamcrest/Core/Core/HCIs.h
  17. +0 −62 Vendor/Hamcrest/Core/Core/HCIs.mm
  18. +0 −61 Vendor/Hamcrest/Core/Core/HCIsAnything.h
  19. +0 −80 Vendor/Hamcrest/Core/Core/HCIsAnything.mm
  20. +0 −47 Vendor/Hamcrest/Core/Core/HCIsEqual.h
  21. +0 −64 Vendor/Hamcrest/Core/Core/HCIsEqual.mm
  22. +0 −47 Vendor/Hamcrest/Core/Core/HCIsInstanceOf.h
  23. +0 −54 Vendor/Hamcrest/Core/Core/HCIsInstanceOf.mm
  24. +0 −55 Vendor/Hamcrest/Core/Core/HCIsNil.h
  25. +0 −51 Vendor/Hamcrest/Core/Core/HCIsNil.mm
  26. +0 −56 Vendor/Hamcrest/Core/Core/HCIsNot.h
  27. +0 −62 Vendor/Hamcrest/Core/Core/HCIsNot.mm
  28. +0 −47 Vendor/Hamcrest/Core/Core/HCIsSame.h
  29. +0 −70 Vendor/Hamcrest/Core/Core/HCIsSame.mm
  30. +0 −30 Vendor/Hamcrest/Core/HCBaseDescription.h
  31. +0 −116 Vendor/Hamcrest/Core/HCBaseDescription.mm
  32. +0 −21 Vendor/Hamcrest/Core/HCBaseMatcher.h
  33. +0 −71 Vendor/Hamcrest/Core/HCBaseMatcher.mm
  34. +0 −46 Vendor/Hamcrest/Core/HCDescription.h
  35. +0 −37 Vendor/Hamcrest/Core/HCInvocationMatcher.h
  36. +0 −90 Vendor/Hamcrest/Core/HCInvocationMatcher.mm
  37. +0 −52 Vendor/Hamcrest/Core/HCMatcher.h
  38. +0 −36 Vendor/Hamcrest/Core/HCMatcherAssert.h
  39. +0 −96 Vendor/Hamcrest/Core/HCMatcherAssert.mm
  40. +0 −29 Vendor/Hamcrest/Core/HCSelfDescribing.h
  41. +0 −40 Vendor/Hamcrest/Core/HCStringDescription.h
  42. +0 −59 Vendor/Hamcrest/Core/HCStringDescription.mm
  43. +0 −24 Vendor/Hamcrest/Core/HCWrapInMatcher.h
  44. +0 −26 Vendor/Hamcrest/Core/HCWrapInMatcher.mm
  45. +0 −28 Vendor/Hamcrest/Core/Internal/HCCollectMatchers.h
  46. +0 −28 Vendor/Hamcrest/Core/Internal/HCCollectMatchers.mm
  47. +0 −20 Vendor/Hamcrest/Core/Internal/HCIntegerTypes.h
  48. +0 −26 Vendor/Hamcrest/Core/Internal/NSObject_HCSelfDescribingValue.h
  49. +0 −22 Vendor/Hamcrest/Core/Internal/NSObject_HCSelfDescribingValue.mm
  50. +0 −51 Vendor/Hamcrest/Library/Collection/HCIsCollectionContaining.h
  51. +0 −99 Vendor/Hamcrest/Library/Collection/HCIsCollectionContaining.mm
  52. +0 −60 Vendor/Hamcrest/Library/Collection/HCIsCollectionOnlyContaining.h
  53. +0 −98 Vendor/Hamcrest/Library/Collection/HCIsCollectionOnlyContaining.mm
  54. +0 −43 Vendor/Hamcrest/Library/Collection/HCIsDictionaryContaining.h
  55. +0 −87 Vendor/Hamcrest/Library/Collection/HCIsDictionaryContaining.mm
  56. +0 −41 Vendor/Hamcrest/Library/Collection/HCIsDictionaryContainingKey.h
  57. +0 −77 Vendor/Hamcrest/Library/Collection/HCIsDictionaryContainingKey.mm
  58. +0 −41 Vendor/Hamcrest/Library/Collection/HCIsDictionaryContainingValue.h
  59. +0 −77 Vendor/Hamcrest/Library/Collection/HCIsDictionaryContainingValue.mm
  60. +0 −41 Vendor/Hamcrest/Library/Collection/HCIsIn.h
  61. +0 −68 Vendor/Hamcrest/Library/Collection/HCIsIn.mm
  62. +0 −87 Vendor/Hamcrest/Library/Number/HCBoxNumber.h
  63. +0 −48 Vendor/Hamcrest/Library/Number/HCIsCloseTo.h
  64. +0 −66 Vendor/Hamcrest/Library/Number/HCIsCloseTo.mm
  65. +0 −185 Vendor/Hamcrest/Library/Number/HCIsEqualToNumber.h
  66. +0 −45 Vendor/Hamcrest/Library/Number/HCIsEqualToNumber.mm
  67. +0 −248 Vendor/Hamcrest/Library/Number/HCNumberAssert.h
  68. +0 −46 Vendor/Hamcrest/Library/Number/HCNumberAssert.mm
  69. +0 −80 Vendor/Hamcrest/Library/Number/HCOrderingComparison.h
  70. +0 −122 Vendor/Hamcrest/Library/Number/HCOrderingComparison.mm
  71. +0 −48 Vendor/Hamcrest/Library/Object/HCHasDescription.h
  72. +0 −43 Vendor/Hamcrest/Library/Object/HCHasDescription.mm
  73. +0 −44 Vendor/Hamcrest/Library/Text/HCIsEqualIgnoringCase.h
  74. +0 −70 Vendor/Hamcrest/Library/Text/HCIsEqualIgnoringCase.mm
  75. +0 −45 Vendor/Hamcrest/Library/Text/HCIsEqualIgnoringWhiteSpace.h
  76. +0 −123 Vendor/Hamcrest/Library/Text/HCIsEqualIgnoringWhiteSpace.mm
  77. +0 −28 Vendor/Hamcrest/Library/Text/HCRequireNonNilString.h
  78. +0 −42 Vendor/Hamcrest/Library/Text/HCStringContains.h
  79. +0 −51 Vendor/Hamcrest/Library/Text/HCStringContains.mm
  80. +0 −42 Vendor/Hamcrest/Library/Text/HCStringEndsWith.h
  81. +0 −51 Vendor/Hamcrest/Library/Text/HCStringEndsWith.mm
  82. +0 −42 Vendor/Hamcrest/Library/Text/HCStringStartsWith.h
  83. +0 −51 Vendor/Hamcrest/Library/Text/HCStringStartsWith.mm
  84. +0 −19 Vendor/Hamcrest/Library/Text/HCSubstringMatcher.h
  85. +0 −51 Vendor/Hamcrest/Library/Text/HCSubstringMatcher.mm
  86. +0 −45 Vendor/Hamcrest/OCHamcrest.h
View
@@ -34,3 +34,6 @@ CVS
Backup[ ]of[ ]*.pages/
Backup[ ]of[ ]*.key/
Backup[ ]of[ ]*.numbers/
+
+# cocoapods artefacts
+Pods
View
@@ -0,0 +1,2 @@
+gem "cocoapods", git: "git://github.com/CocoaPods/CocoaPods"
+gem "xcodeproj", git: "git://github.com/CocoaPods/Xcodeproj"
View
@@ -0,0 +1,22 @@
+GIT
+ remote: git://github.com/CocoaPods/CocoaPods
+ revision: 9765ffa044bb527856ea77e69c78f159427dd9fb
+ specs:
+ cocoapods (0.5.1)
+ xcodeproj (~> 0.1.0)
+
+GIT
+ remote: git://github.com/CocoaPods/Xcodeproj
+ revision: 2e3186e00a2849dc6c4facb38a92775b754103a0
+ specs:
+ xcodeproj (0.1.0)
+
+GEM
+ specs:
+
+PLATFORMS
+ ruby
+
+DEPENDENCIES
+ cocoapods!
+ xcodeproj!
Oops, something went wrong.
@@ -0,0 +1 @@
+<?xml version='1.0' encoding='UTF-8'?><Workspace version='1.0'><FileRef location='group:Mocky.xcodeproj'/><FileRef location='group:Pods/Pods.xcodeproj'/></Workspace>
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+<plist version="1.0">
+<dict>
+ <key>HasAskedToTakeAutomaticSnapshotBeforeSignificantChanges</key>
+ <true/>
+ <key>SnapshotAutomaticallyBeforeSignificantChanges</key>
+ <false/>
+</dict>
+</plist>
View
@@ -0,0 +1,2 @@
+platform :ios
+dependency 'OCHamcrest', '~> 1.6'
View
@@ -0,0 +1,5 @@
+PODS:
+ - OCHamcrest (1.6)
+
+DEPENDENCIES:
+ - OCHamcrest (~> 1.6)
@@ -1,52 +0,0 @@
-//
-// OCHamcrest - HCAllOf.h
-// Copyright 2009 www.hamcrest.org. See LICENSE.txt
-//
-// Created by: Jon Reid
-//
-
- // Inherited
-#import "HCBaseMatcher.h"
-
-
-/**
- Calculates the logical conjunction of multiple matchers.
-
- Evaluation is shortcut, so subsequent matchers are not called if an earlier matcher returns
- @c NO.
-*/
-@interface HCAllOf : HCBaseMatcher
-{
- NSArray* matchers;
-}
-
-+ (HCAllOf*) allOf:(NSArray*)theMatchers;
-- (id) initWithMatchers:(NSArray*)theMatchers;
-
-@end
-
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-/**
- Evaluates to @c YES only if @b all of the passed in matchers evaluate to @c YES.
-
- @param matcher Comma-separated list of matchers ending with @c nil.
-*/
-id<HCMatcher> HC_allOf(id<HCMatcher> matcher, ...);
-
-#ifdef __cplusplus
-}
-#endif
-
-
-#ifdef HC_SHORTHAND
-
-/**
- Shorthand for HC_allOf, available if HC_SHORTHAND is defined.
-*/
-#define allOf HC_allOf
-
-#endif
@@ -1,96 +0,0 @@
-//
-// OCHamcrest - HCAllOf.mm
-// Copyright 2009 www.hamcrest.org. See LICENSE.txt
-//
-// Created by: Jon Reid
-//
-
- // Self
-#import "HCAllOf.h"
-
- // OCHamcrest
-#import "HCDescription.h"
-
- // OCHamcrest internal
-#import "HCCollectMatchers.h"
-
-
-@implementation HCAllOf
-
-+ (HCAllOf*) allOf:(NSArray*)theMatchers
-{
- return [[[HCAllOf alloc] initWithMatchers:theMatchers] autorelease];
-}
-
-
-- (id) initWithMatchers:(NSArray*)theMatchers
-{
- self = [super init];
- if (self != nil)
- matchers = [theMatchers retain];
- return self;
-}
-
-
-- (void) dealloc
-{
- [matchers release];
-
- [super dealloc];
-}
-
-
-- (BOOL) matches:(id)item
-{
- return [self matches:item describingMismatchTo:nil];
-}
-
-
-- (BOOL) matches:(id)item describingMismatchTo:(id<HCDescription>)mismatchDescription
-{
-#if defined(OBJC_API_VERSION) && OBJC_API_VERSION >= 2
- for (id<HCMatcher> oneMatcher in matchers)
-#else
- NSEnumerator* enumerator = [matchers objectEnumerator];
- id<HCMatcher> oneMatcher;
- while ((oneMatcher = [enumerator nextObject]) != nil)
-#endif
- {
- if (![oneMatcher matches:item])
- {
- [[mismatchDescription appendDescriptionOf:oneMatcher] appendText:@" "];
- [oneMatcher describeMismatchOf:item to:mismatchDescription];
- return NO;
- }
- }
- return YES;
-}
-
-
-- (void) describeMismatchOf:(id)item to:(id<HCDescription>)mismatchDescription
-{
- (void) [self matches:item describingMismatchTo:mismatchDescription];
-}
-
-
-- (void) describeTo:(id<HCDescription>)description
-{
- [description appendList:matchers start:@"(" separator:@" and " end:@")"];
-}
-
-@end
-
-
-extern "C" {
-
-id<HCMatcher> HC_allOf(id<HCMatcher> matcher, ...)
-{
- va_list args;
- va_start(args, matcher);
- NSArray* matcherList = HC_collectMatchers(matcher, args);
- va_end(args);
-
- return [HCAllOf allOf:matcherList];
-}
-
-} // extern "C"
@@ -1,52 +0,0 @@
-//
-// OCHamcrest - HCAnyOf.h
-// Copyright 2009 www.hamcrest.org. See LICENSE.txt
-//
-// Created by: Jon Reid
-//
-
- // Inherited
-#import "HCBaseMatcher.h"
-
-
-/**
- Calculates the logical disjunction of multiple matchers.
-
- Evaluation is shortcut, so the subsequent matchers are not called if an earlier matcher returns
- @c YES.
-*/
-@interface HCAnyOf : HCBaseMatcher
-{
- NSArray* matchers;
-}
-
-+ (HCAnyOf*) anyOf:(NSArray*)theMatchers;
-- (id) initWithMatchers:(NSArray*)theMatchers;
-
-@end
-
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-/**
- Evaluates to @c YES if @b any of the passed in matchers evaluate to @c YES.
-
- @param matcher Comma-separated list of matchers ending with @c nil.
-*/
-id<HCMatcher> HC_anyOf(id<HCMatcher> matcher, ...);
-
-#ifdef __cplusplus
-}
-#endif
-
-
-#ifdef HC_SHORTHAND
-
-/**
- Shorthand for HC_anyOf, available if HC_SHORTHAND is defined.
-*/
-#define anyOf HC_anyOf
-
-#endif
@@ -1,80 +0,0 @@
-//
-// OCHamcrest - HCAnyOf.mm
-// Copyright 2009 www.hamcrest.org. See LICENSE.txt
-//
-// Created by: Jon Reid
-//
-
- // Self
-#import "HCAnyOf.h"
-
- // OCHamcrest
-#import "HCDescription.h"
-
- // OCHamcrest internal
-#import "HCCollectMatchers.h"
-
-
-@implementation HCAnyOf
-
-+ (HCAnyOf*) anyOf:(NSArray*)theMatchers
-{
- return [[[HCAnyOf alloc] initWithMatchers:theMatchers] autorelease];
-}
-
-
-- (id) initWithMatchers:(NSArray*)theMatchers
-{
- self = [super init];
- if (self != nil)
- matchers = [theMatchers retain];
- return self;
-}
-
-
-- (void) dealloc
-{
- [matchers release];
-
- [super dealloc];
-}
-
-
-- (BOOL) matches:(id)item
-{
-#if defined(OBJC_API_VERSION) && OBJC_API_VERSION >= 2
- for (id<HCMatcher> oneMatcher in matchers)
-#else
- NSEnumerator* enumerator = [matchers objectEnumerator];
- id<HCMatcher> oneMatcher;
- while ((oneMatcher = [enumerator nextObject]) != nil)
-#endif
- {
- if ([oneMatcher matches:item])
- return YES;
- }
- return NO;
-}
-
-
-- (void) describeTo:(id<HCDescription>)description
-{
- [description appendList:matchers start:@"(" separator:@" or " end:@")"];
-}
-
-@end
-
-
-extern "C" {
-
-id<HCMatcher> HC_anyOf(id<HCMatcher> matcher, ...)
-{
- va_list args;
- va_start(args, matcher);
- NSArray* matcherList = HC_collectMatchers(matcher, args);
- va_end(args);
-
- return [HCAnyOf anyOf:matcherList];
-}
-
-} // extern "C"
@@ -1,56 +0,0 @@
-//
-// OCHamcrest - HCDescribedAs.h
-// Copyright 2009 www.hamcrest.org. See LICENSE.txt
-//
-// Created by: Jon Reid
-//
-
- // Inherited
-#import "HCBaseMatcher.h"
-
-
-/**
- Provides a custom description to another matcher.
-*/
-@interface HCDescribedAs : HCBaseMatcher
-{
- NSString* descriptionTemplate;
- id<HCMatcher> matcher;
- NSArray* values;
-}
-
-+ (HCDescribedAs*) describedAs:(NSString*)description
- forMatcher:(id<HCMatcher>)aMatcher
- overValues:(NSArray*)templateValues;
-- (id) initWithDescription:(NSString*)description
- forMatcher:(id<HCMatcher>)aMatcher
- overValues:(NSArray*)templateValues;
-
-@end
-
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-/**
- Wraps an existing matcher and overrides the description when it fails.
-
- Optional values following the matcher are substituted for \%0, \%1, etc.
- The last argument must be nil.
-*/
-id<HCMatcher> HC_describedAs(NSString* description, id<HCMatcher> matcher, ...);
-
-#ifdef __cplusplus
-}
-#endif
-
-
-#ifdef HC_SHORTHAND
-
-/**
- Shorthand for HC_describedAs, available if HC_SHORTHAND is defined.
-*/
-#define describedAs HC_describedAs
-
-#endif
Oops, something went wrong.

0 comments on commit 8800ffc

Please sign in to comment.