MC-20668: Edit custom options of simple product

IvanPletnyov · IvanPletnyov · commit 3dbe4a751194 · 2019-10-11T15:04:50.000+03:00
diff --git a/dev/tests/integration/testsuite/Magento/Catalog/Controller/Adminhtml/Product/Save/UpdateCustomOptionsTest.php b/dev/tests/integration/testsuite/Magento/Catalog/Controller/Adminhtml/Product/Save/UpdateCustomOptionsTest.php
@@ -11,6 +11,7 @@
 use Magento\Catalog\Api\Data\ProductCustomOptionInterfaceFactory;
 use Magento\Catalog\Api\ProductCustomOptionRepositoryInterface;
 use Magento\Catalog\Api\ProductRepositoryInterface;
+use Magento\Catalog\Model\Product\Option;
 use Magento\Framework\App\Request\Http as HttpRequest;
 use Magento\Framework\Message\MessageInterface;
 use Magento\TestFramework\TestCase\AbstractBackendController;
@@ -60,10 +61,12 @@ protected function setUp()
      *
      * @param array $optionData
      * @param array $updateData
+     * @return void
      */
     public function testUpdateCustomOptionWithTypeField(array $optionData, array $updateData): void
     {
         $product = $this->productRepository->get('simple');
+        /** @var ProductCustomOptionInterface|Option $option */
         $option = $this->optionRepositoryFactory->create(['data' => $optionData]);
         $option->setProductSku($product->getSku());
         $product->setOptions([$option]);
@@ -87,9 +90,9 @@ public function testUpdateCustomOptionWithTypeField(array $optionData, array $up
                         'price' => $currentOption->getPrice(),
                         'price_type' => $currentOption->getPriceType(),
                         'is_use_default' => false,
-                    ]
-                ]
-            ]
+                    ],
+                ],
+            ],
         ];
 
         foreach ($updateData as $methodKey => $newValue) {
@@ -100,7 +103,7 @@ public function testUpdateCustomOptionWithTypeField(array $optionData, array $up
                         'options' => [
                             0 => [
                                 $methodKey => $newValue,
-                            ]
+                            ],
                         ],
                     ],
                 ]
@@ -114,12 +117,11 @@ public function testUpdateCustomOptionWithTypeField(array $optionData, array $up
             );
             $updatedOptions = $this->optionRepository->getProductOptions($product);
             $this->assertCount(1, $updatedOptions);
-            /** @var ProductCustomOptionInterface $updatedOption */
+            /** @var ProductCustomOptionInterface|Option $updatedOption */
             $updatedOption = reset($updatedOptions);
-            $methodName = str_replace('_', '', ucwords($methodKey, '_'));
-            $this->assertEquals($newValue, $updatedOption->{'get' . $methodName}());
+            $this->assertEquals($newValue, $updatedOption->getDataUsingMethod($methodKey));
             $this->assertEquals($option->getOptionId(), $updatedOption->getOptionId());
-            $this->assertNotEquals($option->{'get' . $methodName}(), $updatedOption->{'get' . $methodName}());
+            $this->assertNotEquals($option->getDataUsingMethod($methodKey), $updatedOption->getDataUsingMethod($methodKey));
         }
     }
 }
diff --git a/dev/tests/integration/testsuite/Magento/Catalog/Model/Product/Option/Create/DataProvider/Type/Date/Date.php b/dev/tests/integration/testsuite/Magento/Catalog/Model/Product/Option/Create/DataProvider/Type/Date/Date.php
@@ -7,6 +7,7 @@
 
 namespace Magento\Catalog\Model\Product\Option\Create\DataProvider\Type\Date;
 
+use Magento\Catalog\Api\Data\ProductCustomOptionInterface;
 use Magento\Catalog\Model\Product\Option\Create\DataProvider\AbstractBase;
 
 /**
@@ -19,6 +20,6 @@ class Date extends AbstractBase
      */
     protected function getType(): string
     {
-        return 'date';
+        return ProductCustomOptionInterface::OPTION_GROUP_DATE;
     }
 }
diff --git a/dev/tests/integration/testsuite/Magento/Catalog/Model/Product/Option/Create/DataProvider/Type/Date/DateTime.php b/dev/tests/integration/testsuite/Magento/Catalog/Model/Product/Option/Create/DataProvider/Type/Date/DateTime.php
@@ -7,6 +7,7 @@
 
 namespace Magento\Catalog\Model\Product\Option\Create\DataProvider\Type\Date;
 
+use Magento\Catalog\Api\Data\ProductCustomOptionInterface;
 use Magento\Catalog\Model\Product\Option\Create\DataProvider\AbstractBase;
 
 /**
@@ -19,6 +20,6 @@ class DateTime extends AbstractBase
      */
     protected function getType(): string
     {
-        return 'date_time';
+        return ProductCustomOptionInterface::OPTION_TYPE_DATE_TIME;
     }
 }
diff --git a/dev/tests/integration/testsuite/Magento/Catalog/Model/Product/Option/Create/DataProvider/Type/Date/Time.php b/dev/tests/integration/testsuite/Magento/Catalog/Model/Product/Option/Create/DataProvider/Type/Date/Time.php
@@ -7,6 +7,7 @@
 
 namespace Magento\Catalog\Model\Product\Option\Create\DataProvider\Type\Date;
 
+use Magento\Catalog\Api\Data\ProductCustomOptionInterface;
 use Magento\Catalog\Model\Product\Option\Create\DataProvider\AbstractBase;
 
 /**
@@ -19,6 +20,6 @@ class Time extends AbstractBase
      */
     protected function getType(): string
     {
-        return 'time';
+        return ProductCustomOptionInterface::OPTION_TYPE_TIME;
     }
 }
diff --git a/dev/tests/integration/testsuite/Magento/Catalog/Model/Product/Option/Create/DataProvider/Type/File/File.php b/dev/tests/integration/testsuite/Magento/Catalog/Model/Product/Option/Create/DataProvider/Type/File/File.php
@@ -7,6 +7,7 @@
 
 namespace Magento\Catalog\Model\Product\Option\Create\DataProvider\Type\File;
 
+use Magento\Catalog\Api\Data\ProductCustomOptionInterface;
 use Magento\Catalog\Model\Product\Option\Create\DataProvider\AbstractBase;
 
 /**
@@ -85,6 +86,6 @@ public function getDataForUpdateOptions(): array
      */
     protected function getType(): string
     {
-        return 'file';
+        return ProductCustomOptionInterface::OPTION_TYPE_FILE;
     }
 }
diff --git a/dev/tests/integration/testsuite/Magento/Catalog/Model/Product/Option/Create/DataProvider/Type/Select/Checkbox.php b/dev/tests/integration/testsuite/Magento/Catalog/Model/Product/Option/Create/DataProvider/Type/Select/Checkbox.php
@@ -7,6 +7,7 @@
 
 namespace Magento\Catalog\Model\Product\Option\Create\DataProvider\Type\Select;
 
+use Magento\Catalog\Api\Data\ProductCustomOptionInterface;
 use Magento\Catalog\Model\Product\Option\Create\DataProvider\Type\Select\AbstractSelect;
 
 /**
@@ -19,6 +20,6 @@ class Checkbox extends AbstractSelect
      */
     protected function getType(): string
     {
-        return 'checkbox';
+        return ProductCustomOptionInterface::OPTION_TYPE_CHECKBOX;
     }
 }
diff --git a/dev/tests/integration/testsuite/Magento/Catalog/Model/Product/Option/Create/DataProvider/Type/Select/DropDown.php b/dev/tests/integration/testsuite/Magento/Catalog/Model/Product/Option/Create/DataProvider/Type/Select/DropDown.php
@@ -7,6 +7,7 @@
 
 namespace Magento\Catalog\Model\Product\Option\Create\DataProvider\Type\Select;
 
+use Magento\Catalog\Api\Data\ProductCustomOptionInterface;
 use Magento\Catalog\Model\Product\Option\Create\DataProvider\Type\Select\AbstractSelect;
 
 /**
@@ -19,6 +20,6 @@ class DropDown extends AbstractSelect
      */
     protected function getType(): string
     {
-        return 'drop_down';
+        return ProductCustomOptionInterface::OPTION_TYPE_DROP_DOWN;
     }
 }
diff --git a/dev/tests/integration/testsuite/Magento/Catalog/Model/Product/Option/Create/DataProvider/Type/Select/MultipleSelect.php b/dev/tests/integration/testsuite/Magento/Catalog/Model/Product/Option/Create/DataProvider/Type/Select/MultipleSelect.php
@@ -7,6 +7,7 @@
 
 namespace Magento\Catalog\Model\Product\Option\Create\DataProvider\Type\Select;
 
+use Magento\Catalog\Api\Data\ProductCustomOptionInterface;
 use Magento\Catalog\Model\Product\Option\Create\DataProvider\Type\Select\AbstractSelect;
 
 /**
@@ -19,6 +20,6 @@ class MultipleSelect extends AbstractSelect
      */
     protected function getType(): string
     {
-        return 'multiple';
+        return ProductCustomOptionInterface::OPTION_TYPE_MULTIPLE;
     }
 }
diff --git a/dev/tests/integration/testsuite/Magento/Catalog/Model/Product/Option/Create/DataProvider/Type/Select/RadioButtons.php b/dev/tests/integration/testsuite/Magento/Catalog/Model/Product/Option/Create/DataProvider/Type/Select/RadioButtons.php
@@ -7,6 +7,7 @@
 
 namespace Magento\Catalog\Model\Product\Option\Create\DataProvider\Type\Select;
 
+use Magento\Catalog\Api\Data\ProductCustomOptionInterface;
 use Magento\Catalog\Model\Product\Option\Create\DataProvider\Type\Select\AbstractSelect;
 
 /**
@@ -19,6 +20,6 @@ class RadioButtons extends AbstractSelect
      */
     protected function getType(): string
     {
-        return 'radio';
+        return ProductCustomOptionInterface::OPTION_TYPE_RADIO;
     }
 }
diff --git a/dev/tests/integration/testsuite/Magento/Catalog/Model/Product/Option/Create/DataProvider/Type/Text/Area.php b/dev/tests/integration/testsuite/Magento/Catalog/Model/Product/Option/Create/DataProvider/Type/Text/Area.php
@@ -7,6 +7,7 @@
 
 namespace Magento\Catalog\Model\Product\Option\Create\DataProvider\Type\Text;
 
+use Magento\Catalog\Api\Data\ProductCustomOptionInterface;
 use Magento\Catalog\Model\Product\Option\Create\DataProvider\Type\Text\AbstractText;
 
 /**
@@ -19,6 +20,6 @@ class Area extends AbstractText
      */
     protected function getType(): string
     {
-        return 'area';
+        return ProductCustomOptionInterface::OPTION_TYPE_AREA;
     }
 }
diff --git a/dev/tests/integration/testsuite/Magento/Catalog/Model/Product/Option/Create/DataProvider/Type/Text/Field.php b/dev/tests/integration/testsuite/Magento/Catalog/Model/Product/Option/Create/DataProvider/Type/Text/Field.php
@@ -7,6 +7,7 @@
 
 namespace Magento\Catalog\Model\Product\Option\Create\DataProvider\Type\Text;
 
+use Magento\Catalog\Api\Data\ProductCustomOptionInterface;
 use Magento\Catalog\Model\Product\Option\Create\DataProvider\Type\Text\AbstractText;
 
 /**
@@ -19,6 +20,6 @@ class Field extends AbstractText
      */
     protected function getType(): string
     {
-        return 'field';
+        return ProductCustomOptionInterface::OPTION_TYPE_FIELD;
     }
 }
diff --git a/dev/tests/integration/testsuite/Magento/Catalog/Model/Product/UpdateCustomOptionsTest.php b/dev/tests/integration/testsuite/Magento/Catalog/Model/Product/UpdateCustomOptionsTest.php

Original file line number	Diff line number	Diff line change
`@@ -7,6 +7,7 @@`
`7`	`7`
`8`	`8`	`namespace Magento\Catalog\Model\Product\Option\Create\DataProvider\Type\Date;`
`9`	`9`
	`10`	`+use Magento\Catalog\Api\Data\ProductCustomOptionInterface;`
`10`	`11`	`use Magento\Catalog\Model\Product\Option\Create\DataProvider\AbstractBase;`
`11`	`12`
`12`	`13`	`/**`
`@@ -19,6 +20,6 @@ class Date extends AbstractBase`
`19`	`20`	`*/`
`20`	`21`	`protected function getType(): string`
`21`	`22`	`{`
`22`		`- return 'date';`
	`23`	`+ return ProductCustomOptionInterface::OPTION_GROUP_DATE;`
`23`	`24`	`}`
`24`	`25`	`}`