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

[TEST] Introduce test-infrastructure-utils module and extract common test utilities here

Browse Source
This commit is contained in:
Dmitriy Novozhilov
2020-12-02 16:00:43 +03:00
parent 1c91b74ff0
commit c8f3a4802e
189 changed files with 791 additions and 630 deletions
Download Patch File Download Diff File Expand all files Collapse all files
idea/idea-maven/test/org/jetbrains/kotlin/idea/maven/MavenTestCase.java
+3 -3
View File
@@ -41,7 +41,7 @@ import org.jetbrains.annotations.NotNull;
import org.jetbrains.idea.maven.indices.MavenIndicesManager;
import org.jetbrains.idea.maven.project.*;
import org.jetbrains.idea.maven.server.MavenServerManager;
import org.jetbrains.kotlin.test.KotlinTestUtils;
import org.jetbrains.kotlin.test.util.KtTestUtil;
import java.awt.*;
import java.io.File;
@@ -50,8 +50,8 @@ import java.lang.reflect.Field;
import java.lang.reflect.Modifier;
import java.net.HttpURLConnection;
import java.net.URL;
import java.util.*;
import java.util.List;
import java.util.*;
import java.util.concurrent.TimeUnit;
public abstract class MavenTestCase extends UsefulTestCase {
@@ -91,7 +91,7 @@ public abstract class MavenTestCase extends UsefulTestCase {
protected void setUp() throws Exception {
super.setUp();
myDir = KotlinTestUtils.tmpDir(getTestName(false));
myDir = KtTestUtil.tmpDir(getTestName(false));
setUpFixtures();
idea/idea-maven/test/org/jetbrains/kotlin/idea/maven/MavenUpdateConfigurationQuickFixTest.kt
+4 -4
View File
@@ -24,9 +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.JUnit3WithIdeaConfigurationRunner
import com.intellij.testFramework.runInEdtAndWait
import org.jetbrains.kotlin.test.KotlinTestUtils
import org.jetbrains.kotlin.test.JUnit3WithIdeaConfigurationRunner
import org.jetbrains.kotlin.test.util.KtTestUtil
import org.junit.Test
import org.junit.runner.RunWith
import java.io.File
@@ -37,7 +37,7 @@ class MavenUpdateConfigurationQuickFixTest : MavenImportingTestCase() {
private lateinit var codeInsightTestFixture: CodeInsightTestFixture
private fun getTestDataPath() =
KotlinTestUtils.getHomeDirectory() + "/idea/idea-maven/testData/languageFeature/" + getTestName(true).substringBefore('_')
KtTestUtil.getHomeDirectory() + "/idea/idea-maven/testData/languageFeature/" + getTestName(true).substringBefore('_')
override fun setUpFixtures() {
myTestFixture = IdeaTestFixtureFactory.getFixtureFactory().createFixtureBuilder(getName()).fixture
@@ -115,4 +115,4 @@ class MavenUpdateConfigurationQuickFixTest : MavenImportingTestCase() {
throw FileComparisonFailure("pom.xml doesn't match", expectedContent, actualContent, expectedPath.path)
}
}
}
}