From be71a871ae7b79c9291ca5685aec3c335ed731e5 Mon Sep 17 00:00:00 2001
From: Konstantin Tskhovrebov <konstantin.tskhovrebov@jetbrains.com>
Date: Mon, 19 Oct 2020 09:29:03 +0300
Subject: [PATCH] Fix tests for as42.

(cherry picked from commit 0ce6d694b7c379501662aff5bdc53812534726cf)
---
 gradle/versions.properties.as42                        |  4 ++--
 .../tests/org/w3c/dom/ElementTraversal.java            | 10 ++++++++++
 ...KotlinLightCodeInsightFixtureTestCaseBase.java.as42 |  4 ++++
 .../configuration/AbstractConfigureKotlinTest.kt.as42  |  6 ++----
 4 files changed, 18 insertions(+), 6 deletions(-)
 create mode 100644 idea/idea-new-project-wizard/tests/org/w3c/dom/ElementTraversal.java

diff --git a/gradle/versions.properties.as42 b/gradle/versions.properties.as42
index c44822b9c22e6..f2de0b7e5c476 100644
--- a/gradle/versions.properties.as42
+++ b/gradle/versions.properties.as42
@@ -1,8 +1,8 @@
 versions.intellijSdk=202.6397.94
 versions.androidBuildTools=r23.0.1
 versions.idea.NodeJS=193.6494.7
-versions.androidStudioRelease=4.2.0.12
-versions.androidStudioBuild=202.6847140
+versions.androidStudioRelease=4.2.0.13
+versions.androidStudioBuild=202.6863838
 versions.jar.asm-all=8.0.1
 versions.jar.guava=29.0-jre
 versions.jar.groovy=2.5.11
diff --git a/idea/idea-new-project-wizard/tests/org/w3c/dom/ElementTraversal.java b/idea/idea-new-project-wizard/tests/org/w3c/dom/ElementTraversal.java
new file mode 100644
index 0000000000000..df9a1c4df854d
--- /dev/null
+++ b/idea/idea-new-project-wizard/tests/org/w3c/dom/ElementTraversal.java
@@ -0,0 +1,10 @@
+/*
+ * Copyright 2010-2020 JetBrains s.r.o. and Kotlin Programming Language contributors.
+ * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
+ */
+
+package org.w3c.dom;
+
+//this is hack for support wizard tests in AS42 (there is `util-ui' module for that in intellij platform)
+public interface ElementTraversal extends org.apache.batik.w3c.dom.ElementTraversal {
+}
diff --git a/idea/idea-test-framework/test/org/jetbrains/kotlin/idea/test/KotlinLightCodeInsightFixtureTestCaseBase.java.as42 b/idea/idea-test-framework/test/org/jetbrains/kotlin/idea/test/KotlinLightCodeInsightFixtureTestCaseBase.java.as42
index d55001ae2434a..6b6258f98283d 100644
--- a/idea/idea-test-framework/test/org/jetbrains/kotlin/idea/test/KotlinLightCodeInsightFixtureTestCaseBase.java.as42
+++ b/idea/idea-test-framework/test/org/jetbrains/kotlin/idea/test/KotlinLightCodeInsightFixtureTestCaseBase.java.as42
@@ -92,4 +92,8 @@ public abstract class KotlinLightCodeInsightFixtureTestCaseBase extends LightCod
         //noinspection Convert2MethodRef
         KotlinTestUtils.runTestWithThrowable(this, () -> super.runTest());
     }
+
+    protected boolean isFirPlugin() {
+        return false;
+    }
 }
diff --git a/idea/tests/org/jetbrains/kotlin/idea/configuration/AbstractConfigureKotlinTest.kt.as42 b/idea/tests/org/jetbrains/kotlin/idea/configuration/AbstractConfigureKotlinTest.kt.as42
index c5f8ab57c16e5..ca5595485880f 100644
--- a/idea/tests/org/jetbrains/kotlin/idea/configuration/AbstractConfigureKotlinTest.kt.as42
+++ b/idea/tests/org/jetbrains/kotlin/idea/configuration/AbstractConfigureKotlinTest.kt.as42
@@ -10,6 +10,7 @@ import com.intellij.openapi.application.PathMacros
 import com.intellij.openapi.module.Module
 import com.intellij.openapi.module.ModuleManager
 import com.intellij.openapi.project.Project
+import com.intellij.openapi.project.ex.ProjectManagerEx
 import com.intellij.openapi.projectRoots.Sdk
 import com.intellij.openapi.roots.ProjectRootManager
 import com.intellij.openapi.util.io.FileUtil
@@ -20,12 +21,9 @@ import com.intellij.testFramework.UsefulTestCase
 import junit.framework.TestCase
 import org.jetbrains.kotlin.idea.configuration.KotlinWithLibraryConfigurator.FileState
 import org.jetbrains.kotlin.idea.framework.KotlinSdkType
-import org.jetbrains.kotlin.idea.test.PluginTestCaseBase
 import org.jetbrains.kotlin.idea.test.PluginTestCaseBase.*
-import org.jetbrains.kotlin.idea.util.getProjectJdkTableSafe
 import org.jetbrains.kotlin.test.KotlinTestUtils
 import org.jetbrains.kotlin.test.WithMutedInDatabaseRunTest
-import org.jetbrains.kotlin.test.isIgnoredInDatabaseWithLog
 import org.jetbrains.kotlin.test.runTest
 import org.jetbrains.kotlin.utils.PathUtil
 import java.io.File
@@ -113,7 +111,7 @@ abstract class AbstractConfigureKotlinTest : PlatformTestCase() {
     }
 
     override fun doCreateProject(projectFile: Path): Project {
-        return loadProjectCompat(projectFile)
+        return (ProjectManagerEx.getInstanceEx()).loadProject(projectFile)
     }
 
     private val projectName: String