Fix FormType testcases

nanasess · Jan 11, 2018 · 53c20b9 · 53c20b9
1 parent 6c60ed5
commit 53c20b9
Show file tree

Hide file tree

Showing 12 changed files with 37 additions and 89 deletions.
diff --git a/src/Eccube/Form/Type/Admin/CategoryType.php b/src/Eccube/Form/Type/Admin/CategoryType.php
@@ -39,20 +39,13 @@
 class CategoryType extends AbstractType
 {
     /**
-     * @Inject("config")
      * @var array
      */
-    protected $appConfig;
+    protected $eccubeConfig;
 
-
-    /**
-     * @var \Eccube\Application $app
-     * @Inject(Application::class)
-     */
-    protected $app;
-
-    public function __construct()
+    public function __construct($eccubeConfig)
     {
+        $this->eccubeConfig = $eccubeConfig;
     }
 
     /**
@@ -66,7 +59,7 @@ public function buildForm(FormBuilderInterface $builder, array $options)
                 'constraints' => array(
                     new Assert\NotBlank(),
                     new Assert\Length(array(
-                        'max' => $this->appConfig['stext_len'],
+                        'max' => $this->eccubeConfig['stext_len'],
                     )),
                 ),
             ))

diff --git a/tests/Eccube/Tests/EccubeTestCase.php b/tests/Eccube/Tests/EccubeTestCase.php
@@ -42,6 +42,11 @@ abstract class EccubeTestCase extends WebTestCase
      */
     protected $entityManager;
 
+    /**
+     * @var array
+     */
+    protected $eccubeConfig;
+
     /**
      * Applicaiton を生成しトランザクションを開始する.
      */
@@ -53,6 +58,7 @@ public function setUp()
         $this->container = $this->client->getContainer();
         $this->entityManager = $this->container->get('doctrine')->getManager();
         $this->entityManager->getConnection()->beginTransaction();
+        $this->eccubeConfig = $this->container->getParameter('eccube.constants');
     }
 
     /**

diff --git a/tests/Eccube/Tests/Form/Type/AbstractTypeTestCase.php b/tests/Eccube/Tests/Form/Type/AbstractTypeTestCase.php
@@ -26,7 +26,18 @@
 
 use Eccube\Tests\EccubeTestCase;
 use Symfony\Component\Form\Test\TypeTestCase;
+use Symfony\Component\Form\FormFactoryInterface;
 
 abstract class AbstractTypeTestCase extends EccubeTestCase
 {
+    /**
+     * @var FormFactoryInterface
+     */
+    protected $formFactory;
+
+    public function setUp()
+    {
+        parent::setUp();
+        $this->formFactory = $this->container->get('form.factory');
+    }
 }
diff --git a/tests/Eccube/Tests/Form/Type/AddressTypeTest.php b/tests/Eccube/Tests/Form/Type/AddressTypeTest.php
@@ -46,10 +46,9 @@ class AddressTypeTest extends AbstractTypeTestCase
 
     public function setUp()
     {
-        $this->markTestIncomplete(get_class($this).' は未実装です');
         parent::setUp();
 
-        $this->form = $this->app['form.factory']
+        $this->form = $this->formFactory
             ->createBuilder(FormType::class, null, ['csrf_protection' => false])
             ->add('address', AddressType::class)
             ->getForm();
@@ -68,7 +67,7 @@ public function testInvalidData_Addr01_MaxLength()
         $data = array(
             'address' => array(
                 'pref' => '1',
-                'addr01' => str_repeat('ア', $this->app['config']['address1_len']+1),
+                'addr01' => str_repeat('ア', $this->eccubeConfig['address1_len']+1),
                 'addr02' => 'にゅうりょく',
             ));
 
@@ -82,7 +81,7 @@ public function testInvalidData_Addr02_MaxLength()
             'address' => array(
                 'pref' => '1',
                 'addr01' => 'にゅうりょく',
-                'addr02' => str_repeat('ア', $this->app['config']['address2_len']+1),
+                'addr02' => str_repeat('ア', $this->eccubeConfig['address2_len']+1),
             ));
 
         $this->form->submit($data);
@@ -107,7 +106,7 @@ public function testInvalidData_Pref_NonexistentValue()
 
     public function testRequiredAddNotBlank_Pref()
     {
-        $this->form = $this->app['form.factory']
+        $this->form = $this->formFactory
             ->createBuilder(FormType::class, null, ['csrf_protection' => false])
             ->add('address', AddressType::class, array(
                 'required' => true,
@@ -123,7 +122,7 @@ public function testRequiredAddNotBlank_Pref()
 
     public function testRequiredAddNotBlank_Addr01()
     {
-        $this->form = $this->app['form.factory']
+        $this->form = $this->formFactory
             ->createBuilder(FormType::class, null, ['csrf_protection' => false])
             ->add('address', AddressType::class, array(
                 'required' => true,
@@ -139,7 +138,7 @@ public function testRequiredAddNotBlank_Addr01()
 
     public function testRequiredAddNotBlank_Addr02()
     {
-        $this->form = $this->app['form.factory']
+        $this->form = $this->formFactory
             ->createBuilder(FormType::class, null, ['csrf_protection' => false])
             ->add('address', AddressType::class, array(
                 'required' => true,

diff --git a/tests/Eccube/Tests/Form/Type/Admin/CategoryTypeTest.php b/tests/Eccube/Tests/Form/Type/Admin/CategoryTypeTest.php
@@ -42,11 +42,10 @@ class CategoryTypeTest extends \Eccube\Tests\Form\Type\AbstractTypeTestCase
 
     public function setUp()
     {
-        $this->markTestIncomplete(get_class($this).' は未実装です');
         parent::setUp();
 
         // CSRF tokenを無効にしてFormを作成
-        $this->form = $this->app['form.factory']
+        $this->form = $this->formFactory
             ->createBuilder(CategoryType::class, null, array(
                 'csrf_protection' => false,
             ))
@@ -77,7 +76,7 @@ public function testInvalidName_SptabCheck()
 
     public function testInvalidName_MaxLengthInvalid()
     {
-        $str = str_repeat('S', $this->app['config']['stext_len']) . 'S';
+        $str = str_repeat('S', $this->eccubeConfig['stext_len']) . 'S';
 
         $this->formData['name'] = $str;
         $this->form->submit($this->formData);
@@ -87,7 +86,7 @@ public function testInvalidName_MaxLengthInvalid()
 
     public function testInvalidName_MaxLengthValid()
     {
-        $str = str_repeat('S', $this->app['config']['stext_len']);
+        $str = str_repeat('S', $this->eccubeConfig['stext_len']);
 
         $this->formData['name'] = $str;
         $this->form->submit($this->formData);

diff --git a/tests/Eccube/Tests/Form/Type/Front/ContactTypeTest.php b/tests/Eccube/Tests/Form/Type/Front/ContactTypeTest.php
@@ -63,11 +63,10 @@ class ContactTypeTest extends \Eccube\Tests\Form\Type\AbstractTypeTestCase
 
     public function setUp()
     {
-        $this->markTestIncomplete(get_class($this).' は未実装です');
         parent::setUp();
 
         // CSRF tokenを無効にしてFormを作成
-        $this->form = $this->app['form.factory']
+        $this->form = $this->formFactory
             ->createBuilder(ContactType::class, null, array(
                 'csrf_protection' => false,
             ))

diff --git a/tests/Eccube/Tests/Form/Type/Install/AbstractTypeTestCase.php b/tests/Eccube/Tests/Form/Type/Install/AbstractTypeTestCase.php
diff --git a/tests/Eccube/Tests/Form/Type/Install/Step1TypeTest.php b/tests/Eccube/Tests/Form/Type/Install/Step1TypeTest.php
@@ -25,12 +25,10 @@
 namespace Eccube\Tests\Form\Type\Install;
 
 use Eccube\Form\Type\Install\Step1Type;
+use Eccube\Tests\Form\Type\AbstractTypeTestCase;
 
 class Step1TypeTest extends AbstractTypeTestCase
 {
-    /** @var \Eccube\Application */
-    protected $app;
-
     /** @var \Symfony\Component\Form\FormInterface */
     protected $form;
 
@@ -70,10 +68,9 @@ public function getValidTestData()
 
     public function setUp()
     {
-        $this->markTestIncomplete(get_class($this).' は未実装です');
         parent::setUp();
 
-        $this->form = $this->app['form.factory']
+        $this->form = $this->formFactory
             ->createBuilder(Step1Type::class, null, ['csrf_protection' => false])
             ->getForm();
     }

diff --git a/tests/Eccube/Tests/Form/Type/Install/Step3TypeTest.php b/tests/Eccube/Tests/Form/Type/Install/Step3TypeTest.php
@@ -25,6 +25,7 @@
 namespace Eccube\Tests\Form\Type\Install;
 
 use Eccube\Form\Type\Install\Step3Type;
+use Eccube\Tests\Form\Type\AbstractTypeTestCase;
 
 class Step3TypeTest extends AbstractTypeTestCase
 {

diff --git a/tests/Eccube/Tests/Form/Type/Install/Step4TypeTest.php b/tests/Eccube/Tests/Form/Type/Install/Step4TypeTest.php
@@ -25,6 +25,7 @@
 namespace Eccube\Tests\Form\Type\Install;
 
 use Eccube\Form\Type\Install\Step4Type;
+use Eccube\Tests\Form\Type\AbstractTypeTestCase;
 
 class Step4TypeTest extends AbstractTypeTestCase
 {

diff --git a/tests/Eccube/Tests/Form/Type/Install/Step5TypeTest.php b/tests/Eccube/Tests/Form/Type/Install/Step5TypeTest.php
@@ -25,6 +25,7 @@
 namespace Eccube\Tests\Form\Type\Install;
 
 use Eccube\Form\Type\Install\Step5Type;
+use Eccube\Tests\Form\Type\AbstractTypeTestCase;
 
 class Step5TypeTest extends AbstractTypeTestCase
 {

diff --git a/tests/Eccube/Tests/Form/Type/NameTypeTest.php b/tests/Eccube/Tests/Form/Type/NameTypeTest.php
@@ -28,9 +28,6 @@
 
 class NameTypeTest extends AbstractTypeTestCase
 {
-    /** @var \Eccube\Application */
-    protected $app;
-
     /** @var \Symfony\Component\Form\FormInterface */
     protected $form;
 
@@ -46,9 +43,8 @@ class NameTypeTest extends AbstractTypeTestCase
 
     public function setUp()
     {
-        $this->markTestIncomplete(get_class($this).' は未実装です');
         parent::setUp();
-        $this->form = $this->app['form.factory']
+        $this->form = $this->formFactory
             ->createBuilder(FormType::class, null, ['csrf_protection' => false])
             ->add('name', NameType::class)
             ->getForm();