Merge remote-tracking branch 'cppforlife/singleton_matchers'

burtlo · Nov 9, 2011 · 84da6c6 · 84da6c6
2 parents 3281683 + a2f90aa
commit 84da6c6
Show file tree

Hide file tree

Showing 8 changed files with 71 additions and 8 deletions.
diff --git a/Source/Headers/Matchers/Base/BeNil.h b/Source/Headers/Matchers/Base/BeNil.h
@@ -13,6 +13,7 @@ namespace Cedar { namespace Matchers {
         // Allow default copy ctor.
 
         virtual NSString * failure_message_end() const;
+        const BeNil & operator()() const;
 
         template<typename U>
         bool matches(const U &) const;
@@ -21,7 +22,7 @@ namespace Cedar { namespace Matchers {
         bool matches(U * const &) const;
     };
 
-    BeNil be_nil();
+    static const BeNil be_nil = BeNil();
 
 #pragma mark Generic
     template<typename U>

diff --git a/Source/Headers/Matchers/Base/BeTruthy.h b/Source/Headers/Matchers/Base/BeTruthy.h
@@ -12,12 +12,13 @@ namespace Cedar { namespace Matchers {
         // Allow default copy ctor.
 
         virtual NSString * failure_message_end() const;
+        const BeTruthy & operator()() const;
 
         template<typename U>
         bool matches(const U &) const;
     };
 
-    BeTruthy be_truthy();
+    static const BeTruthy be_truthy = BeTruthy();
 
 #pragma mark Generic
     template<typename U>

diff --git a/Source/Headers/Matchers/Container/BeEmpty.h b/Source/Headers/Matchers/Container/BeEmpty.h
@@ -10,15 +10,20 @@ namespace Cedar { namespace Matchers {
         ~BeEmpty();
         // Allow default copy ctor.
 
+        const BeEmpty & operator()() const;
+
         template<typename U>
         bool matches(const U &) const;
 
     protected:
         virtual NSString * failure_message_end() const;
     };
 
-    inline BeEmpty be_empty() {
-        return BeEmpty();
+    static const BeEmpty be_empty = BeEmpty();
+
+    // For backwards compatible parenthesis syntax
+    inline const BeEmpty & BeEmpty::operator()() const {
+        return *this;
     }
 
     inline BeEmpty::BeEmpty() : Base() {

diff --git a/Source/Matchers/BeNil.mm b/Source/Matchers/BeNil.mm
@@ -2,8 +2,9 @@
 
 namespace Cedar { namespace Matchers {
 
-    BeNil be_nil() {
-        return BeNil();
+    // For backwards compatible parenthesis syntax
+    const BeNil & BeNil::operator()() const {
+        return *this;
     }
 
     BeNil::BeNil() : Base() {

diff --git a/Source/Matchers/BeTruthy.mm b/Source/Matchers/BeTruthy.mm
@@ -2,8 +2,9 @@
 
 namespace Cedar { namespace Matchers {
 
-    BeTruthy be_truthy() {
-        return BeTruthy();
+    // For backwards compatible parenthesis syntax
+    const BeTruthy & BeTruthy::operator()() const {
+        return *this;
     }
 
     BeTruthy::BeTruthy() : Base() {

diff --git a/Spec/Matchers/Base/BeNilSpec.mm b/Spec/Matchers/Base/BeNilSpec.mm
@@ -116,4 +116,22 @@
     });
 });
 
+describe(@"be_nil shorthand syntax (no parenthesis)", ^{
+    void *value = NULL;
+
+    describe(@"positive match", ^{
+        it(@"should should pass", ^{
+            expect(value).to(be_nil);
+        });
+    });
+
+    describe(@"negative match", ^{
+        it(@"should fail with a sensible failure message", ^{
+            expectFailureWithMessage(@"Expected <0> to not be nil", ^{
+                expect(value).to_not(be_nil);
+            });
+        });
+    });
+});
+
 SPEC_END
diff --git a/Spec/Matchers/Base/BeTruthySpec.mm b/Spec/Matchers/Base/BeTruthySpec.mm
@@ -104,4 +104,22 @@
     });
 });
 
+describe(@"be_truthy shorthand syntax (no parenthesis)", ^{
+    BOOL value = YES;
+
+    describe(@"positive match", ^{
+        it(@"should should pass", ^{
+            expect(value).to(be_truthy);
+        });
+    });
+
+    describe(@"negative match", ^{
+        it(@"should fail with a sensible failure message", ^{
+            expectFailureWithMessage(@"Expected <YES> to not evaluate to true", ^{
+                expect(value).to_not(be_truthy);
+            });
+        });
+    });
+});
+
 SPEC_END
diff --git a/Spec/Matchers/Container/BeEmptySpec.mm b/Spec/Matchers/Container/BeEmptySpec.mm
@@ -364,4 +364,22 @@
     });
 });
 
+describe(@"be_empty shorthand syntax (no parenthesis)", ^{
+    NSArray *container = [NSArray array];
+
+    describe(@"positive match", ^{
+        it(@"should should pass", ^{
+            expect(container).to(be_empty);
+        });
+    });
+
+    describe(@"negative match", ^{
+        it(@"should fail with a sensible failure message", ^{
+            expectFailureWithMessage(@"Expected <(\n)> to not be empty", ^{
+                expect(container).to_not(be_empty);
+            });
+        });
+    });
+});
+
 SPEC_END