Merge pull request #5469 from kiy0taka/fix/improved-order-type-test

テスト対象のフォームごとに確認するように変更
EC-CUBE · Aug 2, 2022 · e09643d · e09643d
2 parents 92b9393 + 064e59c
commit e09643d
Showing 1 changed file with 17 additions and 17 deletions.
diff --git a/tests/Eccube/Tests/Form/Type/Admin/OrderTypeTest.php b/tests/Eccube/Tests/Form/Type/Admin/OrderTypeTest.php
@@ -88,85 +88,85 @@ public function testInvalidPhoneNumberBlank()
     {
         $this->formData['phone_number'] = '';
         $this->form->submit($this->formData);
-        $this->assertFalse($this->form->isValid());
+        $this->assertFalse($this->form['phone_number']->isValid());
+    }
+
+    public function testInvalidPhoneNumberTooLong() {
+        $this->formData['phone_number'] = '0123456789012345';
+
+        $this->form->submit($this->formData);
+        $this->assertFalse($this->form['phone_number']->isValid());
     }
 
     public function testInvalidDiscountOverMaxLength()
     {
         $this->formData['discount'] = '12345678910'; //Max 9
 
         $this->form->submit($this->formData);
-        $this->assertFalse($this->form->isValid());
+        $this->assertFalse($this->form['discount']->isValid());
     }
 
     public function testInvalidDiscountNotNumeric()
     {
         $this->formData['discount'] = 'abcde';
 
         $this->form->submit($this->formData);
-        $this->assertFalse($this->form->isValid());
+        $this->assertFalse($this->form['discount']->isValid());
     }
 
     public function testInValidDiscountHasMinus()
     {
         $this->formData['discount'] = '-12345';
 
         $this->form->submit($this->formData);
-        $this->assertFalse($this->form->isValid());
+        $this->assertFalse($this->form['discount']->isValid());
     }
 
     public function testInvalidDeliveryFeeTotalOverMaxLength()
     {
         $this->formData['delivery_fee_total'] = '12345678910'; //Max 9
 
         $this->form->submit($this->formData);
-        $this->assertFalse($this->form->isValid());
+        $this->assertFalse($this->form['delivery_fee_total']->isValid());
     }
 
     public function testInvalidDeliveryFeeTotalNotNumeric()
     {
         $this->formData['delivery_fee_total'] = 'abcde';
 
         $this->form->submit($this->formData);
-        $this->assertFalse($this->form->isValid());
+        $this->assertFalse($this->form['delivery_fee_total']->isValid());
     }
 
     public function testInValidDeliveryFeeTotalHasMinus()
     {
         $this->formData['delivery_fee_total'] = '-12345';
 
         $this->form->submit($this->formData);
-        $this->assertFalse($this->form->isValid());
+        $this->assertFalse($this->form['delivery_fee_total']->isValid());
     }
 
     public function testInvalidChargeOverMaxLength()
     {
         $this->formData['charge'] = '12345678910'; //Max 9
 
         $this->form->submit($this->formData);
-        $this->assertFalse($this->form->isValid());
+        $this->assertFalse($this->form['charge']->isValid());
     }
 
     public function testInvalidChargeNotNumeric()
     {
         $this->formData['charge'] = 'abcde';
 
         $this->form->submit($this->formData);
-        $this->assertFalse($this->form->isValid());
+        $this->assertFalse($this->form['charge']->isValid());
     }
 
     public function testInValidChargeHasMinus()
     {
         $this->formData['charge'] = '-12345';
 
         $this->form->submit($this->formData);
-        $this->assertFalse($this->form->isValid());
-    }
-
-    public function testInvalidPhoneNumberTooLong() {
-        $this->formData['phone_number'] = '0123456789012345';
-
-        $this->form->submit($this->formData);
-        $this->assertFalse($this->form['phone_number']->isValid());
+        $this->assertFalse($this->form['charge']->isValid());
     }
 }