-

OskarStark · OskarStark · commit 5b935b834837 · 2023-10-27T13:50:26.000+02:00
diff --git a/src/Symfony/Bridge/Doctrine/Tests/Form/ChoiceList/DoctrineChoiceLoaderTest.php b/src/Symfony/Bridge/Doctrine/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()
