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

Author: sandesh-as

app/code/Magento/Bundle/Test/Unit/Observer/InitOptionRendererObserverTest.php

@@ -8,7 +8,7 @@
 namespace Magento\Bundle\Test\Unit\Observer;
 
 use Magento\Bundle\Observer\InitOptionRendererObserver;
-use Magento\Framework\Event\Test\Unit\Helper\ObserverTestHelper;
+use Magento\Framework\Event\Observer;
 use Magento\Framework\TestFramework\Unit\Helper\ObjectManager;
 use Magento\Wishlist\Block\Customer\Wishlist\Item\Options;
 use PHPUnit\Framework\MockObject\MockObject;
@@ -39,7 +39,7 @@ class InitOptionRendererObserverTest extends TestCase
     private $observer;
 
     /**
-     * @var ObserverTestHelper
+     * @var Observer
      */
     private $observerMock;
 
@@ -50,7 +50,7 @@ protected function setUp(): void
     {
         $this->objectManager = new ObjectManager($this);
 
-        $this->observerMock = new ObserverTestHelper();
+        $this->observerMock = new Observer();
 
         $this->blockMock = $this->createPartialMock(Options::class, ['addOptionsRenderCfg']);
 

app/code/Magento/ConfigurableProduct/Test/Unit/Observer/HideUnsupportedAttributeTypesTest.php

@@ -13,7 +13,6 @@
 use Magento\Framework\Data\Form;
 use Magento\Framework\Data\Form\Element\Select;
 use Magento\Framework\Event\Observer as EventObserver;
-use Magento\Framework\Event\Test\Unit\Helper\ObserverTestHelper;
 use Magento\Framework\TestFramework\Unit\Helper\ObjectManager;
 use Magento\Framework\Data\Form\Element\Test\Unit\Helper\SelectTestHelper;
 use PHPUnit\Framework\MockObject\MockObject;
@@ -94,7 +93,7 @@ function ($name) use ($popup, $productTab) {
      */
     private function createEventMock(?MockObject $form = null)
     {
-        $event = new ObserverTestHelper();
+        $event = new EventObserver();
         $event->setForm($form);
         return $event;
     }

app/code/Magento/Quote/Test/Unit/Helper/ProductOptionTestHelper.php

@@ -75,3 +75,4 @@ public function setExtensionAttributes($extensionAttributes)
         return $this;
     }
 }
+

lib/internal/Magento/Framework/Event/Test/Unit/Helper/EventTestHelper.php

@@ -15,44 +15,9 @@
 class EventTestHelper extends Event
 {
     /**
-     * @var mixed
+     * @var array
      */
-    private $product;
-
-    /**
-     * @var mixed
-     */
-    private $collection;
-
-    /**
-     * @var mixed
-     */
-    private $limit;
-
-    /**
-     * @var mixed
-     */
-    private $items;
-
-    /**
-     * @var mixed
-     */
-    private $store;
-    
-    /**
-     * @var mixed
-     */
-    private $result;
-    
-    /**
-     * @var mixed
-     */
-    private $quote;
-    
-    /**
-     * @var mixed
-     */
-    private $order;
+    private $data = [];
 
     public function __construct()
     {
@@ -66,7 +31,7 @@ public function __construct()
      */
     public function getProduct()
     {
-        return $this->product;
+        return $this->data['product'] ?? null;
     }
 
     /**
@@ -77,7 +42,7 @@ public function getProduct()
      */
     public function setProduct($product): self
     {
-        $this->product = $product;
+        $this->data['product'] = $product;
         return $this;
     }
 
@@ -88,7 +53,7 @@ public function setProduct($product): self
      */
     public function getCollection()
     {
-        return $this->collection;
+        return $this->data['collection'] ?? null;
     }
 
     /**
@@ -99,7 +64,7 @@ public function getCollection()
      */
     public function setCollection($collection): self
     {
-        $this->collection = $collection;
+        $this->data['collection'] = $collection;
         return $this;
     }
 
@@ -110,7 +75,7 @@ public function setCollection($collection): self
      */
     public function getLimit()
     {
-        return $this->limit;
+        return $this->data['limit'] ?? null;
     }
 
     /**
@@ -121,7 +86,7 @@ public function getLimit()
      */
     public function setLimit($limit): self
     {
-        $this->limit = $limit;
+        $this->data['limit'] = $limit;
         return $this;
     }
 
@@ -132,7 +97,7 @@ public function setLimit($limit): self
      */
     public function getItems()
     {
-        return $this->items;
+        return $this->data['items'] ?? null;
     }
 
     /**
@@ -143,7 +108,7 @@ public function getItems()
      */
     public function setItems($items): self
     {
-        $this->items = $items;
+        $this->data['items'] = $items;
         return $this;
     }
 
@@ -154,7 +119,7 @@ public function setItems($items): self
      */
     public function getStore()
     {
-        return $this->store;
+        return $this->data['store'] ?? null;
     }
 
     /**
@@ -164,16 +129,17 @@ public function getStore()
      */
     public function getResult()
     {
-        return $this->result;
+        return $this->data['result'] ?? null;
     }
+
     /**
      * Get quote (custom method for testing)
      *
      * @return mixed
      */
     public function getQuote()
     {
-        return $this->quote;
+        return $this->data['quote'] ?? null;
     }
 
     /**
@@ -183,6 +149,6 @@ public function getQuote()
      */
     public function getOrder()
     {
-        return $this->order;
+        return $this->data['order'] ?? null;
     }
 }