From aee7329b89589a5aa42e5f5f9f81436111106ba1 Mon Sep 17 00:00:00 2001 From: Nikolay Krasko Date: Thu, 28 Dec 2017 16:24:50 +0300 Subject: [PATCH] Modify incremental test in 173 branch - files are not created anymore --- .../jetbrains/kotlin/jps/build/KotlinJpsBuildTest.kt | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/jps-plugin/jps-tests/test/org/jetbrains/kotlin/jps/build/KotlinJpsBuildTest.kt b/jps-plugin/jps-tests/test/org/jetbrains/kotlin/jps/build/KotlinJpsBuildTest.kt index aa3b3c300d9..728fa6fba1f 100644 --- a/jps-plugin/jps-tests/test/org/jetbrains/kotlin/jps/build/KotlinJpsBuildTest.kt +++ b/jps-plugin/jps-tests/test/org/jetbrains/kotlin/jps/build/KotlinJpsBuildTest.kt @@ -26,7 +26,6 @@ import com.intellij.testFramework.LightVirtualFile import com.intellij.testFramework.UsefulTestCase import com.intellij.util.io.URLUtil import com.intellij.util.io.ZipUtil -import junit.framework.TestCase import org.jetbrains.jps.ModuleChunk import org.jetbrains.jps.api.CanceledStatus import org.jetbrains.jps.builders.BuildResult @@ -57,7 +56,6 @@ import org.jetbrains.kotlin.cli.common.arguments.K2JVMCompilerArguments import org.jetbrains.kotlin.cli.jvm.K2JVMCompiler import org.jetbrains.kotlin.codegen.AsmUtil import org.jetbrains.kotlin.codegen.JvmCodegenUtil -import org.jetbrains.kotlin.config.ApiVersion import org.jetbrains.kotlin.config.IncrementalCompilation import org.jetbrains.kotlin.config.KotlinCompilerVersion.TEST_IS_PRE_RELEASE_SYSTEM_PROPERTY import org.jetbrains.kotlin.config.LanguageVersion @@ -76,7 +74,10 @@ import org.jetbrains.org.objectweb.asm.ClassVisitor import org.jetbrains.org.objectweb.asm.MethodVisitor import org.jetbrains.org.objectweb.asm.Opcodes import org.junit.Assert -import java.io.* +import java.io.File +import java.io.FileNotFoundException +import java.io.FileOutputStream +import java.io.IOException import java.net.URLClassLoader import java.util.* import java.util.regex.Pattern @@ -972,7 +973,7 @@ open class KotlinJpsBuildTest : AbstractKotlinJpsBuildTestCase() { buildAllModules().assertSuccessful() val storageRoot = BuildDataPathsImpl(myDataStorageRoot).dataStorageRoot - assertTrue(File(storageRoot, "targets/java-test/kotlinProject/kotlin").exists()) + assertFalse(File(storageRoot, "targets/java-test/kotlinProject/kotlin").exists()) assertFalse(File(storageRoot, "targets/java-production/kotlinProject/kotlin").exists()) } @@ -989,7 +990,7 @@ open class KotlinJpsBuildTest : AbstractKotlinJpsBuildTestCase() { } val storageRoot = BuildDataPathsImpl(myDataStorageRoot).dataStorageRoot - assertTrue(File(storageRoot, "targets/java-production/kotlinProject/kotlin").exists()) + assertFalse(File(storageRoot, "targets/java-production/kotlinProject/kotlin").exists()) assertFalse(File(storageRoot, "targets/java-production/module2/kotlin").exists()) }