feat: enhance isTestoMethod and isTestoClass logic; add tests for methods in Testo-annotated classes

Author: xepozz

src/main/kotlin/com/github/xepozz/testo/mixin.kt

@@ -24,11 +24,20 @@ fun PsiElement.isTestoFunction() = when(this) {
     else -> false
 }
 
-fun PsiElement.isTestoMethod() = when(this) {
-    is Method -> (modifier.isPublic && name.startsWith("test")) || hasAnyAttribute(*TestoClasses.TEST_ATTRIBUTES)
+fun PsiElement.isTestoMethod() = when (this) {
+    is Method -> hasAnyAttribute(*TestoClasses.TEST_ATTRIBUTES)
+            || (modifier.isPublic && name.startsWith("test"))
+            || isPublicMethodOfTestoMarkedClass()
     else -> false
 }
 
+private fun Method.isPublicMethodOfTestoMarkedClass() = when {
+    !modifier.isPublic -> false
+    modifier.isAbstract -> false
+    name.startsWith("__") -> false
+    else -> containingClass?.hasAnyAttribute(*TestoClasses.TEST_ATTRIBUTES) == true
+}
+
 fun PsiElement.isTestoDataProviderLike() = when (this) {
     is Method -> modifier.isPublic && modifier.isStatic
     is Function -> true
@@ -39,7 +48,9 @@ fun PhpAttributesOwner.hasAttribute(fqn: String) = getAttributes(fqn).isNotEmpty
 fun PhpAttributesOwner.hasAnyAttribute(vararg fqn: String) = attributes.any { it.fqn in fqn }
 
 fun PsiElement.isTestoClass() = when (this) {
-    is PhpClass -> TestoTestDescriptor.isTestClassName(name) || ownMethods.any { it.isTestoMethod() || it.isTestoBench() }
+    is PhpClass -> TestoTestDescriptor.isTestClassName(name)
+            || hasAnyAttribute(*TestoClasses.TEST_ATTRIBUTES)
+            || ownMethods.any { it.isTestoMethod() || it.isTestoBench() }
     else -> false
 }
 

src/test/kotlin/com/github/xepozz/testo/MixinPsiTest.kt

@@ -235,4 +235,97 @@ class MixinPsiTest : BasePlatformTestCase() {
         val method = PsiTreeUtil.findChildOfType(psiFile, Method::class.java)!!
         assertTrue("Method named exactly 'test' should be a Testo method", method.isTestoMethod())
     }
+
+    // ---- Class-level #[Testo\Test] attribute ----
+
+    fun testIsTestoClass_classLevelTestAttribute() {
+        val psiFile = myFixture.configureByText(
+            PhpFileType.INSTANCE,
+            """<?php
+            namespace App;
+            #[\Testo\Test]
+            class UserService { public function it_works(): void {} }"""
+        )
+        val phpClass = PsiTreeUtil.findChildOfType(psiFile, PhpClass::class.java)!!
+        assertTrue("Class with #[Testo\\Test] attribute should be a Testo class", phpClass.isTestoClass())
+    }
+
+    fun testIsTestoMethod_publicMethodInClassWithTestAttribute() {
+        val psiFile = myFixture.configureByText(
+            PhpFileType.INSTANCE,
+            """<?php
+            #[\Testo\Test]
+            class Foo { public function it_works(): void {} }"""
+        )
+        val method = PsiTreeUtil.findChildOfType(psiFile, Method::class.java)!!
+        assertTrue("Public method in class marked with #[Testo\\Test] should be runnable", method.isTestoMethod())
+    }
+
+    fun testIsTestoMethod_privateMethodInClassWithTestAttribute() {
+        val psiFile = myFixture.configureByText(
+            PhpFileType.INSTANCE,
+            """<?php
+            #[\Testo\Test]
+            class Foo { private function helper(): void {} }"""
+        )
+        val method = PsiTreeUtil.findChildOfType(psiFile, Method::class.java)!!
+        assertFalse("Private method in #[Testo\\Test] class should not be runnable", method.isTestoMethod())
+    }
+
+    fun testIsTestoMethod_staticMethodInClassWithTestAttribute() {
+        val psiFile = myFixture.configureByText(
+            PhpFileType.INSTANCE,
+            """<?php
+            #[\Testo\Test]
+            class Foo { public static function provide(): iterable { yield [1]; } }"""
+        )
+        val method = PsiTreeUtil.findChildOfType(psiFile, Method::class.java)!!
+        assertFalse("Public static method in #[Testo\\Test] class should not be runnable", method.isTestoMethod())
+    }
+
+    fun testIsTestoMethod_magicMethodInClassWithTestAttribute() {
+        val psiFile = myFixture.configureByText(
+            PhpFileType.INSTANCE,
+            """<?php
+            #[\Testo\Test]
+            class Foo { public function __construct() {} }"""
+        )
+        val method = PsiTreeUtil.findChildOfType(psiFile, Method::class.java)!!
+        assertFalse("Magic method in #[Testo\\Test] class should not be runnable", method.isTestoMethod())
+    }
+
+    fun testIsTestoMethod_abstractMethodInClassWithTestAttribute() {
+        val psiFile = myFixture.configureByText(
+            PhpFileType.INSTANCE,
+            """<?php
+            #[\Testo\Test]
+            abstract class Foo { abstract public function it_works(): void; }"""
+        )
+        val method = PsiTreeUtil.findChildOfType(psiFile, Method::class.java)!!
+        assertFalse("Abstract method in #[Testo\\Test] class should not be runnable", method.isTestoMethod())
+    }
+
+    fun testIsTestoMethod_publicMethodInRegularClass() {
+        val psiFile = myFixture.configureByText(
+            PhpFileType.INSTANCE,
+            """<?php class Foo { public function it_works(): void {} }"""
+        )
+        val method = PsiTreeUtil.findChildOfType(psiFile, Method::class.java)!!
+        assertFalse("Public method in non-Testo class should not be runnable", method.isTestoMethod())
+    }
+
+    fun testIsTestoMethod_benchMethodInClassWithTestAttribute() {
+        val psiFile = myFixture.configureByText(
+            PhpFileType.INSTANCE,
+            """<?php
+            #[\Testo\Test]
+            class Foo {
+                #[\Testo\Bench]
+                public function bench_it(): void {}
+            }"""
+        )
+        val method = PsiTreeUtil.findChildOfType(psiFile, Method::class.java)!!
+        assertFalse("Bench method should not be reported as a Testo test method", method.isTestoMethod())
+        assertTrue("Bench method should still be detected as a Testo bench", method.isTestoBench())
+    }
 }