Up merge changes from UsefulTestCase into KtUsefulTestCase

compiler/tests-common/tests/org/jetbrains/kotlin/test/testFramework/EdtTestUtil.kt

@@ -1,55 +0,0 @@
-/*
- * Copyright 2010-2016 JetBrains s.r.o.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.jetbrains.kotlin.test.testFramework
-
-import com.intellij.mock.MockApplication
-import com.intellij.openapi.application.ApplicationManager
-import org.jetbrains.annotations.TestOnly
-import java.lang.reflect.InvocationTargetException
-import javax.swing.SwingUtilities
-
-class EdtTestUtil {
-    companion object {
-        @TestOnly @JvmStatic fun runInEdtAndWait(runnable: Runnable) {
-            org.jetbrains.kotlin.test.testFramework.runInEdtAndWait { runnable.run() }
-        }
-    }
-}
-
-
-// Test only because in production you must use Application.invokeAndWait(Runnable, ModalityState).
-// The problem is - Application logs errors, but not throws. But in tests must be thrown.
-// In any case name "runInEdtAndWait" is better than "invokeAndWait".
-@TestOnly
-fun runInEdtAndWait(runnable: () -> Unit) {
-    if (SwingUtilities.isEventDispatchThread()) {
-        runnable()
-    }
-    else {
-        try {
-            val application = ApplicationManager.getApplication()
-                .takeIf { it !is MockApplication } // because MockApplication do nothing instead of `invokeAndWait`
-            if (application != null)
-                application.invokeAndWait(runnable)
-            else
-                SwingUtilities.invokeAndWait(runnable)
-        }
-        catch (e: InvocationTargetException) {
-            throw e.cause ?: e
-        }
-    }
-}

compiler/tests-common/tests/org/jetbrains/kotlin/test/testFramework/KtPlatformTestUtil.java

@@ -1,71 +0,0 @@
-/*
- * Copyright 2010-2016 JetBrains s.r.o.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.jetbrains.kotlin.test.testFramework;
-
-import com.intellij.ide.util.treeView.AbstractTreeNode;
-import com.intellij.openapi.ui.Queryable;
-import com.intellij.openapi.util.text.StringUtil;
-import org.jetbrains.annotations.NotNull;
-import org.jetbrains.annotations.Nullable;
-
-// Based on com.intellij.testFramework.PlatformTestUtil
-public class KtPlatformTestUtil {
-    @NotNull
-    public static String getTestName(@NotNull String name, boolean lowercaseFirstLetter) {
-        name = StringUtil.trimStart(name, "test");
-        return StringUtil.isEmpty(name) ? "" : lowercaseFirstLetter(name, lowercaseFirstLetter);
-    }
-
-    @NotNull
-    public static String lowercaseFirstLetter(@NotNull String name, boolean lowercaseFirstLetter) {
-        if (lowercaseFirstLetter && !isAllUppercaseName(name)) {
-            name = Character.toLowerCase(name.charAt(0)) + name.substring(1);
-        }
-        return name;
-    }
-
-    public static boolean isAllUppercaseName(@NotNull String name) {
-        int uppercaseChars = 0;
-        for (int i = 0; i < name.length(); i++) {
-            if (Character.isLowerCase(name.charAt(i))) {
-                return false;
-            }
-            if (Character.isUpperCase(name.charAt(i))) {
-                uppercaseChars++;
-            }
-        }
-        return uppercaseChars >= 3;
-    }
-
-    @Nullable
-    protected static String toString(@Nullable Object node, @Nullable Queryable.PrintInfo printInfo) {
-        if (node instanceof AbstractTreeNode) {
-            if (printInfo != null) {
-                return ((AbstractTreeNode) node).toTestString(printInfo);
-            }
-            else {
-                @SuppressWarnings({"deprecation", "UnnecessaryLocalVariable"}) String presentation =
-                        ((AbstractTreeNode) node).getTestPresentation();
-                return presentation;
-            }
-        }
-        if (node == null) {
-            return "NULL";
-        }
-        return node.toString();
-    }
-}

idea/idea-gradle/tests/org/jetbrains/kotlin/gradle/GradleMultiplatformHighlightingTest.kt

@@ -16,8 +16,8 @@ import com.intellij.openapi.fileEditor.OpenFileDescriptor
 import com.intellij.openapi.project.Project
 import com.intellij.openapi.vfs.VirtualFile
 import com.intellij.psi.PsiDocumentManager
+import com.intellij.testFramework.runInEdtAndWait
 import org.jetbrains.kotlin.idea.codeInsight.gradle.GradleImportingTestCase
-import org.jetbrains.kotlin.test.testFramework.runInEdtAndWait
 import org.jetbrains.plugins.gradle.tooling.annotation.TargetVersions
 import org.junit.Assert
 import org.junit.Test

idea/idea-gradle/tests/org/jetbrains/kotlin/idea/codeInsight/gradle/ExternalSystemTestCase.java

@@ -51,7 +51,7 @@ import java.util.ArrayList;
 import java.util.Collection;
 import java.util.List;
 
-import static org.jetbrains.kotlin.test.testFramework.EdtTestUtil.runInEdtAndWait;
+import static com.intellij.testFramework.EdtTestUtilKt.runInEdtAndWait;
 
 // part of com.intellij.openapi.externalSystem.test.ExternalSystemTestCase
 public abstract class ExternalSystemTestCase extends UsefulTestCase {
@@ -204,7 +204,10 @@ public abstract class ExternalSystemTestCase extends UsefulTestCase {
 
     @Override
     protected void invokeTestRunnable(@NotNull Runnable runnable) throws Exception {
-        runInEdtAndWait(runnable);
+        runInEdtAndWait(() -> {
+            runnable.run();
+            return null;
+        });
     }
 
     protected static String getRoot() {

idea/idea-gradle/tests/org/jetbrains/kotlin/idea/codeInsight/gradle/GradleConfiguratorPlatformSpecificTest.kt

@@ -5,10 +5,10 @@
 
 package org.jetbrains.kotlin.idea.codeInsight.gradle
 
+import com.intellij.testFramework.runInEdtAndWait
 import org.jetbrains.kotlin.config.LanguageFeature
 import org.jetbrains.kotlin.idea.configuration.KotlinWithGradleConfigurator
 import org.jetbrains.kotlin.idea.util.application.executeWriteCommand
-import org.jetbrains.kotlin.test.testFramework.runInEdtAndWait
 import org.jetbrains.plugins.gradle.tooling.annotation.TargetVersions
 import org.junit.Test
 

idea/idea-gradle/tests/org/jetbrains/kotlin/idea/codeInsight/gradle/GradleConfiguratorTest.kt

@@ -9,11 +9,11 @@ import com.intellij.openapi.extensions.Extensions
 import com.intellij.openapi.module.ModuleManager
 import com.intellij.openapi.roots.DependencyScope
 import com.intellij.openapi.roots.ExternalLibraryDescriptor
+import com.intellij.testFramework.runInEdtAndWait
 import org.jetbrains.kotlin.config.LanguageFeature
 import org.jetbrains.kotlin.idea.configuration.*
 import org.jetbrains.kotlin.idea.util.application.executeWriteCommand
 import org.jetbrains.kotlin.idea.util.application.runReadAction
-import org.jetbrains.kotlin.test.testFramework.runInEdtAndWait
 import org.jetbrains.kotlin.test.testFramework.runWriteAction
 import org.jetbrains.plugins.gradle.execution.test.runner.GradleTestRunConfigurationProducer
 import org.jetbrains.plugins.gradle.tooling.annotation.TargetVersions

idea/idea-gradle/tests/org/jetbrains/kotlin/idea/codeInsight/gradle/GradleMigrateTest.kt

@@ -9,13 +9,13 @@ import com.intellij.openapi.application.runReadAction
 import com.intellij.openapi.application.runWriteAction
 import com.intellij.psi.PsiDocumentManager
 import com.intellij.psi.PsiManager
+import com.intellij.testFramework.runInEdtAndWait
 import com.intellij.util.concurrency.FutureResult
 import org.jetbrains.kotlin.config.ApiVersion
 import org.jetbrains.kotlin.config.LanguageVersion
 import org.jetbrains.kotlin.idea.configuration.KotlinMigrationProjectComponent
 import org.jetbrains.kotlin.idea.configuration.KotlinMigrationProjectComponent.MigrationTestState
 import org.jetbrains.kotlin.idea.configuration.MigrationInfo
-import org.jetbrains.kotlin.test.testFramework.runInEdtAndWait
 import org.jetbrains.plugins.gradle.tooling.annotation.TargetVersions
 import org.junit.Assert
 import org.junit.Test

idea/idea-gradle/tests/org/jetbrains/kotlin/idea/codeInsight/gradle/GradleQuickFixTest.kt

@@ -13,11 +13,11 @@ import com.intellij.openapi.fileEditor.impl.LoadTextUtil
 import com.intellij.openapi.vfs.VirtualFile
 import com.intellij.testFramework.fixtures.CodeInsightTestFixture
 import com.intellij.testFramework.fixtures.IdeaTestFixtureFactory
+import com.intellij.testFramework.runInEdtAndWait
 import org.jetbrains.kotlin.idea.inspections.gradle.GradleKotlinxCoroutinesDeprecationInspection
 import org.jetbrains.kotlin.idea.inspections.runInspection
 import org.jetbrains.kotlin.idea.test.PluginTestCaseBase
 import org.jetbrains.kotlin.test.KotlinTestUtils
-import org.jetbrains.kotlin.test.testFramework.runInEdtAndWait
 import org.junit.Test
 import java.io.File
 import kotlin.reflect.KMutableProperty0

idea/idea-gradle/tests/org/jetbrains/kotlin/idea/codeInsight/gradle/GradleUpdateConfigurationQuickFixTest.kt

@@ -23,8 +23,8 @@ import com.intellij.openapi.vfs.VirtualFile
 import com.intellij.rt.execution.junit.FileComparisonFailure
 import com.intellij.testFramework.fixtures.CodeInsightTestFixture
 import com.intellij.testFramework.fixtures.IdeaTestFixtureFactory
+import com.intellij.testFramework.runInEdtAndWait
 import org.jetbrains.kotlin.idea.test.PluginTestCaseBase
-import org.jetbrains.kotlin.test.testFramework.runInEdtAndWait
 import org.junit.Test
 import java.io.File
 import kotlin.reflect.KMutableProperty0

idea/idea-maven/test/org/jetbrains/kotlin/idea/maven/MavenMigrateTest.kt

@@ -9,15 +9,13 @@ import com.intellij.openapi.application.runReadAction
 import com.intellij.openapi.application.runWriteAction
 import com.intellij.psi.PsiDocumentManager
 import com.intellij.psi.PsiManager
-import com.intellij.testFramework.TestDataPath
+import com.intellij.testFramework.runInEdtAndWait
 import com.intellij.util.concurrency.FutureResult
 import org.jetbrains.kotlin.config.ApiVersion
 import org.jetbrains.kotlin.config.LanguageVersion
 import org.jetbrains.kotlin.idea.configuration.KotlinMigrationProjectComponent
 import org.jetbrains.kotlin.idea.configuration.MigrationInfo
-import org.jetbrains.kotlin.test.JUnit3RunnerWithInners
 import org.jetbrains.kotlin.test.JUnit3WithIdeaConfigurationRunner
-import org.jetbrains.kotlin.test.testFramework.runInEdtAndWait
 import org.junit.Assert
 import org.junit.runner.RunWith
 import java.io.File

idea/idea-maven/test/org/jetbrains/kotlin/idea/maven/MavenUpdateConfigurationQuickFixTest.kt

@@ -24,10 +24,9 @@ import com.intellij.openapi.vfs.VirtualFile
 import com.intellij.rt.execution.junit.FileComparisonFailure
 import com.intellij.testFramework.fixtures.CodeInsightTestFixture
 import com.intellij.testFramework.fixtures.IdeaTestFixtureFactory
-import org.jetbrains.kotlin.test.JUnit3RunnerWithInners
 import org.jetbrains.kotlin.test.JUnit3WithIdeaConfigurationRunner
+import com.intellij.testFramework.runInEdtAndWait
 import org.jetbrains.kotlin.test.KotlinTestUtils
-import org.jetbrains.kotlin.test.testFramework.runInEdtAndWait
 import org.junit.Test
 import org.junit.runner.RunWith
 import java.io.File

idea/idea-test-framework/test/org/jetbrains/kotlin/idea/test/KotlinProjectDescriptorWithFacet.kt

@@ -20,10 +20,10 @@ import com.intellij.facet.FacetManager
 import com.intellij.openapi.module.Module
 import com.intellij.openapi.roots.ContentEntry
 import com.intellij.openapi.roots.ModifiableRootModel
+import com.intellij.testFramework.runInEdtAndWait
 import org.jetbrains.kotlin.config.CompilerSettings
 import org.jetbrains.kotlin.config.LanguageVersion
 import org.jetbrains.kotlin.idea.facet.*
-import org.jetbrains.kotlin.test.testFramework.runInEdtAndWait
 import org.jetbrains.kotlin.test.testFramework.runWriteAction
 
 class KotlinProjectDescriptorWithFacet(