Refactoring for integration-tests

So that more files can be shared among similar projects.
google · Mar 6, 2021 · 448910d · 448910d
1 parent d5b309f
commit 448910d
Show file tree

Hide file tree

Showing 8 changed files with 13 additions and 374 deletions.
diff --git a/integration-tests/src/test/kotlin/com/google/devtools/ksp/test/AndroidIT.kt b/integration-tests/src/test/kotlin/com/google/devtools/ksp/test/AndroidIT.kt
@@ -11,7 +11,7 @@ import java.util.jar.*
 class AndroidIT {
     @Rule
     @JvmField
-    val project: TemporaryTestProject = TemporaryTestProject("playground-android")
+    val project: TemporaryTestProject = TemporaryTestProject("playground-android", "playground")
 
     @Test
     fun testPlaygroundAndroid() {

diff --git a/integration-tests/src/test/kotlin/com/google/devtools/ksp/test/TemporaryTestProject.kt b/integration-tests/src/test/kotlin/com/google/devtools/ksp/test/TemporaryTestProject.kt
@@ -3,13 +3,15 @@ package com.google.devtools.ksp.test
 import org.junit.rules.TemporaryFolder
 import java.io.File
 
-class TemporaryTestProject(projectName: String) : TemporaryFolder() {
+class TemporaryTestProject(projectName: String, baseProject: String? = null) : TemporaryFolder() {
     private val testProjectSrc = File("src/test/resources", projectName)
+    private val baseProjectSrc = baseProject?.let { File("src/test/resources", baseProject) }
 
     override fun before() {
         super.before()
 
-        testProjectSrc.copyRecursively(root)
+        baseProjectSrc?.copyRecursively(root)
+        testProjectSrc.copyRecursively(root, true)
 
         val kotlinVersion = System.getProperty("kotlinVersion")
         val kspVersion = System.getProperty("kspVersion")
@@ -23,6 +25,13 @@ class TemporaryTestProject(projectName: String) : TemporaryFolder() {
     }
 
     fun restore(file: String) {
-        File(testProjectSrc, file).copyTo(File(root, file), true)
+        fun copySafe(src: File, dst: File) {
+            if (src.exists())
+                src.copyTo(dst, true)
+        }
+        baseProjectSrc?.let {
+            copySafe(File(baseProjectSrc, file), File(root, file))
+        }
+        copySafe(File(testProjectSrc, file), File(root, file))
     }
 }
diff --git a/...ion-tests/src/test/resources/playground-android/test-processor/src/main/kotlin/Builder.kt b/...ion-tests/src/test/resources/playground-android/test-processor/src/main/kotlin/Builder.kt
diff --git a/.../src/test/resources/playground-android/test-processor/src/main/kotlin/BuilderProcessor.kt b/.../src/test/resources/playground-android/test-processor/src/main/kotlin/BuilderProcessor.kt
diff --git a/...sts/src/test/resources/playground-android/test-processor/src/main/kotlin/TestProcessor.kt b/...sts/src/test/resources/playground-android/test-processor/src/main/kotlin/TestProcessor.kt
diff --git a/...r/src/main/resources/META-INF/services/com.google.devtools.ksp.processing.SymbolProcessor b/...r/src/main/resources/META-INF/services/com.google.devtools.ksp.processing.SymbolProcessor