Merge remote-tracking branch 'origin/2.4-develop' into Arrows-AC-15800-Test_Helpers

Author: manishranjan-adobe

app/code/Magento/Authorization/Test/Unit/Helper/RoleTestHelper.php

@@ -0,0 +1,112 @@
+<?php
+/**
+ * Copyright 2025 Adobe
+ * All Rights Reserved.
+ */
+declare(strict_types=1);
+
+namespace Magento\Authorization\Test\Unit\Helper;
+
+use Magento\Authorization\Model\Role;
+
+/**
+ * Test helper for Magento\Authorization\Model\Role
+ *
+ * This helper provides only the custom GWS-related methods that are not available
+ * in the parent Role class. Standard methods like getData(), setData(), and load()
+ * are inherited from Magento\Framework\Model\AbstractModel.
+ */
+class RoleTestHelper extends Role
+{
+    /**
+     * @var array
+     */
+    private $gwsWebsites = [];
+
+    /**
+     * @var array
+     */
+    private $gwsStoreGroups = [];
+
+    /**
+     * @var bool
+     */
+    private $gwsDataIsset = false;
+
+    /**
+     * Skip parent constructor to avoid dependency injection requirements in tests
+     */
+    public function __construct()
+    {
+        // Intentionally empty - avoids parent constructor dependencies
+    }
+
+    /**
+     * Get GWS websites
+     *
+     * @return array
+     */
+    public function getGwsWebsites()
+    {
+        return $this->gwsWebsites;
+    }
+
+    /**
+     * Set GWS websites
+     *
+     * @param array $websites
+     * @return $this
+     */
+    public function setGwsWebsites($websites)
+    {
+        $this->gwsWebsites = $websites;
+        return $this;
+    }
+
+    /**
+     * Get GWS store groups
+     *
+     * @return array
+     */
+    public function getGwsStoreGroups()
+    {
+        return $this->gwsStoreGroups;
+    }
+
+    /**
+     * Set GWS store groups
+     *
+     * @param array $storeGroups
+     * @return $this
+     */
+    public function setGwsStoreGroups($storeGroups)
+    {
+        $this->gwsStoreGroups = $storeGroups;
+        return $this;
+    }
+
+    /**
+     * Set GWS data isset flag
+     *
+     * @param bool $value
+     * @return $this
+     */
+    public function setGwsDataIsset($value)
+    {
+        $this->gwsDataIsset = $value;
+        return $this;
+    }
+
+    /**
+     * Load role (overridden to avoid database access in tests)
+     *
+     * @param mixed $modelId
+     * @param string|null $field
+     * @return $this
+     * @SuppressWarnings(PHPMD.UnusedFormalParameter)
+     */
+    public function load($modelId, $field = null)
+    {
+        return $this;
+    }
+}

app/code/Magento/Backend/Test/Unit/Helper/ActionStubTestHelper.php

@@ -0,0 +1,43 @@
+<?php
+/**
+ * Copyright 2025 Adobe
+ * All Rights Reserved.
+ */
+declare(strict_types=1);
+
+namespace Magento\Backend\Test\Unit\Helper;
+
+use Magento\Backend\Test\Unit\App\Action\Stub\ActionStub;
+
+/**
+ * Test helper for ActionStub with additional test-specific methods
+ *
+ * This helper extends ActionStub to provide the setDirtyRulesNoticeMessage()
+ * method which is used in production by CatalogRule controllers but doesn't
+ * exist in the base ActionStub class. Since PHPUnit 12 removed addMethods(),
+ * this helper is necessary to test code that calls this method.
+ *
+ * @SuppressWarnings(PHPMD.AllPurposeAction)
+ */
+class ActionStubTestHelper extends ActionStub
+{
+    public function __construct()
+    {
+        // Skip parent constructor for testing
+    }
+    
+    /**
+     * Stub method for testing CatalogRule controllers
+     *
+     * This method is called by AdminGws\Model\Controllers::promoCatalogIndexAction()
+     * but doesn't exist in the base ActionStub class.
+     *
+     * @param string $message
+     * @return $this
+     * @SuppressWarnings(PHPMD.UnusedFormalParameter)
+     */
+    public function setDirtyRulesNoticeMessage($message)
+    {
+        return $this;
+    }
+}

app/code/Magento/Backend/Test/Unit/Helper/SessionQuoteTestHelper.php

@@ -0,0 +1,37 @@
+<?php
+/**
+ * Copyright 2016 Adobe
+ * All Rights Reserved.
+ */
+declare(strict_types=1);
+
+namespace Magento\Backend\Test\Unit\Helper;
+
+use Magento\Backend\Model\Session\Quote;
+
+/**
+ * Test helper for Session\Quote
+ *
+ * This helper extends the concrete Session\Quote class to provide
+ * test-specific functionality without dependency injection issues.
+ */
+class SessionQuoteTestHelper extends Quote
+{
+    /**
+     * Constructor that skips parent initialization
+     */
+    public function __construct()
+    {
+        // Skip parent constructor to avoid dependency injection issues
+    }
+
+    /**
+     * Get store ID
+     *
+     * @return int
+     */
+    public function getStoreId()
+    {
+        return 1;
+    }
+}

app/code/Magento/Backend/Test/Unit/Helper/SessionTestHelper.php

@@ -8,35 +8,97 @@
 namespace Magento\Backend\Test\Unit\Helper;
 
 use Magento\Backend\Model\Auth\Session;
+use Magento\Framework\Session\Test\Unit\Helper\StorageTestHelper;
+use Magento\User\Model\User;
 
+/**
+ * Test helper for creating Auth Session mocks with various methods
+ *
+ * This helper extends the concrete Auth\Session class directly, providing a clean
+ * way to add test-specific methods without using anonymous classes.
+ * Extends Auth\Session to be compatible with type hints requiring that specific class.
+ *
+ * METHODS PROVIDED:
+ * - setUser() / getUser() - User management
+ * - setIsLoggedIn() / isLoggedIn() - Login state management
+ * - setSkipLoggingAction() - Logging control
+ */
 class SessionTestHelper extends Session
 {
     /**
-     * @var mixed
+     * @var User|null
      */
-    private $user;
-
+    private $user = null;
+    
+    /**
+     * @var bool
+     */
+    private $isLoggedIn = false;
+    
     public function __construct()
     {
-        // Skip parent constructor to avoid dependencies
+        // Skip parent constructor for testing
+        // Initialize storage with the StorageTestHelper
+        $this->storage = new StorageTestHelper();
     }
-
+    
     /**
-     * @return mixed
+     * Get user
+     *
+     * @return User|null
      */
     public function getUser()
     {
         return $this->user;
     }
-
+    
     /**
-     * @param mixed $user
+     * Set user
+     *
+     * @param User $user
      * @return $this
      */
     public function setUser($user)
     {
         $this->user = $user;
+        $this->isLoggedIn = true;
+        return $this;
+    }
+    
+    /**
+     * Set skip logging action
+     *
+     * @param mixed $value
+     * @return $this
+     */
+    public function setSkipLoggingAction($value)
+    {
+        // Store in parent's storage using magic method (via StorageTestHelper::__call)
+        // phpcs:ignore Magento2.Functions.StaticFunction
+        /** @phpstan-ignore-next-line - StorageTestHelper::__call handles dynamic methods */
+        $this->storage->setSkipLoggingAction($value);
+        return $this;
+    }
+    
+    /**
+     * Check if user is logged in
+     *
+     * @return bool
+     */
+    public function isLoggedIn()
+    {
+        return $this->isLoggedIn;
+    }
+    
+    /**
+     * Set is logged in
+     *
+     * @param bool $value
+     * @return $this
+     */
+    public function setIsLoggedIn($value)
+    {
+        $this->isLoggedIn = $value;
         return $this;
     }
 }
-

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

@@ -51,6 +51,10 @@ class ProductTestHelper extends Product
     private $setOptionsCalled = false;
     /** @var array */
     private $setOptionsParams = [];
+    /**
+     * @var float
+     */
+    private $cost;
 
     /**
      * @var bool
@@ -240,17 +244,24 @@ protected function _construct()
     /**
      * Constructor
      *
-     * @param mixed $resource Optional resource parameter or DataObject for URL
+     * @param float $cost
+     * @param ?DataObject $urlDataObject
+     * @param mixed $resource
      */
-    public function __construct($resource = null)
-    {
+    public function __construct(
+        $cost = 0.0,
+        ?DataObject $urlDataObject = null,
+        $resource = null
+    ) {
         if ($resource instanceof DataObject) {
             $this->urlDataObject = $resource;
             $this->resource = null;
         } else {
             $this->resource = $resource;
             $this->urlDataObject = null;
         }
+        
+        $this->cost = $cost;
         $this->_data = [];
         $this->testData = [];
     }
@@ -2501,4 +2512,40 @@ public function hasUrlDataObject()
     {
         return (bool)$this->urlDataObject;
     }
+
+    /**
+     * Set is object new
+     *
+     * Convenience wrapper for parent's isObjectNew($flag) method.
+     *
+     * @param bool $flag
+     * @return $this
+     */
+    public function setIsObjectNew($flag)
+    {
+        parent::isObjectNew($flag);
+        return $this;
+    }
+
+    /**
+     * Check if product has options
+     *
+     * This method is mocked by tests to control option behavior.
+     *
+     * @return bool
+     */
+    public function hasOptions(): bool
+    {
+        return isset($this->_data['has_options']) && $this->_data['has_options'];
+    }
+
+    /**
+     * Get cost
+     *
+     * @return float
+     */
+    public function getCost()
+    {
+        return $this->getData('cost') ?? $this->cost;
+    }
 }