Merge remote-tracking branch 'origin/AC-16072-SalesRule-Order' into Arrows-AC-14808-v4

Author: manishranjan-adobe

app/code/Magento/InstantPurchase/Test/Unit/Block/ButtonTest.php

@@ -13,6 +13,7 @@
 use Magento\InstantPurchase\Model\Config;
 use Magento\Store\Api\Data\StoreInterface;
 use Magento\Store\Model\StoreManagerInterface;
+use PHPUnit\Framework\Attributes\DataProvider;
 use PHPUnit\Framework\MockObject\MockObject;
 use PHPUnit\Framework\TestCase;
 
@@ -54,8 +55,8 @@ class ButtonTest extends TestCase
     protected function setUp(): void
     {
         $this->context = $this->createMock(Context::class);
-        $this->storeManager = $this->getMockForAbstractClass(StoreManagerInterface::class);
-        $this->store = $this->getMockForAbstractClass(StoreInterface::class);
+        $this->storeManager = $this->createMock(StoreManagerInterface::class);
+        $this->store = $this->createMock(StoreInterface::class);
 
         $this->storeManager->expects($this->any())->method('getStore')
             ->willReturn($this->store);
@@ -82,8 +83,8 @@ protected function setUp(): void
      * @param $currentStoreId
      * @param $isModuleEnabled
      * @param $expected
-     * @dataProvider isEnabledDataProvider
      */
+    #[DataProvider('isEnabledDataProvider')]
     public function testIsEnabled($currentStoreId, $isModuleEnabled, $expected)
     {
         $this->store->expects($this->any())->method('getId')

app/code/Magento/InstantPurchase/Test/Unit/CustomerData/InstantPurchaseTest.php

@@ -19,6 +19,7 @@
 use Magento\InstantPurchase\Model\Ui\ShippingMethodFormatter;
 use Magento\Store\Model\Store;
 use Magento\Store\Model\StoreManagerInterface;
+use PHPUnit\Framework\Attributes\DataProvider;
 use PHPUnit\Framework\MockObject\MockObject;
 use PHPUnit\Framework\TestCase;
 
@@ -90,7 +91,7 @@ class InstantPurchaseTest extends TestCase
     protected function setUp(): void
     {
         $this->customerSession = $this->createMock(Session::class);
-        $this->storeManager = $this->getMockForAbstractClass(StoreManagerInterface::class);
+        $this->storeManager = $this->createMock(StoreManagerInterface::class);
         $this->instantPurchase = $this->createMock(InstantPurchaseModel::class);
         $this->paymentTokenFormatter = $this->createMock(PaymentTokenFormatter::class);
         $this->customerAddressesFormatter = $this->createMock(CustomerAddressesFormatter::class);
@@ -119,8 +120,8 @@ protected function setUp(): void
      * @param $isLogin
      * @param $isAvailable
      * @param $expected
-     * @dataProvider getSectionDataProvider
      */
+    #[DataProvider('getSectionDataProvider')]
     public function testGetSectionData($isLogin, $isAvailable, $expected)
     {
         $this->customerSession->expects($this->any())->method('isLoggedIn')->willReturn($isLogin);

app/code/Magento/InstantPurchase/Test/Unit/Model/Ui/CustomerAddressesFormatterTest.php

@@ -9,13 +9,16 @@
 
 use Magento\Customer\Model\Address;
 use Magento\Directory\Model\Country;
+use Magento\Framework\TestFramework\Unit\Helper\MockCreationTrait;
 use Magento\Framework\TestFramework\Unit\Helper\ObjectManager as ObjectManagerHelper;
 use Magento\InstantPurchase\Model\Ui\CustomerAddressesFormatter;
 use PHPUnit\Framework\MockObject\MockObject;
 use PHPUnit\Framework\TestCase;
 
 class CustomerAddressesFormatterTest extends TestCase
 {
+    use MockCreationTrait;
+
     /**
      * @var CustomerAddressesFormatter|MockObject
      */
@@ -35,11 +38,10 @@ protected function setUp(): void
      */
     public function testFormat()
     {
-        $addressMock = $this->getMockBuilder(Address::class)
-            ->addMethods(['getCity', 'getPostcode'])
-            ->onlyMethods(['getName', 'getStreetFull', 'getRegion', 'getCountryModel'])
-            ->disableOriginalConstructor()
-            ->getMock();
+        $addressMock = $this->createPartialMockWithReflection(
+            Address::class,
+            ['getCity', 'getPostcode', 'getName', 'getStreetFull', 'getRegion', 'getCountryModel']
+        );
         $countryMock = $this->createMock(Country::class);
 
         $countryMock->expects($this->any())->method('getName')->willReturn('USA');

app/code/Magento/Multishipping/Test/Unit/Block/Checkout/Address/SelectTest.php

@@ -19,6 +19,7 @@
 use Magento\Framework\TestFramework\Unit\Helper\ObjectManager;
 use Magento\Multishipping\Block\Checkout\Address\Select;
 use Magento\Multishipping\Model\Checkout\Type\Multishipping;
+use PHPUnit\Framework\Attributes\DataProvider;
 use PHPUnit\Framework\MockObject\MockObject;
 use PHPUnit\Framework\TestCase;
 
@@ -82,12 +83,12 @@ protected function setUp(): void
         $this->objectManager = new ObjectManager($this);
         $this->multishippingMock =
             $this->createMock(Multishipping::class);
-        $this->addressMock = $this->getMockForAbstractClass(AddressInterface::class);
-        $this->customerMock = $this->getMockForAbstractClass(CustomerInterface::class);
+        $this->addressMock = $this->createMock(AddressInterface::class);
+        $this->customerMock = $this->createMock(CustomerInterface::class);
         $this->filterBuilderMock = $this->createMock(FilterBuilder::class);
         $this->searchCriteriaBuilderMock =
             $this->createMock(SearchCriteriaBuilder::class);
-        $this->addressRepositoryMock = $this->getMockForAbstractClass(AddressRepositoryInterface::class);
+        $this->addressRepositoryMock = $this->createMock(AddressRepositoryInterface::class);
         $this->filterMock = $this->createMock(Filter::class);
         $this->searchCriteriaMock = $this->createMock(SearchCriteria::class);
         $this->block = $this->objectManager->getObject(
@@ -104,8 +105,8 @@ protected function setUp(): void
     /**
      * @param string $id
      * @param bool $expectedValue
-     * @dataProvider isDefaultAddressDataProvider
      */
+    #[DataProvider('isDefaultAddressDataProvider')]
     public function testIsAddressDefaultBilling($id, $expectedValue)
     {
         $this->addressMock->expects($this->once())->method('getId')->willReturn(1);
@@ -117,8 +118,8 @@ public function testIsAddressDefaultBilling($id, $expectedValue)
     /**
      * @param string $id
      * @param bool $expectedValue
-     * @dataProvider isDefaultAddressDataProvider
      */
+    #[DataProvider('isDefaultAddressDataProvider')]
     public function testIsAddressDefaultShipping($id, $expectedValue)
     {
         $this->addressMock->expects($this->once())->method('getId')->willReturn(1);
@@ -140,7 +141,7 @@ public static function isDefaultAddressDataProvider()
 
     public function testGetAddress()
     {
-        $searchResultMock = $this->getMockForAbstractClass(AddressSearchResultsInterface::class);
+        $searchResultMock = $this->createMock(AddressSearchResultsInterface::class);
         $this->multishippingMock->expects($this->once())->method('getCustomer')->willReturn($this->customerMock);
         $this->customerMock->expects($this->once())->method('getId')->willReturn(1);
         $this->filterBuilderMock->expects($this->once())->method('setField')->with('parent_id')->willReturnSelf();
@@ -188,7 +189,7 @@ public function testGetAlreadyExistingAddress()
 
     public function testGetAddressWhenItNotExistInCustomer()
     {
-        $searchResultMock = $this->getMockForAbstractClass(AddressSearchResultsInterface::class);
+        $searchResultMock = $this->createMock(AddressSearchResultsInterface::class);
         $this->multishippingMock->expects($this->once())->method('getCustomer')->willReturn($this->customerMock);
         $this->customerMock->expects($this->once())->method('getId')->willReturn(1);
         $this->filterBuilderMock->expects($this->once())->method('setField')->with('parent_id')->willReturnSelf();

app/code/Magento/Multishipping/Test/Unit/Block/Checkout/Billing/ItemsTest.php

@@ -28,7 +28,7 @@ class ItemsTest extends TestCase
     protected function setUp(): void
     {
         $objectManager = new ObjectManager($this);
-        $this->urlBuilderMock = $this->getMockForAbstractClass(UrlInterface::class);
+        $this->urlBuilderMock = $this->createMock(UrlInterface::class);
         $this->model = $objectManager->getObject(
             Items::class,
             [

app/code/Magento/Multishipping/Test/Unit/Block/Checkout/OverviewTest.php

@@ -9,6 +9,7 @@
 
 use Magento\Framework\App\Config\ScopeConfigInterface;
 use Magento\Framework\Pricing\PriceCurrencyInterface;
+use Magento\Framework\TestFramework\Unit\Helper\MockCreationTrait;
 use Magento\Framework\TestFramework\Unit\Helper\ObjectManager;
 use Magento\Framework\UrlInterface;
 use Magento\Multishipping\Block\Checkout\Overview;
@@ -27,6 +28,7 @@
  */
 class OverviewTest extends TestCase
 {
+    use MockCreationTrait;
     /**
      * @var Overview
      */
@@ -76,21 +78,18 @@ protected function setUp(): void
     {
         $objectManager = new ObjectManager($this);
 
-        $this->addressMock = $this->getMockBuilder(Address::class)
-            ->addMethods(['getAddressType'])
-            ->onlyMethods(['getShippingMethod', 'getShippingRateByCode', 'getAllVisibleItems', 'getTotals'])
-            ->disableOriginalConstructor()
-            ->getMock();
+        $this->addressMock = $this->createPartialMockWithReflection(
+            Address::class,
+            ['getAddressType', 'getShippingMethod', 'getShippingRateByCode', 'getAllVisibleItems', 'getTotals']
+        );
 
-        $this->priceCurrencyMock =
-            $this->getMockForAbstractClass(PriceCurrencyInterface::class);
+        $this->priceCurrencyMock = $this->createMock(PriceCurrencyInterface::class);
         $this->totalsReaderMock = $this->createMock(TotalsReader::class);
         $this->totalsCollectorMock = $this->createMock(TotalsCollector::class);
-        $this->checkoutMock =
-            $this->createMock(Multishipping::class);
+        $this->checkoutMock = $this->createMock(Multishipping::class);
         $this->quoteMock = $this->createMock(Quote::class);
-        $this->urlBuilderMock = $this->getMockForAbstractClass(UrlInterface::class);
-        $this->scopeConfigMock = $this->getMockForAbstractClass(ScopeConfigInterface::class);
+        $this->urlBuilderMock = $this->createMock(UrlInterface::class);
+        $this->scopeConfigMock = $this->createMock(ScopeConfigInterface::class);
         $this->model = $objectManager->getObject(
             Overview::class,
             [
@@ -137,10 +136,7 @@ public function testGetShippingAddressItems()
 
     public function testGetShippingAddressTotals()
     {
-        $totalMock = $this->getMockBuilder(Total::class)
-            ->addMethods(['getCode', 'setTitle'])
-            ->disableOriginalConstructor()
-            ->getMock();
+        $totalMock = $this->createPartialMockWithReflection(Total::class, ['getCode', 'setTitle']);
         $totalMock->expects($this->once())->method('getCode')->willReturn('grand_total');
         $this->addressMock->expects($this->once())->method('getAddressType')->willReturn(Address::TYPE_BILLING);
         $this->addressMock->expects($this->once())->method('getTotals')->willReturn([$totalMock]);
@@ -151,10 +147,7 @@ public function testGetShippingAddressTotals()
 
     public function testGetShippingAddressTotalsWithNotBillingAddress()
     {
-        $totalMock = $this->getMockBuilder(Total::class)
-            ->addMethods(['getCode', 'setTitle'])
-            ->disableOriginalConstructor()
-            ->getMock();
+        $totalMock = $this->createPartialMockWithReflection(Total::class, ['getCode', 'setTitle']);
         $totalMock->expects($this->once())->method('getCode')->willReturn('grand_total');
         $this->addressMock->expects($this->once())->method('getAddressType')->willReturn('not billing');
         $this->addressMock->expects($this->once())->method('getTotals')->willReturn([$totalMock]);
@@ -169,10 +162,7 @@ public function testGetShippingAddressTotalsWithNotBillingAddress()
      */
     protected function getTotalsMock($address)
     {
-        $totalMock = $this->getMockBuilder(Total::class)
-            ->addMethods(['getCode', 'setTitle'])
-            ->disableOriginalConstructor()
-            ->getMock();
+        $totalMock = $this->createPartialMockWithReflection(Total::class, ['getCode', 'setTitle']);
         $totalsAddressMock = $this->createMock(\Magento\Quote\Model\Quote\Address\Total::class);
         $this->checkoutMock->expects($this->once())->method('getQuote')->willReturn($this->quoteMock);
         $this->totalsCollectorMock

app/code/Magento/Multishipping/Test/Unit/Block/Checkout/ShippingTest.php

@@ -50,11 +50,11 @@ class ShippingTest extends TestCase
     protected function setUp(): void
     {
         $objectManager = new ObjectManager($this);
-        $this->scopeConfigMock = $this->getMockForAbstractClass(ScopeConfigInterface::class);
+        $this->scopeConfigMock = $this->createMock(ScopeConfigInterface::class);
         $this->multiShippingMock =
             $this->createMock(Multishipping::class);
         $this->priceCurrencyMock =
-            $this->getMockForAbstractClass(PriceCurrencyInterface::class);
+            $this->createMock(PriceCurrencyInterface::class);
         $this->taxHelperMock = $this->createMock(Data::class);
         $this->model = $objectManager->getObject(
             Shipping::class,

app/code/Magento/Multishipping/Test/Unit/Block/Checkout/SuccessTest.php

@@ -7,7 +7,8 @@
 
 namespace Magento\Multishipping\Test\Unit\Block\Checkout;
 
-use Magento\Framework\Session\SessionManagerInterface;
+use Magento\Framework\Session\Generic;
+use Magento\Framework\TestFramework\Unit\Helper\MockCreationTrait;
 use Magento\Framework\TestFramework\Unit\Helper\ObjectManager;
 use Magento\Framework\View\Element\Template\Context;
 use Magento\Multishipping\Block\Checkout\Success;
@@ -18,6 +19,7 @@
 
 class SuccessTest extends TestCase
 {
+    use MockCreationTrait;
     /**
      * @var Success
      */
@@ -39,32 +41,12 @@ class SuccessTest extends TestCase
 
     protected function setUp(): void
     {
-        $this->sessionMock = $this->getMockBuilder(SessionManagerInterface::class)
-            ->addMethods(['getOrderIds'])
-            ->onlyMethods(
-                [
-                    'start',
-                    'writeClose',
-                    'isSessionExists',
-                    'getSessionId',
-                    'getName',
-                    'setName',
-                    'destroy',
-                    'clearStorage',
-                    'getCookieDomain',
-                    'getCookiePath',
-                    'getCookieLifetime',
-                    'setSessionId',
-                    'regenerateId',
-                    'expireSessionCookie',
-                    'getSessionIdForHost',
-                    'isValidForHost',
-                    'isValidForPath'
-                ]
-            )
-            ->getMockForAbstractClass();
+        $this->sessionMock = $this->createPartialMockWithReflection(
+            Generic::class,
+            ['getOrderIds']
+        );
         $this->contextMock = $this->createMock(Context::class);
-        $this->storeManagerMock = $this->getMockForAbstractClass(StoreManagerInterface::class);
+        $this->storeManagerMock = $this->createMock(StoreManagerInterface::class);
 
         $objectManager = new ObjectManager($this);
         $this->contextMock->expects($this->once())->method('getSession')->willReturn($this->sessionMock);

app/code/Magento/Multishipping/Test/Unit/Controller/Checkout/Address/EditAddressTest.php

@@ -20,6 +20,7 @@
 use Magento\Framework\View\Result\Page;
 use Magento\Multishipping\Controller\Checkout\Address\EditAddress;
 use Magento\Multishipping\Helper\Data;
+use Magento\Framework\TestFramework\Unit\Helper\MockCreationTrait;
 use Magento\Multishipping\Model\Checkout\Type\Multishipping;
 use PHPUnit\Framework\MockObject\MockObject;
 use PHPUnit\Framework\TestCase;
@@ -29,6 +30,8 @@
  */
 class EditAddressTest extends TestCase
 {
+    use MockCreationTrait;
+
     /**
      * @var EditAddress
      */
@@ -85,13 +88,9 @@ protected function setUp(): void
         $this->checkoutMock = $this->createMock(Multishipping::class);
         $this->titleMock = $this->createMock(Title::class);
         $this->layoutMock = $this->createMock(Layout::class);
-        $this->viewMock = $this->getMockForAbstractClass(ViewInterface::class);
-        $this->request = $this->getMockBuilder(RequestInterface::class)
-            ->disableOriginalConstructor()
-            ->getMockForAbstractClass();
-        $response = $this->getMockBuilder(ResponseInterface::class)
-            ->disableOriginalConstructor()
-            ->getMockForAbstractClass();
+        $this->viewMock = $this->createMock(ViewInterface::class);
+        $this->request = $this->createMock(RequestInterface::class);
+        $response = $this->createMock(ResponseInterface::class);
         $contextMock = $this->createMock(Context::class);
         $contextMock->expects($this->atLeastOnce())
             ->method('getRequest')
@@ -100,13 +99,11 @@ protected function setUp(): void
             ->method('getResponse')
             ->willReturn($response);
         $contextMock->expects($this->any())->method('getView')->willReturn($this->viewMock);
-        $this->addressFormMock =
-            $this->getMockBuilder(Edit::class)
-                ->addMethods(['setTitle', 'setSuccessUrl', 'setBackUrl', 'setErrorUrl'])
-                ->onlyMethods(['getTitle'])
-                ->disableOriginalConstructor()
-                ->getMock();
-        $this->urlMock = $this->getMockForAbstractClass(UrlInterface::class);
+        $this->addressFormMock = $this->createPartialMockWithReflection(
+            Edit::class,
+            ['setTitle', 'setSuccessUrl', 'setBackUrl', 'setErrorUrl', 'getTitle']
+        );
+        $this->urlMock = $this->createMock(UrlInterface::class);
         $contextMock->expects($this->any())->method('getUrl')->willReturn($this->urlMock);
         $this->pageMock = $this->createMock(Page::class);
         $this->pageMock->expects($this->any())->method('getConfig')->willReturn($this->configMock);
@@ -133,10 +130,7 @@ public function testExecute()
             ->method('setTitle')
             ->with('Edit Address')
             ->willReturnSelf();
-        $helperMock = $this->getMockBuilder(Data::class)
-            ->addMethods(['__'])
-            ->disableOriginalConstructor()
-            ->getMock();
+        $helperMock = $this->createPartialMockWithReflection(Data::class, ['__']);
         $helperMock->expects($this->any())->method('__')->willReturn('Edit Address');
         $valueMap = [
             ['*/*/saveBillingFromList', ['id' => 1], 'success/url'],