AC-15634: PHPUnit 12 Upgrade | Added missing files

Author: manishranjan-adobe

app/code/Magento/GraphQl/Test/Unit/Model/Backpressure/BackpressureContextFactoryTest.php

@@ -15,6 +15,7 @@
 use Magento\GraphQl\Model\Backpressure\BackpressureContextFactory;
 use Magento\GraphQl\Model\Backpressure\GraphQlContext;
 use Magento\GraphQl\Model\Backpressure\RequestTypeExtractorInterface;
+use PHPUnit\Framework\Attributes\DataProvider;
 use PHPUnit\Framework\MockObject\MockObject;
 use PHPUnit\Framework\TestCase;
 
@@ -99,8 +100,8 @@ public static function getIdentityCases(): array
      * @param int $identityType
      * @param string $identity
      * @return void
-     * @dataProvider getIdentityCases
      */
+    #[DataProvider('getIdentityCases')]
     public function testCreateForIdentity(int $identityType, string $identity): void
     {
         $this->requestTypeExtractor->method('extract')->willReturn($typeId = 'test');

app/code/Magento/GraphQl/Test/Unit/Model/Config/DisableSessionTest.php

@@ -10,6 +10,7 @@
 use Magento\Framework\App\Config\ScopeConfigInterface;
 use Magento\Framework\TestFramework\Unit\Helper\ObjectManager;
 use Magento\GraphQl\Model\Config\DisableSession;
+use PHPUnit\Framework\Attributes\DataProvider;
 use PHPUnit\Framework\MockObject\MockObject;
 use PHPUnit\Framework\TestCase;
 
@@ -33,16 +34,14 @@ class DisableSessionTest extends TestCase
      */
     public function setUp(): void
     {
-        $this->scopeConfigMock = $this->getMockForAbstractClass(ScopeConfigInterface::class);
+        $this->scopeConfigMock = $this->createMock(ScopeConfigInterface::class);
         $this->model = (new ObjectManager($this))->getObject(
             DisableSession::class,
             ['scopeConfig' => $this->scopeConfigMock]
         );
     }
 
-    /**
-     * @dataProvider disableSessionDataProvider
-     */
+    #[DataProvider('disableSessionDataProvider')]
     public function testisSessionDisabled($configValue, $expectedResult)
     {
         $this->scopeConfigMock->expects($this->any())->method('getValue')->willReturn($configValue);
@@ -56,12 +55,12 @@ public function testisSessionDisabled($configValue, $expectedResult)
     public static function disableSessionDataProvider()
     {
         return [
-            ['configValue' => '1', true],
-            ['configValue' => '0', false],
-            ['configValue' => '11', false],
-            ['configValue' => null, false],
-            ['configValue' => '', false],
-            ['configValue' => 'adfjsadf', false],
+            ['1', true],
+            ['0', false],
+            ['11', false],
+            [null, false],
+            ['', false],
+            ['adfjsadf', false],
         ];
     }
 }

app/code/Magento/GraphQl/Test/Unit/Plugin/DisableSessionTest.php

@@ -13,6 +13,7 @@
 use Magento\Framework\TestFramework\Unit\Helper\ObjectManager;
 use Magento\GraphQl\Model\Config\DisableSession;
 use Magento\GraphQl\Plugin\DisableSession as DisableSessionPlugin;
+use PHPUnit\Framework\Attributes\DataProvider;
 use PHPUnit\Framework\MockObject\MockObject;
 use PHPUnit\Framework\TestCase;
 
@@ -63,8 +64,8 @@ public function setUp(): void
      * @param bool $methodResult
      * @param bool $expectedResult
      * @return void
-     * @dataProvider testAfterCheckDataProvider
      */
+    #[DataProvider('afterCheckDataProvider')]
     public function testAfterCheck(string $area, bool $config, bool $methodResult, bool $expectedResult)
     {
         $this->disableSessionConfigMock->expects($this->any())->method('isDisabled')->willReturn($config);
@@ -77,7 +78,7 @@ public function testAfterCheck(string $area, bool $config, bool $methodResult, b
      *
      * @return array[]
      */
-    public static function testAfterCheckDataProvider()
+    public static function afterCheckDataProvider()
     {
         return [
             ['area' => 'graphql', 'config' => true, 'methodResult' =>  false, 'expectedResult' => false],
@@ -98,8 +99,8 @@ public static function testAfterCheckDataProvider()
      * @param bool $methodResult
      * @param bool $expectedResult
      * @return void
-     * @dataProvider testAfterCheckDataProviderNoAreaCode
      */
+    #[DataProvider('afterCheckDataProviderNoAreaCode')]
     public function testAfterCheckNoArea(bool $config, bool $methodResult, bool $expectedResult)
     {
         $this->disableSessionConfigMock->expects($this->any())->method('isDisabled')->willReturn($config);
@@ -114,7 +115,7 @@ public function testAfterCheckNoArea(bool $config, bool $methodResult, bool $exp
      *
      * @return array[]
      */
-    public static function testAfterCheckDataProviderNoAreaCode()
+    public static function afterCheckDataProviderNoAreaCode()
     {
         return [
             ['config' => true, 'methodResult' =>  true, 'expectedResult' => true],
@@ -123,4 +124,4 @@ public static function testAfterCheckDataProviderNoAreaCode()
             ['config' => false, 'methodResult' =>  false, 'expectedResult' => false],
         ];
     }
-}
+}

app/code/Magento/GraphQlCache/Test/Unit/Model/CacheId/CacheIdCalculatorTest.php

@@ -60,21 +60,17 @@ class CacheIdCalculatorTest extends TestCase
 
     protected function setup(): void
     {
-        $this->logger = $this->getMockForAbstractClass(LoggerInterface::class);
-        $this->contextFactory = $this->getMockForAbstractClass(ContextFactoryInterface::class);
-        $context = $this->getMockForAbstractClass(ContextInterface::class);
+        $this->logger = $this->createMock(LoggerInterface::class);
+        $this->contextFactory = $this->createMock(ContextFactoryInterface::class);
+        $context = $this->createMock(ContextInterface::class);
         $this->contextFactory->expects($this->any())->method('get')->willReturn($context);
-        $this->deploymentConfig = $this->getMockBuilder(DeploymentConfig::class)
-            ->disableOriginalConstructor()
-            ->getMock();
-        $this->envWriter = $this->getMockBuilder(DeploymentConfig\Writer::class)
-            ->disableOriginalConstructor()
-            ->getMock();
+        $this->deploymentConfig = $this->createMock(DeploymentConfig::class);
+        $this->envWriter = $this->createMock(DeploymentConfig\Writer::class);
         $this->random = new Random();
-        $this->factorProvider1 = $this->getMockForAbstractClass(CacheIdFactorProviderInterface::class);
+        $this->factorProvider1 = $this->createMock(CacheIdFactorProviderInterface::class);
         $this->factorProvider1->expects($this->any())->method('getFactorName')->willReturn('FACTOR_ONE_NAME');
         $this->factorProvider1->expects($this->any())->method('getFactorValue')->willReturn('FACTOR_ONE_VALUE');
-        $this->factorProvider2 = $this->getMockForAbstractClass(CacheIdFactorProviderInterface::class);
+        $this->factorProvider2 = $this->createMock(CacheIdFactorProviderInterface::class);
         $this->factorProvider2->expects($this->any())->method('getFactorName')->willReturn('FACTOR_TWO_NAME');
         $this->factorProvider2->expects($this->any())->method('getFactorValue')->willReturn('FACTOR_TWO_VALUE');
     }

app/code/Magento/GraphQlCache/Test/Unit/Model/CacheableQueryHandlerTest.php

@@ -13,6 +13,7 @@
 use Magento\GraphQlCache\Model\CacheableQuery;
 use Magento\GraphQlCache\Model\CacheableQueryHandler;
 use Magento\GraphQlCache\Model\Resolver\IdentityPool;
+use PHPUnit\Framework\Attributes\DataProvider;
 use PHPUnit\Framework\TestCase;
 
 /**
@@ -59,8 +60,8 @@ protected function setup(): void
     /**
      * @param array $resolvedData
      * @param array $identities
-     * @dataProvider resolvedDataProvider
      */
+    #[DataProvider('resolvedDataProvider')]
     public function testhandleCacheFromResolverResponse(
         array $resolvedData,
         array $identities,
@@ -70,9 +71,10 @@ public function testhandleCacheFromResolverResponse(
             'cacheIdentity' => IdentityInterface::class,
             'cacheTag' => 'cat_p'
         ];
-        $mockIdentity = $this->getMockBuilder($cacheData['cacheIdentity'])
-            ->onlyMethods(['getIdentities'])
-            ->getMockForAbstractClass();
+        $mockIdentity = $this->createPartialMock(
+            IdentityInterface::class,
+            ['getIdentities']
+        );
 
         $this->requestMock->expects($this->once())->method('isGet')->willReturn(true);
         $this->identityPoolMock->expects($this->once())->method('get')->willReturn($mockIdentity);

app/code/Magento/Swagger/Test/Unit/Block/IndexTest.php

@@ -44,12 +44,9 @@ class IndexTest extends TestCase
      */
     protected function setUp(): void
     {
-        $this->requestMock = $this->getMockBuilder(RequestInterface::class)
-            ->getMock();
-        $this->schemaTypeMock = $this->getMockBuilder(SchemaTypeInterface::class)
-            ->getMock();
-        $this->urlBuilder = $this->getMockBuilder(UrlInterface::class)
-            ->getMock();
+        $this->requestMock = $this->createMock(RequestInterface::class);
+        $this->schemaTypeMock = $this->createMock(SchemaTypeInterface::class);
+        $this->urlBuilder = $this->createMock(UrlInterface::class);
 
         $this->index = (new ObjectManager($this))->getObject(
             Index::class,

app/code/Magento/Swagger/Test/Unit/Controller/Index/IndexTest.php

@@ -46,17 +46,11 @@ protected function setUp(): void
         $contextMock = $this->createMock(Context::class);
 
         /** @var MockObject|PageConfig $pageConfigMock */
-        $this->pageConfigMock = $this->getMockBuilder(PageConfig::class)
-            ->disableOriginalConstructor()
-            ->getMock();
+        $this->pageConfigMock = $this->createMock(PageConfig::class);
         /** @var MockObject|PageFactory $resultPageFactory */
-        $this->resultPageFactory = $this->getMockBuilder(PageFactory::class)
-            ->disableOriginalConstructor()
-            ->getMock();
+        $this->resultPageFactory = $this->createMock(PageFactory::class);
 
-        $this->config = self::getMockBuilder(Config::class)
-            ->disableOriginalConstructor()
-            ->getMock();
+        $this->config = $this->createMock(Config::class);
 
         $this->indexAction = new Index(
             $contextMock,
@@ -86,9 +80,7 @@ public function testDispatchRejectsWhenDisabled()
         $this->expectException(NotFoundException::class);
         $this->expectExceptionMessage('Page not found.');
 
-        $request = self::getMockBuilder(Http::class)
-            ->disableOriginalConstructor()
-            ->getMock();
+        $request = $this->createMock(Http::class);
 
         $this->config->method('isEnabled')
             ->willReturn(false);
@@ -101,9 +93,7 @@ public function testDispatchRejectsWhenDisabled()
      */
     public function testDispatchIsSuccessfulWhenEnabled(): void
     {
-        $request = self::getMockBuilder(Http::class)
-            ->disableOriginalConstructor()
-            ->getMock();
+        $request = $this->createMock(Http::class);
         // Assert that execute is called
         $request->expects($this->once())
             ->method('getFullActionName');

app/code/Magento/Swagger/Test/Unit/Model/ConfigTest.php

@@ -10,6 +10,7 @@
 
 use Magento\Framework\App\State;
 use Magento\Swagger\Model\Config;
+use PHPUnit\Framework\Attributes\DataProvider;
 use PHPUnit\Framework\MockObject\MockObject;
 use PHPUnit\Framework\TestCase;
 
@@ -22,9 +23,7 @@ class ConfigTest extends TestCase
 
     protected function setUp(): void
     {
-        $this->state = self::getMockBuilder(State::class)
-            ->disableOriginalConstructor()
-            ->getMock();
+        $this->state = $this->createMock(State::class);
     }
 
     public function testDisabledInProductionByDefault()
@@ -40,8 +39,8 @@ public function testDisabledInProductionByDefault()
      * @param string $mode
      * @param bool $configuredValue
      * @param bool $expectedResult
-     * @dataProvider useCaseProvider
      */
+    #[DataProvider('useCaseProvider')]
     public function testUseCases(string $mode, bool $configuredValue, bool $expectedResult)
     {
         $this->state->method('getMode')

app/code/Magento/SwaggerWebapi/Test/Unit/Model/SchemaType/RestTest.php

@@ -10,6 +10,7 @@
 
 use Magento\Swagger\Api\Data\SchemaTypeInterface;
 use Magento\SwaggerWebapi\Model\SchemaType\Rest;
+use PHPUnit\Framework\Attributes\DataProvider;
 use PHPUnit\Framework\MockObject\MockObject;
 use PHPUnit\Framework\TestCase;
 
@@ -33,9 +34,8 @@ protected function setUp(): void
      *
      * @param $expected
      * @param null|string $store
-     *
-     * @dataProvider getSchemaUrlPathProvider
      */
+    #[DataProvider('getSchemaUrlPathProvider')]
     public function testGetSchemaUrlPath($expected, $store = null)
     {
         $this->assertEquals($expected, $this->rest->getSchemaUrlPath($store));

app/code/Magento/SwaggerWebapiAsync/Test/Unit/Model/SchemaType/AsyncTest.php

@@ -10,6 +10,7 @@
 
 use Magento\Swagger\Api\Data\SchemaTypeInterface;
 use Magento\SwaggerWebapiAsync\Model\SchemaType\Async;
+use PHPUnit\Framework\Attributes\DataProvider;
 use PHPUnit\Framework\MockObject\MockObject;
 use PHPUnit\Framework\TestCase;
 
@@ -41,9 +42,8 @@ public function testGetCode()
      *
      * @param null|string $store
      * @param $expected
-     *
-     * @dataProvider getSchemaUrlPathProvider
      */
+    #[DataProvider('getSchemaUrlPathProvider')]
     public function testGetSchemaUrlPath($expected, $store = null)
     {
         $this->assertEquals($expected, $this->async->getSchemaUrlPath($store));