replace mocks with real objects in tests

Author: xabbuh

Tests/AbstractRequestHandlerTest.php

@@ -200,7 +200,7 @@ public function testMergeParamsAndFiles($method)
         $form = $this->createForm('param1', $method, true);
         $form->add($this->createForm('field1'));
         $form->add($this->createBuilder('field2', false, ['allow_file_upload' => true])->getForm());
-        $file = $this->getMockFile();
+        $file = $this->getUploadedFile();
 
         $this->setRequestData($method, [
             'param1' => [
@@ -225,7 +225,7 @@ public function testMergeParamsAndFiles($method)
     public function testParamTakesPrecedenceOverFile($method)
     {
         $form = $this->createForm('param1', $method);
-        $file = $this->getMockFile();
+        $file = $this->getUploadedFile();
 
         $this->setRequestData($method, [
             'param1' => 'DATA',
@@ -247,7 +247,7 @@ public function testSubmitFileIfNoParam($method)
         $form = $this->createBuilder('param1', false, ['allow_file_upload' => true])
             ->setMethod($method)
             ->getForm();
-        $file = $this->getMockFile();
+        $file = $this->getUploadedFile();
 
         $this->setRequestData($method, [
             'param1' => null,
@@ -269,14 +269,14 @@ public function testSubmitMultipleFiles($method)
         $form = $this->createBuilder('param1', false, ['allow_file_upload' => true])
             ->setMethod($method)
             ->getForm();
-        $file = $this->getMockFile();
+        $file = $this->getUploadedFile();
 
         $this->setRequestData($method, [
             'param1' => null,
         ], [
-            'param2' => $this->getMockFile('2'),
+            'param2' => $this->getUploadedFile('2'),
             'param1' => $file,
-            'param3' => $this->getMockFile('3'),
+            'param3' => $this->getUploadedFile('3'),
         ]);
 
         $this->requestHandler->handleRequest($form, $this->request);
@@ -332,7 +332,7 @@ public function getPostMaxSizeFixtures()
 
     public function testUploadedFilesAreAccepted()
     {
-        $this->assertTrue($this->requestHandler->isFileUpload($this->getMockFile()));
+        $this->assertTrue($this->requestHandler->isFileUpload($this->getUploadedFile()));
     }
 
     public function testInvalidFilesAreRejected()
@@ -344,7 +344,7 @@ abstract protected function setRequestData($method, $data, $files = []);
 
     abstract protected function getRequestHandler();
 
-    abstract protected function getMockFile($suffix = '');
+    abstract protected function getUploadedFile($suffix = '');
 
     abstract protected function getInvalidFile();
 

Tests/DependencyInjection/FormPassTest.php

@@ -19,8 +19,9 @@
 use Symfony\Component\DependencyInjection\Reference;
 use Symfony\Component\DependencyInjection\ServiceLocator;
 use Symfony\Component\Form\AbstractType;
+use Symfony\Component\Form\Command\DebugCommand;
 use Symfony\Component\Form\DependencyInjection\FormPass;
-use Symfony\Component\Form\FormRegistryInterface;
+use Symfony\Component\Form\FormRegistry;
 
 /**
  * @author Bernhard Schussek <bschussek@gmail.com>
@@ -70,8 +71,12 @@ public function testAddTaggedTypesToDebugCommand()
     {
         $container = $this->createContainerBuilder();
 
+        $container->register('form.registry', FormRegistry::class);
+        $commandDefinition = new Definition(DebugCommand::class, [new Reference('form.registry')]);
+        $commandDefinition->setPublic(true);
+
         $container->setDefinition('form.extension', $this->createExtensionDefinition());
-        $container->setDefinition('console.command.form_debug', $this->createDebugCommandDefinition());
+        $container->setDefinition('console.command.form_debug', $commandDefinition);
         $container->register('my.type1', __CLASS__.'_Type1')->addTag('form.type')->setPublic(true);
         $container->register('my.type2', __CLASS__.'_Type2')->addTag('form.type')->setPublic(true);
 
@@ -259,19 +264,6 @@ private function createExtensionDefinition()
         return $definition;
     }
 
-    private function createDebugCommandDefinition()
-    {
-        $definition = new Definition('Symfony\Component\Form\Command\DebugCommand');
-        $definition->setPublic(true);
-        $definition->setArguments([
-            $formRegistry = $this->getMockBuilder(FormRegistryInterface::class)->getMock(),
-            [],
-            ['Symfony\Component\Form\Extension\Core\Type'],
-        ]);
-
-        return $definition;
-    }
-
     private function createContainerBuilder()
     {
         $container = new ContainerBuilder();