MAGETWO-73774: [2.3] Custom option price field disallows negative values #7333

nikita-shcherbatykh · nikita-shcherbatykh · commit df7ecf71c50d · 2018-08-09T17:06:57.000+03:00
diff --git a/app/code/Magento/Catalog/Test/Unit/Model/Product/Option/Validator/DefaultValidatorTest.php b/app/code/Magento/Catalog/Test/Unit/Model/Product/Option/Validator/DefaultValidatorTest.php
@@ -18,6 +18,11 @@ class DefaultValidatorTest extends \PHPUnit\Framework\TestCase
      */
     protected $valueMock;
 
+    /**
+     * Class dependencies initialization
+     *
+     * @return void
+     */
     protected function setUp()
     {
         $configMock = $this->createMock(\Magento\Catalog\Model\ProductOptions\ConfigInterface::class);
@@ -68,12 +73,12 @@ public function isValidTitleDataProvider()
     }
 
     /**
-     * @param $title
-     * @param $type
-     * @param $priceType
-     * @param $product
-     * @param $messages
-     * @param $result
+     * @param string $title
+     * @param string $type
+     * @param string $priceType
+     * @param \Magento\Framework\DataObject $product
+     * @param array $messages
+     * @param bool $result
      * @dataProvider isValidTitleDataProvider
      */
     public function testIsValidTitle($title, $type, $priceType, $product, $messages, $result)
@@ -103,7 +108,7 @@ public function isValidFailDataProvider()
     }
 
     /**
-     * @param $product
+     * @param \Magento\Framework\DataObject $product
      * @dataProvider isValidFailDataProvider
      */
     public function testIsValidFail($product)
diff --git a/app/code/Magento/Catalog/Test/Unit/Model/Product/Option/Validator/FileTest.php b/app/code/Magento/Catalog/Test/Unit/Model/Product/Option/Validator/FileTest.php
@@ -18,6 +18,11 @@ class FileTest extends \PHPUnit\Framework\TestCase
      */
     protected $valueMock;
 
+    /**
+     * Class dependencies initialization
+     *
+     * @return void
+     */
     protected function setUp()
     {
         $configMock = $this->createMock(\Magento\Catalog\Model\ProductOptions\ConfigInterface::class);
@@ -54,6 +59,10 @@ protected function setUp()
         );
     }
 
+    /**
+     * @throws \Zend_Validate_Exception
+     * @return void
+     */
     public function testIsValidSuccess()
     {
         $this->valueMock->expects($this->once())->method('getTitle')->will($this->returnValue('option_title'));
@@ -68,6 +77,10 @@ public function testIsValidSuccess()
         $this->assertTrue($this->validator->isValid($this->valueMock));
     }
 
+    /**
+     * @throws \Zend_Validate_Exception
+     * @return void
+     */
     public function testIsValidWithNegativeImageSize()
     {
         $this->valueMock->expects($this->once())->method('getTitle')->will($this->returnValue('option_title'));
@@ -85,6 +98,10 @@ public function testIsValidWithNegativeImageSize()
         $this->assertEquals($messages, $this->validator->getMessages());
     }
 
+    /**
+     * @throws \Zend_Validate_Exception
+     * @return void
+     */
     public function testIsValidWithNegativeImageSizeY()
     {
         $this->valueMock->expects($this->once())->method('getTitle')->will($this->returnValue('option_title'));
diff --git a/app/code/Magento/Catalog/Test/Unit/Model/Product/Option/Validator/SelectTest.php b/app/code/Magento/Catalog/Test/Unit/Model/Product/Option/Validator/SelectTest.php
@@ -18,6 +18,11 @@ class SelectTest extends \PHPUnit\Framework\TestCase
      */
     protected $valueMock;
 
+    /**
+     * Class dependencies initialization
+     *
+     * @return void
+     */
     protected function setUp()
     {
         $configMock = $this->createMock(\Magento\Catalog\Model\ProductOptions\ConfigInterface::class);
@@ -100,6 +105,10 @@ public function isValidSuccessDataProvider()
         ];
     }
 
+    /**
+     * @throws \Zend_Validate_Exception
+     * @return void
+     */
     public function testIsValidateWithInvalidOptionValues()
     {
         $this->valueMock->expects($this->once())->method('getTitle')->will($this->returnValue('option_title'));
@@ -118,6 +127,10 @@ public function testIsValidateWithInvalidOptionValues()
         $this->assertEquals($messages, $this->validator->getMessages());
     }
 
+    /**
+     * @throws \Zend_Validate_Exception
+     * @return void
+     */
     public function testIsValidateWithEmptyValues()
     {
         $this->valueMock->expects($this->once())->method('getTitle')->will($this->returnValue('option_title'));
diff --git a/app/code/Magento/Catalog/Test/Unit/Model/Product/Option/Validator/TextTest.php b/app/code/Magento/Catalog/Test/Unit/Model/Product/Option/Validator/TextTest.php
@@ -18,6 +18,11 @@ class TextTest extends \PHPUnit\Framework\TestCase
      */
     protected $valueMock;
 
+    /**
+     * Class dependencies initialization
+     *
+     * @return void
+     */
     protected function setUp()
     {
         $configMock = $this->createMock(\Magento\Catalog\Model\ProductOptions\ConfigInterface::class);
@@ -54,6 +59,10 @@ protected function setUp()
         );
     }
 
+    /**
+     * @throws \Zend_Validate_Exception
+     * @return void
+     */
     public function testIsValidSuccess()
     {
         $this->valueMock->expects($this->once())->method('getTitle')->will($this->returnValue('option_title'));
@@ -67,6 +76,10 @@ public function testIsValidSuccess()
         $this->assertEmpty($this->validator->getMessages());
     }
 
+    /**
+     * @throws \Zend_Validate_Exception
+     * @return void
+     */
     public function testIsValidWithNegativeMaxCharacters()
     {
         $this->valueMock->expects($this->once())->method('getTitle')->will($this->returnValue('option_title'));
diff --git a/app/code/Magento/Catalog/Ui/DataProvider/Product/Form/Modifier/CustomOptions.php b/app/code/Magento/Catalog/Ui/DataProvider/Product/Form/Modifier/CustomOptions.php
@@ -166,7 +166,7 @@ public function __construct(
     }
 
     /**
-     * {@inheritdoc}
+     * @inheritdoc
      * @since 101.0.0
      */
     public function modifyData(array $data)
@@ -226,7 +226,7 @@ protected function formatPriceByPath($path, array $data)
     }
 
     /**
-     * {@inheritdoc}
+     * @inheritdoc
      * @since 101.0.0
      */
     public function modifyMeta(array $meta)
diff --git a/dev/tests/integration/testsuite/Magento/Catalog/Model/ProductPriceTest.php b/dev/tests/integration/testsuite/Magento/Catalog/Model/ProductPriceTest.php
@@ -29,19 +29,30 @@ class ProductPriceTest extends \PHPUnit\Framework\TestCase
      */
     private $productRepository;
 
+    /**
+     * Class dependencies initialization
+     *
+     * @return void
+     */
     protected function setUp()
     {
         $this->_model = Bootstrap::getObjectManager()->create(Product::class);
         $this->productRepository = Bootstrap::getObjectManager()->create(ProductRepositoryInterface::class);
     }
 
+    /**
+     * @return void
+     */
     public function testGetPrice()
     {
         $this->assertEmpty($this->_model->getPrice());
         $this->_model->setPrice(10.0);
         $this->assertEquals(10.0, $this->_model->getPrice());
     }
 
+    /**
+     * @return void
+     */
     public function testGetPriceModel()
     {
         $default = $this->_model->getPriceModel();
@@ -73,6 +84,9 @@ public function testGetFormatedPrice()
         $this->assertEquals('<span class="price">$0.00</span>', $this->_model->getFormatedPrice());
     }
 
+    /**
+     * @return void
+     */
     public function testSetGetFinalPrice()
     {
         $this->assertEquals(0, $this->_model->getFinalPrice());
diff --git a/dev/tests/integration/testsuite/Magento/Catalog/Model/ProductTest.php b/dev/tests/integration/testsuite/Magento/Catalog/Model/ProductTest.php
@@ -35,6 +35,11 @@ class ProductTest extends \PHPUnit\Framework\TestCase
      */
     protected $_model;
 
+    /**
+     * Class dependencies initialization
+     *
+     * @return void
+     */
     protected function setUp()
     {
         $this->productRepository = \Magento\TestFramework\Helper\Bootstrap::getObjectManager()
@@ -45,6 +50,10 @@ protected function setUp()
         );
     }
 
+    /**
+     * @throws \Magento\Framework\Exception\FileSystemException
+     * @return void
+     */
     public static function tearDownAfterClass()
     {
         $objectManager = \Magento\TestFramework\Helper\Bootstrap::getObjectManager();
@@ -66,6 +75,9 @@ public static function tearDownAfterClass()
         }
     }
 
+    /**
+     * @return void
+     */
     public function testCanAffectOptions()
     {
         $this->assertFalse($this->_model->canAffectOptions());
@@ -105,6 +117,9 @@ public function testCRUD()
         $crud->testCrud();
     }
 
+    /**
+     * @return void
+     */
     public function testCleanCache()
     {
         \Magento\TestFramework\Helper\Bootstrap::getObjectManager()->get(
@@ -125,6 +140,9 @@ public function testCleanCache()
         );
     }
 
+    /**
+     * @return void
+     */
     public function testAddImageToMediaGallery()
     {
         // Model accepts only files in tmp media path, we need to copy fixture file there
@@ -332,13 +350,19 @@ public function testIsVirtual()
         $this->assertTrue($model->getIsVirtual());
     }
 
+    /**
+     * @return void
+     */
     public function testToArray()
     {
         $this->assertEquals([], $this->_model->toArray());
         $this->_model->setSku('sku')->setName('name');
         $this->assertEquals(['sku' => 'sku', 'name' => 'name'], $this->_model->toArray());
     }
 
+    /**
+     * @return void
+     */
     public function testFromArray()
     {
         $this->_model->fromArray(['sku' => 'sku', 'name' => 'name', 'stock_item' => ['key' => 'value']]);
@@ -410,6 +434,9 @@ public function testIsProductsHasSku()
         );
     }
 
+    /**
+     * @return void
+     */
     public function testProcessBuyRequest()
     {
         $request = new \Magento\Framework\DataObject();
@@ -418,6 +445,9 @@ public function testProcessBuyRequest()
         $this->assertArrayHasKey('errors', $result->getData());
     }
 
+    /**
+     * @return void
+     */
     public function testValidate()
     {
         $this->_model->setTypeId(

Original file line number	Diff line number	Diff line change
`@@ -18,6 +18,11 @@ class FileTest extends \PHPUnit\Framework\TestCase`
`18`	`18`	`*/`
`19`	`19`	`protected $valueMock;`
`20`	`20`
	`21`	`+ /**`
	`22`	`+ * Class dependencies initialization`
	`23`	`+ *`
	`24`	`+ * @return void`
	`25`	`+ */`
`21`	`26`	`protected function setUp()`
`22`	`27`	`{`
`23`	`28`	`$configMock = $this->createMock(\Magento\Catalog\Model\ProductOptions\ConfigInterface::class);`
`@@ -54,6 +59,10 @@ protected function setUp()`
`54`	`59`	`);`
`55`	`60`	`}`
`56`	`61`
	`62`	`+ /**`
	`63`	`+ * @throws \Zend_Validate_Exception`
	`64`	`+ * @return void`
	`65`	`+ */`
`57`	`66`	`public function testIsValidSuccess()`
`58`	`67`	`{`
`59`	`68`	`$this->valueMock->expects($this->once())->method('getTitle')->will($this->returnValue('option_title'));`
`@@ -68,6 +77,10 @@ public function testIsValidSuccess()`
`68`	`77`	`$this->assertTrue($this->validator->isValid($this->valueMock));`
`69`	`78`	`}`
`70`	`79`
	`80`	`+ /**`
	`81`	`+ * @throws \Zend_Validate_Exception`
	`82`	`+ * @return void`
	`83`	`+ */`
`71`	`84`	`public function testIsValidWithNegativeImageSize()`
`72`	`85`	`{`
`73`	`86`	`$this->valueMock->expects($this->once())->method('getTitle')->will($this->returnValue('option_title'));`
`@@ -85,6 +98,10 @@ public function testIsValidWithNegativeImageSize()`
`85`	`98`	`$this->assertEquals($messages, $this->validator->getMessages());`
`86`	`99`	`}`
`87`	`100`
	`101`	`+ /**`
	`102`	`+ * @throws \Zend_Validate_Exception`
	`103`	`+ * @return void`
	`104`	`+ */`
`88`	`105`	`public function testIsValidWithNegativeImageSizeY()`
`89`	`106`	`{`
`90`	`107`	`$this->valueMock->expects($this->once())->method('getTitle')->will($this->returnValue('option_title'));`
Original file line number	Diff line number	Diff line change
`@@ -18,6 +18,11 @@ class SelectTest extends \PHPUnit\Framework\TestCase`
`18`	`18`	`*/`
`19`	`19`	`protected $valueMock;`
`20`	`20`
	`21`	`+ /**`
	`22`	`+ * Class dependencies initialization`
	`23`	`+ *`
	`24`	`+ * @return void`
	`25`	`+ */`
`21`	`26`	`protected function setUp()`
`22`	`27`	`{`
`23`	`28`	`$configMock = $this->createMock(\Magento\Catalog\Model\ProductOptions\ConfigInterface::class);`
`@@ -100,6 +105,10 @@ public function isValidSuccessDataProvider()`
`100`	`105`	`];`
`101`	`106`	`}`
`102`	`107`
	`108`	`+ /**`
	`109`	`+ * @throws \Zend_Validate_Exception`
	`110`	`+ * @return void`
	`111`	`+ */`
`103`	`112`	`public function testIsValidateWithInvalidOptionValues()`
`104`	`113`	`{`
`105`	`114`	`$this->valueMock->expects($this->once())->method('getTitle')->will($this->returnValue('option_title'));`
`@@ -118,6 +127,10 @@ public function testIsValidateWithInvalidOptionValues()`
`118`	`127`	`$this->assertEquals($messages, $this->validator->getMessages());`
`119`	`128`	`}`
`120`	`129`
	`130`	`+ /**`
	`131`	`+ * @throws \Zend_Validate_Exception`
	`132`	`+ * @return void`
	`133`	`+ */`
`121`	`134`	`public function testIsValidateWithEmptyValues()`
`122`	`135`	`{`
`123`	`136`	`$this->valueMock->expects($this->once())->method('getTitle')->will($this->returnValue('option_title'));`
Original file line number	Diff line number	Diff line change
`@@ -18,6 +18,11 @@ class TextTest extends \PHPUnit\Framework\TestCase`
`18`	`18`	`*/`
`19`	`19`	`protected $valueMock;`
`20`	`20`
	`21`	`+ /**`
	`22`	`+ * Class dependencies initialization`
	`23`	`+ *`
	`24`	`+ * @return void`
	`25`	`+ */`
`21`	`26`	`protected function setUp()`
`22`	`27`	`{`
`23`	`28`	`$configMock = $this->createMock(\Magento\Catalog\Model\ProductOptions\ConfigInterface::class);`
`@@ -54,6 +59,10 @@ protected function setUp()`
`54`	`59`	`);`
`55`	`60`	`}`
`56`	`61`
	`62`	`+ /**`
	`63`	`+ * @throws \Zend_Validate_Exception`
	`64`	`+ * @return void`
	`65`	`+ */`
`57`	`66`	`public function testIsValidSuccess()`
`58`	`67`	`{`
`59`	`68`	`$this->valueMock->expects($this->once())->method('getTitle')->will($this->returnValue('option_title'));`
`@@ -67,6 +76,10 @@ public function testIsValidSuccess()`
`67`	`76`	`$this->assertEmpty($this->validator->getMessages());`
`68`	`77`	`}`
`69`	`78`
	`79`	`+ /**`
	`80`	`+ * @throws \Zend_Validate_Exception`
	`81`	`+ * @return void`
	`82`	`+ */`
`70`	`83`	`public function testIsValidWithNegativeMaxCharacters()`
`71`	`84`	`{`
`72`	`85`	`$this->valueMock->expects($this->once())->method('getTitle')->will($this->returnValue('option_title'));`
Original file line number	Diff line number	Diff line change
`@@ -29,19 +29,30 @@ class ProductPriceTest extends \PHPUnit\Framework\TestCase`
`29`	`29`	`*/`
`30`	`30`	`private $productRepository;`
`31`	`31`
	`32`	`+ /**`
	`33`	`+ * Class dependencies initialization`
	`34`	`+ *`
	`35`	`+ * @return void`
	`36`	`+ */`
`32`	`37`	`protected function setUp()`
`33`	`38`	`{`
`34`	`39`	`$this->_model = Bootstrap::getObjectManager()->create(Product::class);`
`35`	`40`	`$this->productRepository = Bootstrap::getObjectManager()->create(ProductRepositoryInterface::class);`
`36`	`41`	`}`
`37`	`42`
	`43`	`+ /**`
	`44`	`+ * @return void`
	`45`	`+ */`
`38`	`46`	`public function testGetPrice()`
`39`	`47`	`{`
`40`	`48`	`$this->assertEmpty($this->_model->getPrice());`
`41`	`49`	`$this->_model->setPrice(10.0);`
`42`	`50`	`$this->assertEquals(10.0, $this->_model->getPrice());`
`43`	`51`	`}`
`44`	`52`
	`53`	`+ /**`
	`54`	`+ * @return void`
	`55`	`+ */`
`45`	`56`	`public function testGetPriceModel()`
`46`	`57`	`{`
`47`	`58`	`$default = $this->_model->getPriceModel();`
`@@ -73,6 +84,9 @@ public function testGetFormatedPrice()`
`73`	`84`	`$this->assertEquals('<span class="price">$0.00</span>', $this->_model->getFormatedPrice());`
`74`	`85`	`}`
`75`	`86`
	`87`	`+ /**`
	`88`	`+ * @return void`
	`89`	`+ */`
`76`	`90`	`public function testSetGetFinalPrice()`
`77`	`91`	`{`
`78`	`92`	`$this->assertEquals(0, $this->_model->getFinalPrice());`
Original file line number	Diff line number	Diff line change
`@@ -35,6 +35,11 @@ class ProductTest extends \PHPUnit\Framework\TestCase`
`35`	`35`	`*/`
`36`	`36`	`protected $_model;`
`37`	`37`
	`38`	`+ /**`
	`39`	`+ * Class dependencies initialization`
	`40`	`+ *`
	`41`	`+ * @return void`
	`42`	`+ */`
`38`	`43`	`protected function setUp()`
`39`	`44`	`{`
`40`	`45`	`$this->productRepository = \Magento\TestFramework\Helper\Bootstrap::getObjectManager()`
`@@ -45,6 +50,10 @@ protected function setUp()`
`45`	`50`	`);`
`46`	`51`	`}`
`47`	`52`
	`53`	`+ /**`
	`54`	`+ * @throws \Magento\Framework\Exception\FileSystemException`
	`55`	`+ * @return void`
	`56`	`+ */`
`48`	`57`	`public static function tearDownAfterClass()`
`49`	`58`	`{`
`50`	`59`	`$objectManager = \Magento\TestFramework\Helper\Bootstrap::getObjectManager();`
`@@ -66,6 +75,9 @@ public static function tearDownAfterClass()`
`66`	`75`	`}`
`67`	`76`	`}`
`68`	`77`
	`78`	`+ /**`
	`79`	`+ * @return void`
	`80`	`+ */`
`69`	`81`	`public function testCanAffectOptions()`
`70`	`82`	`{`
`71`	`83`	`$this->assertFalse($this->_model->canAffectOptions());`
`@@ -105,6 +117,9 @@ public function testCRUD()`
`105`	`117`	`$crud->testCrud();`
`106`	`118`	`}`
`107`	`119`
	`120`	`+ /**`
	`121`	`+ * @return void`
	`122`	`+ */`
`108`	`123`	`public function testCleanCache()`
`109`	`124`	`{`
`110`	`125`	`\Magento\TestFramework\Helper\Bootstrap::getObjectManager()->get(`
`@@ -125,6 +140,9 @@ public function testCleanCache()`
`125`	`140`	`);`
`126`	`141`	`}`
`127`	`142`
	`143`	`+ /**`
	`144`	`+ * @return void`
	`145`	`+ */`
`128`	`146`	`public function testAddImageToMediaGallery()`
`129`	`147`	`{`
`130`	`148`	`// Model accepts only files in tmp media path, we need to copy fixture file there`
`@@ -332,13 +350,19 @@ public function testIsVirtual()`
`332`	`350`	`$this->assertTrue($model->getIsVirtual());`
`333`	`351`	`}`
`334`	`352`
	`353`	`+ /**`
	`354`	`+ * @return void`
	`355`	`+ */`
`335`	`356`	`public function testToArray()`
`336`	`357`	`{`
`337`	`358`	`$this->assertEquals([], $this->_model->toArray());`
`338`	`359`	`$this->_model->setSku('sku')->setName('name');`
`339`	`360`	`$this->assertEquals(['sku' => 'sku', 'name' => 'name'], $this->_model->toArray());`
`340`	`361`	`}`
`341`	`362`
	`363`	`+ /**`
	`364`	`+ * @return void`
	`365`	`+ */`
`342`	`366`	`public function testFromArray()`
`343`	`367`	`{`
`344`	`368`	`$this->_model->fromArray(['sku' => 'sku', 'name' => 'name', 'stock_item' => ['key' => 'value']]);`
`@@ -410,6 +434,9 @@ public function testIsProductsHasSku()`
`410`	`434`	`);`
`411`	`435`	`}`
`412`	`436`
	`437`	`+ /**`
	`438`	`+ * @return void`
	`439`	`+ */`
`413`	`440`	`public function testProcessBuyRequest()`
`414`	`441`	`{`
`415`	`442`	`$request = new \Magento\Framework\DataObject();`
`@@ -418,6 +445,9 @@ public function testProcessBuyRequest()`
`418`	`445`	`$this->assertArrayHasKey('errors', $result->getData());`
`419`	`446`	`}`
`420`	`447`
	`448`	`+ /**`
	`449`	`+ * @return void`
	`450`	`+ */`
`421`	`451`	`public function testValidate()`
`422`	`452`	`{`
`423`	`453`	`$this->_model->setTypeId(`