simplified PHPUnit exception expectations

fabpot · fabpot · commit 765d0d89e744 · 2019-01-16T07:59:14.000+01:00
diff --git a/Tests/ConstraintTest.php b/Tests/ConstraintTest.php
@@ -35,7 +35,7 @@ public function testSetProperties()
 
     public function testSetNotExistingPropertyThrowsException()
     {
-        $this->{method_exists($this, $_ = 'expectException') ? $_ : 'setExpectedException'}('Symfony\Component\Validator\Exception\InvalidOptionsException');
+        $this->expectException('Symfony\Component\Validator\Exception\InvalidOptionsException');
 
         new ConstraintA(array(
             'foo' => 'bar',
@@ -46,14 +46,14 @@ public function testMagicPropertiesAreNotAllowed()
     {
         $constraint = new ConstraintA();
 
-        $this->{method_exists($this, $_ = 'expectException') ? $_ : 'setExpectedException'}('Symfony\Component\Validator\Exception\InvalidOptionsException');
+        $this->expectException('Symfony\Component\Validator\Exception\InvalidOptionsException');
 
         $constraint->foo = 'bar';
     }
 
     public function testInvalidAndRequiredOptionsPassed()
     {
-        $this->{method_exists($this, $_ = 'expectException') ? $_ : 'setExpectedException'}('Symfony\Component\Validator\Exception\InvalidOptionsException');
+        $this->expectException('Symfony\Component\Validator\Exception\InvalidOptionsException');
 
         new ConstraintC(array(
             'option1' => 'default',
@@ -101,14 +101,14 @@ public function testDontSetDefaultPropertyIfValuePropertyExists()
 
     public function testSetUndefinedDefaultProperty()
     {
-        $this->{method_exists($this, $_ = 'expectException') ? $_ : 'setExpectedException'}('Symfony\Component\Validator\Exception\ConstraintDefinitionException');
+        $this->expectException('Symfony\Component\Validator\Exception\ConstraintDefinitionException');
 
         new ConstraintB('foo');
     }
 
     public function testRequiredOptionsMustBeDefined()
     {
-        $this->{method_exists($this, $_ = 'expectException') ? $_ : 'setExpectedException'}('Symfony\Component\Validator\Exception\MissingOptionsException');
+        $this->expectException('Symfony\Component\Validator\Exception\MissingOptionsException');
 
         new ConstraintC();
     }
diff --git a/Tests/Mapping/ClassMetadataTest.php b/Tests/Mapping/ClassMetadataTest.php
@@ -40,14 +40,14 @@ protected function tearDown()
 
     public function testAddConstraintDoesNotAcceptValid()
     {
-        $this->{method_exists($this, $_ = 'expectException') ? $_ : 'setExpectedException'}('Symfony\Component\Validator\Exception\ConstraintDefinitionException');
+        $this->expectException('Symfony\Component\Validator\Exception\ConstraintDefinitionException');
 
         $this->metadata->addConstraint(new Valid());
     }
 
     public function testAddConstraintRequiresClassConstraints()
     {
-        $this->{method_exists($this, $_ = 'expectException') ? $_ : 'setExpectedException'}('Symfony\Component\Validator\Exception\ConstraintDefinitionException');
+        $this->expectException('Symfony\Component\Validator\Exception\ConstraintDefinitionException');
 
         $this->metadata->addConstraint(new PropertyConstraint());
     }
diff --git a/Tests/Mapping/GetterMetadataTest.php b/Tests/Mapping/GetterMetadataTest.php
@@ -21,7 +21,7 @@ class GetterMetadataTest extends TestCase
 
     public function testInvalidPropertyName()
     {
-        $this->{method_exists($this, $_ = 'expectException') ? $_ : 'setExpectedException'}('Symfony\Component\Validator\Exception\ValidatorException');
+        $this->expectException('Symfony\Component\Validator\Exception\ValidatorException');
 
         new GetterMetadata(self::CLASSNAME, 'foobar');
     }
diff --git a/Tests/Mapping/Loader/XmlFileLoaderTest.php b/Tests/Mapping/Loader/XmlFileLoaderTest.php
@@ -114,7 +114,7 @@ public function testThrowExceptionIfDocTypeIsSet()
         $loader = new XmlFileLoader(__DIR__.'/withdoctype.xml');
         $metadata = new ClassMetadata('Symfony\Component\Validator\Tests\Fixtures\Entity');
 
-        $this->{method_exists($this, $_ = 'expectException') ? $_ : 'setExpectedException'}('\Symfony\Component\Validator\Exception\MappingException');
+        $this->expectException('\Symfony\Component\Validator\Exception\MappingException');
         $loader->loadClassMetadata($metadata);
     }
 
@@ -129,7 +129,7 @@ public function testDoNotModifyStateIfExceptionIsThrown()
         try {
             $loader->loadClassMetadata($metadata);
         } catch (MappingException $e) {
-            $this->{method_exists($this, $_ = 'expectException') ? $_ : 'setExpectedException'}('\Symfony\Component\Validator\Exception\MappingException');
+            $this->expectException('\Symfony\Component\Validator\Exception\MappingException');
             $loader->loadClassMetadata($metadata);
         }
     }
diff --git a/Tests/Mapping/Loader/YamlFileLoaderTest.php b/Tests/Mapping/Loader/YamlFileLoaderTest.php
@@ -69,7 +69,7 @@ public function testDoNotModifyStateIfExceptionIsThrown()
             $loader->loadClassMetadata($metadata);
         } catch (\InvalidArgumentException $e) {
             // Call again. Again an exception should be thrown
-            $this->{method_exists($this, $_ = 'expectException') ? $_ : 'setExpectedException'}('\InvalidArgumentException');
+            $this->expectException('\InvalidArgumentException');
             $loader->loadClassMetadata($metadata);
         }
     }
diff --git a/Tests/Mapping/MemberMetadataTest.php b/Tests/Mapping/MemberMetadataTest.php
@@ -38,7 +38,7 @@ protected function tearDown()
 
     public function testAddConstraintRequiresClassConstraints()
     {
-        $this->{method_exists($this, $_ = 'expectException') ? $_ : 'setExpectedException'}('Symfony\Component\Validator\Exception\ConstraintDefinitionException');
+        $this->expectException('Symfony\Component\Validator\Exception\ConstraintDefinitionException');
 
         $this->metadata->addConstraint(new ClassConstraint());
     }
diff --git a/Tests/Mapping/PropertyMetadataTest.php b/Tests/Mapping/PropertyMetadataTest.php
@@ -22,7 +22,7 @@ class PropertyMetadataTest extends TestCase
 
     public function testInvalidPropertyName()
     {
-        $this->{method_exists($this, $_ = 'expectException') ? $_ : 'setExpectedException'}('Symfony\Component\Validator\Exception\ValidatorException');
+        $this->expectException('Symfony\Component\Validator\Exception\ValidatorException');
 
         new PropertyMetadata(self::CLASSNAME, 'foobar');
     }
@@ -50,7 +50,7 @@ public function testGetPropertyValueFromRemovedProperty()
         $metadata = new PropertyMetadata(self::CLASSNAME, 'internal');
         $metadata->name = 'test';
 
-        $this->{method_exists($this, $_ = 'expectException') ? $_ : 'setExpectedException'}('Symfony\Component\Validator\Exception\ValidatorException');
+        $this->expectException('Symfony\Component\Validator\Exception\ValidatorException');
         $metadata->getPropertyValue($entity);
     }
 }

Original file line number	Diff line number	Diff line change
`@@ -35,7 +35,7 @@ public function testSetProperties()`
`35`	`35`
`36`	`36`	`public function testSetNotExistingPropertyThrowsException()`
`37`	`37`	`{`
`38`		`- $this->{method_exists($this, $_ = 'expectException') ? $_ : 'setExpectedException'}('Symfony\Component\Validator\Exception\InvalidOptionsException');`
	`38`	`+ $this->expectException('Symfony\Component\Validator\Exception\InvalidOptionsException');`
`39`	`39`
`40`	`40`	`new ConstraintA(array(`
`41`	`41`	`'foo' => 'bar',`
`@@ -46,14 +46,14 @@ public function testMagicPropertiesAreNotAllowed()`
`46`	`46`	`{`
`47`	`47`	`$constraint = new ConstraintA();`
`48`	`48`
`49`		`- $this->{method_exists($this, $_ = 'expectException') ? $_ : 'setExpectedException'}('Symfony\Component\Validator\Exception\InvalidOptionsException');`
	`49`	`+ $this->expectException('Symfony\Component\Validator\Exception\InvalidOptionsException');`
`50`	`50`
`51`	`51`	`$constraint->foo = 'bar';`
`52`	`52`	`}`
`53`	`53`
`54`	`54`	`public function testInvalidAndRequiredOptionsPassed()`
`55`	`55`	`{`
`56`		`- $this->{method_exists($this, $_ = 'expectException') ? $_ : 'setExpectedException'}('Symfony\Component\Validator\Exception\InvalidOptionsException');`
	`56`	`+ $this->expectException('Symfony\Component\Validator\Exception\InvalidOptionsException');`
`57`	`57`
`58`	`58`	`new ConstraintC(array(`
`59`	`59`	`'option1' => 'default',`
`@@ -101,14 +101,14 @@ public function testDontSetDefaultPropertyIfValuePropertyExists()`
`101`	`101`
`102`	`102`	`public function testSetUndefinedDefaultProperty()`
`103`	`103`	`{`
`104`		`- $this->{method_exists($this, $_ = 'expectException') ? $_ : 'setExpectedException'}('Symfony\Component\Validator\Exception\ConstraintDefinitionException');`
	`104`	`+ $this->expectException('Symfony\Component\Validator\Exception\ConstraintDefinitionException');`
`105`	`105`
`106`	`106`	`new ConstraintB('foo');`
`107`	`107`	`}`
`108`	`108`
`109`	`109`	`public function testRequiredOptionsMustBeDefined()`
`110`	`110`	`{`
`111`		`- $this->{method_exists($this, $_ = 'expectException') ? $_ : 'setExpectedException'}('Symfony\Component\Validator\Exception\MissingOptionsException');`
	`111`	`+ $this->expectException('Symfony\Component\Validator\Exception\MissingOptionsException');`
`112`	`112`
`113`	`113`	`new ConstraintC();`
`114`	`114`	`}`
Original file line number	Diff line number	Diff line change
`@@ -40,14 +40,14 @@ protected function tearDown()`
`40`	`40`
`41`	`41`	`public function testAddConstraintDoesNotAcceptValid()`
`42`	`42`	`{`
`43`		`- $this->{method_exists($this, $_ = 'expectException') ? $_ : 'setExpectedException'}('Symfony\Component\Validator\Exception\ConstraintDefinitionException');`
	`43`	`+ $this->expectException('Symfony\Component\Validator\Exception\ConstraintDefinitionException');`
`44`	`44`
`45`	`45`	`$this->metadata->addConstraint(new Valid());`
`46`	`46`	`}`
`47`	`47`
`48`	`48`	`public function testAddConstraintRequiresClassConstraints()`
`49`	`49`	`{`
`50`		`- $this->{method_exists($this, $_ = 'expectException') ? $_ : 'setExpectedException'}('Symfony\Component\Validator\Exception\ConstraintDefinitionException');`
	`50`	`+ $this->expectException('Symfony\Component\Validator\Exception\ConstraintDefinitionException');`
`51`	`51`
`52`	`52`	`$this->metadata->addConstraint(new PropertyConstraint());`
`53`	`53`	`}`
Original file line number	Diff line number	Diff line change
`@@ -21,7 +21,7 @@ class GetterMetadataTest extends TestCase`
`21`	`21`
`22`	`22`	`public function testInvalidPropertyName()`
`23`	`23`	`{`
`24`		`- $this->{method_exists($this, $_ = 'expectException') ? $_ : 'setExpectedException'}('Symfony\Component\Validator\Exception\ValidatorException');`
	`24`	`+ $this->expectException('Symfony\Component\Validator\Exception\ValidatorException');`
`25`	`25`
`26`	`26`	`new GetterMetadata(self::CLASSNAME, 'foobar');`
`27`	`27`	`}`
Original file line number	Diff line number	Diff line change
`@@ -114,7 +114,7 @@ public function testThrowExceptionIfDocTypeIsSet()`
`114`	`114`	`$loader = new XmlFileLoader(__DIR__.'/withdoctype.xml');`
`115`	`115`	`$metadata = new ClassMetadata('Symfony\Component\Validator\Tests\Fixtures\Entity');`
`116`	`116`
`117`		`- $this->{method_exists($this, $_ = 'expectException') ? $_ : 'setExpectedException'}('\Symfony\Component\Validator\Exception\MappingException');`
	`117`	`+ $this->expectException('\Symfony\Component\Validator\Exception\MappingException');`
`118`	`118`	`$loader->loadClassMetadata($metadata);`
`119`	`119`	`}`
`120`	`120`
`@@ -129,7 +129,7 @@ public function testDoNotModifyStateIfExceptionIsThrown()`
`129`	`129`	`try {`
`130`	`130`	`$loader->loadClassMetadata($metadata);`
`131`	`131`	`} catch (MappingException $e) {`
`132`		`- $this->{method_exists($this, $_ = 'expectException') ? $_ : 'setExpectedException'}('\Symfony\Component\Validator\Exception\MappingException');`
	`132`	`+ $this->expectException('\Symfony\Component\Validator\Exception\MappingException');`
`133`	`133`	`$loader->loadClassMetadata($metadata);`
`134`	`134`	`}`
`135`	`135`	`}`
Original file line number	Diff line number	Diff line change
`@@ -69,7 +69,7 @@ public function testDoNotModifyStateIfExceptionIsThrown()`
`69`	`69`	`$loader->loadClassMetadata($metadata);`
`70`	`70`	`} catch (\InvalidArgumentException $e) {`
`71`	`71`	`// Call again. Again an exception should be thrown`
`72`		`- $this->{method_exists($this, $_ = 'expectException') ? $_ : 'setExpectedException'}('\InvalidArgumentException');`
	`72`	`+ $this->expectException('\InvalidArgumentException');`
`73`	`73`	`$loader->loadClassMetadata($metadata);`
`74`	`74`	`}`
`75`	`75`	`}`
Original file line number	Diff line number	Diff line change
`@@ -38,7 +38,7 @@ protected function tearDown()`
`38`	`38`
`39`	`39`	`public function testAddConstraintRequiresClassConstraints()`
`40`	`40`	`{`
`41`		`- $this->{method_exists($this, $_ = 'expectException') ? $_ : 'setExpectedException'}('Symfony\Component\Validator\Exception\ConstraintDefinitionException');`
	`41`	`+ $this->expectException('Symfony\Component\Validator\Exception\ConstraintDefinitionException');`
`42`	`42`
`43`	`43`	`$this->metadata->addConstraint(new ClassConstraint());`
`44`	`44`	`}`
Original file line number	Diff line number	Diff line change
`@@ -22,7 +22,7 @@ class PropertyMetadataTest extends TestCase`
`22`	`22`
`23`	`23`	`public function testInvalidPropertyName()`
`24`	`24`	`{`
`25`		`- $this->{method_exists($this, $_ = 'expectException') ? $_ : 'setExpectedException'}('Symfony\Component\Validator\Exception\ValidatorException');`
	`25`	`+ $this->expectException('Symfony\Component\Validator\Exception\ValidatorException');`
`26`	`26`
`27`	`27`	`new PropertyMetadata(self::CLASSNAME, 'foobar');`
`28`	`28`	`}`
`@@ -50,7 +50,7 @@ public function testGetPropertyValueFromRemovedProperty()`
`50`	`50`	`$metadata = new PropertyMetadata(self::CLASSNAME, 'internal');`
`51`	`51`	`$metadata->name = 'test';`
`52`	`52`
`53`		`- $this->{method_exists($this, $_ = 'expectException') ? $_ : 'setExpectedException'}('Symfony\Component\Validator\Exception\ValidatorException');`
	`53`	`+ $this->expectException('Symfony\Component\Validator\Exception\ValidatorException');`
`54`	`54`	`$metadata->getPropertyValue($entity);`
`55`	`55`	`}`
`56`	`56`	`}`