azalea/kotlin-fork
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix tests for as42.

Browse Source
This commit is contained in:
Konstantin Tskhovrebov
2020-10-19 09:29:03 +03:00
parent 48cd86b717
commit 0ce6d694b7
4 changed files with 18 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
gradle/versions.properties.as42
+2 -2
View File
@@ -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
idea/idea-new-project-wizard/tests/org/w3c/dom/ElementTraversal.java
+10
View File
@@ -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 {
}
idea/idea-test-framework/test/org/jetbrains/kotlin/idea/test/KotlinLightCodeInsightFixtureTestCaseBase.java.as42
+4
View File
@@ -92,4 +92,8 @@ public abstract class KotlinLightCodeInsightFixtureTestCaseBase extends LightCod
//noinspection Convert2MethodRef
KotlinTestUtils.runTestWithThrowable(this, () -> super.runTest());
}
protected boolean isFirPlugin() {
return false;
}
}
idea/tests/org/jetbrains/kotlin/idea/configuration/AbstractConfigureKotlinTest.kt.as42
+2 -4
View File
@@ -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