clean filler tests and add test case for condition check

PrestaShop · Oct 25, 2022 · 07e2bd8 · 07e2bd8
1 parent 5e0e8f2
commit 07e2bd8
Show file tree

Hide file tree

Showing 4 changed files with 70 additions and 13 deletions.
diff --git a/tests/Unit/Adapter/Product/Update/Filler/BasicInformationFillerTest.php b/tests/Unit/Adapter/Product/Update/Filler/BasicInformationFillerTest.php
@@ -30,13 +30,34 @@
 use PrestaShop\PrestaShop\Adapter\Product\Update\Filler\BasicInformationFiller;
 use PrestaShop\PrestaShop\Adapter\Product\Update\Filler\ProductFillerInterface;
 use PrestaShop\PrestaShop\Adapter\Tools;
+use PrestaShop\PrestaShop\Core\Domain\Product\Command\UpdateProductCommand;
+use Product;
 
 class BasicInformationFillerTest extends ProductFillerTestCase
 {
+    /**
+     * @dataProvider getDataForTestFillsUpdatableProperties
+     *
+     * @param UpdateProductCommand $command
+     * @param array $expectedUpdatableProperties
+     * @param Product $expectedProduct
+     */
+    public function testFillsUpdatableProperties(
+        UpdateProductCommand $command,
+        array $expectedUpdatableProperties,
+        Product $expectedProduct
+    ): void {
+        $this->fillUpdatableProperties(
+            $command,
+            $expectedUpdatableProperties,
+            $expectedProduct
+        );
+    }
+
     /**
      * @return ProductFillerInterface
      */
-    public function getFiller(): ProductFillerInterface
+    protected function getFiller(): ProductFillerInterface
     {
         return new BasicInformationFiller(
             self::DEFAULT_LANG_ID,

diff --git a/tests/Unit/Adapter/Product/Update/Filler/OptionsFillerTest.php b/tests/Unit/Adapter/Product/Update/Filler/OptionsFillerTest.php
@@ -36,6 +36,25 @@
 
 class OptionsFillerTest extends ProductFillerTestCase
 {
+    /**
+     * @dataProvider getDataForTestFillsUpdatableProperties
+     *
+     * @param UpdateProductCommand $command
+     * @param array $expectedUpdatableProperties
+     * @param Product $expectedProduct
+     */
+    public function testFillsUpdatableProperties(
+        UpdateProductCommand $command,
+        array $expectedUpdatableProperties,
+        Product $expectedProduct
+    ): void {
+        $this->fillUpdatableProperties(
+            $command,
+            $expectedUpdatableProperties,
+            $expectedProduct
+        );
+    }
+
     /**
      * @dataProvider getDataForTestShowPriceAndAvailableForOrderProperties
      *
@@ -59,6 +78,9 @@ public function testFillsShowPriceAndAvailableForOrderProperties(
     }
 
     /**
+     * This provider Provides the initial product and the expected one,
+     * because there are some cases that depends on previous and new values
+     *
      * @return iterable
      */
     public function getDataForTestShowPriceAndAvailableForOrderProperties(): iterable
@@ -73,6 +95,10 @@ public function getDataForTestShowPriceAndAvailableForOrderProperties(): iterabl
         ;
 
         $expectedProduct = $this->mockDefaultProduct();
+        // default product properties already has these values,
+        // but we still set them just to be more explicit about the expected change
+        $expectedProduct->show_price = true;
+        $expectedProduct->available_for_order = true;
 
         yield [
             $product,
@@ -85,6 +111,7 @@ public function getDataForTestShowPriceAndAvailableForOrderProperties(): iterabl
         ];
 
         $product = $this->mockDefaultProduct();
+        $product->available_for_order = true;
         $product->show_price = false;
 
         $command = $this
@@ -130,6 +157,9 @@ public function getDataForTestShowPriceAndAvailableForOrderProperties(): iterabl
         ];
     }
 
+    /**
+     * @return iterable
+     */
     public function getDataForTestFillsUpdatableProperties(): iterable
     {
         $command = $this->getEmptyCommand();

diff --git a/tests/Unit/Adapter/Product/Update/Filler/ProductFillerTestCase.php b/tests/Unit/Adapter/Product/Update/Filler/ProductFillerTestCase.php
@@ -43,36 +43,30 @@ abstract class ProductFillerTestCase extends TestCase
     protected const PRODUCT_ID = 3;
 
     /**
-     * @dataProvider getDataForTestFillsUpdatableProperties
-     *
      * @param UpdateProductCommand $command
-     * @param array<int|string, string|int[]> $expectedUpdatableProperties
+     * @param array $expectedUpdatableProperties
      * @param Product $expectedProduct
      */
-    public function testFillsUpdatableProperties(
+    protected function fillUpdatableProperties(
         UpdateProductCommand $command,
         array $expectedUpdatableProperties,
         Product $expectedProduct
-    ): void {
+    ) {
         $product = $this->mockDefaultProduct();
 
         $this->assertSame(
             $expectedUpdatableProperties,
             $this->getFiller()->fillUpdatableProperties($product, $command)
         );
 
+        // make sure the product properties were filled as expected.
         $this->assertEquals($expectedProduct, $product);
     }
 
-    /**
-     * @return iterable
-     */
-    abstract public function getDataForTestFillsUpdatableProperties(): iterable;
-
     /**
      * @return ProductFillerInterface
      */
-    abstract public function getFiller(): ProductFillerInterface;
+    abstract protected function getFiller(): ProductFillerInterface;
 
     /**
      * This method mocks product into its default state.

diff --git a/.../Core/Form/IdentifiableObject/CommandBuilder/Product/UpdateProductCommandsBuilderTest.php b/.../Core/Form/IdentifiableObject/CommandBuilder/Product/UpdateProductCommandsBuilderTest.php
@@ -49,8 +49,20 @@ public function testBuildCommand(array $formData, array $expectedCommands)
         $this->assertEquals($expectedCommands, $builtCommands);
     }
 
-    public function getExpectedCommands()
+    /**
+     * @return iterable
+     */
+    public function getExpectedCommands(): iterable
     {
+        yield [
+            [
+                'specifications' => [
+                    'condition' => null,
+                ],
+            ],
+            [],
+        ];
+
         yield [
             [
                 'no_data' => ['useless value'],