Replace setExpectedException() with @ExpectedException

reactphp · Apr 13, 2019 · 5f67f82 · 5f67f82
1 parent 4250253
commit 5f67f82
Show file tree

Hide file tree

Showing 3 changed files with 20 additions and 15 deletions.
diff --git a/tests/FunctionRejectTest.php b/tests/FunctionRejectTest.php
@@ -19,11 +19,12 @@ public function shouldRejectAnException()
             ->then($this->expectCallableNever(), $mock);
     }
 
-    /** @test */
+    /**
+     * @test
+     * @expectedException \InvalidArgumentException
+     */
     public function shouldThrowWhenCalledWithANonException()
     {
-        $this->setExpectedException('\InvalidArgumentException');
-
         reject(1);
     }
 }
diff --git a/tests/PromiseTest/RejectTestTrait.php b/tests/PromiseTest/RejectTestTrait.php
@@ -31,31 +31,34 @@ public function rejectShouldRejectWithAnException()
         $adapter->reject($exception);
     }
 
-    /** @test */
+    /**
+     * @test
+     * @expectedException \InvalidArgumentException
+     */
     public function rejectShouldThrowWhenCalledWithAnImmediateValue()
     {
-        $this->setExpectedException('\InvalidArgumentException');
-
         $adapter = $this->getPromiseTestAdapter();
 
         $adapter->reject(1);
     }
 
-    /** @test */
+    /**
+     * @test
+     * @expectedException \InvalidArgumentException
+     */
     public function rejectShouldThrowWhenCalledWithAFulfilledPromise()
     {
-        $this->setExpectedException('\InvalidArgumentException');
-
         $adapter = $this->getPromiseTestAdapter();
 
         $adapter->reject(Promise\resolve(1));
     }
 
-    /** @test */
+    /**
+     * @test
+     * @expectedException \InvalidArgumentException
+     */
     public function rejectShouldThrowWhenCalledWithARejectedPromise()
     {
-        $this->setExpectedException('\InvalidArgumentException');
-
         $adapter = $this->getPromiseTestAdapter();
 
         $adapter->reject(Promise\reject(1));

diff --git a/tests/RejectedPromiseTest.php b/tests/RejectedPromiseTest.php
@@ -41,11 +41,12 @@ public function getPromiseTestAdapter(callable $canceller = null)
         ]);
     }
 
-    /** @test */
+    /**
+     * @test
+     * @expectedException \InvalidArgumentException
+     */
     public function shouldThrowExceptionIfConstructedWithANonException()
     {
-        $this->setExpectedException('\InvalidArgumentException');
-
         return new RejectedPromise('foo');
     }
 }