From 4cfd6ad080652cfb9886fd18b9651f0fea85053d Mon Sep 17 00:00:00 2001
From: Blanchon Vincent <vincent.blanchon@4mation.com.au>
Date: Thu, 27 Mar 2014 09:11:04 +1100
Subject: [PATCH] Fix test never ran because 2 setExpectedException in the same
 test

---
 .../Controller/AbstractHttpControllerTestCaseTest.php      | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/test/PHPUnit/Controller/AbstractHttpControllerTestCaseTest.php b/test/PHPUnit/Controller/AbstractHttpControllerTestCaseTest.php
index 4a8ddd5a6b..fd1f125052 100644
--- a/test/PHPUnit/Controller/AbstractHttpControllerTestCaseTest.php
+++ b/test/PHPUnit/Controller/AbstractHttpControllerTestCaseTest.php
@@ -627,11 +627,14 @@ public function testAssertExceptionInAction()
     {
         $this->dispatch('/exception');
         $this->assertResponseStatusCode(500);
-        $this->assertApplicationException('RuntimeException', 'Foo error');
+        $this->assertApplicationException('RuntimeException');
+    }
 
+    public function testAssertExceptionAndMessageInAction()
+    {
         $this->dispatch('/exception');
         $this->assertResponseStatusCode(500);
-        $this->assertApplicationException('RuntimeException');
+        $this->assertApplicationException('RuntimeException', 'Foo error');
     }
 
     /**