Fix tests for as42.
This commit is contained in:
@@ -1,8 +1,8 @@
|
|||||||
versions.intellijSdk=202.6397.94
|
versions.intellijSdk=202.6397.94
|
||||||
versions.androidBuildTools=r23.0.1
|
versions.androidBuildTools=r23.0.1
|
||||||
versions.idea.NodeJS=193.6494.7
|
versions.idea.NodeJS=193.6494.7
|
||||||
versions.androidStudioRelease=4.2.0.12
|
versions.androidStudioRelease=4.2.0.13
|
||||||
versions.androidStudioBuild=202.6847140
|
versions.androidStudioBuild=202.6863838
|
||||||
versions.jar.asm-all=8.0.1
|
versions.jar.asm-all=8.0.1
|
||||||
versions.jar.guava=29.0-jre
|
versions.jar.guava=29.0-jre
|
||||||
versions.jar.groovy=2.5.11
|
versions.jar.groovy=2.5.11
|
||||||
|
|||||||
@@ -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 {
|
||||||
|
}
|
||||||
+4
@@ -92,4 +92,8 @@ public abstract class KotlinLightCodeInsightFixtureTestCaseBase extends LightCod
|
|||||||
//noinspection Convert2MethodRef
|
//noinspection Convert2MethodRef
|
||||||
KotlinTestUtils.runTestWithThrowable(this, () -> super.runTest());
|
KotlinTestUtils.runTestWithThrowable(this, () -> super.runTest());
|
||||||
}
|
}
|
||||||
|
|
||||||
|
protected boolean isFirPlugin() {
|
||||||
|
return false;
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
+2
-4
@@ -10,6 +10,7 @@ import com.intellij.openapi.application.PathMacros
|
|||||||
import com.intellij.openapi.module.Module
|
import com.intellij.openapi.module.Module
|
||||||
import com.intellij.openapi.module.ModuleManager
|
import com.intellij.openapi.module.ModuleManager
|
||||||
import com.intellij.openapi.project.Project
|
import com.intellij.openapi.project.Project
|
||||||
|
import com.intellij.openapi.project.ex.ProjectManagerEx
|
||||||
import com.intellij.openapi.projectRoots.Sdk
|
import com.intellij.openapi.projectRoots.Sdk
|
||||||
import com.intellij.openapi.roots.ProjectRootManager
|
import com.intellij.openapi.roots.ProjectRootManager
|
||||||
import com.intellij.openapi.util.io.FileUtil
|
import com.intellij.openapi.util.io.FileUtil
|
||||||
@@ -20,12 +21,9 @@ import com.intellij.testFramework.UsefulTestCase
|
|||||||
import junit.framework.TestCase
|
import junit.framework.TestCase
|
||||||
import org.jetbrains.kotlin.idea.configuration.KotlinWithLibraryConfigurator.FileState
|
import org.jetbrains.kotlin.idea.configuration.KotlinWithLibraryConfigurator.FileState
|
||||||
import org.jetbrains.kotlin.idea.framework.KotlinSdkType
|
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.test.PluginTestCaseBase.*
|
||||||
import org.jetbrains.kotlin.idea.util.getProjectJdkTableSafe
|
|
||||||
import org.jetbrains.kotlin.test.KotlinTestUtils
|
import org.jetbrains.kotlin.test.KotlinTestUtils
|
||||||
import org.jetbrains.kotlin.test.WithMutedInDatabaseRunTest
|
import org.jetbrains.kotlin.test.WithMutedInDatabaseRunTest
|
||||||
import org.jetbrains.kotlin.test.isIgnoredInDatabaseWithLog
|
|
||||||
import org.jetbrains.kotlin.test.runTest
|
import org.jetbrains.kotlin.test.runTest
|
||||||
import org.jetbrains.kotlin.utils.PathUtil
|
import org.jetbrains.kotlin.utils.PathUtil
|
||||||
import java.io.File
|
import java.io.File
|
||||||
@@ -113,7 +111,7 @@ abstract class AbstractConfigureKotlinTest : PlatformTestCase() {
|
|||||||
}
|
}
|
||||||
|
|
||||||
override fun doCreateProject(projectFile: Path): Project {
|
override fun doCreateProject(projectFile: Path): Project {
|
||||||
return loadProjectCompat(projectFile)
|
return (ProjectManagerEx.getInstanceEx()).loadProject(projectFile)
|
||||||
}
|
}
|
||||||
|
|
||||||
private val projectName: String
|
private val projectName: String
|
||||||
|
|||||||
Reference in New Issue
Block a user