AC-15000: [CE] PHPUnit cut 12: related tests

DeepaAdobe · DeepaAdobe · commit de444c6e08b8 · 2025-11-27T03:14:50.000+05:30
diff --git a/app/code/Magento/Integration/Test/Unit/Block/Adminhtml/Integration/Edit/Tab/InfoTest.php b/app/code/Magento/Integration/Test/Unit/Block/Adminhtml/Integration/Edit/Tab/InfoTest.php
@@ -73,12 +73,4 @@ public function testIsHidden(): void
         $this->assertFalse($this->infoBlock->isHidden());
     }
 
-    protected function tearDown(): void
-    {
-        // Reset ObjectManager instance using reflection to avoid type issues
-        $reflection = new \ReflectionClass(AppObjectManager::class);
-        $property = $reflection->getProperty('_instance');
-        $property->setAccessible(true);
-        $property->setValue(null, null); // For static properties: setValue(object, value)
-    }
 }
diff --git a/app/code/Magento/Integration/Test/Unit/Block/Adminhtml/Integration/Edit/Tab/WebapiTest.php b/app/code/Magento/Integration/Test/Unit/Block/Adminhtml/Integration/Edit/Tab/WebapiTest.php
@@ -284,13 +284,4 @@ private function getWebapiBlock(?array $integrationData = [], array $selectedRes
             ]
         );
     }
-
-    protected function tearDown(): void
-    {
-        // Reset ObjectManager instance using reflection to avoid type issues
-        $reflection = new \ReflectionClass(AppObjectManager::class);
-        $property = $reflection->getProperty('_instance');
-        $property->setAccessible(true);
-        $property->setValue(null, null); // For static properties: setValue(object, value)
-    }
 }
diff --git a/app/code/Magento/Integration/Test/Unit/Controller/Adminhtml/IntegrationTestCase.php b/app/code/Magento/Integration/Test/Unit/Controller/Adminhtml/IntegrationTestCase.php
@@ -30,6 +30,7 @@
 use Magento\Framework\View\Page\Config;
 use Magento\Framework\View\Page\Title;
 use Magento\Framework\View\Result\Page;
+use Magento\Framework\View\Layout as LayoutModel;
 use Magento\Integration\Api\IntegrationServiceInterface;
 use Magento\Integration\Api\OauthServiceInterface;
 use Magento\Integration\Block\Adminhtml\Integration\Edit\Tab\Info;
@@ -245,7 +246,7 @@ protected function _createIntegrationController($actionName)
             ->getMock();
         // Use concrete Layout class since we need getNode() method which isn't in interface
         $this->_layoutMock = $this->createPartialMockWithReflection(
-            \Magento\Framework\View\Layout::class,
+            LayoutModel::class,
             ['getUpdate', 'getNode', 'getMessagesBlock', 'getBlock']
         );
         $this->_layoutMergeMock = $this->getMockBuilder(
@@ -405,12 +406,12 @@ protected function _getSampleIntegrationData()
     /**
      * Return integration model mock with sample data.
      *
-     * @return \Magento\Integration\Model\Integration|MockObject
+     * @return IntegrationModel|MockObject
      */
     protected function _getIntegrationModelMock()
     {
         $integrationModelMock = $this->createPartialMockWithReflection(
-            \Magento\Integration\Model\Integration::class,
+            IntegrationModel::class,
             ['setStatus', 'save', '__wakeup', 'getData']
         );
 
diff --git a/app/code/Magento/Integration/Test/Unit/Model/Oauth/ConsumerTest.php b/app/code/Magento/Integration/Test/Unit/Model/Oauth/ConsumerTest.php
@@ -17,6 +17,7 @@
 use Magento\Framework\Stdlib\DateTime\DateTime;
 use Magento\Framework\Url\Validator as UrlValidator;
 use Magento\Integration\Helper\Oauth\Data;
+use Magento\Integration\Model\ResourceModel\Oauth\Consumer as ConsumerResourceModel;
 use Magento\Framework\TestFramework\Unit\Helper\MockCreationTrait;
 use Magento\Integration\Model\Oauth\Consumer;
 use Magento\Integration\Model\Oauth\Consumer\Validator\KeyLength;
@@ -108,7 +109,7 @@ protected function setUp(): void
             ->willReturn(Data::CONSUMER_EXPIRATION_PERIOD_DEFAULT);
 
         $this->resourceMock = $this->createPartialMockWithReflection(
-            \Magento\Integration\Model\ResourceModel\Oauth\Consumer::class,
+            ConsumerResourceModel::class,
             ['selectByCompositeKey', 'deleteOldEntries', 'getIdFieldName']
         );
         $this->resourceCollectionMock = $this->createMock(AbstractDb::class);
diff --git a/app/code/Magento/Integration/Test/Unit/Model/ResourceModel/Oauth/ConsumerTest.php b/app/code/Magento/Integration/Test/Unit/Model/ResourceModel/Oauth/ConsumerTest.php
@@ -72,15 +72,6 @@ protected function setUp(): void
         );
     }
 
-    protected function tearDown(): void
-    {
-        // Reset ObjectManager instance
-        $reflection = new \ReflectionClass(AppObjectManager::class);
-        $property = $reflection->getProperty('_instance');
-        $property->setAccessible(true);
-        $property->setValue(null, null);
-    }
-
     public function testAfterDelete(): void
     {
         $this->connectionMock->expects($this->exactly(2))->method('delete');
diff --git a/app/code/Magento/Integration/Test/Unit/Model/ResourceModel/Oauth/TokenTest.php b/app/code/Magento/Integration/Test/Unit/Model/ResourceModel/Oauth/TokenTest.php
@@ -16,6 +16,7 @@
 use Magento\Framework\ObjectManagerInterface;
 use Magento\Framework\TestFramework\Unit\Helper\ObjectManager;
 use Magento\Integration\Model\ResourceModel\Oauth\Token;
+use Magento\Integration\Model\Oauth\Token as TokenModel;
 use Magento\Framework\TestFramework\Unit\Helper\MockCreationTrait;
 use PHPUnit\Framework\MockObject\MockObject;
 use PHPUnit\Framework\TestCase;
@@ -63,19 +64,10 @@ protected function setUp(): void
         );
     }
 
-    protected function tearDown(): void
-    {
-        // Reset ObjectManager instance
-        $reflection = new \ReflectionClass(AppObjectManager::class);
-        $property = $reflection->getProperty('_instance');
-        $property->setAccessible(true);
-        $property->setValue(null, null);
-    }
-
     public function testCleanOldAuthorizedTokensExcept(): void
     {
         $tokenMock = $this->createPartialMockWithReflection(
-            \Magento\Integration\Model\Oauth\Token::class,
+            TokenModel::class,
             ['getAuthorized', 'getConsumerId', 'getCustomerId', 'getAdminId', 'getId']
         );
         $tokenMock->expects($this->any())->method('getId')->willReturn(1);
diff --git a/app/code/Magento/Msrp/Test/Unit/Ui/DataProvider/Product/Listing/Collector/MsrpPriceTest.php b/app/code/Magento/Msrp/Test/Unit/Ui/DataProvider/Product/Listing/Collector/MsrpPriceTest.php
@@ -17,11 +17,13 @@
 use Magento\Framework\Pricing\PriceCurrencyInterface;
 use Magento\Framework\TestFramework\Unit\Helper\MockCreationTrait;
 use Magento\Framework\TestFramework\Unit\Helper\ObjectManager as ObjectManagerHelper;
+use Magento\Framework\Pricing\PriceInfo\Base as BasePriceInfo;
 use Magento\Msrp\Api\Data\ProductRender\MsrpPriceInfoInterface;
 use Magento\Msrp\Api\Data\ProductRender\MsrpPriceInfoInterfaceFactory;
 use Magento\Msrp\Helper\Data;
 use Magento\Msrp\Model\Config;
 use Magento\Msrp\Ui\DataProvider\Product\Listing\Collector\MsrpPrice;
+use Magento\Msrp\Pricing\Price\MsrpPrice as MsrpPriceModel;
 use PHPUnit\Framework\MockObject\MockObject;
 use PHPUnit\Framework\TestCase;
 
@@ -163,13 +165,13 @@ public function testCollect(): void
         $this->priceInfoExtensionFactory->expects($this->once())
             ->method('create')
             ->willReturn($extensionAttributes);
-        $price = $this->getMockBuilder(\Magento\Msrp\Pricing\Price\MsrpPrice::class)
+        $price = $this->getMockBuilder(MsrpPriceModel::class)
             ->disableOriginalConstructor()
             ->getMock();
         
         // Product's PriceInfo needs getPrice method
         $priceInfo = $this->createPartialMockWithReflection(
-            \Magento\Framework\Pricing\PriceInfo\Base::class,
+            BasePriceInfo::class,
             ['getPrice']
         );
         $priceInfo->expects($this->once())
diff --git a/app/code/Magento/Tax/Test/Unit/Block/Adminhtml/Items/Price/RendererTest.php b/app/code/Magento/Tax/Test/Unit/Block/Adminhtml/Items/Price/RendererTest.php
@@ -69,15 +69,6 @@ protected function setUp(): void
         );
     }
 
-    protected function tearDown(): void
-    {
-        // Reset ObjectManager instance
-        $reflection = new \ReflectionClass(AppObjectManager::class);
-        $instanceProperty = $reflection->getProperty('_instance');
-        $instanceProperty->setAccessible(true);
-        $instanceProperty->setValue(null, null);
-    }
-
     public function testDisplayPriceInclTax(): void
     {
         $flag = false;
diff --git a/app/code/Magento/Tax/Test/Unit/Block/Adminhtml/Rule/Edit/FormTest.php b/app/code/Magento/Tax/Test/Unit/Block/Adminhtml/Rule/Edit/FormTest.php
@@ -133,15 +133,6 @@ protected function setUp(): void
         ]);
     }
 
-    protected function tearDown(): void
-    {
-        // Reset ObjectManager instance
-        $reflection = new \ReflectionClass(AppObjectManager::class);
-        $instanceProperty = $reflection->getProperty('_instance');
-        $instanceProperty->setAccessible(true);
-        $instanceProperty->setValue(null, null);
-    }
-
     /**
      * Check tax lazy loading URL.
      *
diff --git a/app/code/Magento/Tax/Test/Unit/Block/Checkout/ShippingTest.php b/app/code/Magento/Tax/Test/Unit/Block/Checkout/ShippingTest.php
@@ -47,15 +47,6 @@ protected function setUp(): void
         );
     }
 
-    protected function tearDown(): void
-    {
-        // Reset ObjectManager instance
-        $reflection = new \ReflectionClass(AppObjectManager::class);
-        $instanceProperty = $reflection->getProperty('_instance');
-        $instanceProperty->setAccessible(true);
-        $instanceProperty->setValue(null, null);
-    }
-
     /**
      * @param string|null $shippingMethod
      * @param bool $expectedResult
diff --git a/app/code/Magento/Tax/Test/Unit/Block/Item/Price/RendererTest.php b/app/code/Magento/Tax/Test/Unit/Block/Item/Price/RendererTest.php
@@ -15,6 +15,7 @@
 use Magento\Sales\Model\Order\Invoice\Item as InvoiceItem;
 use Magento\Sales\Model\Order\Item;
 use Magento\Store\Model\Store;
+use Magento\Quote\Model\Quote\Item as QuoteItem;
 use Magento\Tax\Block\Item\Price\Renderer;
 use Magento\Tax\Helper\Data;
 use PHPUnit\Framework\Attributes\DataProvider;
@@ -253,7 +254,7 @@ public function testFormatPriceQuoteItem(): void
             ->with($price, true)
             ->willReturn($formattedPrice);
 
-        $itemMock = $this->getMockBuilder(\Magento\Quote\Model\Quote\Item::class)
+        $itemMock = $this->getMockBuilder(QuoteItem::class)
             ->disableOriginalConstructor()
             ->onlyMethods(['getStore', '__wakeup'])
             ->getMock();
@@ -340,7 +341,7 @@ public function testGetStoreId(): void
         $storeId = 'default';
 
         $itemMock = $this->createPartialMockWithReflection(
-            \Magento\Quote\Model\Quote\Item::class,
+            QuoteItem::class,
             ['getStoreId', '__wakeup']
         );
 
@@ -356,8 +357,8 @@ public function testGetItemDisplayPriceExclTaxQuoteItem(): void
     {
         $price = 10;
 
-        /** @var \Magento\Quote\Model\Quote\Item|MockObject $quoteItemMock */
-        $quoteItemMock = $this->getMockBuilder(\Magento\Quote\Model\Quote\Item::class)
+        /** @var QuoteItem|MockObject $quoteItemMock */
+        $quoteItemMock = $this->getMockBuilder(QuoteItem::class)
             ->disableOriginalConstructor()
             ->onlyMethods(['getPrice', '__wakeup'])
             ->getMock();
diff --git a/app/code/Magento/Tax/Test/Unit/Model/Sales/Total/Quote/CommonTaxCollectorTest.php b/app/code/Magento/Tax/Test/Unit/Model/Sales/Total/Quote/CommonTaxCollectorTest.php
@@ -30,7 +30,7 @@
 use Magento\Tax\Api\Data\TaxDetailsItemInterface;
 use Magento\Tax\Api\TaxCalculationInterface;
 use Magento\Tax\Helper\Data as TaxHelper;
-use Magento\Framework\TestFramework\Unit\Helper\MockCreationTrait;
+use \Magento\Quote\Model\Quote\Address\Total as QuoteAddressTotal;
 use Magento\Tax\Model\Config;
 use Magento\Tax\Model\Sales\Total\Quote\CommonTaxCollector;
 use PHPUnit\Framework\MockObject\MockObject;
@@ -637,7 +637,7 @@ public function testGetShippingDataObjectReturnsItem(): void
         $shippingAssignment = $this->createMock(ShippingAssignmentInterface::class);
         $shippingAssignment->method('getShipping')->willReturn($shipping);
 
-        $total = $this->createPartialMockWithReflection(\Magento\Quote\Model\Quote\Address\Total::class, [
+        $total = $this->createPartialMockWithReflection(QuoteAddressTotal::class, [
                 'getShippingTaxCalculationAmount', 'setShippingTaxCalculationAmount', 'getShippingAmount',
                 'setBaseShippingTaxCalculationAmount', 'getBaseShippingAmount', 'getShippingDiscountAmount',
                 'getBaseShippingDiscountAmount'
@@ -787,7 +787,7 @@ public function testProcessProductItemsAggregatesValues(): void
         $shippingAssignment->method('getShipping')->willReturn($shipping);
 
         $total = $this->createPartialMockWithReflection(
-            \Magento\Quote\Model\Quote\Address\Total::class,
+            QuoteAddressTotal::class,
             [
                 'setTotalAmount', 'setBaseTotalAmount', 'setSubtotalInclTax',
                 'setBaseSubtotalTotalInclTax', 'setBaseSubtotalInclTax'
@@ -869,13 +869,13 @@ public function testProcessAppliedTaxesSetsItemsAppliedTaxesAndItem(): void
         $shippingAssignment->method('getItems')->willReturn([$addressItem]);
         $shippingAssignment->method('getShipping')->willReturn($shipping);
 
-        $applied = $this->createMock(\Magento\Tax\Api\Data\AppliedTaxInterface::class);
+        $applied = $this->createMock(AppliedTaxInterface::class);
         $applied->method('getAmount')->willReturn(1.0);
         $applied->method('getPercent')->willReturn(10.0);
         $applied->method('getTaxRateKey')->willReturn('rate1');
         $applied->method('getRates')->willReturn([]);
 
-        $baseApplied = $this->createMock(\Magento\Tax\Api\Data\AppliedTaxInterface::class);
+        $baseApplied = $this->createMock(AppliedTaxInterface::class);
         $baseApplied->method('getAmount')->willReturn(0.8);
         $baseApplied->method('getPercent')->willReturn(10.0);
         $baseApplied->method('getTaxRateKey')->willReturn('rate1');
@@ -898,7 +898,7 @@ public function testProcessAppliedTaxesSetsItemsAppliedTaxesAndItem(): void
         ];
 
         $total = $this->createPartialMockWithReflection(
-            \Magento\Quote\Model\Quote\Address\Total::class,
+            QuoteAddressTotal::class,
             ['addTotalAmount', 'addBaseTotalAmount', 'setAppliedTaxes', 'setItemsAppliedTaxes', 'getAppliedTaxes']
         );
         $total->method('getAppliedTaxes')->willReturn([]);
@@ -981,7 +981,7 @@ public function testProcessAppliedTaxesSetsAssociatedItemIdForNonProduct(): void
         ];
 
         $total = $this->createPartialMockWithReflection(
-            \Magento\Quote\Model\Quote\Address\Total::class,
+            QuoteAddressTotal::class,
             ['addTotalAmount', 'addBaseTotalAmount', 'setAppliedTaxes', 'setItemsAppliedTaxes', 'getAppliedTaxes']
         );
         $total->method('getAppliedTaxes')->willReturn([]);
@@ -1054,7 +1054,7 @@ public function testProcessAppliedTaxesSetsItemIdNullForOrderAssociation(): void
         ];
 
         $total = $this->createPartialMockWithReflection(
-            \Magento\Quote\Model\Quote\Address\Total::class,
+            QuoteAddressTotal::class,
             ['addTotalAmount', 'addBaseTotalAmount', 'setAppliedTaxes', 'setItemsAppliedTaxes', 'getAppliedTaxes']
         );
         $total->method('getAppliedTaxes')->willReturn([]);
@@ -1094,7 +1094,7 @@ public function testProcessShippingTaxInfoUpdatesTotals(): void
         $shippingAssignment->method('getShipping')->willReturn($shipping);
 
         $total = $this->createPartialMockWithReflection(
-            \Magento\Quote\Model\Quote\Address\Total::class,
+            QuoteAddressTotal::class,
             [
                 'setTotalAmount', 'setBaseTotalAmount', 'addTotalAmount', 'addBaseTotalAmount',
                 'setShippingInclTax', 'setBaseShippingInclTax', 'setShippingTaxAmount',
@@ -1128,7 +1128,7 @@ public function testProcessShippingTaxInfoUpdatesTotals(): void
     public function testSaveAppliedTaxesAggregatesAmounts(): void
     {
         $total = $this->createPartialMockWithReflection(
-            \Magento\Quote\Model\Quote\Address\Total::class,
+           QuoteAddressTotal::class,
             ['getAppliedTaxes', 'setAppliedTaxes']
         );
         $total->method('getAppliedTaxes')->willReturn([]);
@@ -1511,7 +1511,7 @@ public function testProcessProductItemsSkipsAggregationForChildrenCalculated():
         $shippingAssignment->method('getShipping')->willReturn($shipping);
 
         $total = $this->createPartialMockWithReflection(
-            \Magento\Quote\Model\Quote\Address\Total::class,
+            QuoteAddressTotal::class,
             [
                 'setTotalAmount', 'setBaseTotalAmount', 'setSubtotalInclTax',
                 'setBaseSubtotalTotalInclTax', 'setBaseSubtotalInclTax'
diff --git a/app/code/Magento/Tax/Test/Unit/Model/TaxClass/Source/ProductTest.php b/app/code/Magento/Tax/Test/Unit/Model/TaxClass/Source/ProductTest.php
@@ -12,7 +12,6 @@
 use Magento\Framework\Api\FilterBuilder;
 use Magento\Framework\Api\SearchCriteria;
 use Magento\Framework\Api\SearchCriteriaBuilder;
-use Magento\Framework\TestFramework\Unit\Helper\MockCreationTrait;
 use Magento\Framework\TestFramework\Unit\Helper\ObjectManager;
 use Magento\Tax\Api\Data\TaxClassInterface;
 use Magento\Tax\Api\Data\TaxClassSearchResultsInterface;
@@ -29,8 +28,6 @@
  */
 class ProductTest extends TestCase
 {
-    use MockCreationTrait;
-
     /**
      * @var TaxClassRepositoryInterface|MockObject
      */
diff --git a/app/code/Magento/Tax/Test/Unit/Model/TaxRateCollectionTest.php b/app/code/Magento/Tax/Test/Unit/Model/TaxRateCollectionTest.php
@@ -12,7 +12,6 @@
 use Magento\Framework\Api\SearchCriteriaInterface;
 use Magento\Framework\Api\SortOrderBuilder;
 use Magento\Framework\Data\Collection\EntityFactory;
-use Magento\Framework\TestFramework\Unit\Helper\MockCreationTrait;
 use Magento\Tax\Api\Data\TaxRateSearchResultsInterface;
 use Magento\Tax\Api\TaxRateRepositoryInterface;
 use Magento\Tax\Model\Calculation\Rate;
@@ -23,8 +22,6 @@
 
 class TaxRateCollectionTest extends TestCase
 {
-    use MockCreationTrait;
-
     /**
      * @var TaxRateCollection
      */

Original file line number	Diff line number	Diff line change
`@@ -73,12 +73,4 @@ public function testIsHidden(): void`
`73`	`73`	`$this->assertFalse($this->infoBlock->isHidden());`
`74`	`74`	`}`
`75`	`75`
`76`		`- protected function tearDown(): void`
`77`		`- {`
`78`		`- // Reset ObjectManager instance using reflection to avoid type issues`
`79`		`- $reflection = new \ReflectionClass(AppObjectManager::class);`
`80`		`- $property = $reflection->getProperty('_instance');`
`81`		`- $property->setAccessible(true);`
`82`		`- $property->setValue(null, null); // For static properties: setValue(object, value)`
`83`		`- }`
`84`	`76`	`}`
Original file line number	Diff line number	Diff line change
`@@ -284,13 +284,4 @@ private function getWebapiBlock(?array $integrationData = [], array $selectedRes`
`284`	`284`	`]`
`285`	`285`	`);`
`286`	`286`	`}`
`287`		`-`
`288`		`- protected function tearDown(): void`
`289`		`- {`
`290`		`- // Reset ObjectManager instance using reflection to avoid type issues`
`291`		`- $reflection = new \ReflectionClass(AppObjectManager::class);`
`292`		`- $property = $reflection->getProperty('_instance');`
`293`		`- $property->setAccessible(true);`
`294`		`- $property->setValue(null, null); // For static properties: setValue(object, value)`
`295`		`- }`
`296`	`287`	`}`