[Tests] Move expectException closer to the place of the expectation to avoid false positives

Author: OskarStark

Tests/DependencyInjection/CompilerPass/RegisterEventListenersAndSubscribersPassTest.php

@@ -27,7 +27,6 @@ class RegisterEventListenersAndSubscribersPassTest extends TestCase
 
     public function testExceptionOnAbstractTaggedSubscriber()
     {
-        $this->expectException(\InvalidArgumentException::class);
         $container = $this->createBuilder();
 
         $abstractDefinition = new Definition('stdClass');
@@ -36,12 +35,13 @@ public function testExceptionOnAbstractTaggedSubscriber()
 
         $container->setDefinition('a', $abstractDefinition);
 
+        $this->expectException(\InvalidArgumentException::class);
+
         $this->process($container);
     }
 
     public function testExceptionOnAbstractTaggedListener()
     {
-        $this->expectException(\InvalidArgumentException::class);
         $container = $this->createBuilder();
 
         $abstractDefinition = new Definition('stdClass');
@@ -50,6 +50,8 @@ public function testExceptionOnAbstractTaggedListener()
 
         $container->setDefinition('a', $abstractDefinition);
 
+        $this->expectException(\InvalidArgumentException::class);
+
         $this->process($container);
     }
 

Tests/DependencyInjection/CompilerPass/RegisterMappingsPassTest.php

@@ -20,9 +20,11 @@ class RegisterMappingsPassTest extends TestCase
 {
     public function testNoDriverParmeterException()
     {
+        $container = $this->createBuilder();
+
         $this->expectException(\InvalidArgumentException::class);
         $this->expectExceptionMessage('Could not find the manager name parameter in the container. Tried the following parameter names: "manager.param.one", "manager.param.two"');
-        $container = $this->createBuilder();
+
         $this->process($container, [
             'manager.param.one',
             'manager.param.two',

Tests/DependencyInjection/DoctrineExtensionTest.php

@@ -58,7 +58,6 @@ protected function setUp(): void
 
     public function testFixManagersAutoMappingsWithTwoAutomappings()
     {
-        $this->expectException(\LogicException::class);
         $emConfigs = [
             'em1' => [
                 'auto_mapping' => true,
@@ -76,6 +75,8 @@ public function testFixManagersAutoMappingsWithTwoAutomappings()
         $reflection = new \ReflectionClass($this->extension);
         $method = $reflection->getMethod('fixManagersAutoMappings');
 
+        $this->expectException(\LogicException::class);
+
         $method->invoke($this->extension, $emConfigs, $bundles);
     }
 
@@ -255,8 +256,6 @@ public function testServiceCacheDriver()
 
     public function testUnrecognizedCacheDriverException()
     {
-        $this->expectException(\InvalidArgumentException::class);
-        $this->expectExceptionMessage('"unrecognized_type" is an unrecognized Doctrine cache driver.');
         $cacheName = 'metadata_cache';
         $container = $this->createContainer();
         $objectManager = [
@@ -266,6 +265,9 @@ public function testUnrecognizedCacheDriverException()
             ],
         ];
 
+        $this->expectException(\InvalidArgumentException::class);
+        $this->expectExceptionMessage('"unrecognized_type" is an unrecognized Doctrine cache driver.');
+
         $this->invokeLoadCacheDriver($objectManager, $container, $cacheName);
     }
 

Tests/Form/ChoiceList/DoctrineChoiceLoaderTest.php

@@ -152,9 +152,6 @@ public function testLoadValuesForChoicesDoesNotLoadIfEmptyChoices()
 
     public function testLoadValuesForChoicesDoesNotLoadIfSingleIntId()
     {
-        $this->expectException(LogicException::class);
-        $this->expectExceptionMessage('Not defining the IdReader explicitly as a value callback when the query can be optimized is not supported.');
-
         $loader = new DoctrineChoiceLoader(
             $this->om,
             $this->class,
@@ -169,7 +166,10 @@ public function testLoadValuesForChoicesDoesNotLoadIfSingleIntId()
             ->with($this->obj2)
             ->willReturn('2');
 
-        $this->assertSame(['2'], $loader->loadValuesForChoices([$this->obj2]));
+        $this->expectException(LogicException::class);
+        $this->expectExceptionMessage('Not defining the IdReader explicitly as a value callback when the query can be optimized is not supported.');
+
+        $loader->loadValuesForChoices([$this->obj2]);
     }
 
     public function testLoadValuesForChoicesDoesNotLoadIfSingleIntIdAndValueGiven()
@@ -253,18 +253,13 @@ public function testLoadChoicesForValuesDoesNotLoadIfEmptyValues()
 
     public function testLegacyLoadChoicesForValuesLoadsOnlyChoicesIfValueUseIdReader()
     {
-        $this->expectException(LogicException::class);
-        $this->expectExceptionMessage('Not defining the IdReader explicitly as a value callback when the query can be optimized is not supported.');
-
         $loader = new DoctrineChoiceLoader(
             $this->om,
             $this->class,
             $this->idReader,
             $this->objectLoader
         );
 
-        $choices = [$this->obj2, $this->obj3];
-
         $this->idReader->expects($this->any())
             ->method('getIdField')
             ->willReturn('idField');
@@ -275,10 +270,10 @@ public function testLegacyLoadChoicesForValuesLoadsOnlyChoicesIfValueUseIdReader
         $this->objectLoader->expects($this->never())
             ->method('getEntitiesByIds');
 
-        $this->assertSame(
-            [4 => $this->obj3, 7 => $this->obj2],
-            $loader->loadChoicesForValues([4 => '3', 7 => '2'])
-        );
+        $this->expectException(LogicException::class);
+        $this->expectExceptionMessage('Not defining the IdReader explicitly as a value callback when the query can be optimized is not supported.');
+
+        $loader->loadChoicesForValues([4 => '3', 7 => '2']);
     }
 
     public function testLoadChoicesForValuesLoadsOnlyChoicesIfValueUseIdReader()
@@ -374,15 +369,15 @@ public function testLoadChoicesForValuesLoadsOnlyChoicesIfValueIsIdReader()
 
     public function testPassingIdReaderWithoutSingleIdEntity()
     {
-        $this->expectException(\InvalidArgumentException::class);
-        $this->expectExceptionMessage('The "$idReader" argument of "Symfony\\Bridge\\Doctrine\\Form\\ChoiceList\\DoctrineChoiceLoader::__construct" must be null when the query cannot be optimized because of composite id fields.');
-
         $idReader = $this->createMock(IdReader::class);
         $idReader->expects($this->once())
             ->method('isSingleId')
             ->willReturn(false)
         ;
 
+        $this->expectException(\InvalidArgumentException::class);
+        $this->expectExceptionMessage('The "$idReader" argument of "Symfony\\Bridge\\Doctrine\\Form\\ChoiceList\\DoctrineChoiceLoader::__construct" must be null when the query cannot be optimized because of composite id fields.');
+
         new DoctrineChoiceLoader($this->om, $this->class, $idReader, $this->objectLoader);
     }
 }

Tests/Form/Type/EntityTypeTest.php

@@ -218,7 +218,7 @@ public function testConfigureQueryBuilderWithNonQueryBuilderAndNonClosure()
     public function testConfigureQueryBuilderWithClosureReturningNonQueryBuilder()
     {
         $this->expectException(UnexpectedTypeException::class);
-        $field = $this->factory->createNamed('name', static::TESTED_TYPE, null, [
+        $this->factory->createNamed('name', static::TESTED_TYPE, null, [
             'em' => 'default',
             'class' => self::SINGLE_IDENT_CLASS,
             'query_builder' => fn () => new \stdClass(),

Tests/Messenger/DoctrineTransactionMiddlewareTest.php

@@ -56,15 +56,16 @@ public function testMiddlewareWrapsInTransactionAndFlushes()
 
     public function testTransactionIsRolledBackOnException()
     {
-        $this->expectException(\RuntimeException::class);
-        $this->expectExceptionMessage('Thrown from next middleware.');
         $this->connection->expects($this->once())
             ->method('beginTransaction')
         ;
         $this->connection->expects($this->once())
             ->method('rollBack')
         ;
 
+        $this->expectException(\RuntimeException::class);
+        $this->expectExceptionMessage('Thrown from next middleware.');
+
         $this->middleware->handle(new Envelope(new \stdClass()), $this->getThrowingStackMock());
     }
 

Tests/Security/User/EntityUserProviderTest.php

@@ -89,8 +89,6 @@ public function testLoadUserByIdentifierWithUserLoaderRepositoryAndWithoutProper
 
     public function testLoadUserByIdentifierWithNonUserLoaderRepositoryAndWithoutProperty()
     {
-        $this->expectException(\InvalidArgumentException::class);
-        $this->expectExceptionMessage('You must either make the "Symfony\Bridge\Doctrine\Tests\Fixtures\User" entity Doctrine Repository ("Doctrine\ORM\EntityRepository") implement "Symfony\Bridge\Doctrine\Security\User\UserLoaderInterface" or set the "property" option in the corresponding entity provider configuration.');
         $em = DoctrineTestHelper::createTestEntityManager();
         $this->createSchema($em);
 
@@ -100,6 +98,10 @@ public function testLoadUserByIdentifierWithNonUserLoaderRepositoryAndWithoutPro
         $em->flush();
 
         $provider = new EntityUserProvider($this->getManager($em), 'Symfony\Bridge\Doctrine\Tests\Fixtures\User');
+
+        $this->expectException(\InvalidArgumentException::class);
+        $this->expectExceptionMessage('You must either make the "Symfony\Bridge\Doctrine\Tests\Fixtures\User" entity Doctrine Repository ("Doctrine\ORM\EntityRepository") implement "Symfony\Bridge\Doctrine\Security\User\UserLoaderInterface" or set the "property" option in the corresponding entity provider configuration.');
+
         $provider->loadUserByIdentifier('user1');
     }
 
@@ -171,14 +173,15 @@ public function testLoadUserByIdentifierShouldLoadUserWhenProperInterfaceProvide
 
     public function testLoadUserByIdentifierShouldDeclineInvalidInterface()
     {
-        $this->expectException(\InvalidArgumentException::class);
         $repository = $this->createMock(ObjectRepository::class);
 
         $provider = new EntityUserProvider(
             $this->getManager($this->getObjectManager($repository)),
             'Symfony\Bridge\Doctrine\Tests\Fixtures\User'
         );
 
+        $this->expectException(\InvalidArgumentException::class);
+
         $provider->loadUserByIdentifier('name');
     }
 

Tests/Validator/Constraints/UniqueEntityValidatorTest.php

@@ -617,8 +617,6 @@ public function testValidateUniquenessWithArrayValue()
 
     public function testDedicatedEntityManagerNullObject()
     {
-        $this->expectException(ConstraintDefinitionException::class);
-        $this->expectExceptionMessage('Object manager "foo" does not exist.');
         $constraint = new UniqueEntity([
             'message' => 'myMessage',
             'fields' => ['name'],
@@ -632,13 +630,14 @@ public function testDedicatedEntityManagerNullObject()
 
         $entity = new SingleIntIdEntity(1, null);
 
+        $this->expectException(ConstraintDefinitionException::class);
+        $this->expectExceptionMessage('Object manager "foo" does not exist.');
+
         $this->validator->validate($entity, $constraint);
     }
 
     public function testEntityManagerNullObject()
     {
-        $this->expectException(ConstraintDefinitionException::class);
-        $this->expectExceptionMessage('Unable to find the object manager associated with an entity of class "Symfony\Bridge\Doctrine\Tests\Fixtures\SingleIntIdEntity"');
         $constraint = new UniqueEntity([
             'message' => 'myMessage',
             'fields' => ['name'],
@@ -652,6 +651,9 @@ public function testEntityManagerNullObject()
 
         $entity = new SingleIntIdEntity(1, null);
 
+        $this->expectException(ConstraintDefinitionException::class);
+        $this->expectExceptionMessage('Unable to find the object manager associated with an entity of class "Symfony\Bridge\Doctrine\Tests\Fixtures\SingleIntIdEntity"');
+
         $this->validator->validate($entity, $constraint);
     }
 
@@ -719,8 +721,6 @@ public function testValidateInheritanceUniqueness()
 
     public function testInvalidateRepositoryForInheritance()
     {
-        $this->expectException(ConstraintDefinitionException::class);
-        $this->expectExceptionMessage('The "Symfony\Bridge\Doctrine\Tests\Fixtures\SingleStringIdEntity" entity repository does not support the "Symfony\Bridge\Doctrine\Tests\Fixtures\Person" entity. The entity should be an instance of or extend "Symfony\Bridge\Doctrine\Tests\Fixtures\SingleStringIdEntity".');
         $constraint = new UniqueEntity([
             'message' => 'myMessage',
             'fields' => ['name'],
@@ -729,6 +729,10 @@ public function testInvalidateRepositoryForInheritance()
         ]);
 
         $entity = new Person(1, 'Foo');
+
+        $this->expectException(ConstraintDefinitionException::class);
+        $this->expectExceptionMessage('The "Symfony\Bridge\Doctrine\Tests\Fixtures\SingleStringIdEntity" entity repository does not support the "Symfony\Bridge\Doctrine\Tests\Fixtures\Person" entity. The entity should be an instance of or extend "Symfony\Bridge\Doctrine\Tests\Fixtures\SingleStringIdEntity".');
+
         $this->validator->validate($entity, $constraint);
     }