Merge pull request #9 from kanyun-inc/feature/update-ut

Update unit tests.
kanyun-inc · Dec 6, 2022 · 39c0740 · 39c0740
2 parents cd4f87d + 47199de
commit 39c0740
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 11 deletions.
diff --git a/kace-compiler/build.gradle.kts b/kace-compiler/build.gradle.kts
@@ -20,7 +20,7 @@ dependencies {
     testImplementation(kotlin("test-junit"))
     testImplementation("org.jetbrains.kotlin:kotlin-compiler-embeddable")
 
-    testImplementation("com.bennyhuo.kotlin:kotlin-compile-testing-extensions:1.7.10.2-SNAPSHOT")
+    testImplementation("com.bennyhuo.kotlin:kotlin-compile-testing-extensions:1.7.10.2")
     testImplementation("com.github.tschuchortdev:kotlin-compile-testing:1.4.9")
 }
 

diff --git a/kace-compiler/src/test/java/com/kanyun/kace/compiler/KaceTest.kt b/kace-compiler/src/test/java/com/kanyun/kace/compiler/KaceTest.kt
@@ -18,23 +18,19 @@ package com.kanyun.kace.compiler
 
 import com.bennyhuo.kotlin.compiletesting.extensions.module.KotlinModule
 import com.bennyhuo.kotlin.compiletesting.extensions.module.checkResult
-import com.bennyhuo.kotlin.compiletesting.extensions.module.compileAll
-import com.bennyhuo.kotlin.compiletesting.extensions.module.resolveAllDependencies
-import com.bennyhuo.kotlin.compiletesting.extensions.source.SingleFileModuleInfoLoader
+import com.bennyhuo.kotlin.compiletesting.extensions.source.FileBasedModuleInfoLoader
 import com.kanyun.kace.compiler.options.Options
 import org.junit.Test
 
 class KaceTest {
 
-    private val compileLogName = "compiles.log"
-
     @Test
     fun basic() {
         testBase("basic.kt")
     }
 
     private fun testBase(fileName: String) {
-        val loader = SingleFileModuleInfoLoader("testData/$fileName")
+        val loader = FileBasedModuleInfoLoader("testData/$fileName")
         val sourceModuleInfos = loader.loadSourceModuleInfos()
 
         Options.isEnabled.set(true)
@@ -43,8 +39,6 @@ class KaceTest {
             KotlinModule(it, componentRegistrars = listOf(KaceComponentRegistrar()))
         }
 
-        modules.resolveAllDependencies()
-        modules.compileAll()
         modules.checkResult(
             loader.loadExpectModuleInfos(),
             executeEntries = true,

diff --git a/kace-compiler/testData/basic.kt b/kace-compiler/testData/basic.kt
@@ -110,10 +110,10 @@ fun main() {
     println(fifth.findViewByIdCached<View>(fifth, 4))
 }
 
-// GENERATED
+// EXPECT
 // FILE: compiles.log
 OK
-// FILE: Main.kt
+// FILE: MainKt.main.stdout
 class MainActivity
 0
 class SecondActivity