AC-15104::[CE] PHPUnit 12: Upgrade Checkout & Cart Management related test cases

Author: sandesh-as

app/code/Magento/Catalog/Test/Unit/Helper/ProductTestHelper.php

@@ -23,9 +23,6 @@ class ProductTestHelper extends Product
      */
     private $data = [];
 
-    /** @var int */
-    private $id;
-
     /** @var DataObject|null */
     private $urlDataObject;
 
@@ -56,10 +53,8 @@ class ProductTestHelper extends Product
      * Skip parent constructor to avoid dependencies
      */
     public function __construct(
-        $id = 0,
         ?DataObject $urlDataObject = null
     ) {
-        $this->id = (int)$id;
         $this->urlDataObject = $urlDataObject;
         $this->_data = [];
     }
@@ -135,7 +130,7 @@ protected function getCustomAttributesCodes()
      */
     public function getId()
     {
-        return $this->id ?? null;
+        return $this->data['id'] ?? null;
     }
 
     /**

app/code/Magento/Checkout/Test/Unit/CustomerData/CartTest.php

@@ -130,7 +130,8 @@ public function testGetSectionData()
         $storeMock = new StoreWebsiteIdTestHelper($websiteId);
         $quoteMock->setFixtureStore($storeMock);
 
-        $productMock = new ProductTestHelper($productId);
+        $productMock = new ProductTestHelper();
+        $productMock->setId($productId);
         $quoteItemMock->setProduct($productMock);
 
         $this->catalogUrlMock->expects($this->once())
@@ -206,7 +207,8 @@ public function testGetSectionDataWithCompositeProduct()
 
         $quoteMock->setFixtureItems([$quoteItemMock]);
 
-        $productMock = new ProductTestHelper($productId);
+        $productMock = new ProductTestHelper();
+        $productMock->setId($productId);
 
         $optionsMock = $this->createMock(Option::class);
         $optionsMock->expects($this->once())->method('getProduct')->willReturn($productMock);