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

remove Jet from names of classes in tests: phase 2

Browse Source
This commit is contained in:
Dmitry Jemerov
2015-11-03 14:05:20 +01:00
parent c604f98a1c
commit 19af88738b
382 changed files with 21630 additions and 21661 deletions
Download Patch File Download Diff File Expand all files Collapse all files
idea/idea-test-framework/src/org/jetbrains/kotlin/idea/test/JdkAndMockLibraryProjectDescriptor.java
+1 -2
View File
@@ -17,7 +17,6 @@
package org.jetbrains.kotlin.idea.test;
import com.intellij.openapi.module.Module;
import com.intellij.openapi.roots.ContentEntry;
import com.intellij.openapi.roots.ModifiableRootModel;
import com.intellij.openapi.roots.OrderRootType;
import com.intellij.openapi.roots.libraries.Library;
@@ -27,7 +26,7 @@ import org.jetbrains.kotlin.test.MockLibraryUtil;
import java.io.File;
public class JdkAndMockLibraryProjectDescriptor extends JetLightProjectDescriptor {
public class JdkAndMockLibraryProjectDescriptor extends KotlinLightProjectDescriptor {
public static final String LIBRARY_NAME = "myKotlinLib";
private final String sourcesPath;
idea/idea-test-framework/src/org/jetbrains/kotlin/idea/test/KotlinCodeInsightTestCase.java
+3 -3
View File
@@ -18,18 +18,18 @@ package org.jetbrains.kotlin.idea.test;
import com.intellij.codeInsight.CodeInsightTestCase;
import com.intellij.openapi.vfs.newvfs.impl.VfsRootAccess;
import org.jetbrains.kotlin.test.JetTestUtils;
import org.jetbrains.kotlin.test.KotlinTestUtils;
public abstract class KotlinCodeInsightTestCase extends CodeInsightTestCase {
@Override
protected void setUp() throws Exception {
VfsRootAccess.allowRootAccess(JetTestUtils.getHomeDirectory());
VfsRootAccess.allowRootAccess(KotlinTestUtils.getHomeDirectory());
super.setUp();
}
@Override
protected void tearDown() throws Exception {
super.tearDown();
VfsRootAccess.disallowRootAccess(JetTestUtils.getHomeDirectory());
VfsRootAccess.disallowRootAccess(KotlinTestUtils.getHomeDirectory());
}
}
idea/idea-test-framework/src/org/jetbrains/kotlin/idea/test/KotlinLightCodeInsightFixtureTestCase.kt
+4 -4
View File
@@ -88,13 +88,13 @@ public abstract class KotlinLightCodeInsightFixtureTestCase : LightCodeInsightFi
val testName = StringUtil.toLowerCase(getTestName(false))
if (testName.endsWith("runtime")) {
return JetWithJdkAndRuntimeLightProjectDescriptor.INSTANCE
return KotlinWithJdkAndRuntimeLightProjectDescriptor.INSTANCE
}
else if (testName.endsWith("stdlib")) {
return ProjectDescriptorWithStdlibSources.INSTANCE
}
return JetLightProjectDescriptor.INSTANCE
return KotlinLightProjectDescriptor.INSTANCE
}
protected fun getProjectDescriptorFromFileDirective(): LightProjectDescriptor {
@@ -110,7 +110,7 @@ public abstract class KotlinLightCodeInsightFixtureTestCase : LightCodeInsightFi
return ProjectDescriptorWithStdlibSources.INSTANCE
}
else if (InTextDirectivesUtils.isDirectiveDefined(fileText, "RUNTIME")) {
return JetWithJdkAndRuntimeLightProjectDescriptor.INSTANCE
return KotlinWithJdkAndRuntimeLightProjectDescriptor.INSTANCE
}
else if (InTextDirectivesUtils.isDirectiveDefined(fileText, "JS")) {
return KotlinStdJSProjectDescriptor.instance
@@ -121,7 +121,7 @@ public abstract class KotlinLightCodeInsightFixtureTestCase : LightCodeInsightFi
}
}
return JetLightProjectDescriptor.INSTANCE
return KotlinLightProjectDescriptor.INSTANCE
}
protected fun isAllFilesPresentInTest(): Boolean
idea/idea-test-framework/src/org/jetbrains/kotlin/idea/test/KotlinLightPlatformCodeInsightFixtureTestCase.kt
+3 -3
View File
@@ -21,7 +21,7 @@ import com.intellij.openapi.startup.StartupManager
import com.intellij.openapi.vfs.newvfs.impl.VfsRootAccess
import com.intellij.testFramework.fixtures.LightPlatformCodeInsightFixtureTestCase
import org.jetbrains.kotlin.idea.actions.internal.KotlinInternalMode
import org.jetbrains.kotlin.test.JetTestUtils
import org.jetbrains.kotlin.test.KotlinTestUtils
public abstract class KotlinLightPlatformCodeInsightFixtureTestCase: LightPlatformCodeInsightFixtureTestCase() {
private var kotlinInternalModeOriginalValue: Boolean = false
@@ -29,7 +29,7 @@ public abstract class KotlinLightPlatformCodeInsightFixtureTestCase: LightPlatfo
override fun setUp() {
super.setUp()
(StartupManager.getInstance(getProject()) as StartupManagerImpl).runPostStartupActivities()
VfsRootAccess.allowRootAccess(JetTestUtils.getHomeDirectory())
VfsRootAccess.allowRootAccess(KotlinTestUtils.getHomeDirectory())
invalidateLibraryCache(project)
kotlinInternalModeOriginalValue = KotlinInternalMode.enabled
@@ -38,7 +38,7 @@ public abstract class KotlinLightPlatformCodeInsightFixtureTestCase: LightPlatfo
override fun tearDown() {
KotlinInternalMode.enabled = kotlinInternalModeOriginalValue
VfsRootAccess.disallowRootAccess(JetTestUtils.getHomeDirectory())
VfsRootAccess.disallowRootAccess(KotlinTestUtils.getHomeDirectory())
unInvalidateBuiltinsAndStdLib(getProject()) {
super.tearDown()
idea/idea-test-framework/src/org/jetbrains/kotlin/idea/test/KotlinMultiFileTestCase.kt
+3 -3
View File
@@ -21,7 +21,7 @@ import com.intellij.openapi.vfs.newvfs.impl.VfsRootAccess
import com.intellij.psi.PsiDocumentManager
import com.intellij.refactoring.MultiFileTestCase
import org.jetbrains.kotlin.idea.util.application.runWriteAction
import org.jetbrains.kotlin.test.JetTestUtils
import org.jetbrains.kotlin.test.KotlinTestUtils
public abstract class KotlinMultiFileTestCase : MultiFileTestCase() {
protected fun extractCaretOffset(doc: Document): Int {
@@ -45,11 +45,11 @@ public abstract class KotlinMultiFileTestCase : MultiFileTestCase() {
override fun setUp() {
super.setUp()
VfsRootAccess.allowRootAccess(JetTestUtils.getHomeDirectory())
VfsRootAccess.allowRootAccess(KotlinTestUtils.getHomeDirectory())
}
override fun tearDown() {
VfsRootAccess.disallowRootAccess(JetTestUtils.getHomeDirectory())
VfsRootAccess.disallowRootAccess(KotlinTestUtils.getHomeDirectory())
super.tearDown()
}
}
idea/idea-test-framework/src/org/jetbrains/kotlin/idea/test/KotlinStdJSProjectDescriptor.kt
+1 -1
View File
@@ -18,7 +18,7 @@ package org.jetbrains.kotlin.idea.test
import com.intellij.testFramework.LightProjectDescriptor
public open class KotlinStdJSProjectDescriptor : JetLightProjectDescriptor() {
public open class KotlinStdJSProjectDescriptor : KotlinLightProjectDescriptor() {
companion object {
public val instance: KotlinStdJSProjectDescriptor
= Class.forName("org.jetbrains.kotlin.test.KotlinStdJSProjectDescriptorImpl").newInstance() as KotlinStdJSProjectDescriptor
idea/idea-test-framework/src/org/jetbrains/kotlin/idea/test/PluginTestCaseBase.java
+2 -2
View File
@@ -20,7 +20,7 @@ import com.intellij.openapi.projectRoots.JavaSdk;
import com.intellij.openapi.projectRoots.Sdk;
import com.intellij.openapi.util.text.StringUtil;
import org.jetbrains.annotations.NotNull;
import org.jetbrains.kotlin.test.JetTestUtils;
import org.jetbrains.kotlin.test.KotlinTestUtils;
import java.io.File;
@@ -32,7 +32,7 @@ public class PluginTestCaseBase {
@NotNull
public static String getTestDataPathBase() {
return JetTestUtils.getHomeDirectory() + TEST_DATA_PROJECT_RELATIVE;
return KotlinTestUtils.getHomeDirectory() + TEST_DATA_PROJECT_RELATIVE;
}
@NotNull
idea/idea-test-framework/src/org/jetbrains/kotlin/idea/test/ProjectDescriptorWithStdlibSources.java
+1 -3
View File
@@ -17,17 +17,15 @@
package org.jetbrains.kotlin.idea.test;
import com.intellij.openapi.module.Module;
import com.intellij.openapi.roots.ContentEntry;
import com.intellij.openapi.roots.ModifiableRootModel;
import com.intellij.openapi.roots.OrderRootType;
import com.intellij.openapi.roots.libraries.Library;
import com.intellij.openapi.vfs.VfsUtil;
import org.jetbrains.annotations.NotNull;
import org.jetbrains.annotations.Nullable;
import java.io.File;
public class ProjectDescriptorWithStdlibSources extends JetWithJdkAndRuntimeLightProjectDescriptor {
public class ProjectDescriptorWithStdlibSources extends KotlinWithJdkAndRuntimeLightProjectDescriptor {
public static final ProjectDescriptorWithStdlibSources INSTANCE = new ProjectDescriptorWithStdlibSources();
@Override
idea/idea-test-framework/src/org/jetbrains/kotlin/idea/test/testUtils.kt
+1 -1
View File
@@ -44,7 +44,7 @@ public enum class ModuleKind {
KOTLIN_JAVASCRIPT
}
public fun Module.configureAs(descriptor: JetLightProjectDescriptor) {
public fun Module.configureAs(descriptor: KotlinLightProjectDescriptor) {
val module = this
updateModel(module, object : Consumer<ModifiableRootModel> {
override fun consume(model: ModifiableRootModel) {