Tests/Core: rename AbstractMethodUnitTest to AbstractMethodTestCase

jrfnl · jrfnl · commit bd8ccf9419b1 · 2025-04-15T14:59:00.000+02:00
... to comply with PHPUnit naming conventions, which are more strictly enforced as of PHPUnit 10.

Ref: sebastianbergmann/phpunit 5132
diff --git a/tests/Core/AbstractMethodTestCase.php b/tests/Core/AbstractMethodTestCase.php
@@ -16,7 +16,7 @@
 use PHP_CodeSniffer\Tests\ConfigDouble;
 use PHPUnit\Framework\TestCase;
 
-abstract class AbstractMethodUnitTest extends TestCase
+abstract class AbstractMethodTestCase extends TestCase
 {
 
     /**
diff --git a/tests/Core/File/FindEndOfStatementTest.php b/tests/Core/File/FindEndOfStatementTest.php
@@ -9,15 +9,15 @@
 
 namespace PHP_CodeSniffer\Tests\Core\File;
 
-use PHP_CodeSniffer\Tests\Core\AbstractMethodUnitTest;
+use PHP_CodeSniffer\Tests\Core\AbstractMethodTestCase;
 use PHP_CodeSniffer\Util\Tokens;
 
 /**
  * Tests for the \PHP_CodeSniffer\Files\File::findEndOfStatement method.
  *
  * @covers \PHP_CodeSniffer\Files\File::findEndOfStatement
  */
-final class FindEndOfStatementTest extends AbstractMethodUnitTest
+final class FindEndOfStatementTest extends AbstractMethodTestCase
 {
 
 
diff --git a/tests/Core/File/FindExtendedClassNameTest.php b/tests/Core/File/FindExtendedClassNameTest.php
@@ -9,14 +9,14 @@
 
 namespace PHP_CodeSniffer\Tests\Core\File;
 
-use PHP_CodeSniffer\Tests\Core\AbstractMethodUnitTest;
+use PHP_CodeSniffer\Tests\Core\AbstractMethodTestCase;
 
 /**
  * Tests for the \PHP_CodeSniffer\Files\File::findExtendedClassName method.
  *
  * @covers \PHP_CodeSniffer\Files\File::findExtendedClassName
  */
-final class FindExtendedClassNameTest extends AbstractMethodUnitTest
+final class FindExtendedClassNameTest extends AbstractMethodTestCase
 {
 
 
diff --git a/tests/Core/File/FindImplementedInterfaceNamesTest.php b/tests/Core/File/FindImplementedInterfaceNamesTest.php
@@ -9,14 +9,14 @@
 
 namespace PHP_CodeSniffer\Tests\Core\File;
 
-use PHP_CodeSniffer\Tests\Core\AbstractMethodUnitTest;
+use PHP_CodeSniffer\Tests\Core\AbstractMethodTestCase;
 
 /**
  * Tests for the \PHP_CodeSniffer\Files\File::findImplementedInterfaceNames method.
  *
  * @covers \PHP_CodeSniffer\Files\File::findImplementedInterfaceNames
  */
-final class FindImplementedInterfaceNamesTest extends AbstractMethodUnitTest
+final class FindImplementedInterfaceNamesTest extends AbstractMethodTestCase
 {
 
 
diff --git a/tests/Core/File/FindStartOfStatementTest.php b/tests/Core/File/FindStartOfStatementTest.php
@@ -11,15 +11,15 @@
 
 namespace PHP_CodeSniffer\Tests\Core\File;
 
-use PHP_CodeSniffer\Tests\Core\AbstractMethodUnitTest;
+use PHP_CodeSniffer\Tests\Core\AbstractMethodTestCase;
 use PHP_CodeSniffer\Util\Tokens;
 
 /**
  * Tests for the \PHP_CodeSniffer\Files\File:findStartOfStatement method.
  *
  * @covers \PHP_CodeSniffer\Files\File::findStartOfStatement
  */
-final class FindStartOfStatementTest extends AbstractMethodUnitTest
+final class FindStartOfStatementTest extends AbstractMethodTestCase
 {
 
 
diff --git a/tests/Core/File/GetClassPropertiesTest.php b/tests/Core/File/GetClassPropertiesTest.php
@@ -9,14 +9,14 @@
 
 namespace PHP_CodeSniffer\Tests\Core\File;
 
-use PHP_CodeSniffer\Tests\Core\AbstractMethodUnitTest;
+use PHP_CodeSniffer\Tests\Core\AbstractMethodTestCase;
 
 /**
  * Tests for the \PHP_CodeSniffer\Files\File:getClassProperties method.
  *
  * @covers \PHP_CodeSniffer\Files\File::getClassProperties
  */
-final class GetClassPropertiesTest extends AbstractMethodUnitTest
+final class GetClassPropertiesTest extends AbstractMethodTestCase
 {
 
 
diff --git a/tests/Core/File/GetConditionTest.php b/tests/Core/File/GetConditionTest.php
@@ -9,7 +9,7 @@
 
 namespace PHP_CodeSniffer\Tests\Core\File;
 
-use PHP_CodeSniffer\Tests\Core\AbstractMethodUnitTest;
+use PHP_CodeSniffer\Tests\Core\AbstractMethodTestCase;
 use PHP_CodeSniffer\Util\Tokens;
 
 /**
@@ -18,7 +18,7 @@
  * @covers \PHP_CodeSniffer\Files\File::getCondition
  * @covers \PHP_CodeSniffer\Files\File::hasCondition
  */
-final class GetConditionTest extends AbstractMethodUnitTest
+final class GetConditionTest extends AbstractMethodTestCase
 {
 
     /**
diff --git a/tests/Core/File/GetDeclarationNameParseError1Test.php b/tests/Core/File/GetDeclarationNameParseError1Test.php
@@ -9,14 +9,14 @@
 
 namespace PHP_CodeSniffer\Tests\Core\File;
 
-use PHP_CodeSniffer\Tests\Core\AbstractMethodUnitTest;
+use PHP_CodeSniffer\Tests\Core\AbstractMethodTestCase;
 
 /**
  * Tests for the \PHP_CodeSniffer\Files\File:getDeclarationName method.
  *
  * @covers \PHP_CodeSniffer\Files\File::getDeclarationName
  */
-final class GetDeclarationNameParseError1Test extends AbstractMethodUnitTest
+final class GetDeclarationNameParseError1Test extends AbstractMethodTestCase
 {
 
 
diff --git a/tests/Core/File/GetDeclarationNameParseError2Test.php b/tests/Core/File/GetDeclarationNameParseError2Test.php
@@ -9,14 +9,14 @@
 
 namespace PHP_CodeSniffer\Tests\Core\File;
 
-use PHP_CodeSniffer\Tests\Core\AbstractMethodUnitTest;
+use PHP_CodeSniffer\Tests\Core\AbstractMethodTestCase;
 
 /**
  * Tests for the \PHP_CodeSniffer\Files\File:getDeclarationName method.
  *
  * @covers \PHP_CodeSniffer\Files\File::getDeclarationName
  */
-final class GetDeclarationNameParseError2Test extends AbstractMethodUnitTest
+final class GetDeclarationNameParseError2Test extends AbstractMethodTestCase
 {
 
 
diff --git a/tests/Core/File/GetDeclarationNameTest.php b/tests/Core/File/GetDeclarationNameTest.php
@@ -9,14 +9,14 @@
 
 namespace PHP_CodeSniffer\Tests\Core\File;
 
-use PHP_CodeSniffer\Tests\Core\AbstractMethodUnitTest;
+use PHP_CodeSniffer\Tests\Core\AbstractMethodTestCase;
 
 /**
  * Tests for the \PHP_CodeSniffer\Files\File:getDeclarationName method.
  *
  * @covers \PHP_CodeSniffer\Files\File::getDeclarationName
  */
-final class GetDeclarationNameTest extends AbstractMethodUnitTest
+final class GetDeclarationNameTest extends AbstractMethodTestCase
 {
 
 
diff --git a/tests/Core/File/GetMemberPropertiesTest.php b/tests/Core/File/GetMemberPropertiesTest.php
@@ -9,14 +9,14 @@
 
 namespace PHP_CodeSniffer\Tests\Core\File;
 
-use PHP_CodeSniffer\Tests\Core\AbstractMethodUnitTest;
+use PHP_CodeSniffer\Tests\Core\AbstractMethodTestCase;
 
 /**
  * Tests for the \PHP_CodeSniffer\Files\File::getMemberProperties method.
  *
  * @covers \PHP_CodeSniffer\Files\File::getMemberProperties
  */
-final class GetMemberPropertiesTest extends AbstractMethodUnitTest
+final class GetMemberPropertiesTest extends AbstractMethodTestCase
 {
 
 
diff --git a/tests/Core/File/GetMethodParametersParseError1Test.php b/tests/Core/File/GetMethodParametersParseError1Test.php
@@ -9,14 +9,14 @@
 
 namespace PHP_CodeSniffer\Tests\Core\File;
 
-use PHP_CodeSniffer\Tests\Core\AbstractMethodUnitTest;
+use PHP_CodeSniffer\Tests\Core\AbstractMethodTestCase;
 
 /**
  * Tests for the \PHP_CodeSniffer\Files\File::getMethodParameters method.
  *
  * @covers \PHP_CodeSniffer\Files\File::getMethodParameters
  */
-final class GetMethodParametersParseError1Test extends AbstractMethodUnitTest
+final class GetMethodParametersParseError1Test extends AbstractMethodTestCase
 {
 
 
diff --git a/tests/Core/File/GetMethodParametersParseError2Test.php b/tests/Core/File/GetMethodParametersParseError2Test.php
@@ -9,14 +9,14 @@
 
 namespace PHP_CodeSniffer\Tests\Core\File;
 
-use PHP_CodeSniffer\Tests\Core\AbstractMethodUnitTest;
+use PHP_CodeSniffer\Tests\Core\AbstractMethodTestCase;
 
 /**
  * Tests for the \PHP_CodeSniffer\Files\File::getMethodParameters method.
  *
  * @covers \PHP_CodeSniffer\Files\File::getMethodParameters
  */
-final class GetMethodParametersParseError2Test extends AbstractMethodUnitTest
+final class GetMethodParametersParseError2Test extends AbstractMethodTestCase
 {
 
 
diff --git a/tests/Core/File/GetMethodParametersTest.php b/tests/Core/File/GetMethodParametersTest.php
@@ -11,14 +11,14 @@
 
 namespace PHP_CodeSniffer\Tests\Core\File;
 
-use PHP_CodeSniffer\Tests\Core\AbstractMethodUnitTest;
+use PHP_CodeSniffer\Tests\Core\AbstractMethodTestCase;
 
 /**
  * Tests for the \PHP_CodeSniffer\Files\File::getMethodParameters method.
  *
  * @covers \PHP_CodeSniffer\Files\File::getMethodParameters
  */
-final class GetMethodParametersTest extends AbstractMethodUnitTest
+final class GetMethodParametersTest extends AbstractMethodTestCase
 {
 
 
diff --git a/tests/Core/File/GetMethodPropertiesTest.php b/tests/Core/File/GetMethodPropertiesTest.php
@@ -9,14 +9,14 @@
 
 namespace PHP_CodeSniffer\Tests\Core\File;
 
-use PHP_CodeSniffer\Tests\Core\AbstractMethodUnitTest;
+use PHP_CodeSniffer\Tests\Core\AbstractMethodTestCase;
 
 /**
  * Tests for the \PHP_CodeSniffer\Files\File::getMethodProperties method.
  *
  * @covers \PHP_CodeSniffer\Files\File::getMethodProperties
  */
-final class GetMethodPropertiesTest extends AbstractMethodUnitTest
+final class GetMethodPropertiesTest extends AbstractMethodTestCase
 {
 
 
diff --git a/tests/Core/File/GetTokensAsStringTest.php b/tests/Core/File/GetTokensAsStringTest.php
@@ -9,14 +9,14 @@
 
 namespace PHP_CodeSniffer\Tests\Core\File;
 
-use PHP_CodeSniffer\Tests\Core\AbstractMethodUnitTest;
+use PHP_CodeSniffer\Tests\Core\AbstractMethodTestCase;
 
 /**
  * Tests for the \PHP_CodeSniffer\Files\File:getTokensAsString method.
  *
  * @covers \PHP_CodeSniffer\Files\File::getTokensAsString
  */
-final class GetTokensAsStringTest extends AbstractMethodUnitTest
+final class GetTokensAsStringTest extends AbstractMethodTestCase
 {
 
 
diff --git a/tests/Core/File/IsReferenceTest.php b/tests/Core/File/IsReferenceTest.php
@@ -9,14 +9,14 @@
 
 namespace PHP_CodeSniffer\Tests\Core\File;
 
-use PHP_CodeSniffer\Tests\Core\AbstractMethodUnitTest;
+use PHP_CodeSniffer\Tests\Core\AbstractMethodTestCase;
 
 /**
  * Tests for the \PHP_CodeSniffer\Files\File::isReference method.
  *
  * @covers \PHP_CodeSniffer\Files\File::isReference
  */
-final class IsReferenceTest extends AbstractMethodUnitTest
+final class IsReferenceTest extends AbstractMethodTestCase
 {
 
 
diff --git a/tests/Core/Sniffs/AbstractArraySniffTest.php b/tests/Core/Sniffs/AbstractArraySniffTest.php
@@ -9,14 +9,14 @@
 
 namespace PHP_CodeSniffer\Tests\Core\Sniffs;
 
-use PHP_CodeSniffer\Tests\Core\AbstractMethodUnitTest;
+use PHP_CodeSniffer\Tests\Core\AbstractMethodTestCase;
 
 /**
  * Tests for the \PHP_CodeSniffer\Sniffs\AbstractArraySniff.
  *
  * @covers \PHP_CodeSniffer\Sniffs\AbstractArraySniff
  */
-final class AbstractArraySniffTest extends AbstractMethodUnitTest
+final class AbstractArraySniffTest extends AbstractMethodTestCase
 {
 
     /**
diff --git a/tests/Core/Tokenizers/AbstractTokenizerTestCase.php b/tests/Core/Tokenizers/AbstractTokenizerTestCase.php
@@ -2,7 +2,7 @@
 /**
  * Base class to use when testing parts of the tokenizer.
  *
- * This is a near duplicate of the AbstractMethodUnitTest class, with the
+ * This is a near duplicate of the AbstractMethodTestCase class, with the
  * difference being that it allows for recording code coverage for tokenizer tests.
  *
  * @author    Juliette Reinders Folmer <phpcs_nospam@adviesenzo.nl>
@@ -15,7 +15,7 @@
 use PHP_CodeSniffer\Files\DummyFile;
 use PHP_CodeSniffer\Ruleset;
 use PHP_CodeSniffer\Tests\ConfigDouble;
-use PHP_CodeSniffer\Tests\Core\AbstractMethodUnitTest;
+use PHP_CodeSniffer\Tests\Core\AbstractMethodTestCase;
 use PHPUnit\Framework\TestCase;
 use ReflectionProperty;
 
@@ -90,7 +90,7 @@ protected function setUp(): void
      */
     public function testTestMarkersAreUnique()
     {
-        AbstractMethodUnitTest::assertTestMarkersAreUnique($this->phpcsFile);
+        AbstractMethodTestCase::assertTestMarkersAreUnique($this->phpcsFile);
 
     }//end testTestMarkersAreUnique()
 
@@ -109,7 +109,7 @@ public function testTestMarkersAreUnique()
      */
     protected function getTargetToken($commentString, $tokenType, $tokenContent=null)
     {
-        return AbstractMethodUnitTest::getTargetTokenFromFile($this->phpcsFile, $commentString, $tokenType, $tokenContent);
+        return AbstractMethodTestCase::getTargetTokenFromFile($this->phpcsFile, $commentString, $tokenType, $tokenContent);
 
     }//end getTargetToken()
 

Original file line number	Diff line number	Diff line change
`@@ -16,7 +16,7 @@`
`16`	`16`	`use PHP_CodeSniffer\Tests\ConfigDouble;`
`17`	`17`	`use PHPUnit\Framework\TestCase;`
`18`	`18`
`19`		`-abstract class AbstractMethodUnitTest extends TestCase`
	`19`	`+abstract class AbstractMethodTestCase extends TestCase`
`20`	`20`	`{`
`21`	`21`
`22`	`22`	`/**`
Original file line number	Diff line number	Diff line change
`@@ -9,15 +9,15 @@`
`9`	`9`
`10`	`10`	`namespace PHP_CodeSniffer\Tests\Core\File;`
`11`	`11`
`12`		`-use PHP_CodeSniffer\Tests\Core\AbstractMethodUnitTest;`
	`12`	`+use PHP_CodeSniffer\Tests\Core\AbstractMethodTestCase;`
`13`	`13`	`use PHP_CodeSniffer\Util\Tokens;`
`14`	`14`
`15`	`15`	`/**`
`16`	`16`	`* Tests for the \PHP_CodeSniffer\Files\File::findEndOfStatement method.`
`17`	`17`	`*`
`18`	`18`	`* @covers \PHP_CodeSniffer\Files\File::findEndOfStatement`
`19`	`19`	`*/`
`20`		`-final class FindEndOfStatementTest extends AbstractMethodUnitTest`
	`20`	`+final class FindEndOfStatementTest extends AbstractMethodTestCase`
`21`	`21`	`{`
`22`	`22`
`23`	`23`
Original file line number	Diff line number	Diff line change
`@@ -9,14 +9,14 @@`
`9`	`9`
`10`	`10`	`namespace PHP_CodeSniffer\Tests\Core\File;`
`11`	`11`
`12`		`-use PHP_CodeSniffer\Tests\Core\AbstractMethodUnitTest;`
	`12`	`+use PHP_CodeSniffer\Tests\Core\AbstractMethodTestCase;`
`13`	`13`
`14`	`14`	`/**`
`15`	`15`	`* Tests for the \PHP_CodeSniffer\Files\File::findExtendedClassName method.`
`16`	`16`	`*`
`17`	`17`	`* @covers \PHP_CodeSniffer\Files\File::findExtendedClassName`
`18`	`18`	`*/`
`19`		`-final class FindExtendedClassNameTest extends AbstractMethodUnitTest`
	`19`	`+final class FindExtendedClassNameTest extends AbstractMethodTestCase`
`20`	`20`	`{`
`21`	`21`
`22`	`22`
Original file line number	Diff line number	Diff line change
`@@ -11,15 +11,15 @@`
`11`	`11`
`12`	`12`	`namespace PHP_CodeSniffer\Tests\Core\File;`
`13`	`13`
`14`		`-use PHP_CodeSniffer\Tests\Core\AbstractMethodUnitTest;`
	`14`	`+use PHP_CodeSniffer\Tests\Core\AbstractMethodTestCase;`
`15`	`15`	`use PHP_CodeSniffer\Util\Tokens;`
`16`	`16`
`17`	`17`	`/**`
`18`	`18`	`* Tests for the \PHP_CodeSniffer\Files\File:findStartOfStatement method.`
`19`	`19`	`*`
`20`	`20`	`* @covers \PHP_CodeSniffer\Files\File::findStartOfStatement`
`21`	`21`	`*/`
`22`		`-final class FindStartOfStatementTest extends AbstractMethodUnitTest`
	`22`	`+final class FindStartOfStatementTest extends AbstractMethodTestCase`
`23`	`23`	`{`
`24`	`24`
`25`	`25`