fixed expectExceptionMessage and expectExceptionCode not working whit…

…hout setExpectedException
sebastianbergmann · Jan 25, 2017 · e208250 · e208250
1 parent e934314
commit e208250
Show file tree

Hide file tree

Showing 2 changed files with 29 additions and 0 deletions.
diff --git a/src/Framework/TestCase.php b/src/Framework/TestCase.php
@@ -613,6 +613,10 @@ public function expectException($exception)
      */
     public function expectExceptionCode($code)
     {
+        if (!$this->expectedException) {
+            $this->expectedException = \Exception::class;
+        }
+
         if (!is_int($code) && !is_string($code)) {
             throw PHPUnit_Util_InvalidArgumentHelper::factory(1, 'integer or string');
         }
@@ -629,6 +633,10 @@ public function expectExceptionCode($code)
      */
     public function expectExceptionMessage($message)
     {
+        if (!$this->expectedException) {
+            $this->expectedException = \Exception::class;
+        }
+
         if (!is_string($message)) {
             throw PHPUnit_Util_InvalidArgumentHelper::factory(1, 'string');
         }

diff --git a/tests/Regression/GitHub/2299/Issue2299Test.php b/tests/Regression/GitHub/2299/Issue2299Test.php
@@ -0,0 +1,21 @@
+<?php
+
+/**
+ * @author Jean Carlo Machado <contato@jeancarlomachado.com.br>
+ */
+class Test extends PHPUnit_Framework_TestCase
+{
+    public function testOne()
+    {
+        $this->expectExceptionMessage('message');
+
+        throw new Exception('message');
+    }
+
+    public function testTwo()
+    {
+        $this->expectExceptionCode(123);
+
+        throw new Exception('message', 123);
+    }
+}