refactor: remove deprecated inline test attributes

Author: xepozz

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

@@ -1,45 +1,33 @@
 package com.github.xepozz.testo
 
 object TestoClasses {
-    const val TEST_NEW = "\\Testo\\Attribute\\Test"
-    const val TEST_OLD = "\\Testo\\Application\\Attribute\\Test"
-    const val TEST_INLINE_OLD = "\\Testo\\Sample\\TestInline"
-    const val TEST_INLINE_NEW = "\\Testo\\Inline\\TestInline"
+    const val TEST = "\\Testo\\Test"
+    const val TEST_INLINE = "\\Testo\\Inline\\TestInline"
 
-    const val DATA_PROVIDER_OLD = "\\Testo\\Sample\\DataProvider"
-    const val DATA_SET_OLD = "\\Testo\\Sample\\DataSet"
-    const val DATA_PROVIDER_NEW = "\\Testo\\Data\\DataProvider"
-    const val DATA_SET_NEW = "\\Testo\\Data\\DataSet"
+    const val DATA_PROVIDER = "\\Testo\\Data\\DataProvider"
+    const val DATA_SET = "\\Testo\\Data\\DataSet"
     const val DATA_UNION = "\\Testo\\Data\\DataUnion"
     const val DATA_CROSS = "\\Testo\\Data\\DataCross"
     const val DATA_ZIP = "\\Testo\\Data\\DataZip"
 
     const val BENCH = "\\Testo\\Bench"
-    const val BENCH_WITH = "\\Testo\\Bench\\BenchWith"
 
     const val ASSERT = "\\Testo\\Assert"
     const val ASSERTION_EXCEPTION = "\\Testo\\Assert\\State\\Assertion\\AssertionException"
     const val EXPECT = "\\Testo\\Expect"
 
     val DATA_ATTRIBUTES = arrayOf(
-        DATA_PROVIDER_OLD,
-        DATA_PROVIDER_NEW,
-        DATA_SET_OLD,
-        DATA_SET_NEW,
+        DATA_PROVIDER,
+        DATA_SET,
         DATA_UNION,
         DATA_CROSS,
         DATA_ZIP,
     )
     val TEST_ATTRIBUTES = arrayOf(
-        TEST_NEW,
-        TEST_OLD,
-    )
-    val TEST_INLINE_ATTRIBUTES = arrayOf(
-        TEST_INLINE_OLD,
-        TEST_INLINE_NEW,
+        TEST,
+        TEST_INLINE,
     )
     val BENCH_ATTRIBUTES = arrayOf(
         BENCH,
-        BENCH_WITH,
     )
 }

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

@@ -18,12 +18,12 @@ fun PsiElement.isTestoBench() = when(this) {
 }
 
 fun PsiElement.isTestoFunction() = when(this) {
-    is Function -> hasAnyAttribute(*TestoClasses.TEST_ATTRIBUTES, *TestoClasses.TEST_INLINE_ATTRIBUTES)
+    is Function -> hasAnyAttribute(*TestoClasses.TEST_ATTRIBUTES)
     else -> false
 }
 
 fun PsiElement.isTestoMethod() = when(this) {
-    is Method -> (modifier.isPublic && name.startsWith("test")) || hasAnyAttribute(*TestoClasses.TEST_ATTRIBUTES, *TestoClasses.TEST_INLINE_ATTRIBUTES)
+    is Method -> (modifier.isPublic && name.startsWith("test")) || hasAnyAttribute(*TestoClasses.TEST_ATTRIBUTES)
     else -> false
 }
 

src/main/kotlin/com/github/xepozz/testo/tests/TestoTestRunLineMarkerProvider.kt

@@ -87,9 +87,9 @@ class TestoTestRunLineMarkerProvider : RunLineMarkerContributor() {
 
     companion object Companion {
         val RUNNABLE_ATTRIBUTES = arrayOf(
-            *TestoClasses.DATA_ATTRIBUTES,
-            *TestoClasses.TEST_INLINE_ATTRIBUTES,
+            *TestoClasses.TEST_ATTRIBUTES,
             *TestoClasses.BENCH_ATTRIBUTES,
+            *TestoClasses.DATA_ATTRIBUTES,
         )
 
         fun getLocationHint(element: Function) = when (element) {

src/main/kotlin/com/github/xepozz/testo/util/PsiUtil.kt

@@ -10,7 +10,6 @@ object PsiUtil {
     val MEANINGFUL_ATTRIBUTES = arrayOf(
         *TestoClasses.DATA_ATTRIBUTES,
         *TestoClasses.TEST_ATTRIBUTES,
-        *TestoClasses.TEST_INLINE_ATTRIBUTES,
         *TestoClasses.BENCH_ATTRIBUTES,
     )
 

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

@@ -14,9 +14,6 @@ class PsiUtilTest : TestCase() {
         for (attr in TestoClasses.TEST_ATTRIBUTES) {
             assertTrue("Missing test attribute: $attr", meaningful.contains(attr))
         }
-        for (attr in TestoClasses.TEST_INLINE_ATTRIBUTES) {
-            assertTrue("Missing inline test attribute: $attr", meaningful.contains(attr))
-        }
         for (attr in TestoClasses.BENCH_ATTRIBUTES) {
             assertTrue("Missing bench attribute: $attr", meaningful.contains(attr))
         }
@@ -25,7 +22,6 @@ class PsiUtilTest : TestCase() {
     fun testMeaningfulAttributes_totalCount() {
         val expected = TestoClasses.DATA_ATTRIBUTES.size +
                 TestoClasses.TEST_ATTRIBUTES.size +
-                TestoClasses.TEST_INLINE_ATTRIBUTES.size +
                 TestoClasses.BENCH_ATTRIBUTES.size
         assertEquals(expected, PsiUtil.MEANINGFUL_ATTRIBUTES.size)
     }

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

@@ -11,13 +11,6 @@ class TestoClassesTest : TestCase() {
         assertTrue(attrs.contains("\\Testo\\Application\\Attribute\\Test"))
     }
 
-    fun testTestInlineAttributes_containsExpectedValues() {
-        val attrs = TestoClasses.TEST_INLINE_ATTRIBUTES
-        assertEquals(2, attrs.size)
-        assertTrue(attrs.contains("\\Testo\\Sample\\TestInline"))
-        assertTrue(attrs.contains("\\Testo\\Inline\\TestInline"))
-    }
-
     fun testDataAttributes_containsAllDataTypes() {
         val attrs = TestoClasses.DATA_ATTRIBUTES
         assertEquals(7, attrs.size)
@@ -56,14 +49,10 @@ class TestoClassesTest : TestCase() {
     fun testDataAttributes_noOverlapWithTestAttributes() {
         val dataSet = TestoClasses.DATA_ATTRIBUTES.toSet()
         val testSet = TestoClasses.TEST_ATTRIBUTES.toSet()
-        val inlineSet = TestoClasses.TEST_INLINE_ATTRIBUTES.toSet()
         val benchSet = TestoClasses.BENCH_ATTRIBUTES.toSet()
 
         assertTrue(dataSet.intersect(testSet).isEmpty())
-        assertTrue(dataSet.intersect(inlineSet).isEmpty())
         assertTrue(dataSet.intersect(benchSet).isEmpty())
-        assertTrue(testSet.intersect(inlineSet).isEmpty())
         assertTrue(testSet.intersect(benchSet).isEmpty())
-        assertTrue(inlineSet.intersect(benchSet).isEmpty())
     }
 }

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

@@ -12,13 +12,6 @@ class TestoLineMarkerCompanionTest : TestCase() {
         }
     }
 
-    fun testRunnableAttributes_containsInlineTestAttributes() {
-        val runnable = TestoTestRunLineMarkerProvider.RUNNABLE_ATTRIBUTES.toSet()
-        for (attr in TestoClasses.TEST_INLINE_ATTRIBUTES) {
-            assertTrue("Missing inline test attribute: $attr", runnable.contains(attr))
-        }
-    }
-
     fun testRunnableAttributes_containsBenchAttributes() {
         val runnable = TestoTestRunLineMarkerProvider.RUNNABLE_ATTRIBUTES.toSet()
         for (attr in TestoClasses.BENCH_ATTRIBUTES) {
@@ -40,7 +33,7 @@ class TestoLineMarkerCompanionTest : TestCase() {
 
     fun testRunnableAttributes_totalCount() {
         val expected = TestoClasses.DATA_ATTRIBUTES.size +
-                TestoClasses.TEST_INLINE_ATTRIBUTES.size +
+                TestoClasses.TEST_ATTRIBUTES.size +
                 TestoClasses.BENCH_ATTRIBUTES.size
         assertEquals(expected, TestoTestRunLineMarkerProvider.RUNNABLE_ATTRIBUTES.size)
     }