Extend tests with more assertions

hfmehmed · KSP Auto Pick · commit dd0c918b4923 · 2025-11-03T19:18:57.000Z
(cherry picked from commit b235f49)
diff --git a/integration-tests/src/test/kotlin/com/google/devtools/ksp/test/AGP900IT.kt b/integration-tests/src/test/kotlin/com/google/devtools/ksp/test/AGP900IT.kt
@@ -17,7 +17,7 @@ class AGP900IT() {
     fun testRunsKSP() {
         val gradleRunner = GradleRunner.create().withProjectDir(project.root).withGradleVersion("9.0.0")
 
-        File(project.root, "gradle.properties").appendText("\nagpVersion=9.0.0-alpha05")
+        File(project.root, "gradle.properties").appendText("\nagpVersion=9.0.0-alpha12")
         File(project.root, "gradle.properties").appendText("\nandroid.builtInKotlin=false")
         File(project.root, "gradle.properties").appendText("\nandroid.newDsl=false")
 
diff --git a/integration-tests/src/test/kotlin/com/google/devtools/ksp/test/AndroidBuiltInKotlinIT.kt b/integration-tests/src/test/kotlin/com/google/devtools/ksp/test/AndroidBuiltInKotlinIT.kt
@@ -1,13 +1,15 @@
 package com.google.devtools.ksp.test
 
 import com.google.devtools.ksp.test.fixtures.TemporaryTestProject
+import com.google.devtools.ksp.test.utils.assertContainsNonNullEntry
 import com.google.devtools.ksp.test.utils.assertMergedConfigurationOutput
 import org.gradle.testkit.runner.GradleRunner
 import org.gradle.testkit.runner.TaskOutcome
 import org.junit.Assert
 import org.junit.Rule
 import org.junit.Test
 import java.io.File
+import java.util.jar.JarFile
 
 class AndroidBuiltInKotlinIT {
     @Rule
@@ -22,7 +24,27 @@ class AndroidBuiltInKotlinIT {
             "clean", "build", "minifyReleaseWithR8", "--configuration-cache", "--info", "--stacktrace"
         ).build().let { result ->
             Assert.assertEquals(TaskOutcome.SUCCESS, result.task(":workload:build")?.outcome)
+
+            val classesJar = File(
+                project.root,
+                "workload/build/intermediates/compile_app_classes_jar/debug/bundleDebugClassesToCompileJar/classes.jar"
+            )
+            JarFile(classesJar).use { jarFile ->
+                jarFile.assertContainsNonNullEntry("Generated.class")
+                jarFile.assertContainsNonNullEntry("hello/HELLO.class")
+                jarFile.assertContainsNonNullEntry("com/example/AClassBuilder.class")
+                jarFile.assertContainsNonNullEntry("com/example/BClassBuilder.class")
+                jarFile.assertContainsNonNullEntry("com/example/AClass.class")
+                jarFile.assertContainsNonNullEntry("com/example/BClass.class")
+            }
+
+            val javaResDir = File(project.root, "workload/build/intermediates/java_res/debug/processDebugJavaRes/out")
+            Assert.assertTrue(File(javaResDir, "TestProcessor.log").exists())
+            Assert.assertTrue(File(javaResDir, "META-INF/proguard/builder-AClassBuilder.pro").exists())
+            Assert.assertTrue(File(javaResDir, "META-INF/proguard/builder-BClassBuilder.pro").exists())
             assertMergedConfigurationOutput(project, "-keep class com.example.AClassBuilder { *; }")
+            assertMergedConfigurationOutput(project, "-keep class com.example.BClassBuilder { *; }")
+
             val outputs = result.output.lines()
             assert("w: [ksp] [workload_debug] Mangled name for internalFun: internalFun\$workload_debug" in outputs)
             assert("w: [ksp] [workload_release] Mangled name for internalFun: internalFun\$workload_release" in outputs)
@@ -59,7 +81,27 @@ class AndroidBuiltInKotlinIT {
             "clean", "build", "minifyReleaseWithR8", "--configuration-cache", "--info", "--stacktrace"
         ).build().let { result ->
             Assert.assertEquals(TaskOutcome.SUCCESS, result.task(":workload:build")?.outcome)
+
+            val classesJar = File(
+                project.root,
+                "workload/build/intermediates/compile_app_classes_jar/debug/bundleDebugClassesToCompileJar/classes.jar"
+            )
+            JarFile(classesJar).use { jarFile ->
+                jarFile.assertContainsNonNullEntry("Generated.class")
+                jarFile.assertContainsNonNullEntry("hello/HELLO.class")
+                jarFile.assertContainsNonNullEntry("com/example/AClassBuilder.class")
+                jarFile.assertContainsNonNullEntry("com/example/BClassBuilder.class")
+                jarFile.assertContainsNonNullEntry("com/example/AClass.class")
+                jarFile.assertContainsNonNullEntry("com/example/BClass.class")
+            }
+
+            val javaResDir = File(project.root, "workload/build/intermediates/java_res/debug/processDebugJavaRes/out")
+            Assert.assertTrue(File(javaResDir, "TestProcessor.log").exists())
+            Assert.assertTrue(File(javaResDir, "META-INF/proguard/builder-AClassBuilder.pro").exists())
+            Assert.assertTrue(File(javaResDir, "META-INF/proguard/builder-BClassBuilder.pro").exists())
             assertMergedConfigurationOutput(project, "-keep class com.example.AClassBuilder { *; }")
+            assertMergedConfigurationOutput(project, "-keep class com.example.BClassBuilder { *; }")
+
             val outputs = result.output.lines()
             assert("w: [ksp] [workload_debug] Mangled name for internalFun: internalFun\$workload_debug" in outputs)
             assert("w: [ksp] [workload_release] Mangled name for internalFun: internalFun\$workload_release" in outputs)
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
@@ -1,12 +1,15 @@
 package com.google.devtools.ksp.test
 
 import com.google.devtools.ksp.test.fixtures.TemporaryTestProject
+import com.google.devtools.ksp.test.utils.assertContainsNonNullEntry
 import com.google.devtools.ksp.test.utils.assertMergedConfigurationOutput
 import org.gradle.testkit.runner.GradleRunner
 import org.gradle.testkit.runner.TaskOutcome
 import org.junit.Assert
 import org.junit.Rule
 import org.junit.Test
+import java.io.File
+import java.util.jar.JarFile
 
 class AndroidIT() {
     @Rule
@@ -21,7 +24,30 @@ class AndroidIT() {
             "clean", "build", "minifyReleaseWithR8", "--configuration-cache", "--info", "--stacktrace"
         ).build().let { result ->
             Assert.assertEquals(TaskOutcome.SUCCESS, result.task(":workload:build")?.outcome)
+
+            val classesJar = File(
+                project.root,
+                "workload/build/intermediates/compile_app_classes_jar/debug/bundleDebugClassesToCompileJar/classes.jar"
+            )
+            JarFile(classesJar).use { jarFile ->
+                jarFile.assertContainsNonNullEntry("Generated.class")
+                jarFile.assertContainsNonNullEntry("hello/HELLO.class")
+                jarFile.assertContainsNonNullEntry("com/example/AClassBuilder.class")
+                jarFile.assertContainsNonNullEntry("com/example/BClassBuilder.class")
+                jarFile.assertContainsNonNullEntry("com/example/AClass.class")
+                jarFile.assertContainsNonNullEntry("com/example/BClass.class")
+                jarFile.assertContainsNonNullEntry("TestProcessor.log")
+                jarFile.assertContainsNonNullEntry("META-INF/proguard/builder-AClassBuilder.pro")
+                jarFile.assertContainsNonNullEntry("META-INF/proguard/builder-BClassBuilder.pro")
+            }
+
+            val javaResDir = File(project.root, "workload/build/intermediates/java_res/debug/processDebugJavaRes/out")
+            Assert.assertTrue(File(javaResDir, "TestProcessor.log").exists())
+            Assert.assertTrue(File(javaResDir, "META-INF/proguard/builder-AClassBuilder.pro").exists())
+            Assert.assertTrue(File(javaResDir, "META-INF/proguard/builder-BClassBuilder.pro").exists())
             assertMergedConfigurationOutput(project, "-keep class com.example.AClassBuilder { *; }")
+            assertMergedConfigurationOutput(project, "-keep class com.example.BClassBuilder { *; }")
+
             val outputs = result.output.lines()
             assert("w: [ksp] [workload_debug] Mangled name for internalFun: internalFun\$workload_debug" in outputs)
             assert("w: [ksp] [workload_release] Mangled name for internalFun: internalFun\$workload_release" in outputs)
diff --git a/integration-tests/src/test/kotlin/com/google/devtools/ksp/test/PlaygroundIT.kt b/integration-tests/src/test/kotlin/com/google/devtools/ksp/test/PlaygroundIT.kt
@@ -1,6 +1,7 @@
 package com.google.devtools.ksp.test
 
 import com.google.devtools.ksp.test.fixtures.TemporaryTestProject
+import com.google.devtools.ksp.test.utils.assertContainsNonNullEntry
 import org.gradle.testkit.runner.BuildResult
 import org.gradle.testkit.runner.GradleRunner
 import org.gradle.testkit.runner.TaskOutcome
@@ -46,12 +47,6 @@ class PlaygroundIT() {
         extraCheck(result)
     }
 
-    private fun JarFile.assertContainsNonNullEntry(path: String) {
-        val entry = getEntry(path)
-        Assert.assertNotNull("Entry '$path' should exist in the JAR file.", entry)
-        Assert.assertTrue("Entry '$path' should not be empty.", entry.size > 0)
-    }
-
     @Test
     fun testPlayground() {
         // FIXME: `clean` fails to delete files on windows.
diff --git a/integration-tests/src/test/kotlin/com/google/devtools/ksp/test/utils/AssertionUtils.kt b/integration-tests/src/test/kotlin/com/google/devtools/ksp/test/utils/AssertionUtils.kt
@@ -1,7 +1,9 @@
 package com.google.devtools.ksp.test.utils
 
 import com.google.devtools.ksp.test.fixtures.TemporaryTestProject
+import org.junit.Assert
 import java.io.File
+import java.util.jar.JarFile
 
 fun assertMergedConfigurationOutput(project: TemporaryTestProject, expectedOutput: String) {
     val mergedConfiguration = File(project.root, "workload/build/outputs/mapping/release/configuration.txt")
@@ -13,3 +15,9 @@ fun assertMergedConfigurationOutput(project: TemporaryTestProject, expectedOutpu
         "Merged configuration did not contain expected output!\n"
     }
 }
+
+fun JarFile.assertContainsNonNullEntry(path: String) {
+    val entry = getEntry(path)
+    Assert.assertNotNull("Entry '$path' should exist in the JAR file.", entry)
+    Assert.assertTrue("Entry '$path' should not be empty.", entry.size > 0)
+}
diff --git a/integration-tests/src/test/resources/playground-android-multi/application/build.gradle.kts b/integration-tests/src/test/resources/playground-android-multi/application/build.gradle.kts
@@ -11,6 +11,7 @@ repositories {
     maven(testRepo)
     mavenCentral()
     maven("https://redirector.kotlinlang.org/maven/bootstrap/")
+    google()
 }
 
 dependencies {
diff --git a/integration-tests/src/test/resources/playground-android-multi/build.gradle.kts b/integration-tests/src/test/resources/playground-android-multi/build.gradle.kts
@@ -15,13 +15,3 @@ plugins {
     id("com.google.devtools.ksp") apply false
     id("com.android.library") apply false
 }
-
-allprojects {
-    val testRepo: String by project
-    repositories {
-        maven(testRepo)
-        mavenCentral()
-        maven("https://redirector.kotlinlang.org/maven/bootstrap/")
-        google()
-    }
-}
diff --git a/integration-tests/src/test/resources/playground-android-multi/test-processor/build.gradle.kts b/integration-tests/src/test/resources/playground-android-multi/test-processor/build.gradle.kts
@@ -12,6 +12,7 @@ repositories {
     maven(testRepo)
     mavenCentral()
     maven("https://redirector.kotlinlang.org/maven/bootstrap/")
+    google()
 }
 
 dependencies {
diff --git a/integration-tests/src/test/resources/playground-android-multi/workload/build.gradle.kts b/integration-tests/src/test/resources/playground-android-multi/workload/build.gradle.kts
@@ -13,6 +13,7 @@ repositories {
     maven(testRepo)
     mavenCentral()
     maven("https://redirector.kotlinlang.org/maven/bootstrap/")
+    google()
 }
 
 dependencies {
diff --git a/integration-tests/src/test/resources/playground-android/build.gradle.kts b/integration-tests/src/test/resources/playground-android/build.gradle.kts
@@ -8,13 +8,3 @@ buildscript {
         google()
     }
 }
-
-allprojects {
-    val testRepo: String by project
-    repositories {
-        maven(testRepo)
-        mavenCentral()
-        maven("https://redirector.kotlinlang.org/maven/bootstrap/")
-        google()
-    }
-}
diff --git a/integration-tests/src/test/resources/playground-android/test-processor/build.gradle.kts b/integration-tests/src/test/resources/playground-android/test-processor/build.gradle.kts
@@ -12,6 +12,7 @@ repositories {
     maven(testRepo)
     mavenCentral()
     maven("https://redirector.kotlinlang.org/maven/bootstrap/")
+    google()
 }
 
 dependencies {
diff --git a/integration-tests/src/test/resources/playground-android/workload/build.gradle.kts b/integration-tests/src/test/resources/playground-android/workload/build.gradle.kts
@@ -14,6 +14,7 @@ repositories {
     maven(testRepo)
     mavenCentral()
     maven("https://redirector.kotlinlang.org/maven/bootstrap/")
+    google()
 }
 
 dependencies {
diff --git a/integration-tests/src/test/resources/srcs-gen/build.gradle.kts b/integration-tests/src/test/resources/srcs-gen/build.gradle.kts
@@ -14,13 +14,3 @@ plugins {
     id("com.google.devtools.ksp") apply false
     id("com.android.library") apply false
 }
-
-allprojects {
-    val testRepo: String by project
-    repositories {
-        maven(testRepo)
-        mavenCentral()
-        maven("https://redirector.kotlinlang.org/maven/bootstrap/")
-        google()
-    }
-}
diff --git a/integration-tests/src/test/resources/srcs-gen/workload/build.gradle.kts b/integration-tests/src/test/resources/srcs-gen/workload/build.gradle.kts
@@ -12,6 +12,7 @@ repositories {
     maven(testRepo)
     mavenCentral()
     maven("https://redirector.kotlinlang.org/maven/bootstrap/")
+    google()
 }
 
 dependencies {
diff --git a/integration-tests/src/test/resources/test-processor/test-processor/build.gradle.kts b/integration-tests/src/test/resources/test-processor/test-processor/build.gradle.kts
@@ -12,6 +12,7 @@ repositories {
     maven(testRepo)
     mavenCentral()
     maven("https://redirector.kotlinlang.org/maven/bootstrap/")
+    google()
 }
 
 dependencies {
diff --git a/integration-tests/src/test/resources/test-processor/workload/build.gradle.kts b/integration-tests/src/test/resources/test-processor/workload/build.gradle.kts
@@ -11,6 +11,7 @@ repositories {
     maven(testRepo)
     mavenCentral()
     maven("https://redirector.kotlinlang.org/maven/bootstrap/")
+    google()
 }
 
 dependencies {

Original file line number	Diff line number	Diff line change
`@@ -11,6 +11,7 @@ repositories {`
`11`	`11`	`maven(testRepo)`
`12`	`12`	`mavenCentral()`
`13`	`13`	`maven("https://redirector.kotlinlang.org/maven/bootstrap/")`
	`14`	`+ google()`
`14`	`15`	`}`
`15`	`16`
`16`	`17`	`dependencies {`
Original file line number	Diff line number	Diff line change
`@@ -12,6 +12,7 @@ repositories {`
`12`	`12`	`maven(testRepo)`
`13`	`13`	`mavenCentral()`
`14`	`14`	`maven("https://redirector.kotlinlang.org/maven/bootstrap/")`
	`15`	`+ google()`
`15`	`16`	`}`
`16`	`17`
`17`	`18`	`dependencies {`
Original file line number	Diff line number	Diff line change
`@@ -13,6 +13,7 @@ repositories {`
`13`	`13`	`maven(testRepo)`
`14`	`14`	`mavenCentral()`
`15`	`15`	`maven("https://redirector.kotlinlang.org/maven/bootstrap/")`
	`16`	`+ google()`
`16`	`17`	`}`
`17`	`18`
`18`	`19`	`dependencies {`
Original file line number	Diff line number	Diff line change
`@@ -8,13 +8,3 @@ buildscript {`
`8`	`8`	`google()`
`9`	`9`	`}`
`10`	`10`	`}`
`11`		`-`
`12`		`-allprojects {`
`13`		`- val testRepo: String by project`
`14`		`- repositories {`
`15`		`- maven(testRepo)`
`16`		`- mavenCentral()`
`17`		`- maven("https://redirector.kotlinlang.org/maven/bootstrap/")`
`18`		`- google()`
`19`		`- }`
`20`		`-}`