From 40574d31ac4648fea44a641904e31707a2ac4f39 Mon Sep 17 00:00:00 2001 From: Alexey Tsvetkov Date: Wed, 1 Feb 2017 19:04:56 +0300 Subject: [PATCH] JPS tests: avoid using deprecated API --- .../tests/AndroidJpsBuildTestCase.java | 4 +- .../jps/build/AbstractIncrementalJpsTest.kt | 2 +- .../kotlin/jps/build/KotlinJpsBuildTest.kt | 66 +++++++++---------- .../jps/build/SimpleKotlinJpsBuildTest.kt | 2 +- .../build/kannotator/KannotatorJpsTest.java | 12 ++-- .../android/AbstractAndroidJpsTestCase.kt | 4 +- 6 files changed, 45 insertions(+), 45 deletions(-) diff --git a/compiler/android-tests/tests/org/jetbrains/kotlin/android/tests/AndroidJpsBuildTestCase.java b/compiler/android-tests/tests/org/jetbrains/kotlin/android/tests/AndroidJpsBuildTestCase.java index 842b63ffbfc..3d9c9ec6262 100644 --- a/compiler/android-tests/tests/org/jetbrains/kotlin/android/tests/AndroidJpsBuildTestCase.java +++ b/compiler/android-tests/tests/org/jetbrains/kotlin/android/tests/AndroidJpsBuildTestCase.java @@ -29,8 +29,8 @@ public class AndroidJpsBuildTestCase extends BaseKotlinJpsBuildTestCase { public void doTest() { initProject(); - rebuildAll(); - makeAll().assertSuccessful(); + rebuildAllModules(); + buildAllModules().assertSuccessful(); } @Override diff --git a/jps-plugin/jps-tests/test/org/jetbrains/kotlin/jps/build/AbstractIncrementalJpsTest.kt b/jps-plugin/jps-tests/test/org/jetbrains/kotlin/jps/build/AbstractIncrementalJpsTest.kt index 94a41420acc..f033d78cdbf 100644 --- a/jps-plugin/jps-tests/test/org/jetbrains/kotlin/jps/build/AbstractIncrementalJpsTest.kt +++ b/jps-plugin/jps-tests/test/org/jetbrains/kotlin/jps/build/AbstractIncrementalJpsTest.kt @@ -141,7 +141,7 @@ abstract class AbstractIncrementalJpsTest( protected open fun checkLookups(@Suppress("UNUSED_PARAMETER") lookupTracker: LookupTracker, compiledFiles: Set) { } - private fun build(scope: CompileScopeTestBuilder = CompileScopeTestBuilder.make().all(), checkLookups: Boolean = true): MakeResult { + private fun build(scope: CompileScopeTestBuilder = CompileScopeTestBuilder.make().allModules(), checkLookups: Boolean = true): MakeResult { val workDirPath = FileUtil.toSystemIndependentName(workDir.absolutePath) val logger = MyLogger(workDirPath) projectDescriptor = createProjectDescriptor(BuildLoggingManager(logger)) 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 b78ac922e9a..80df674ea75 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 @@ -243,19 +243,19 @@ class KotlinJpsBuildTest : AbstractKotlinJpsBuildTestCase() { fun doTest() { initProject(JVM_MOCK_RUNTIME) - makeAll().assertSuccessful() + buildAllModules().assertSuccessful() } fun doTestWithRuntime() { initProject(JVM_FULL_RUNTIME) - makeAll().assertSuccessful() + buildAllModules().assertSuccessful() } fun doTestWithKotlinJavaScriptLibrary() { initProject(JS_STDLIB) createKotlinJavaScriptLibraryArchive() addKotlinJavaScriptDependency(KOTLIN_JS_LIBRARY, File(workDir, KOTLIN_JS_LIBRARY_JAR)) - makeAll().assertSuccessful() + buildAllModules().assertSuccessful() } fun testKotlinProject() { @@ -270,7 +270,7 @@ class KotlinJpsBuildTest : AbstractKotlinJpsBuildTestCase() { fun testSourcePackageLongPrefix() { initProject() - val buildResult = makeAll() + val buildResult = buildAllModules() buildResult.assertSuccessful() val warnings = buildResult.getMessages(BuildMessage.Kind.WARNING) assertEquals("Warning about invalid package prefix in module 2 is expected: $warnings", 2, warnings.size) @@ -279,7 +279,7 @@ class KotlinJpsBuildTest : AbstractKotlinJpsBuildTestCase() { fun testSourcePackagePrefixKnownIssueWithInnerClasses() { initProject() - val buildResult = makeAll() + val buildResult = buildAllModules() buildResult.assertFailed() val errors = buildResult.getMessages(BuildMessage.Kind.ERROR).map { it.messageText } assertTrue("Message wasn't found. $errors", errors.first().contains("class xxx.JavaWithInner.TextRenderer, unresolved supertypes: TableRow")) @@ -287,7 +287,7 @@ class KotlinJpsBuildTest : AbstractKotlinJpsBuildTestCase() { fun testKotlinJavaScriptProject() { initProject(JS_STDLIB) - makeAll().assertSuccessful() + buildAllModules().assertSuccessful() assertEquals(EXPECTED_JS_FILES_IN_OUTPUT_FOR_STDLIB_ONLY, contentOfOutputDir(PROJECT_NAME)) checkWhen(touch("src/test1.kt"), null, k2jsOutput(PROJECT_NAME)) @@ -295,7 +295,7 @@ class KotlinJpsBuildTest : AbstractKotlinJpsBuildTestCase() { fun testKotlinJavaScriptProjectWithTwoModules() { initProject(JS_STDLIB) - makeAll().assertSuccessful() + buildAllModules().assertSuccessful() assertEquals(EXPECTED_JS_FILES_IN_OUTPUT_FOR_STDLIB_ONLY, contentOfOutputDir(PROJECT_NAME)) assertEquals(EXPECTED_JS_FILES_IN_OUTPUT_FOR_MODULE_STDLIB_ONLY, contentOfOutputDir(ADDITIONAL_MODULE_NAME)) @@ -311,7 +311,7 @@ class KotlinJpsBuildTest : AbstractKotlinJpsBuildTestCase() { createKotlinJavaScriptLibraryArchive() addKotlinJavaScriptDependency(KOTLIN_JS_LIBRARY, File(workDir, KOTLIN_JS_LIBRARY_JAR)) addKotlinJavaScriptStdlibDependency() - makeAll().assertSuccessful() + buildAllModules().assertSuccessful() } fun testKotlinJavaScriptProjectWithDirectoryAsStdlib() { @@ -326,7 +326,7 @@ class KotlinJpsBuildTest : AbstractKotlinJpsBuildTestCase() { } addKotlinJavaScriptDependency("KotlinJavaScript", jslibDir) - makeAll().assertSuccessful() + buildAllModules().assertSuccessful() assertEquals(EXPECTED_JS_FILES_IN_OUTPUT_FOR_STDLIB_ONLY, contentOfOutputDir(PROJECT_NAME)) checkWhen(touch("src/test1.kt"), null, k2jsOutput(PROJECT_NAME)) @@ -335,7 +335,7 @@ class KotlinJpsBuildTest : AbstractKotlinJpsBuildTestCase() { fun testKotlinJavaScriptProjectWithDirectoryAsLibrary() { initProject(JS_STDLIB) addKotlinJavaScriptDependency(KOTLIN_JS_LIBRARY, File(workDir, KOTLIN_JS_LIBRARY)) - makeAll().assertSuccessful() + buildAllModules().assertSuccessful() assertEquals(EXPECTED_JS_FILES_IN_OUTPUT_WITH_ADDITIONAL_LIB_AND_DEFAULT_DIR, contentOfOutputDir(PROJECT_NAME)) checkWhen(touch("src/test1.kt"), null, k2jsOutput(PROJECT_NAME)) @@ -366,7 +366,7 @@ class KotlinJpsBuildTest : AbstractKotlinJpsBuildTestCase() { initProject(JS_STDLIB) createKotlinJavaScriptLibraryArchive() addKotlinJavaScriptDependency(KOTLIN_JS_LIBRARY, File(workDir, KOTLIN_JS_LIBRARY_JAR)) - makeAll().assertFailed() + buildAllModules().assertFailed() assertEquals(Collections.EMPTY_SET, contentOfOutputDir(PROJECT_NAME)) } @@ -562,7 +562,7 @@ class KotlinJpsBuildTest : AbstractKotlinJpsBuildTestCase() { fun testCircularDependenciesDifferentPackages() { initProject(JVM_MOCK_RUNTIME) - val result = makeAll() + val result = buildAllModules() // Check that outputs are located properly assertFilesExistInOutput(findModule("module2"), "kt1/Kt1Kt.class") @@ -576,7 +576,7 @@ class KotlinJpsBuildTest : AbstractKotlinJpsBuildTestCase() { fun testCircularDependenciesSamePackage() { initProject(JVM_MOCK_RUNTIME) - val result = makeAll() + val result = buildAllModules() result.assertSuccessful() // Check that outputs are located properly @@ -591,7 +591,7 @@ class KotlinJpsBuildTest : AbstractKotlinJpsBuildTestCase() { fun testCircularDependenciesSamePackageWithTests() { initProject(JVM_MOCK_RUNTIME) - val result = makeAll() + val result = buildAllModules() result.assertSuccessful() // Check that outputs are located properly @@ -606,14 +606,14 @@ class KotlinJpsBuildTest : AbstractKotlinJpsBuildTestCase() { fun testInternalFromAnotherModule() { initProject(JVM_MOCK_RUNTIME) - val result = makeAll() + val result = buildAllModules() result.assertFailed() result.checkErrors() } fun testInternalFromSpecialRelatedModule() { initProject(JVM_MOCK_RUNTIME) - makeAll().assertSuccessful() + buildAllModules().assertSuccessful() val classpath = listOf("out/production/module1", "out/test/module2").map { File(workDir, it).toURI().toURL() }.toTypedArray() val clazz = URLClassLoader(classpath).loadClass("test2.BarKt") @@ -622,14 +622,14 @@ class KotlinJpsBuildTest : AbstractKotlinJpsBuildTestCase() { fun testCircularDependenciesInternalFromAnotherModule() { initProject(JVM_MOCK_RUNTIME) - val result = makeAll() + val result = buildAllModules() result.assertFailed() result.checkErrors() } fun testCircularDependenciesWrongInternalFromTests() { initProject(JVM_MOCK_RUNTIME) - val result = makeAll() + val result = buildAllModules() result.assertFailed() result.checkErrors() } @@ -641,7 +641,7 @@ class KotlinJpsBuildTest : AbstractKotlinJpsBuildTestCase() { AbstractKotlinJpsBuildTestCase.addDependency(JpsJavaDependencyScope.COMPILE, Lists.newArrayList(findModule("module1"), findModule("module2")), false, "module-lib", libraryJar) - val result = makeAll() + val result = buildAllModules() result.assertSuccessful() } @@ -654,13 +654,13 @@ class KotlinJpsBuildTest : AbstractKotlinJpsBuildTestCase() { addKotlinRuntimeDependency() - val result = makeAll() + val result = buildAllModules() result.assertSuccessful() } fun testAccessToInternalInProductionFromTests() { initProject(JVM_MOCK_RUNTIME) - val result = makeAll() + val result = buildAllModules() result.assertSuccessful() } @@ -700,7 +700,7 @@ class KotlinJpsBuildTest : AbstractKotlinJpsBuildTestCase() { return module.name == "module2" } }), true) - makeAll().assertSuccessful() + buildAllModules().assertSuccessful() } fun testCancelLongKotlinCompilation() { @@ -730,7 +730,7 @@ class KotlinJpsBuildTest : AbstractKotlinJpsBuildTestCase() { fun testCancelKotlinCompilation() { initProject(JVM_MOCK_RUNTIME) - makeAll().assertSuccessful() + buildAllModules().assertSuccessful() val module = myProject.modules.get(0) assertFilesExistInOutput(module, "foo/Bar.class") @@ -767,7 +767,7 @@ class KotlinJpsBuildTest : AbstractKotlinJpsBuildTestCase() { File("some/test.class"), File("some/other/baddir")) - val result = makeAll() + val result = buildAllModules() result.assertSuccessful() val warnings = result.getMessages(BuildMessage.Kind.WARNING) @@ -785,7 +785,7 @@ class KotlinJpsBuildTest : AbstractKotlinJpsBuildTestCase() { fun testCodeInKotlinPackage() { initProject(JVM_MOCK_RUNTIME) - val result = makeAll() + val result = buildAllModules() result.assertFailed() val errors = result.getMessages(BuildMessage.Kind.ERROR) @@ -794,7 +794,7 @@ class KotlinJpsBuildTest : AbstractKotlinJpsBuildTestCase() { fun testDoNotCreateUselessKotlinIncrementalCaches() { initProject(JVM_MOCK_RUNTIME) - makeAll().assertSuccessful() + buildAllModules().assertSuccessful() val storageRoot = BuildDataPathsImpl(myDataStorageRoot).dataStorageRoot assertTrue(File(storageRoot, "targets/java-test/kotlinProject/kotlin").exists()) @@ -803,7 +803,7 @@ class KotlinJpsBuildTest : AbstractKotlinJpsBuildTestCase() { fun testDoNotCreateUselessKotlinIncrementalCachesForDependentTargets() { initProject(JVM_MOCK_RUNTIME) - makeAll().assertSuccessful() + buildAllModules().assertSuccessful() checkWhen(touch("src/utils.kt"), null, packageClasses("kotlinProject", "src/utils.kt", "_DefaultPackage")) @@ -814,7 +814,7 @@ class KotlinJpsBuildTest : AbstractKotlinJpsBuildTestCase() { fun testKotlinProjectWithEmptyProductionOutputDir() { initProject(JVM_MOCK_RUNTIME) - val result = makeAll() + val result = buildAllModules() result.assertFailed() result.checkErrors() } @@ -841,16 +841,16 @@ class KotlinJpsBuildTest : AbstractKotlinJpsBuildTestCase() { initProject(JVM_MOCK_RUNTIME) setPreRelease(true) - makeAll().assertSuccessful() + buildAllModules().assertSuccessful() assertCompiled(KotlinBuilder.KOTLIN_BUILDER_NAME, "src/Bar.kt", "src/Foo.kt") touch("src/Foo.kt").apply() - makeAll() + buildAllModules() assertCompiled(KotlinBuilder.KOTLIN_BUILDER_NAME, "src/Foo.kt") setPreRelease(false) touch("src/Foo.kt").apply() - makeAll().assertSuccessful() + buildAllModules().assertSuccessful() assertCompiled(KotlinBuilder.KOTLIN_BUILDER_NAME, "src/Bar.kt", "src/Foo.kt") } } @@ -914,7 +914,7 @@ class KotlinJpsBuildTest : AbstractKotlinJpsBuildTestCase() { buildResult: BuildResult, setupProject: ProjectDescriptor.() -> Unit = {} ) { - val scopeBuilder = CompileScopeTestBuilder.make().all() + val scopeBuilder = CompileScopeTestBuilder.make().allModules() val descriptor = this.createProjectDescriptor(BuildLoggingManager(logger)) descriptor.setupProject() @@ -976,7 +976,7 @@ class KotlinJpsBuildTest : AbstractKotlinJpsBuildTestCase() { action.apply() } - makeAll().assertSuccessful() + buildAllModules().assertSuccessful() if (pathsToCompile != null) { assertCompiled(KotlinBuilder.KOTLIN_BUILDER_NAME, *pathsToCompile) diff --git a/jps-plugin/jps-tests/test/org/jetbrains/kotlin/jps/build/SimpleKotlinJpsBuildTest.kt b/jps-plugin/jps-tests/test/org/jetbrains/kotlin/jps/build/SimpleKotlinJpsBuildTest.kt index 124f60f8d93..c0272ec8462 100644 --- a/jps-plugin/jps-tests/test/org/jetbrains/kotlin/jps/build/SimpleKotlinJpsBuildTest.kt +++ b/jps-plugin/jps-tests/test/org/jetbrains/kotlin/jps/build/SimpleKotlinJpsBuildTest.kt @@ -61,7 +61,7 @@ class SimpleKotlinJpsBuildTest : AbstractKotlinJpsBuildTestCase() { ).isExported = false addKotlinRuntimeDependency() - rebuildAll() + rebuildAllModules() } // TODO: add JS tests diff --git a/jps-plugin/kannotator-jps-plugin-test/test/org/jetbrains/kotlin/jps/build/kannotator/KannotatorJpsTest.java b/jps-plugin/kannotator-jps-plugin-test/test/org/jetbrains/kotlin/jps/build/kannotator/KannotatorJpsTest.java index 39c0146cdca..410af784abe 100644 --- a/jps-plugin/kannotator-jps-plugin-test/test/org/jetbrains/kotlin/jps/build/kannotator/KannotatorJpsTest.java +++ b/jps-plugin/kannotator-jps-plugin-test/test/org/jetbrains/kotlin/jps/build/kannotator/KannotatorJpsTest.java @@ -39,7 +39,7 @@ public class KannotatorJpsTest extends AbstractKotlinJpsBuildTestCase { public void testMakeKannotator() throws IOException { initProject(); - rebuildAll(); + rebuildAllModules(); FileUtil.copyDir(getOutDir(), getOutDirAfterRebuild()); for (JpsModule module : myProject.getModules()) { for (JpsModuleSourceRoot sourceRoot : module.getSourceRoots()) { @@ -71,7 +71,7 @@ public class KannotatorJpsTest extends AbstractKotlinJpsBuildTestCase { String path = root.getAbsolutePath(); System.out.println("Change file: " + path); change(path); - makeAll().assertSuccessful(); + buildAllModules().assertSuccessful(); System.out.println("Make successful"); System.out.println("Checking output directories after make and rebuild"); @@ -86,17 +86,17 @@ public class KannotatorJpsTest extends AbstractKotlinJpsBuildTestCase { } @Override - protected void rebuildAll() { + protected void rebuildAllModules() { System.out.println("'Rebuild all' started"); - super.rebuildAll(); + super.rebuildAllModules(); System.out.println("'Rebuild all' finished"); } @NotNull @Override - protected BuildResult makeAll() { + protected BuildResult buildAllModules() { System.out.println("'Make all' started"); - BuildResult result = super.makeAll(); + BuildResult result = super.buildAllModules(); System.out.println("'Make all' finished"); return result; } diff --git a/plugins/plugins-tests/tests/org/jetbrains/kotlin/jps/build/android/AbstractAndroidJpsTestCase.kt b/plugins/plugins-tests/tests/org/jetbrains/kotlin/jps/build/android/AbstractAndroidJpsTestCase.kt index 7b2420dff39..d57b46c2ec1 100644 --- a/plugins/plugins-tests/tests/org/jetbrains/kotlin/jps/build/android/AbstractAndroidJpsTestCase.kt +++ b/plugins/plugins-tests/tests/org/jetbrains/kotlin/jps/build/android/AbstractAndroidJpsTestCase.kt @@ -33,8 +33,8 @@ abstract class AbstractAndroidJpsTestCase : BaseKotlinJpsBuildTestCase() { fun doTest(path: String) { addJdkAndAndroidSdk() loadProject(path + getTestName(true) + ".ipr") - rebuildAll() - makeAll().assertSuccessful() + rebuildAllModules() + buildAllModules().assertSuccessful() FileUtil.delete(File(path + "/out")) }