AC-15051:[CE] PHPUnit 12: Upgrade Product Types related test cases

Author: sandesh-as

app/code/Magento/Bundle/Test/Unit/Helper/Catalog/Product/ConfigurationTest.php

@@ -21,7 +21,7 @@
 use Magento\Framework\Pricing\Helper\Data;
 use Magento\Framework\Serialize\Serializer\Json;
 use Magento\Framework\TestFramework\Unit\Helper\ObjectManager;
-use Magento\Catalog\Test\Unit\Helper\ItemTestHelper;
+use Magento\Wishlist\Test\Unit\Helper\ItemTestHelper;
 use Magento\Catalog\Test\Unit\Helper\ProductTestHelper;
 use Magento\Catalog\Test\Unit\Helper\OptionTestHelper;
 use PHPUnit\Framework\MockObject\MockObject;

app/code/Magento/Bundle/Test/Unit/Model/Product/CopyConstructor/BundleTest.php

@@ -65,20 +65,39 @@ public function testBuildPositive()
         $product->expects($this->once())
             ->method('getExtensionAttributes')
             ->willReturn($extensionAttributesProduct);
-
-        // Use parent Link class - all setters work via setData()
-        $productLink = $this->createPartialMock(Link::class, []);
-        // Create options using partial mock - setProductLinks works via magic methods
-        $firstOption = $this->createPartialMock(Option::class, []);
-        $firstOption->setProductLinks([$productLink]);
-        // setOptionId will be called by the code under test
-        $secondOption = $this->createPartialMock(Option::class, []);
-        $secondOption->setProductLinks([$productLink]);
-        // setOptionId will be called by the code under test
-        $bundleOptions = [
-            $firstOption,
-            $secondOption
+        $bundleOptionsData = [
+            [
+                'option_id' => 1,
+                'title' => 'Option 1',
+                'product_links' => [
+                    [
+                        'option_id' => 1,
+                        'id' => 1,
+                        'selection_id' => 1,
+                        'sku' => 'sku-1'
+                    ],
+                ]
+            ],
+            [
+                'option_id' => 2,
+                'title' => 'Option 2',
+                'product_links' => [
+                    [
+                        'option_id' => 2,
+                        'id' => 2,
+                        'selection_id' => 2,
+                        'sku' => 'sku-2'
+                    ]
+                ]
+            ]
         ];
+        $bundleOptions = array_map(
+            fn ($optionData) => $this->createOptionMock(
+                [...$optionData, 'product_links' => array_map($this->createLinkMock(...), $optionData['product_links'])]
+            ),
+            $bundleOptionsData
+        );
+
         // Configure test helper with setter method
         $extensionAttributesProduct->setBundleProductOptions($bundleOptions);
 
@@ -90,8 +109,65 @@ public function testBuildPositive()
             ->method('getExtensionAttributes')
             ->willReturn($extensionAttributesDuplicate);
         // Test helper doesn't need mock expectations - setBundleProductOptions will be called by code under test
-
         $this->model->build($product, $duplicate);
+
+        // Capture the cloned options after the build method runs
+        $bundleOptionsClone = $extensionAttributesDuplicate->getBundleProductOptions();
+        $this->assertNotEmpty($bundleOptionsClone, 'Bundle options should be set on duplicate product');
+
+        foreach ($bundleOptionsData as $key => $optionData) {
+            $bundleOption = $bundleOptions[$key];
+            $bundleOptionClone = $bundleOptionsClone[$key];
+
+            $this->assertEquals($optionData['option_id'], $bundleOption->getOptionId());
+            $this->assertEquals($optionData['title'], $bundleOption->getTitle());
+
+            $this->assertNotEquals($bundleOption, $bundleOptionClone);
+
+            $this->assertNull($bundleOptionClone->getOptionId());
+            $this->assertEquals($optionData['title'], $bundleOptionClone->getTitle());
+
+            foreach ($optionData['product_links'] as $productLinkKey => $productLinkData) {
+                $productLink = $bundleOption->getProductLinks()[$productLinkKey];
+                $productLinkClone = $bundleOptionClone->getProductLinks()[$productLinkKey];
+
+                $this->assertEquals($productLinkData['option_id'], $productLink->getOptionId());
+                $this->assertEquals($productLinkData['id'], $productLink->getId());
+                $this->assertEquals($productLinkData['selection_id'], $productLink->getSelectionId());
+                $this->assertEquals($productLinkData['sku'], $productLink->getSku());
+
+                $this->assertNotEquals($productLink, $productLinkClone);
+
+                $this->assertNull($productLinkClone->getId());
+                $this->assertNull($productLinkClone->getOptionId());
+                $this->assertNull($productLinkClone->getSelectionId());
+                $this->assertEquals($productLinkData['sku'], $productLinkClone->getSku());
+            }
+        }
+    }
+
+    /**
+     * @param array $data
+     * @return Option
+     * @throws \PHPUnit\Framework\MockObject\Exception
+     */
+    private function createOptionMock(array $data): Option
+    {
+        $option = $this->createPartialMock(Option::class, []);
+        $option->addData($data);
+        return $option;
+    }
+
+    /**
+     * @param array $data
+     * @return Link
+     * @throws \PHPUnit\Framework\MockObject\Exception
+     */
+    private function createLinkMock(array $data): Link
+    {
+        $productLink = $this->createPartialMock(Link::class, []);
+        $productLink->addData($data);
+        return $productLink;
     }
 
     /**

app/code/Magento/BundleImportExport/Test/Unit/Helper/TypeInstanceTestHelper.php

@@ -15,7 +15,6 @@
 use Magento\Framework\App\ScopeInterface;
 use Magento\Framework\App\ScopeResolverInterface;
 use Magento\Framework\TestFramework\Unit\Helper\ObjectManager as ObjectManagerHelper;
-use Magento\BundleImportExport\Test\Unit\Helper\TypeInstanceTestHelper;
 use PHPUnit\Framework\MockObject\MockObject;
 use PHPUnit\Framework\TestCase;
 
@@ -130,7 +129,15 @@ protected function setUp(): void
         $this->selectionsCollection->method('getItems')->willReturn([$this->selection]);
         $this->option->setData('selections', [$this->selection]);
         $this->product->setSelectionsCollection($this->selectionsCollection);
-        $typeInstance = new TypeInstanceTestHelper($this->optionsCollection, $this->selectionsCollection, [1]);
+        // Use createPartialMock instead of TypeInstanceTestHelper
+        $typeInstance = $this->createPartialMock(
+            \Magento\Bundle\Model\Product\Type::class,
+            ['getOptionsCollection', 'getSelectionsCollection', 'getOptionsIds', 'setStoreFilter']
+        );
+        $typeInstance->method('getOptionsCollection')->willReturn($this->optionsCollection);
+        $typeInstance->method('getSelectionsCollection')->willReturn($this->selectionsCollection);
+        $typeInstance->method('getOptionsIds')->willReturn([1]);
+        $typeInstance->method('setStoreFilter')->willReturnSelf();
         $this->product->setTypeInstance($typeInstance);
         $this->product->setSku(1);
         $this->productResourceCollection->method('addAttributeToFilter')->willReturnSelf();

app/code/Magento/BundleImportExport/Test/Unit/Model/Export/Product/RowCustomizerTest.php

@@ -93,7 +93,7 @@ public function testAroundGetOptionsGroupedProductWithAssociated()
             \Magento\GroupedProduct\Model\Product\Type\Grouped::TYPE_CODE
         );
 
-        $quantityItemMock = new \Magento\Catalog\Test\Unit\Helper\ItemTestHelper();
+        $quantityItemMock = new \Magento\Wishlist\Test\Unit\Helper\ItemTestHelper();
         $quantityItemMock->setValue(1);
 
         $this->itemMock->expects(