Use methods instead of annotations for expected exceptions in tests

bitExpert · Sep 6, 2017 · 628bbc5 · 628bbc5
1 parent f0a8fd1
commit 628bbc5
Show file tree

Hide file tree

Showing 8 changed files with 58 additions and 27 deletions.
diff --git a/tests/bitExpert/Disco/AnnotationBeanFactoryUnitTest.php b/tests/bitExpert/Disco/AnnotationBeanFactoryUnitTest.php
@@ -12,6 +12,8 @@
 
 namespace bitExpert\Disco;
 
+use bitExpert\Disco\BeanException;
+use bitExpert\Disco\BeanNotFoundException;
 use bitExpert\Disco\Config\BeanConfiguration;
 use bitExpert\Disco\Config\BeanConfigurationSubclass;
 use bitExpert\Disco\Config\BeanConfigurationTrait;
@@ -54,28 +56,31 @@ public function setUp()
 
     /**
      * @test
-     * @expectedException \bitExpert\Disco\BeanNotFoundException
      */
     public function retrievingNonExistentBeanThrowsException()
     {
+        self::expectException(BeanNotFoundException::class);
+
         $this->beanFactory->get('serviceWhichDoesNotExist');
     }
 
     /**
      * @test
-     * @expectedException \bitExpert\Disco\BeanException
      */
     public function retrievingBeanWithEmptyStringThrowsException()
     {
+        self::expectException(BeanException::class);
+
         $this->beanFactory->get('');
     }
 
     /**
      * @test
-     * @expectedException \bitExpert\Disco\BeanException
      */
     public function retrievingBeanWithNonStringThrowsException()
     {
+        self::expectException(BeanException::class);
+
         $this->beanFactory->get(3);
     }
 
@@ -322,10 +327,11 @@ public function nestedParameterKeyPassedToBeanFactoryGetsInjectedInBean()
 
     /**
      * @test
-     * @expectedException \bitExpert\Disco\BeanException
      */
     public function missingRequiredParameterWillThrowException()
     {
+        self::expectException(BeanException::class);
+
         $this->beanFactory = new AnnotationBeanFactory(BeanConfigurationWithParameters::class);
         BeanFactoryRegistry::register($this->beanFactory);
 
@@ -421,10 +427,11 @@ public function protectedDependencyNotVisibleToTheCaller()
 
     /**
      * @test
-     * @expectedException \bitExpert\Disco\BeanException
      */
     public function throwsExceptionIfTypeOfReturnedObjectIsNotExpectedOfNonLazyBean()
     {
+        self::expectException(BeanException::class);
+
         $this->beanFactory = new AnnotationBeanFactory(WrongReturnTypeConfiguration::class);
         BeanFactoryRegistry::register($this->beanFactory);
 
@@ -433,10 +440,11 @@ public function throwsExceptionIfTypeOfReturnedObjectIsNotExpectedOfNonLazyBean(
 
     /**
      * @test
-     * @expectedException \bitExpert\Disco\BeanException
      */
     public function throwsExceptionIfNonLazyBeanMethodDoesNotReturnAnything()
     {
+        self::expectException(BeanException::class);
+
         $this->beanFactory = new AnnotationBeanFactory(WrongReturnTypeConfiguration::class);
         BeanFactoryRegistry::register($this->beanFactory);
 
@@ -445,10 +453,11 @@ public function throwsExceptionIfNonLazyBeanMethodDoesNotReturnAnything()
 
     /**
      * @test
-     * @expectedException \bitExpert\Disco\BeanException
      */
     public function throwsExceptionIfTypeOfReturnedObjectIsNotExpectedOfLazyBean()
     {
+        self::expectException(BeanException::class);
+
         $this->beanFactory = new AnnotationBeanFactory(WrongReturnTypeConfiguration::class);
         BeanFactoryRegistry::register($this->beanFactory);
 
@@ -458,10 +467,11 @@ public function throwsExceptionIfTypeOfReturnedObjectIsNotExpectedOfLazyBean()
 
     /**
      * @test
-     * @expectedException \bitExpert\Disco\BeanException
      */
     public function throwsExceptionIfLazyBeanMethodDoesNotReturnAnything()
     {
+        self::expectException(BeanException::class);
+
         $this->beanFactory = new AnnotationBeanFactory(WrongReturnTypeConfiguration::class);
         BeanFactoryRegistry::register($this->beanFactory);
 

diff --git a/tests/bitExpert/Disco/Annotations/AliasUnitTest.php b/tests/bitExpert/Disco/Annotations/AliasUnitTest.php
@@ -38,6 +38,7 @@ public function aliasCannotBeNamedAliasAndTypeAlias()
     {
         self::expectException(AnnotationException::class);
         self::expectExceptionMessage('Type alias should not have a name!');
+
         new Alias(['value' => ['name' => 'someAliasName', 'type' => true]]);
     }
 
@@ -59,6 +60,7 @@ public function aliasShouldBeNamedOrTypeAlias()
     {
         self::expectException(AnnotationException::class);
         self::expectExceptionMessage('Alias should either be a named alias or a type alias!');
+
         new Alias();
     }
 
@@ -70,6 +72,7 @@ public function aliasNameCannotBeEmpty($name)
     {
         self::expectException(AnnotationException::class);
         self::expectExceptionMessage('Alias should either be a named alias or a type alias!');
+
         new Alias(['value' => ['name' => $name, 'type' => false]]);
     }
 

diff --git a/tests/bitExpert/Disco/Annotations/BeanPostProcessorUnitTest.php b/tests/bitExpert/Disco/Annotations/BeanPostProcessorUnitTest.php
@@ -48,10 +48,11 @@ function (Parameter $parameter) {
 
     /**
      * @test
-     * @expectedException TypeError
      */
     public function throwsExceptionIfParameterTypeDoesNotMatch()
     {
+        self::expectException(TypeError::class);
+
         $bean = new Bean([
             'value' => [
                 'parameters' => [

diff --git a/tests/bitExpert/Disco/Annotations/BeanUnitTest.php b/tests/bitExpert/Disco/Annotations/BeanUnitTest.php
@@ -205,10 +205,11 @@ function (Alias $alias) {
 
     /**
      * @test
-     * @expectedException TypeError
      */
     public function throwsExceptionIfAliasTypeDoesNotMatch()
     {
+        self::expectException(TypeError::class);
+
         $bean = new Bean([
             'value' => [
                 'aliases' => [
@@ -245,10 +246,11 @@ function (Parameter $parameter) {
 
     /**
      * @test
-     * @expectedException TypeError
      */
     public function throwsExceptionIfParameterTypeDoesNotMatch()
     {
+        self::expectException(TypeError::class);
+
         $bean = new Bean([
             'value' => [
                 'parameters' => [

diff --git a/tests/bitExpert/Disco/Annotations/ParameterUnitTest.php b/tests/bitExpert/Disco/Annotations/ParameterUnitTest.php
@@ -12,6 +12,7 @@
 
 namespace bitExpert\Disco\Annotations;
 
+use Doctrine\Common\Annotations\AnnotationException;
 use PHPUnit\Framework\TestCase;
 
 /**
@@ -21,10 +22,11 @@ class ParameterUnitTest extends TestCase
 {
     /**
      * @test
-     * @expectedException \Doctrine\Common\Annotations\AnnotationException
      */
     public function missingNameWillThrowAnnotationException()
     {
+        self::expectException(AnnotationException::class);
+
         new Parameter();
     }
 

diff --git a/tests/bitExpert/Disco/BeanFactoryConfigurationUnitTest.php b/tests/bitExpert/Disco/BeanFactoryConfigurationUnitTest.php
@@ -13,6 +13,7 @@
 namespace bitExpert\Disco;
 
 use bitExpert\Disco\Store\SerializableBeanStore;
+use InvalidArgumentException;
 use org\bovigo\vfs\vfsStream;
 use PHPUnit\Framework\TestCase;
 use ProxyManager\Autoloader\Autoloader;
@@ -28,10 +29,11 @@ class BeanFactoryConfigurationUnitTest extends TestCase
 {
     /**
      * @test
-     * @expectedException \InvalidArgumentException
      */
     public function invalidProxyTargetDirThrowsException()
     {
+        self::expectException(InvalidArgumentException::class);
+
         new BeanFactoryConfiguration('/abc');
     }
 
@@ -130,22 +132,24 @@ public function configuredBeanStoreInstanceCanBererieved()
 
     /**
      * @test
-     * @expectedException \InvalidArgumentException
-     * @expectedExceptionCode 10
      */
     public function injectedInvalidProxyTargetDirThrowsException()
     {
+        self::expectException(InvalidArgumentException::class);
+        self::expectExceptionCode(10);
+
         $config = new BeanFactoryConfiguration(sys_get_temp_dir());
         $config->setProxyTargetDir('/abc');
     }
 
     /**
      * @test
-     * @expectedException \InvalidArgumentException
-     * @expectedExceptionCode 20
      */
     public function injectedNotWritableProxyTargetDirThrowsException()
     {
+        self::expectException(InvalidArgumentException::class);
+        self::expectExceptionCode(20);
+
         $config = new BeanFactoryConfiguration(sys_get_temp_dir());
         $path = vfsStream::setup('root', 0x111);
         $config->setProxyTargetDir($path->url());

diff --git a/tests/bitExpert/Disco/Proxy/Configuration/ConfigurationGeneratorUnitTest.php b/tests/bitExpert/Disco/Proxy/Configuration/ConfigurationGeneratorUnitTest.php
@@ -22,6 +22,7 @@
 use bitExpert\Disco\Config\NonExistentReturnTypeConfiguration;
 use PHPUnit\Framework\TestCase;
 use PHPUnit_Framework_MockObject_MockObject;
+use ProxyManager\Exception\InvalidProxiedClassException;
 use Zend\Code\Generator\ClassGenerator;
 
 /**
@@ -52,71 +53,78 @@ public function setUp()
 
     /**
      * @test
-     * @expectedException \ProxyManager\Exception\InvalidProxiedClassException
      */
     public function configClassWithoutAnAnnotationThrowsException()
     {
+        self::expectException(InvalidProxiedClassException::class);
+
         $reflClass = new \ReflectionClass(InvalidConfiguration::class);
         $this->configGenerator->generate($reflClass, $this->classGenerator);
     }
 
     /**
      * @test
-     * @expectedException \ProxyManager\Exception\InvalidProxiedClassException
      */
     public function passingInterfaceAsConfigClassThrowsException()
     {
+        self::expectException(InvalidProxiedClassException::class);
+
         $reflClass = new \ReflectionClass(InterfaceConfiguration::class);
         $this->configGenerator->generate($reflClass, $this->classGenerator);
     }
 
     /**
      * @test
-     * @expectedException \ProxyManager\Exception\InvalidProxiedClassException
      */
     public function missingBeanAnnotationThrowsException()
     {
+        self::expectException(InvalidProxiedClassException::class);
+
         $reflClass = new \ReflectionClass(MissingBeanAnnotationConfiguration::class);
         $this->configGenerator->generate($reflClass, $this->classGenerator);
     }
 
     /**
      * @test
-     * @expectedException \ProxyManager\Exception\InvalidProxiedClassException
      */
     public function missingReturnTypeOfBeanDeclarationThrowsException()
     {
+        self::expectException(InvalidProxiedClassException::class);
+
         $reflClass = new \ReflectionClass(MissingReturnTypeConfiguration::class);
         $this->configGenerator->generate($reflClass, $this->classGenerator);
     }
 
     /**
      * @test
-     * @expectedException \ProxyManager\Exception\InvalidProxiedClassException
      */
     public function nonExistentClassInReturnTypeThrowsException()
     {
+        self::expectException(InvalidProxiedClassException::class);
+
         $reflClass = new \ReflectionClass(NonExistentReturnTypeConfiguration::class);
         $this->configGenerator->generate($reflClass, $this->classGenerator);
     }
 
     /**
      * @test
-     * @expectedException \ProxyManager\Exception\InvalidProxiedClassException
      */
     public function sameAliasUsedForMultipleBeansThrowsException()
     {
+        self::expectException(InvalidProxiedClassException::class);
+
         $reflClass = new \ReflectionClass(BeanConfigurationWithConflictingAliases::class);
         $this->configGenerator->generate($reflClass, $this->classGenerator);
     }
 
     /**
      * @test
-     * @expectedException \ProxyManager\Exception\InvalidProxiedClassException
-     * @expectedExceptionMessageRegExp /^\[Semantical Error\] The annotation "@foo"/
      */
     public function unknownAnnotationThrowsException()
     {
+        self::expectException(InvalidProxiedClassException::class);
+        self::expectExceptionMessageRegExp('/^\[Semantical Error\] The annotation "@foo"/');
+
         /**
          * @foo
          */

diff --git a/tests/bitExpert/Disco/Store/SerializableBeanStoreUnitTest.php b/tests/bitExpert/Disco/Store/SerializableBeanStoreUnitTest.php
@@ -14,7 +14,7 @@
 
 use bitExpert\Disco\Helper\MasterService;
 use bitExpert\Disco\Helper\SampleService;
-use Doctrine\Instantiator\Exception\InvalidArgumentException;
+use InvalidArgumentException;
 use PHPUnit\Framework\TestCase;
 
 /**
@@ -66,10 +66,11 @@ public function addingBeanWithSameBeanIdMultipleTimeWillNotTriggerError()
 
     /**
      * @test
-     * @expectedException InvalidArgumentException
      */
     public function gettingNonExistentBeanWillThrowException()
     {
+        self::expectException(InvalidArgumentException::class);
+
         $this->beanStore->get('some-random-bean-instance');
     }