From b351556b1f2adf90a2f325ed98cc0d039fb81e34 Mon Sep 17 00:00:00 2001 From: Yan Zhulanow Date: Mon, 20 Jul 2020 06:07:03 +0900 Subject: [PATCH] Fix testJarsWithDependenciesWithinClasses() compilation after unsuccessful cherry-pick --- .../internal/kapt/incremental/ClasspathAnalyzerTest.kt | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/libraries/tools/kotlin-gradle-plugin/src/test/kotlin/org/jetbrains/kotlin/gradle/internal/kapt/incremental/ClasspathAnalyzerTest.kt b/libraries/tools/kotlin-gradle-plugin/src/test/kotlin/org/jetbrains/kotlin/gradle/internal/kapt/incremental/ClasspathAnalyzerTest.kt index a441d5c901f..140e3377089 100644 --- a/libraries/tools/kotlin-gradle-plugin/src/test/kotlin/org/jetbrains/kotlin/gradle/internal/kapt/incremental/ClasspathAnalyzerTest.kt +++ b/libraries/tools/kotlin-gradle-plugin/src/test/kotlin/org/jetbrains/kotlin/gradle/internal/kapt/incremental/ClasspathAnalyzerTest.kt @@ -151,10 +151,12 @@ class ClasspathAnalyzerTest { it.closeEntry() } } - val transform = StructureArtifactTransform().also { it.outputDirectory = tmp.newFolder() } - val outputs = transform.transform(inputJar) + val transformAction = StructureTransformTestAction(inputJar) + val outputs = TransformOutputsMock(tmp.newFolder()) - val data = ClasspathEntryData.ClasspathEntrySerializer.loadFrom(outputs.single()) + transformAction.transform(outputs) + + val data = ClasspathEntryData.ClasspathEntrySerializer.loadFrom(outputs.createdOutputs.single()) assertEquals(setOf("test/A", "test/B", "test/C"), data.classAbiHash.keys) assertEquals(setOf("test/A", "test/B", "test/C"), data.classDependencies.keys) }