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 1

Browse Source
This commit is contained in:
Dmitry Jemerov
2015-11-03 13:37:54 +01:00
parent 86f8845c00
commit c604f98a1c
65 changed files with 296 additions and 281 deletions
Download Patch File Download Diff File Expand all files Collapse all files
idea/idea-test-framework/src/org/jetbrains/kotlin/idea/test/JetJdkAndLibraryProjectDescriptor.java → idea/idea-test-framework/src/org/jetbrains/kotlin/idea/test/KotlinJdkAndLibraryProjectDescriptor.java
+2 -5
View File
@@ -20,23 +20,20 @@ import com.intellij.openapi.module.Module;
import com.intellij.openapi.module.ModuleType;
import com.intellij.openapi.module.StdModuleTypes;
import com.intellij.openapi.projectRoots.Sdk;
import com.intellij.openapi.roots.ContentEntry;
import com.intellij.openapi.roots.ModifiableRootModel;
import com.intellij.openapi.roots.OrderRootType;
import com.intellij.openapi.roots.ui.configuration.libraryEditor.NewLibraryEditor;
import com.intellij.openapi.vfs.VfsUtil;
import com.intellij.testFramework.LightProjectDescriptor;
import org.jetbrains.annotations.NotNull;
import org.jetbrains.annotations.Nullable;
import java.io.File;
public class JetJdkAndLibraryProjectDescriptor extends JetLightProjectDescriptor {
public class KotlinJdkAndLibraryProjectDescriptor extends KotlinLightProjectDescriptor {
public static final String LIBRARY_NAME = "myLibrary";
private final File libraryFile;
public JetJdkAndLibraryProjectDescriptor(File libraryFile) {
public KotlinJdkAndLibraryProjectDescriptor(File libraryFile) {
assert libraryFile.exists() : "Library file doesn't exist: " + libraryFile.getAbsolutePath();
this.libraryFile = libraryFile;
}
idea/idea-test-framework/src/org/jetbrains/kotlin/idea/test/JetLightCodeInsightFixtureTestCase.kt → idea/idea-test-framework/src/org/jetbrains/kotlin/idea/test/KotlinLightCodeInsightFixtureTestCase.kt
+4 -4
View File
@@ -33,14 +33,14 @@ import com.intellij.testFramework.fixtures.LightCodeInsightFixtureTestCase
import org.apache.log4j.Logger
import org.jetbrains.kotlin.idea.actions.internal.KotlinInternalMode
import org.jetbrains.kotlin.test.InTextDirectivesUtils
import org.jetbrains.kotlin.test.JetTestUtils
import org.jetbrains.kotlin.test.KotlinTestUtils
import org.jetbrains.kotlin.utils.addIfNotNull
import org.jetbrains.kotlin.utils.rethrow
import java.io.File
import java.io.IOException
import java.util.*
public abstract class JetLightCodeInsightFixtureTestCase : LightCodeInsightFixtureTestCase() {
public abstract class KotlinLightCodeInsightFixtureTestCase : LightCodeInsightFixtureTestCase() {
private var kotlinInternalModeOriginalValue = false
private val exceptions = ArrayList<Throwable>()
@@ -48,7 +48,7 @@ public abstract class JetLightCodeInsightFixtureTestCase : LightCodeInsightFixtu
override fun setUp() {
super.setUp()
(StartupManager.getInstance(getProject()) as StartupManagerImpl).runPostStartupActivities()
VfsRootAccess.allowRootAccess(JetTestUtils.getHomeDirectory())
VfsRootAccess.allowRootAccess(KotlinTestUtils.getHomeDirectory())
kotlinInternalModeOriginalValue = KotlinInternalMode.enabled
KotlinInternalMode.enabled = true
@@ -69,7 +69,7 @@ public abstract class JetLightCodeInsightFixtureTestCase : LightCodeInsightFixtu
LoggedErrorProcessor.restoreDefaultProcessor()
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/JetLightProjectDescriptor.java → idea/idea-test-framework/src/org/jetbrains/kotlin/idea/test/KotlinLightProjectDescriptor.java
+3 -3
View File
@@ -25,11 +25,11 @@ import com.intellij.openapi.roots.ModifiableRootModel;
import com.intellij.testFramework.LightProjectDescriptor;
import org.jetbrains.annotations.NotNull;
public class JetLightProjectDescriptor extends LightProjectDescriptor {
protected JetLightProjectDescriptor() {
public class KotlinLightProjectDescriptor extends LightProjectDescriptor {
protected KotlinLightProjectDescriptor() {
}
public static final JetLightProjectDescriptor INSTANCE = new JetLightProjectDescriptor();
public static final KotlinLightProjectDescriptor INSTANCE = new KotlinLightProjectDescriptor();
@Override
public ModuleType getModuleType() {
idea/idea-test-framework/src/org/jetbrains/kotlin/idea/test/JetWithJdkAndRuntimeLightProjectDescriptor.java → idea/idea-test-framework/src/org/jetbrains/kotlin/idea/test/KotlinWithJdkAndRuntimeLightProjectDescriptor.java
+3 -3
View File
@@ -18,10 +18,10 @@ package org.jetbrains.kotlin.idea.test;
import org.jetbrains.kotlin.codegen.forTestCompile.ForTestCompileRuntime;
public class JetWithJdkAndRuntimeLightProjectDescriptor extends JetJdkAndLibraryProjectDescriptor {
protected JetWithJdkAndRuntimeLightProjectDescriptor() {
public class KotlinWithJdkAndRuntimeLightProjectDescriptor extends KotlinJdkAndLibraryProjectDescriptor {
protected KotlinWithJdkAndRuntimeLightProjectDescriptor() {
super(ForTestCompileRuntime.runtimeJarForTests());
}
public static final JetWithJdkAndRuntimeLightProjectDescriptor INSTANCE = new JetWithJdkAndRuntimeLightProjectDescriptor();
public static final KotlinWithJdkAndRuntimeLightProjectDescriptor INSTANCE = new KotlinWithJdkAndRuntimeLightProjectDescriptor();
}