Merge pull request #2069 from RogerRussel/assert-regex-ability

Implemented assertRegExp and assertNotRegExp
Codeception · Jun 22, 2015 · a428062 · a428062
2 parents 0c12ecb + 58279f0
commit a428062
Show file tree

Hide file tree

Showing 3 changed files with 42 additions and 0 deletions.
diff --git a/src/Codeception/Module/Asserts.php b/src/Codeception/Module/Asserts.php
@@ -22,6 +22,8 @@ class Asserts extends Module
         assertLessThanOrEqual as public;
         assertContains as public;
         assertNotContains as public;
+        assertRegExp as public;
+        assertNotRegExp as public;
         assertEmpty as public;
         assertNotEmpty as public;
         assertNull as public;

diff --git a/src/Codeception/Util/Shared/Asserts.php b/src/Codeception/Util/Shared/Asserts.php
@@ -165,6 +165,31 @@ protected function assertNotContains($needle, $haystack, $message = '')
         \PHPUnit_Framework_Assert::assertNotContains($needle, $haystack, $message);
     }
 
+    /**
+     * Checks that string match with pattern
+     *
+     * @param string $pattern
+     * @param string $string
+     * @param string $message
+     */
+    protected function assertRegExp($pattern, $string, $message = '')
+    {
+        \PHPUnit_Framework_Assert::assertRegExp($pattern, $string, $message);
+    }  
+
+    /**
+     * Checks that string not match with pattern
+     *
+     * @param string $pattern
+     * @param string $string
+     * @param string $message
+     */
+    protected function assertNotRegExp($pattern, $string, $message = '')
+    {
+        \PHPUnit_Framework_Assert::assertNotRegExp($pattern, $string, $message);
+    }  
+
+
     /**
      * Checks that variable is empty.
      *
@@ -231,11 +256,24 @@ protected function assertFalse($condition, $message = '')
         \PHPUnit_Framework_Assert::assertFalse($condition, $message);
     }
 
+    /**
+     * 
+     * @param        $haystack
+     * @param        $constraint
+     * @param string $message
+     */
     protected function assertThat($haystack, $constraint, $message)
     {
         \PHPUnit_Framework_Assert::assertThat($haystack, $constraint, $message);
     }
 
+    /**
+     * Checks that haystack doesn't attend
+     *  
+     * @param        $haystack
+     * @param        $constraint
+     * @param string $message
+     */
     protected function assertThatItsNot($haystack, $constraint, $message)
     {
         $constraint = new \PHPUnit_Framework_Constraint_Not($constraint);

diff --git a/tests/unit/Codeception/Module/AssertsTest.php b/tests/unit/Codeception/Module/AssertsTest.php
@@ -8,6 +8,8 @@ public function testAsserts()
         $module->assertContains(1,[1,2]);
         $module->assertSame(1,1);
         $module->assertNotSame(1,true);
+        $module->assertRegExp('/^[\d]$/','1');
+        $module->assertNotRegExp('/^[a-z]$/','1');
     }
 
 }