refactor: 💡 move gumtree creation helper dsl to test package

Xanonymous-GitHub · Jul 31, 2024 · d8270b8 · d8270b8
1 parent 9065687
commit d8270b8
Show file tree

Hide file tree

Showing 10 changed files with 16 additions and 10 deletions.
diff --git a/core/src/test/kotlin/BasicTreeTest.kt b/core/src/test/kotlin/BasicTreeTest.kt
@@ -1,7 +1,7 @@
+import helpers.gumTree
 import org.junit.jupiter.api.assertDoesNotThrow
 import org.junit.jupiter.api.parallel.Execution
 import org.junit.jupiter.api.parallel.ExecutionMode
-import tw.xcc.gumtree.helper.gumTree
 import tw.xcc.gumtree.model.BasicTree
 import java.util.UUID
 import kotlin.test.BeforeTest

diff --git a/core/src/test/kotlin/GumTreeTest.kt b/core/src/test/kotlin/GumTreeTest.kt
@@ -1,6 +1,6 @@
+import helpers.gumTree
 import org.junit.jupiter.api.parallel.Execution
 import org.junit.jupiter.api.parallel.ExecutionMode
-import tw.xcc.gumtree.helper.gumTree
 import tw.xcc.gumtree.model.GumTree
 import tw.xcc.gumtree.model.TreeType
 import kotlin.test.BeforeTest

diff --git a/core/src/test/kotlin/HashSimilarityOrganizerTest.kt b/core/src/test/kotlin/HashSimilarityOrganizerTest.kt
@@ -1,9 +1,9 @@
+import helpers.gumTree
 import kotlinx.coroutines.runBlocking
 import org.junit.jupiter.api.parallel.Execution
 import org.junit.jupiter.api.parallel.ExecutionMode
 import tw.xcc.gumtree.helper.createHashMemoOf
 import tw.xcc.gumtree.helper.crossProductOf
-import tw.xcc.gumtree.helper.gumTree
 import tw.xcc.gumtree.matchers.HashSimilarityOrganizer
 import kotlin.test.BeforeTest
 import kotlin.test.Test

diff --git a/core/src/test/kotlin/NonFrozenGumTreePoolTest.kt b/core/src/test/kotlin/NonFrozenGumTreePoolTest.kt
@@ -1,7 +1,7 @@
+import helpers.gumTree
 import org.junit.jupiter.api.assertThrows
 import org.junit.jupiter.api.parallel.Execution
 import org.junit.jupiter.api.parallel.ExecutionMode
-import tw.xcc.gumtree.helper.gumTree
 import tw.xcc.gumtree.model.NonFrozenGumTreeCachePool
 import kotlin.test.BeforeTest
 import kotlin.test.Test

diff --git a/core/src/test/kotlin/SharedFunctionTest.kt b/core/src/test/kotlin/SharedFunctionTest.kt
@@ -1,6 +1,6 @@
+import helpers.gumTree
 import org.junit.jupiter.api.parallel.Execution
 import org.junit.jupiter.api.parallel.ExecutionMode
-import tw.xcc.gumtree.helper.gumTree
 import tw.xcc.gumtree.matchers.comparator.calculateDiceValue
 import tw.xcc.gumtree.matchers.comparator.hasSameParent
 import tw.xcc.gumtree.matchers.comparator.numOfMappedDescendents

diff --git a/...cc/gumtree/helper/GumTreeCreatorHelper.kt → ...st/kotlin/helpers/GumTreeCreatorHelper.kt b/...cc/gumtree/helper/GumTreeCreatorHelper.kt → ...st/kotlin/helpers/GumTreeCreatorHelper.kt
@@ -1,14 +1,17 @@
-package tw.xcc.gumtree.helper
+package helpers
 
+import org.jetbrains.annotations.TestOnly
 import tw.xcc.gumtree.model.GumTree
 import tw.xcc.gumtree.model.TreeType
 import kotlin.contracts.ExperimentalContracts
 import kotlin.contracts.InvocationKind
 import kotlin.contracts.contract
 
+@TestOnly
 @DslMarker
 internal annotation class GumTreeMarker
 
+@TestOnly
 @OptIn(ExperimentalContracts::class)
 @GumTreeMarker
 internal class GumTreeBuilder(
@@ -19,6 +22,7 @@ internal class GumTreeBuilder(
 ) {
     private val root by lazy { GumTree(TreeType(grammarName), label, pos, length) }
 
+    @TestOnly
     internal inline fun child(
         grammarName: String,
         label: String = "",
@@ -36,6 +40,7 @@ internal class GumTreeBuilder(
         return builder.build().also { root.addChild(it) }
     }
 
+    @TestOnly
     internal fun child(
         grammarName: String,
         label: String = "",
@@ -46,6 +51,7 @@ internal class GumTreeBuilder(
     internal fun build(): GumTree = root
 }
 
+@TestOnly
 @OptIn(ExperimentalContracts::class)
 internal inline fun gumTree(
     grammarName: String,

diff --git a/core/src/test/kotlin/matchers/RealWorldTrees.kt b/core/src/test/kotlin/matchers/RealWorldTrees.kt
@@ -1,6 +1,6 @@
 package matchers
 
-import tw.xcc.gumtree.helper.gumTree
+import helpers.gumTree
 
 /**
  * The real-world tree 1.

diff --git a/core/src/test/kotlin/matchers/TopDownMatcherOnlyRootTest.kt b/core/src/test/kotlin/matchers/TopDownMatcherOnlyRootTest.kt
@@ -1,9 +1,9 @@
 package matchers
 
+import helpers.gumTree
 import kotlinx.coroutines.runBlocking
 import org.junit.jupiter.api.parallel.Execution
 import org.junit.jupiter.api.parallel.ExecutionMode
-import tw.xcc.gumtree.helper.gumTree
 import tw.xcc.gumtree.matchers.GreedyTopDownMatcher
 import tw.xcc.gumtree.model.MappingStorage
 import kotlin.test.BeforeTest

diff --git a/core/src/test/kotlin/matchers/TopDownMatcherTest1.kt b/core/src/test/kotlin/matchers/TopDownMatcherTest1.kt
@@ -1,9 +1,9 @@
 package matchers
 
+import helpers.gumTree
 import kotlinx.coroutines.runBlocking
 import org.junit.jupiter.api.parallel.Execution
 import org.junit.jupiter.api.parallel.ExecutionMode
-import tw.xcc.gumtree.helper.gumTree
 import tw.xcc.gumtree.matchers.GreedyTopDownMatcher
 import tw.xcc.gumtree.model.GumTree
 import tw.xcc.gumtree.model.MappingStorage

diff --git a/core/src/test/kotlin/matchers/TopDownMatcherTest2.kt b/core/src/test/kotlin/matchers/TopDownMatcherTest2.kt
@@ -1,9 +1,9 @@
 package matchers
 
+import helpers.gumTree
 import kotlinx.coroutines.runBlocking
 import org.junit.jupiter.api.parallel.Execution
 import org.junit.jupiter.api.parallel.ExecutionMode
-import tw.xcc.gumtree.helper.gumTree
 import tw.xcc.gumtree.matchers.GreedyTopDownMatcher
 import tw.xcc.gumtree.model.GumTree
 import tw.xcc.gumtree.model.MappingStorage