Propagate any non-expected exceptions in testing fixtures

szjani · Jun 9, 2015 · bc22336 · bc22336
1 parent feb869d
commit bc22336
Show file tree

Hide file tree

Showing 2 changed files with 25 additions and 7 deletions.
diff --git a/src/predaddy/util/test/Fixture.php b/src/predaddy/util/test/Fixture.php
@@ -345,14 +345,14 @@ private function checkReturnValue()
     private function checkThrownException()
     {
         if ($this->raisedException !== null) {
-            /* @var $exception Exception */
-            PHPUnit_Framework_TestCase::assertInstanceOf($this->expectedExceptionClass, $this->raisedException);
-            if ($this->expectedExceptionMessage !== null) {
-                PHPUnit_Framework_TestCase::assertEquals(
-                    $this->expectedExceptionMessage,
-                    $this->raisedException->getMessage()
-                );
+            if ($this->expectedExceptionClass === null) {
+                throw $this->raisedException;
             }
+            PHPUnit_Framework_TestCase::assertInstanceOf($this->expectedExceptionClass, $this->raisedException);
+            PHPUnit_Framework_TestCase::assertEquals(
+                $this->expectedExceptionMessage,
+                $this->raisedException->getMessage()
+            );
         }
     }
 

diff --git a/tests/src/predaddy/domain/UserTest.php b/tests/src/predaddy/domain/UserTest.php
@@ -67,4 +67,22 @@ public function shouldThrowExceptionIfIncrementedThreeTimes()
             ->when(new Increment())
             ->expectException('\RuntimeException', 'Cannot be incremented more, than twice');
     }
+
+    /**
+     * @test
+     * @expectedException \RuntimeException
+     */
+    public function shouldThrowNotExpectedException()
+    {
+        $fixture = Fixtures::newGivenWhenThenFixture(User::className());
+        $fixture
+            ->registerAnnotatedCommandHandler(new UserCommandHandler(new InMemoryRepository()))
+            ->givenCommands(
+                new CreateUser(),
+                new Increment(),
+                new Increment()
+            )
+            ->when(new Increment())
+            ->expectNoEvents();
+    }
 }