Tests/FindExtendedClassNameTest: add extra tests

This adds some extra tests which were already in use in PHPCSUtils. This brings test coverage for this method up to 100%.

It also cleans up the test case file a little by removing some code which isn't actually used in the tests (namespace declaration) and moves the "class not extended" test up.

Author: jrfnl

tests/Core/File/FindExtendedClassNameTest.inc

@@ -1,17 +1,19 @@
 <?php
 
-namespace PHP_CodeSniffer\Tests\Core\File;
+/* testNotAClass */
+function notAClass() {}
 
-class testFECNClass {}
+/* testNonExtendedClass */
+class testFECNNonExtendedClass {}
 
 /* testExtendsUnqualifiedClass */
 class testFECNExtendedClass extends testFECNClass {}
 
 /* testExtendsFullyQualifiedClass */
 class testFECNNamespacedClass extends \PHP_CodeSniffer\Tests\Core\File\testFECNClass {}
 
-/* testNonExtendedClass */
-class testFECNNonExtendedClass {}
+/* testExtendsPartiallyQualifiedClass */
+class testFECNQualifiedClass extends Core\File\RelativeClass {}
 
 /* testNonExtendedInterface */
 interface testFECNInterface {}
@@ -22,6 +24,9 @@ interface testInterfaceThatExtendsInterface extends testFECNInterface{}
 /* testInterfaceExtendsFullyQualifiedInterface */
 interface testInterfaceThatExtendsFQCNInterface extends \PHP_CodeSniffer\Tests\Core\File\testFECNInterface{}
 
+/* testExtendedAnonClass */
+$anon = new class( $a, $b ) extends testFECNExtendedAnonClass {};
+
 /* testNestedExtendedClass */
 class testFECNNestedExtendedClass {
 	public function someMethod() {
@@ -35,3 +40,13 @@ class testFECNClassThatExtendsAndImplements extends testFECNClass implements Int
 
 /* testClassThatImplementsAndExtends */
 class testFECNClassThatImplementsAndExtends implements InterfaceA, InterfaceB extends testFECNClass {}
+
+/* testInterfaceMultiExtends */
+interface Multi extends \Package\FooInterface, \BarInterface {};
+
+/* testMissingExtendsName */
+class testMissingExtendsName extends { /* missing classname */ } // Intentional parse error.
+
+// Intentional parse error. Has to be the last test in the file.
+/* testParseError */
+class testParseError extends testFECNClass

tests/Core/File/FindExtendedClassNameTest.php

@@ -20,6 +20,33 @@ class FindExtendedClassNameTest extends AbstractMethodUnitTest
 {
 
 
+    /**
+     * Test getting a `false` result when a non-existent token is passed.
+     *
+     * @return void
+     */
+    public function testNonExistentToken()
+    {
+        $result = self::$phpcsFile->findExtendedClassName(100000);
+        $this->assertFalse($result);
+
+    }//end testNonExistentToken()
+
+
+    /**
+     * Test getting a `false` result when a token other than one of the supported tokens is passed.
+     *
+     * @return void
+     */
+    public function testNotAClass()
+    {
+        $token  = $this->getTargetToken('/* testNotAClass */', [T_FUNCTION]);
+        $result = self::$phpcsFile->findExtendedClassName($token);
+        $this->assertFalse($result);
+
+    }//end testNotAClass()
+
+
     /**
      * Test retrieving the name of the class being extended by another class
      * (or interface).
@@ -50,6 +77,10 @@ public function testFindExtendedClassName($identifier, $expected)
     public function dataExtendedClass()
     {
         return [
+            'class does not extend'                                       => [
+                'identifier' => '/* testNonExtendedClass */',
+                'expected'   => false,
+            ],
             'class extends unqualified class'                             => [
                 'identifier' => '/* testExtendsUnqualifiedClass */',
                 'expected'   => 'testFECNClass',
@@ -58,9 +89,9 @@ public function dataExtendedClass()
                 'identifier' => '/* testExtendsFullyQualifiedClass */',
                 'expected'   => '\PHP_CodeSniffer\Tests\Core\File\testFECNClass',
             ],
-            'class does not extend'                                       => [
-                'identifier' => '/* testNonExtendedClass */',
-                'expected'   => false,
+            'class extends partially qualified class'                     => [
+                'identifier' => '/* testExtendsPartiallyQualifiedClass */',
+                'expected'   => 'Core\File\RelativeClass',
             ],
             'interface does not extend'                                   => [
                 'identifier' => '/* testNonExtendedInterface */',
@@ -74,6 +105,10 @@ public function dataExtendedClass()
                 'identifier' => '/* testInterfaceExtendsFullyQualifiedInterface */',
                 'expected'   => '\PHP_CodeSniffer\Tests\Core\File\testFECNInterface',
             ],
+            'anon class extends unqualified class'                        => [
+                'identifier' => '/* testExtendedAnonClass */',
+                'expected'   => 'testFECNExtendedAnonClass',
+            ],
             'class does not extend but contains anon class which extends' => [
                 'identifier' => '/* testNestedExtendedClass */',
                 'expected'   => false,
@@ -90,6 +125,18 @@ public function dataExtendedClass()
                 'identifier' => '/* testClassThatImplementsAndExtends */',
                 'expected'   => 'testFECNClass',
             ],
+            'interface extends multiple interfaces (not supported)'       => [
+                'identifier' => '/* testInterfaceMultiExtends */',
+                'expected'   => '\Package\FooInterface',
+            ],
+            'parse error - extends keyword, but no class name'            => [
+                'identifier' => '/* testMissingExtendsName */',
+                'expected'   => false,
+            ],
+            'parse error - live coding - no curly braces'                 => [
+                'identifier' => '/* testParseError */',
+                'expected'   => false,
+            ],
         ];
 
     }//end dataExtendedClass()