merged 2.1

Author: DavertMik

src/Codeception/Module/Asserts.php

@@ -361,32 +361,38 @@ public function fail($message)
      * @param $callback
      */
     public function expectException($exception, $callback)
-     {
-         $code = null;
-         $msg = null;
-         if (is_object($exception)) {
-             /** @var $exception \Exception  **/
+    {
+        $code = null;
+        $msg = null;
+        if (is_object($exception)) {
+            /** @var $exception \Exception  **/
              $class = get_class($exception);
-             $msg = $exception->getMessage();
-             $code = $exception->getCode();
-         } else {
-             $class = $exception;
-         }
-         try {
-             $callback();
-         } catch (\Exception $e) {
-             if (!$e instanceof $class) {
-                 $this->fail(sprintf("Exception of class $class expected to be thrown, but %s caught", get_class($e)));
-             }
-             if (null !== $msg and $e->getMessage() !== $msg) {
-                 $this->fail(sprintf("Exception of $class expected to be '$msg', but actual message was '%s'", $e->getMessage()));
-             }
-             if (null !== $code and $e->getCode() !== $code) {
-                 $this->fail(sprintf("Exception of $class expected to have code $code, but actual code was %s", $e->getCode()));
-             }
-             $this->assertTrue(true); // increment assertion counter
+            $msg = $exception->getMessage();
+            $code = $exception->getCode();
+        } else {
+            $class = $exception;
+        }
+        try {
+            $callback();
+        } catch (\Exception $e) {
+            if (!$e instanceof $class) {
+                $this->fail(sprintf("Exception of class $class expected to be thrown, but %s caught", get_class($e)));
+            }
+            if (null !== $msg and $e->getMessage() !== $msg) {
+                $this->fail(sprintf(
+                    "Exception of $class expected to be '$msg', but actual message was '%s'",
+                    $e->getMessage()
+                ));
+            }
+            if (null !== $code and $e->getCode() !== $code) {
+                $this->fail(sprintf(
+                    "Exception of $class expected to have code $code, but actual code was %s",
+                    $e->getCode()
+                ));
+            }
+            $this->assertTrue(true); // increment assertion counter
              return;
-         }
-         $this->fail("Expected exception to be thrown, but nothing was caught");
-     }
+        }
+        $this->fail("Expected exception to be thrown, but nothing was caught");
+    }
 }

tests/unit/Codeception/Module/AssertsTest.php

@@ -4,12 +4,12 @@ class AssertsTest extends PHPUnit_Framework_TestCase
     public function testAsserts()
     {
         $module = new \Codeception\Module\Asserts(make_container());
-        $module->assertEquals(1,1);
-        $module->assertContains(1,[1,2]);
-        $module->assertSame(1,1);
+        $module->assertEquals(1, 1);
+        $module->assertContains(1, [1, 2]);
+        $module->assertSame(1, 1);
         $module->assertNotSame(1, '1');
-        $module->assertRegExp('/^[\d]$/','1');
-        $module->assertNotRegExp('/^[a-z]$/','1');
+        $module->assertRegExp('/^[\d]$/', '1');
+        $module->assertNotRegExp('/^[a-z]$/', '1');
         $module->assertEmpty([]);
         $module->assertNotEmpty([1]);
         $module->assertNull(null);
@@ -28,9 +28,15 @@ public function testAsserts()
     public function testExceptions()
     {
         $module = new \Codeception\Module\Asserts(make_container());
-        $module->expectException('Exception', function() { throw new Exception; });
-        $module->expectException(new Exception('here'), function() { throw new Exception('here'); });
-        $module->expectException(new Exception('here', 200), function() { throw new Exception('here', 200); });
+        $module->expectException('Exception', function () {
+            throw new Exception;
+        });
+        $module->expectException(new Exception('here'), function () {
+            throw new Exception('here');
+        });
+        $module->expectException(new Exception('here', 200), function () {
+            throw new Exception('here', 200);
+        });
     }
 
     /**
@@ -39,7 +45,8 @@ public function testExceptions()
     public function testExceptionFails()
     {
         $module = new \Codeception\Module\Asserts(make_container());
-        $module->expectException(new Exception('here', 200), function() { throw new Exception('here', 2); });
+        $module->expectException(new Exception('here', 200), function () {
+            throw new Exception('here', 2);
+        });
     }
-
 }