Test Fixes for PHPUnit10 - Rename classname to prevent individual run test

jayrangnani-gl · jayrangnani-gl · commit 64c47f64ad1d · 2024-04-22T12:25:18.000+05:30
diff --git a/lib/internal/Magento/Framework/Code/Test/Unit/Validator/ConstructorIntegrityTest.php b/lib/internal/Magento/Framework/Code/Test/Unit/Validator/ConstructorIntegrityTest.php
@@ -5,20 +5,20 @@
  */
 namespace Magento\Framework\Code\Test\Unit\Validator;
 
-use Magento\SomeModule\Model\NamedArguments\NamedParametersTest;
-use Magento\SomeModule\Model\NamedArguments\MixedParametersTest;
+use Magento\SomeModule\Model\NamedArguments\TestNamedParameters;
+use Magento\SomeModule\Model\NamedArguments\TestMixedParameters;
 use PHPUnit\Framework\TestCase;
 use Magento\Framework\Code\Validator\ConstructorIntegrity;
 use Magento\Framework\Exception\ValidatorException;
 
-require_once __DIR__ . '/../_files/app/code/Magento/SomeModule/Model/Three/Test.php';
-require_once __DIR__ . '/../_files/app/code/Magento/SomeModule/Model/Two/Test.php';
-require_once __DIR__ . '/../_files/app/code/Magento/SomeModule/Model/One/TestFinal.php';
-require_once __DIR__ . '/../_files/app/code/Magento/SomeModule/Model/Four/Test.php';
-require_once __DIR__ . '/../_files/app/code/Magento/SomeModule/Model/Five/Test.php';
-require_once __DIR__ . '/../_files/app/code/Magento/SomeModule/Model/Six/Test.php';
-require_once __DIR__ . '/../_files/app/code/Magento/SomeModule/Model/NamedArguments/NamedParametersTest.php';
-require_once __DIR__ . '/../_files/app/code/Magento/SomeModule/Model/NamedArguments/MixedParametersTest.php';
+require_once __DIR__ . '/../_files/app/code/Magento/SomeModule/Model/Three/TestThree.php';
+require_once __DIR__ . '/../_files/app/code/Magento/SomeModule/Model/Two/TestTwo.php';
+require_once __DIR__ . '/../_files/app/code/Magento/SomeModule/Model/One/TestOne.php';
+require_once __DIR__ . '/../_files/app/code/Magento/SomeModule/Model/Four/TestFour.php';
+require_once __DIR__ . '/../_files/app/code/Magento/SomeModule/Model/Five/TestFive.php';
+require_once __DIR__ . '/../_files/app/code/Magento/SomeModule/Model/Six/TestSix.php';
+require_once __DIR__ . '/../_files/app/code/Magento/SomeModule/Model/NamedArguments/TestNamedParameters.php';
+require_once __DIR__ . '/../_files/app/code/Magento/SomeModule/Model/NamedArguments/TestMixedParameters.php';
 require_once __DIR__ . '/_files/ClassesForConstructorIntegrity.php';
 class ConstructorIntegrityTest extends TestCase
 {
@@ -34,48 +34,48 @@ protected function setUp(): void
 
     public function testValidateIfParentClassExist()
     {
-        $this->assertTrue($this->_model->validate(\Magento\SomeModule\Model\One\TestFinal::class));
+        $this->assertTrue($this->_model->validate(\Magento\SomeModule\Model\One\TestOne::class));
     }
 
     public function testValidateIfClassHasParentConstructCall()
     {
-        $this->assertTrue($this->_model->validate(\Magento\SomeModule\Model\Two\Test::class));
+        $this->assertTrue($this->_model->validate(\Magento\SomeModule\Model\Two\TestTwo::class));
     }
 
     public function testValidateIfClassHasParentConstructCallWithNamedArguments()
     {
-        $this->assertTrue($this->_model->validate(NamedParametersTest::class));
+        $this->assertTrue($this->_model->validate(TestNamedParameters::class));
     }
 
     public function testValidateIfClassHasParentConstructCallWithMixedArguments()
     {
-        $this->assertTrue($this->_model->validate(MixedParametersTest::class));
+        $this->assertTrue($this->_model->validate(TestMixedParameters::class));
     }
 
     public function testValidateIfClassHasArgumentsQtyEqualToParentClass()
     {
-        $this->assertTrue($this->_model->validate(\Magento\SomeModule\Model\Three\Test::class));
+        $this->assertTrue($this->_model->validate(\Magento\SomeModule\Model\Three\TestThree::class));
     }
 
     public function testValidateIfClassHasExtraArgumentInTheParentConstructor()
     {
-        $this->_model->validate(\Magento\SomeModule\Model\Four\Test::class);
+        $this->_model->validate(\Magento\SomeModule\Model\Four\TestFour::class);
     }
 
     public function testValidateIfClassHasMissingRequiredArguments()
     {
-        $fileName = realpath(__DIR__ . '/../_files/app/code/Magento/SomeModule/Model/Five/Test.php');
+        $fileName = realpath(__DIR__ . '/../_files/app/code/Magento/SomeModule/Model/Five/TestFive.php');
         $fileName = str_replace('\\', '/', $fileName);
         $this->expectException(ValidatorException::class);
         $this->expectExceptionMessage(
             'Missed required argument factory in parent::__construct call. File: ' . $fileName
         );
-        $this->_model->validate(\Magento\SomeModule\Model\Five\Test::class);
+        $this->_model->validate(\Magento\SomeModule\Model\Five\TestFive::class);
     }
 
     public function testValidateIfClassHasIncompatibleArguments()
     {
-        $fileName = realpath(__DIR__ . '/../_files/app/code/Magento/SomeModule/Model/Six/Test.php');
+        $fileName = realpath(__DIR__ . '/../_files/app/code/Magento/SomeModule/Model/Six/TestSix.php');
         $fileName = str_replace('\\', '/', $fileName);
         $this->expectException(ValidatorException::class);
         $this->expectExceptionMessage(
@@ -84,7 +84,7 @@ public function testValidateIfClassHasIncompatibleArguments()
             PHP_EOL .
             $fileName
         );
-        $this->_model->validate(\Magento\SomeModule\Model\Six\Test::class);
+        $this->_model->validate(\Magento\SomeModule\Model\Six\TestSix::class);
     }
 
     public function testValidateWrongOrderForParentArguments()
diff --git a/lib/internal/Magento/Framework/Code/Test/Unit/_files/app/code/Magento/SomeModule/Model/Five/TestFive.php b/lib/internal/Magento/Framework/Code/Test/Unit/_files/app/code/Magento/SomeModule/Model/Five/TestFive.php
@@ -5,9 +5,9 @@
  */
 namespace Magento\SomeModule\Model\Five;
 
-require_once __DIR__ . '/../Three/Test.php';
+require_once __DIR__ . '/../Three/TestThree.php';
 require_once __DIR__ . '/../Proxy.php';
-class Test extends \Magento\SomeModule\Model\Three\Test
+class TestFive extends \Magento\SomeModule\Model\Three\TestThree
 {
     /**
      * @var \Magento\SomeModule\Model\Proxy
diff --git a/lib/internal/Magento/Framework/Code/Test/Unit/_files/app/code/Magento/SomeModule/Model/Four/TestFour.php b/lib/internal/Magento/Framework/Code/Test/Unit/_files/app/code/Magento/SomeModule/Model/Four/TestFour.php
@@ -5,10 +5,10 @@
  */
 namespace Magento\SomeModule\Model\Four;
 
-require_once __DIR__ . '/../One/TestFinal.php';
+require_once __DIR__ . '/../One/TestOne.php';
 require_once __DIR__ . '/../ElementFactory.php';
 require_once __DIR__ . '/../Proxy.php';
-class Test extends \Magento\SomeModule\Model\One\TestFinal
+class TestFour extends \Magento\SomeModule\Model\One\TestOne
 {
     /**
      * @var \Magento\SomeModule\Model\ElementFactory
diff --git a/lib/internal/Magento/Framework/Code/Test/Unit/_files/app/code/Magento/SomeModule/Model/NamedArguments/TestMixedParameters.php b/lib/internal/Magento/Framework/Code/Test/Unit/_files/app/code/Magento/SomeModule/Model/NamedArguments/TestMixedParameters.php
@@ -7,9 +7,9 @@
 
 namespace Magento\SomeModule\Model\NamedArguments;
 
-require_once __DIR__ . '/ParentClassTest.php';
+require_once __DIR__ . '/TestParentClass.php';
 
-class MixedParametersTest extends ParentClassTest
+class TestMixedParameters extends TestParentClass
 {
     /**
      * @param \stdClass $stdClassObject
diff --git a/lib/internal/Magento/Framework/Code/Test/Unit/_files/app/code/Magento/SomeModule/Model/NamedArguments/TestNamedParameters.php b/lib/internal/Magento/Framework/Code/Test/Unit/_files/app/code/Magento/SomeModule/Model/NamedArguments/TestNamedParameters.php
@@ -7,9 +7,9 @@
 
 namespace Magento\SomeModule\Model\NamedArguments;
 
-require_once __DIR__ . '/ParentClassTest.php';
+require_once __DIR__ . '/TestParentClass.php';
 
-class NamedParametersTest extends ParentClassTest
+class TestNamedParameters extends TestParentClass
 {
     /**
      * @param \stdClass $stdClassObject
diff --git a/lib/internal/Magento/Framework/Code/Test/Unit/_files/app/code/Magento/SomeModule/Model/NamedArguments/TestParentClass.php b/lib/internal/Magento/Framework/Code/Test/Unit/_files/app/code/Magento/SomeModule/Model/NamedArguments/TestParentClass.php
@@ -7,7 +7,7 @@
 
 namespace Magento\SomeModule\Model\NamedArguments;
 
-class ParentClassTest
+class TestParentClass
 {
     /**
      * @var \stdClass
diff --git a/lib/internal/Magento/Framework/Code/Test/Unit/_files/app/code/Magento/SomeModule/Model/One/TestOne.php b/lib/internal/Magento/Framework/Code/Test/Unit/_files/app/code/Magento/SomeModule/Model/One/TestOne.php
@@ -8,7 +8,7 @@
 use PHPUnit\Framework\TestCase;
 
 require_once __DIR__ . '/../Proxy.php';
-class TestFinal
+class TestOne
 {
     /**
      * @var \Magento\SomeModule\Model\Proxy
diff --git a/lib/internal/Magento/Framework/Code/Test/Unit/_files/app/code/Magento/SomeModule/Model/Six/TestSix.php b/lib/internal/Magento/Framework/Code/Test/Unit/_files/app/code/Magento/SomeModule/Model/Six/TestSix.php
@@ -5,10 +5,10 @@
  */
 namespace Magento\SomeModule\Model\Six;
 
-require_once __DIR__ . '/../One/TestFinal.php';
+require_once __DIR__ . '/../One/TestOne.php';
 require_once __DIR__ . '/../Proxy.php';
 require_once __DIR__ . '/../ElementFactory.php';
-class Test extends \Magento\SomeModule\Model\One\TestFinal
+class TestSix extends \Magento\SomeModule\Model\One\TestOne
 {
     /**
      * @var \Magento\SomeModule\Model\ElementFactory
diff --git a/lib/internal/Magento/Framework/Code/Test/Unit/_files/app/code/Magento/SomeModule/Model/Three/TestThree.php b/lib/internal/Magento/Framework/Code/Test/Unit/_files/app/code/Magento/SomeModule/Model/Three/TestThree.php
@@ -5,10 +5,10 @@
  */
 namespace Magento\SomeModule\Model\Three;
 
-require_once __DIR__ . '/../Two/Test.php';
+require_once __DIR__ . '/../Two/TestTwo.php';
 require_once __DIR__ . '/../ElementFactory.php';
 require_once __DIR__ . '/../Proxy.php';
-class Test extends \Magento\SomeModule\Model\Two\Test
+class TestThree extends \Magento\SomeModule\Model\Two\TestTwo
 {
     /**
      * @var \Magento\SomeModule\Model\ElementFactory
diff --git a/lib/internal/Magento/Framework/Code/Test/Unit/_files/app/code/Magento/SomeModule/Model/Two/TestTwo.php b/lib/internal/Magento/Framework/Code/Test/Unit/_files/app/code/Magento/SomeModule/Model/Two/TestTwo.php
@@ -5,9 +5,9 @@
  */
 namespace Magento\SomeModule\Model\Two;
 
-require_once __DIR__ . '/../One/TestFinal.php';
+require_once __DIR__ . '/../One/TestOne.php';
 require_once __DIR__ . '/../Proxy.php';
-class Test extends \Magento\SomeModule\Model\One\TestFinal
+class TestTwo extends \Magento\SomeModule\Model\One\TestOne
 {
     /**
      * @var \Magento\SomeModule\Model\Proxy
diff --git a/setup/src/Magento/Setup/Test/Unit/Module/Di/_files/app/code/Magento/SomeModule/Helper/TestHelper.php b/setup/src/Magento/Setup/Test/Unit/Module/Di/_files/app/code/Magento/SomeModule/Helper/TestHelper.php
@@ -12,7 +12,7 @@
 /**
  * @SuppressWarnings(PHPMD.ConstructorWithNameAsEnclosingClass)
  */
-class Test
+class TestHelper
 {
     /**
      * @var \Magento\SomeModule\ElementFactory\Proxy
diff --git a/setup/src/Magento/Setup/Test/Unit/Module/Di/_files/app/code/Magento/SomeModule/Model/TestModel.php b/setup/src/Magento/Setup/Test/Unit/Module/Di/_files/app/code/Magento/SomeModule/Model/TestModel.php
@@ -10,7 +10,7 @@
 /**
  * @SuppressWarnings(PHPMD.ConstructorWithNameAsEnclosingClass)
  */
-class Test
+class TestModel
 {
     public function __construct()
     {

Original file line number	Diff line number	Diff line change
`@@ -5,20 +5,20 @@`
`5`	`5`	`*/`
`6`	`6`	`namespace Magento\Framework\Code\Test\Unit\Validator;`
`7`	`7`
`8`		`-use Magento\SomeModule\Model\NamedArguments\NamedParametersTest;`
`9`		`-use Magento\SomeModule\Model\NamedArguments\MixedParametersTest;`
	`8`	`+use Magento\SomeModule\Model\NamedArguments\TestNamedParameters;`
	`9`	`+use Magento\SomeModule\Model\NamedArguments\TestMixedParameters;`
`10`	`10`	`use PHPUnit\Framework\TestCase;`
`11`	`11`	`use Magento\Framework\Code\Validator\ConstructorIntegrity;`
`12`	`12`	`use Magento\Framework\Exception\ValidatorException;`
`13`	`13`
`14`		`-require_once __DIR__ . '/../_files/app/code/Magento/SomeModule/Model/Three/Test.php';`
`15`		`-require_once __DIR__ . '/../_files/app/code/Magento/SomeModule/Model/Two/Test.php';`
`16`		`-require_once __DIR__ . '/../_files/app/code/Magento/SomeModule/Model/One/TestFinal.php';`
`17`		`-require_once __DIR__ . '/../_files/app/code/Magento/SomeModule/Model/Four/Test.php';`
`18`		`-require_once __DIR__ . '/../_files/app/code/Magento/SomeModule/Model/Five/Test.php';`
`19`		`-require_once __DIR__ . '/../_files/app/code/Magento/SomeModule/Model/Six/Test.php';`
`20`		`-require_once __DIR__ . '/../_files/app/code/Magento/SomeModule/Model/NamedArguments/NamedParametersTest.php';`
`21`		`-require_once __DIR__ . '/../_files/app/code/Magento/SomeModule/Model/NamedArguments/MixedParametersTest.php';`
	`14`	`+require_once __DIR__ . '/../_files/app/code/Magento/SomeModule/Model/Three/TestThree.php';`
	`15`	`+require_once __DIR__ . '/../_files/app/code/Magento/SomeModule/Model/Two/TestTwo.php';`
	`16`	`+require_once __DIR__ . '/../_files/app/code/Magento/SomeModule/Model/One/TestOne.php';`
	`17`	`+require_once __DIR__ . '/../_files/app/code/Magento/SomeModule/Model/Four/TestFour.php';`
	`18`	`+require_once __DIR__ . '/../_files/app/code/Magento/SomeModule/Model/Five/TestFive.php';`
	`19`	`+require_once __DIR__ . '/../_files/app/code/Magento/SomeModule/Model/Six/TestSix.php';`
	`20`	`+require_once __DIR__ . '/../_files/app/code/Magento/SomeModule/Model/NamedArguments/TestNamedParameters.php';`
	`21`	`+require_once __DIR__ . '/../_files/app/code/Magento/SomeModule/Model/NamedArguments/TestMixedParameters.php';`
`22`	`22`	`require_once __DIR__ . '/_files/ClassesForConstructorIntegrity.php';`
`23`	`23`	`class ConstructorIntegrityTest extends TestCase`
`24`	`24`	`{`
`@@ -34,48 +34,48 @@ protected function setUp(): void`
`34`	`34`
`35`	`35`	`public function testValidateIfParentClassExist()`
`36`	`36`	`{`
`37`		`- $this->assertTrue($this->_model->validate(\Magento\SomeModule\Model\One\TestFinal::class));`
	`37`	`+ $this->assertTrue($this->_model->validate(\Magento\SomeModule\Model\One\TestOne::class));`
`38`	`38`	`}`
`39`	`39`
`40`	`40`	`public function testValidateIfClassHasParentConstructCall()`
`41`	`41`	`{`
`42`		`- $this->assertTrue($this->_model->validate(\Magento\SomeModule\Model\Two\Test::class));`
	`42`	`+ $this->assertTrue($this->_model->validate(\Magento\SomeModule\Model\Two\TestTwo::class));`
`43`	`43`	`}`
`44`	`44`
`45`	`45`	`public function testValidateIfClassHasParentConstructCallWithNamedArguments()`
`46`	`46`	`{`
`47`		`- $this->assertTrue($this->_model->validate(NamedParametersTest::class));`
	`47`	`+ $this->assertTrue($this->_model->validate(TestNamedParameters::class));`
`48`	`48`	`}`
`49`	`49`
`50`	`50`	`public function testValidateIfClassHasParentConstructCallWithMixedArguments()`
`51`	`51`	`{`
`52`		`- $this->assertTrue($this->_model->validate(MixedParametersTest::class));`
	`52`	`+ $this->assertTrue($this->_model->validate(TestMixedParameters::class));`
`53`	`53`	`}`
`54`	`54`
`55`	`55`	`public function testValidateIfClassHasArgumentsQtyEqualToParentClass()`
`56`	`56`	`{`
`57`		`- $this->assertTrue($this->_model->validate(\Magento\SomeModule\Model\Three\Test::class));`
	`57`	`+ $this->assertTrue($this->_model->validate(\Magento\SomeModule\Model\Three\TestThree::class));`
`58`	`58`	`}`
`59`	`59`
`60`	`60`	`public function testValidateIfClassHasExtraArgumentInTheParentConstructor()`
`61`	`61`	`{`
`62`		`- $this->_model->validate(\Magento\SomeModule\Model\Four\Test::class);`
	`62`	`+ $this->_model->validate(\Magento\SomeModule\Model\Four\TestFour::class);`
`63`	`63`	`}`
`64`	`64`
`65`	`65`	`public function testValidateIfClassHasMissingRequiredArguments()`
`66`	`66`	`{`
`67`		`- $fileName = realpath(__DIR__ . '/../_files/app/code/Magento/SomeModule/Model/Five/Test.php');`
	`67`	`+ $fileName = realpath(__DIR__ . '/../_files/app/code/Magento/SomeModule/Model/Five/TestFive.php');`
`68`	`68`	`$fileName = str_replace('\\', '/', $fileName);`
`69`	`69`	`$this->expectException(ValidatorException::class);`
`70`	`70`	`$this->expectExceptionMessage(`
`71`	`71`	`'Missed required argument factory in parent::__construct call. File: ' . $fileName`
`72`	`72`	`);`
`73`		`- $this->_model->validate(\Magento\SomeModule\Model\Five\Test::class);`
	`73`	`+ $this->_model->validate(\Magento\SomeModule\Model\Five\TestFive::class);`
`74`	`74`	`}`
`75`	`75`
`76`	`76`	`public function testValidateIfClassHasIncompatibleArguments()`
`77`	`77`	`{`
`78`		`- $fileName = realpath(__DIR__ . '/../_files/app/code/Magento/SomeModule/Model/Six/Test.php');`
	`78`	`+ $fileName = realpath(__DIR__ . '/../_files/app/code/Magento/SomeModule/Model/Six/TestSix.php');`
`79`	`79`	`$fileName = str_replace('\\', '/', $fileName);`
`80`	`80`	`$this->expectException(ValidatorException::class);`
`81`	`81`	`$this->expectExceptionMessage(`
`@@ -84,7 +84,7 @@ public function testValidateIfClassHasIncompatibleArguments()`
`84`	`84`	`PHP_EOL .`
`85`	`85`	`$fileName`
`86`	`86`	`);`
`87`		`- $this->_model->validate(\Magento\SomeModule\Model\Six\Test::class);`
	`87`	`+ $this->_model->validate(\Magento\SomeModule\Model\Six\TestSix::class);`
`88`	`88`	`}`
`89`	`89`
`90`	`90`	`public function testValidateWrongOrderForParentArguments()`
Original file line number	Diff line number	Diff line change
`@@ -7,9 +7,9 @@`
`7`	`7`
`8`	`8`	`namespace Magento\SomeModule\Model\NamedArguments;`
`9`	`9`
`10`		`-require_once __DIR__ . '/ParentClassTest.php';`
	`10`	`+require_once __DIR__ . '/TestParentClass.php';`
`11`	`11`
`12`		`-class MixedParametersTest extends ParentClassTest`
	`12`	`+class TestMixedParameters extends TestParentClass`
`13`	`13`	`{`
`14`	`14`	`/**`
`15`	`15`	`* @param \stdClass $stdClassObject`
Original file line number	Diff line number	Diff line change
`@@ -7,7 +7,7 @@`
`7`	`7`
`8`	`8`	`namespace Magento\SomeModule\Model\NamedArguments;`
`9`	`9`
`10`		`-class ParentClassTest`
	`10`	`+class TestParentClass`
`11`	`11`	`{`
`12`	`12`	`/**`
`13`	`13`	`* @var \stdClass`
Original file line number	Diff line number	Diff line change
`@@ -8,7 +8,7 @@`
`8`	`8`	`use PHPUnit\Framework\TestCase;`
`9`	`9`
`10`	`10`	`require_once __DIR__ . '/../Proxy.php';`
`11`		`-class TestFinal`
	`11`	`+class TestOne`
`12`	`12`	`{`
`13`	`13`	`/**`
`14`	`14`	`* @var \Magento\SomeModule\Model\Proxy`