From 064e59c4d9725ec8158e2509a6a8ff46a75cdbc1 Mon Sep 17 00:00:00 2001
From: kiy0taka <kiy0taka333@gmail.com>
Date: Fri, 22 Jul 2022 16:53:38 +0900
Subject: [PATCH] =?UTF-8?q?$this->form->isValid()=E3=81=AF=E5=B8=B8?=
 =?UTF-8?q?=E3=81=ABfalse=E3=81=AB=E3=81=AA=E3=82=8B=E3=81=AE=E3=81=A7?=
 =?UTF-8?q?=E3=80=81=E3=83=86=E3=82=B9=E3=83=88=E5=AF=BE=E8=B1=A1=E3=81=AE?=
 =?UTF-8?q?=E3=83=95=E3=82=A9=E3=83=BC=E3=83=A0=E3=81=94=E3=81=A8=E3=81=AB?=
 =?UTF-8?q?=E7=A2=BA=E8=AA=8D=E3=81=99=E3=82=8B=E3=82=88=E3=81=86=E3=81=AB?=
 =?UTF-8?q?=E5=A4=89=E6=9B=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../Tests/Form/Type/Admin/OrderTypeTest.php   | 34 +++++++++----------
 1 file changed, 17 insertions(+), 17 deletions(-)

diff --git a/tests/Eccube/Tests/Form/Type/Admin/OrderTypeTest.php b/tests/Eccube/Tests/Form/Type/Admin/OrderTypeTest.php
index ed094d5a2a5..eef73585303 100644
--- a/tests/Eccube/Tests/Form/Type/Admin/OrderTypeTest.php
+++ b/tests/Eccube/Tests/Form/Type/Admin/OrderTypeTest.php
@@ -88,7 +88,14 @@ 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()
@@ -96,7 +103,7 @@ 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()
@@ -104,7 +111,7 @@ 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()
@@ -112,7 +119,7 @@ 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()
@@ -120,7 +127,7 @@ 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()
@@ -128,7 +135,7 @@ 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()
@@ -136,7 +143,7 @@ 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()
@@ -144,7 +151,7 @@ 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()
@@ -152,7 +159,7 @@ 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()
@@ -160,13 +167,6 @@ 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());
     }
 }