Per #16, test exception messages

Author: electricjones

src/Codeception/Specify.php

@@ -85,32 +85,56 @@ private function getSpecifyExamples($params)
 
     private function getSpecifyExpectedException($params)
     {
-        $throws = false;
         if (isset($params['throws'])) {
-            $throws = $params['throws'];
+            $throws = (is_array($params['throws'])) ? $params['throws'][0] : $params['throws'];
+
             if (is_object($throws)) {
                 $throws = get_class($throws);
             }
             if ($throws === 'fail') {
                 $throws = 'PHPUnit_Framework_AssertionFailedError';
             }
+
+            $message = (is_array($params['throws']) && isset($params['throws'][1])) ? $params['throws'][1] : false;
+
+            return [$throws, $message];
         }
-        return $throws;
+
+        return false;
     }
 
     private function specifyExecute($test, $throws = false, $examples = array())
     {
+        $message = false;
+
+        if (is_array($throws)) {
+            $message = $throws[1];
+            $throws = $throws[0];
+        }
+
         $result = $this->getTestResultObject();
         try {
             call_user_func_array($test, $examples);
         } catch (\PHPUnit_Framework_AssertionFailedError $e) {
-            if ($throws !== get_class($e)) $result->addFailure(clone($this), $e, $result->time());
+            if ($throws !== get_class($e)){
+                $result->addFailure(clone($this), $e, $result->time());
+            }
+
+            if ($message !==false && $message !== $e->getMessage()) {
+                $f = new \PHPUnit_Framework_AssertionFailedError("exception message '$message' was expected, but '" . $e->getMessage() . "' was received");
+                $result->addFailure(clone($this), $f, $result->time());
+            }
         } catch (\Exception $e) {
             if ($throws) {
                 if ($throws !== get_class($e)) {
                     $f = new \PHPUnit_Framework_AssertionFailedError("exception '$throws' was expected, but " . get_class($e) . ' was thrown');
                     $result->addFailure(clone($this), $f, $result->time());
                 }
+
+                if ($message !==false && $message !== $e->getMessage()) {
+                    $f = new \PHPUnit_Framework_AssertionFailedError("exception message '$message' was expected, but '" . $e->getMessage() . "' was received");
+                    $result->addFailure(clone($this), $f, $result->time());
+                }
             } else {
                 throw $e;
             }

tests/SpecifyTest.php

@@ -16,7 +16,7 @@ public function testSpecification()
            $this->user->name = 'jon';
            $this->assertEquals('jon', $this->user->name);
         });
-               
+
         $this->assertEquals('davert', $this->user->name);
 
         $this->specify('i can fail here but test goes on', function() {
@@ -57,7 +57,7 @@ function testAfterCallback()
             $this->user = "jon";
         });
         $this->assertEquals('davert', $this->user);
-    }    
+    }
 
     function testMultiAfterCallback()
     {
@@ -104,6 +104,29 @@ public function testExceptions()
         }, ['throws' => 'fail']);
     }
 
+    public function testExceptionsWithMessages()
+    {
+        $this->specify('user is invalid', function() {
+            throw new Exception("test message");
+        }, ['throws' => ['Exception', 'test message']]);
+
+        $this->specify('user is invalid', function() {
+            throw new RuntimeException("test message");
+        }, ['throws' => ['RuntimeException', 'test message']]);
+
+        $this->specify('user is invalid', function() {
+            throw new RuntimeException("test message");
+        }, ['throws' => [new RuntimeException(), "test message"]]);
+
+        $this->specify('i can handle fails', function() {
+            $this->fail("test message");
+        }, ['throws' => ['fail', 'test message']]);
+
+        $this->specify('ignores an empty message', function() {
+            $this->fail("test message");
+        }, ['throws' => ['fail']]);
+    }
+
     /**
      * @expectedException RuntimeException
      */
@@ -140,7 +163,7 @@ public function testDeepCopy()
             $this->assertEquals(2, $this->a->prop->prop);
         });
         $this->assertEquals(1, $this->a->prop->prop);
-        
+
     }
 
     public function testConfiguration()