change @ExpectedException over setExpectedException

koriym · Jul 22, 2017 · fb6b341 · fb6b341
1 parent a8767d7
commit fb6b341
Show file tree

Hide file tree

Showing 6 changed files with 33 additions and 11 deletions.
diff --git a/tests/AssistedTest.php b/tests/AssistedTest.php
@@ -57,9 +57,11 @@ public function testAssistedMethodInvocation()
         $this->assertSame(1, $db->dbId);
     }
 
+    /**
+     * @expectedException \Ray\Di\Exception\MethodInvocationNotAvailable
+     */
     public function testAssistedMethodInvocationNotAvailable()
     {
-        $this->setExpectedException(MethodInvocationNotAvailable::class);
         $assistedDbProvider = (new Injector(new FakeAssistedDbModule))->getInstance(FakeAssistedDbProvider::class);
         /* @var $assistedDbProvider FakeAssistedDbProvider */
         $assistedDbProvider->get();

diff --git a/tests/BindTest.php b/tests/BindTest.php
@@ -31,21 +31,27 @@ public function testToString()
         $this->assertSame('Ray\Di\FakeTyreInterface-' . NAME::ANY, (string) $this->bind);
     }
 
+    /**
+     * @expectedException \Ray\Di\Exception\Notfound
+     */
     public function testInvalidToTest()
     {
-        $this->setExpectedException(Notfound::class);
         $this->bind->to('invalid-class');
     }
 
+    /**
+     * @expectedException \Ray\Di\Exception\Notfound
+     */
     public function testInvalidToProviderTest()
     {
-        $this->setExpectedException(Notfound::class);
         $this->bind->toProvider('invalid-class');
     }
 
+    /**
+     * @expectedException \Ray\Di\Exception\NotFound
+     */
     public function testInValidInterfaceBinding()
     {
-        $this->setExpectedException(NotFound::class);
         new Bind(new Container, 'invalid-interface');
     }
 
@@ -98,15 +104,19 @@ public function testToConstructorWithMethodInjection()
         $this->assertInstanceOf(FakeEngine::class, $instance->engine);
     }
 
+    /**
+     * @expectedException \Ray\Di\Exception\InvalidType
+     */
     public function testToValidation()
     {
-        $this->setExpectedException(InvalidType::class);
         (new Bind(new Container, FakeHandleInterface::class))->to(FakeEngine::class);
     }
 
+    /**
+     * @expectedException \Ray\Di\Exception\InvalidProvider
+     */
     public function testToProvider()
     {
-        $this->setExpectedException(InvalidProvider::class);
         (new Bind(new Container, FakeHandleInterface::class))->toProvider(FakeEngine::class);
     }
 

diff --git a/tests/ContainerTest.php b/tests/ContainerTest.php
@@ -120,9 +120,11 @@ public function testMove()
         $this->assertInstanceOf(FakeEngine::class, $instance);
     }
 
+    /**
+     * @expectedException \Ray\Di\Exception\Unbound
+     */
     public function testMoveUnbound()
     {
-        $this->setExpectedException(Unbound::class);
         $this->container->move(FakeEngineInterface::class, 'invalid', FakeEngineInterface::class, 'new');
     }
 

diff --git a/tests/InjectorTest.php b/tests/InjectorTest.php
@@ -26,9 +26,11 @@ public function testToInstance()
         $this->assertSame($engine, $injector->getInstance(FakeEngine::class));
     }
 
+    /**
+     * @expectedException \Ray\Di\Exception\Unbound
+     */
     public function testUnbound()
     {
-        $this->setExpectedException(Unbound::class);
         $injector = new Injector(new FakeInstanceBindModule);
         $injector->getInstance('', 'invalid-binding-xxx');
     }
@@ -274,9 +276,11 @@ public function testContextualDependencyInjection()
         $this->assertInstanceOf(FakeRightLeg::class, $robot->rightLeg);
     }
 
+    /**
+     * @expectedException \Ray\Di\Exception\Unbound
+     */
     public function testNewAbstract()
     {
-        $this->setExpectedException(Unbound::class, FakeAbstractClass::class);
         (new Injector)->getInstance(FakeConcreteClass::class);
     }
 

diff --git a/tests/ModuleTest.php b/tests/ModuleTest.php
@@ -18,9 +18,11 @@ public function testInstall()
         $this->assertInstanceOf(AbstractModule::class, $module);
     }
 
+    /**
+     * @expectedException \Ray\Di\Exception\NotFound
+     */
     public function testToInvalidClass()
     {
-        $this->setExpectedException(NotFound::class);
         new FakeToBindInvalidClassModule;
     }
 

diff --git a/tests/SetterMethodTest.php b/tests/SetterMethodTest.php
@@ -30,9 +30,11 @@ public function testInvoke()
         $this->assertNotSame(spl_object_hash($car->frontTyre), spl_object_hash($car->rearTyre));
     }
 
+    /**
+     * @expectedException \Ray\Di\Exception\Unbound
+     */
     public function testUnbound()
     {
-        $this->setExpectedException(Unbound::class);
         $container = new Container;
         $car = new FakeCar(new FakeEngine);
         $this->setterMethods->__invoke($car, $container);