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

Codebase update

Browse Source
This commit is contained in:
Yan Zhulanow
2015-02-03 18:37:49 +03:00
parent 346dbe3f7c
commit c756cfef86
46 changed files with 197 additions and 355 deletions
Download Patch File Download Diff File Expand all files Collapse all files
plugins/android-idea-plugin/tests/org/jetbrains/jet/android/AbstractAndroidCompletionTest.kt
+2 -6
View File
@@ -16,23 +16,19 @@
package org.jetbrains.jet.android
import org.jetbrains.jet.plugin.PluginTestCaseBase
import com.intellij.openapi.application.PathManager
import com.intellij.codeInsight.completion.CompletionType
import com.intellij.openapi.util.io.FileUtil
import java.io.File
import org.jetbrains.jet.completion.util.testCompletion
import org.jetbrains.jet.plugin.project.TargetPlatform
import com.intellij.ide.startup.impl.StartupManagerImpl
import com.intellij.openapi.vfs.newvfs.impl.VfsRootAccess
import com.intellij.openapi.startup.StartupManager
import org.jetbrains.jet.JetTestCaseBuilder
import org.jetbrains.jet.plugin.actions.internal.KotlinInternalMode
import com.intellij.psi.impl.PsiManagerEx
import com.intellij.psi.PsiManager
import org.jetbrains.jet.plugin.references.BuiltInsReferenceResolver
import com.android.SdkConstants
import com.intellij.codeInsight.CodeInsightSettings
import org.jetbrains.kotlin.completion.util.testCompletion
import org.jetbrains.kotlin.idea.project.TargetPlatform
public abstract class AbstractAndroidCompletionTest : KotlinAndroidTestCase() {
private var kotlinInternalModeOriginalValue: Boolean = false
plugins/android-idea-plugin/tests/org/jetbrains/jet/android/AbstractAndroidFindUsagesTest.kt
-1
View File
@@ -16,7 +16,6 @@
package org.jetbrains.jet.android
import org.jetbrains.jet.plugin.PluginTestCaseBase
import kotlin.test.assertTrue
import com.intellij.codeInsight.TargetElementUtilBase
import com.intellij.codeInsight.navigation.actions.GotoDeclarationAction
plugins/android-idea-plugin/tests/org/jetbrains/jet/android/AbstractAndroidGotoTest.kt
+1 -2
View File
@@ -18,11 +18,10 @@ package org.jetbrains.jet.android
import com.intellij.openapi.application.PathManager
import com.android.SdkConstants
import org.jetbrains.jet.plugin.PluginTestCaseBase
import com.intellij.codeInsight.navigation.actions.GotoDeclarationAction
import kotlin.test.fail
import kotlin.test.assertEquals
import org.jetbrains.jet.lang.psi.JetProperty
import org.jetbrains.kotlin.psi.JetProperty
public abstract class AbstractAndroidGotoTest : KotlinAndroidTestCase() {
plugins/android-idea-plugin/tests/org/jetbrains/jet/android/AbstractAndroidRenameTest.kt
+1 -2
View File
@@ -21,12 +21,11 @@ import com.intellij.psi.impl.source.tree.injected.InjectedLanguageUtil
import com.intellij.codeInsight.TargetElementUtilBase
import com.intellij.refactoring.rename.RenamePsiElementProcessor
import com.intellij.refactoring.rename.RenameProcessor
import org.jetbrains.jet.plugin.PluginTestCaseBase
import com.intellij.codeInsight.navigation.actions.GotoDeclarationAction
import kotlin.test.assertEquals
import kotlin.test.assertTrue
import com.intellij.psi.PsiElement
import org.jetbrains.jet.lang.psi.JetProperty
import org.jetbrains.kotlin.psi.JetProperty
public abstract class AbstractAndroidRenameTest : KotlinAndroidTestCase() {
plugins/android-idea-plugin/tests/org/jetbrains/jet/android/AbstractParserResultEqualityTest.kt
+7 -9
View File
@@ -16,19 +16,17 @@
package org.jetbrains.jet.android
import org.jetbrains.jet.cli.jvm.compiler.JetCoreEnvironment
import org.jetbrains.jet.lang.resolve.android.CliAndroidUIXmlProcessor
import org.jetbrains.jet.JetTestUtils
import org.jetbrains.jet.ConfigurationKind
import org.jetbrains.jet.TestJdkKind
import org.jetbrains.jet.plugin.android.IDEAndroidUIXmlProcessor
import org.jetbrains.jet.cli.jvm.JVMConfigurationKeys
import kotlin.test.assertEquals
import org.jetbrains.jet.plugin.android.TestConst
import org.jetbrains.jet.plugin.PluginTestCaseBase
import org.jetbrains.kotlin.android.AndroidConfigurationKeys
import org.jetbrains.jet.cli.jvm.compiler.EnvironmentConfigFiles
import com.intellij.openapi.module.ModuleManager
import org.jetbrains.kotlin.cli.jvm.compiler.JetCoreEnvironment
import org.jetbrains.kotlin.test.JetTestUtils
import org.jetbrains.kotlin.test.ConfigurationKind
import org.jetbrains.kotlin.test.TestJdkKind
import org.jetbrains.kotlin.cli.jvm.compiler.EnvironmentConfigFiles
public abstract class AbstractParserResultEqualityTest : KotlinAndroidTestCase() {
public fun doTest(path: String) {
@@ -38,8 +36,8 @@ public abstract class AbstractParserResultEqualityTest : KotlinAndroidTestCase()
val cliParser = CliAndroidUIXmlProcessor(project, path + "../AndroidManifest.xml", path + getResDir() + "/layout/")
val ideParser = IDEAndroidUIXmlProcessor(ModuleManager.getInstance(project).getModules()[0])
val cliResult = cliParser.parseToPsi()!!.getText()
val ideResult = ideParser.parseToPsi()!!.getText()
val cliResult = cliParser.parseToPsi()!!.joinToString("\n\n")
val ideResult = ideParser.parseToPsi()!!.joinToString("\n\n")
assertEquals(cliResult, ideResult)
}
plugins/android-idea-plugin/tests/org/jetbrains/jet/android/AndroidCompletionTestGenerated.java
+3 -4
View File
@@ -17,10 +17,9 @@
package org.jetbrains.jet.android;
import com.intellij.testFramework.TestDataPath;
import org.jetbrains.jet.JUnit3RunnerWithInners;
import org.jetbrains.jet.JetTestUtils;
import org.jetbrains.jet.test.InnerTestClasses;
import org.jetbrains.jet.test.TestMetadata;
import org.jetbrains.kotlin.test.JUnit3RunnerWithInners;
import org.jetbrains.kotlin.test.JetTestUtils;
import org.jetbrains.kotlin.test.TestMetadata;
import org.junit.runner.RunWith;
import java.io.File;
plugins/android-idea-plugin/tests/org/jetbrains/jet/android/AndroidFindUsagesTestGenerated.java
+3 -4
View File
@@ -17,10 +17,9 @@
package org.jetbrains.jet.android;
import com.intellij.testFramework.TestDataPath;
import org.jetbrains.jet.JUnit3RunnerWithInners;
import org.jetbrains.jet.JetTestUtils;
import org.jetbrains.jet.test.InnerTestClasses;
import org.jetbrains.jet.test.TestMetadata;
import org.jetbrains.kotlin.test.JUnit3RunnerWithInners;
import org.jetbrains.kotlin.test.JetTestUtils;
import org.jetbrains.kotlin.test.TestMetadata;
import org.junit.runner.RunWith;
import java.io.File;
plugins/android-idea-plugin/tests/org/jetbrains/jet/android/AndroidGotoTestGenerated.java
+3 -4
View File
@@ -17,10 +17,9 @@
package org.jetbrains.jet.android;
import com.intellij.testFramework.TestDataPath;
import org.jetbrains.jet.JUnit3RunnerWithInners;
import org.jetbrains.jet.JetTestUtils;
import org.jetbrains.jet.test.InnerTestClasses;
import org.jetbrains.jet.test.TestMetadata;
import org.jetbrains.kotlin.test.JUnit3RunnerWithInners;
import org.jetbrains.kotlin.test.JetTestUtils;
import org.jetbrains.kotlin.test.TestMetadata;
import org.junit.runner.RunWith;
import java.io.File;
plugins/android-idea-plugin/tests/org/jetbrains/jet/android/AndroidRenameTestGenerated.java
+3 -4
View File
@@ -17,10 +17,9 @@
package org.jetbrains.jet.android;
import com.intellij.testFramework.TestDataPath;
import org.jetbrains.jet.JUnit3RunnerWithInners;
import org.jetbrains.jet.JetTestUtils;
import org.jetbrains.jet.test.InnerTestClasses;
import org.jetbrains.jet.test.TestMetadata;
import org.jetbrains.kotlin.test.JUnit3RunnerWithInners;
import org.jetbrains.kotlin.test.JetTestUtils;
import org.jetbrains.kotlin.test.TestMetadata;
import org.junit.runner.RunWith;
import java.io.File;
plugins/android-idea-plugin/tests/org/jetbrains/jet/android/KotlinAndroidTestCase.java
+9 -9
View File
@@ -21,7 +21,6 @@ import com.android.ide.common.rendering.RenderSecurityManager;
import com.intellij.analysis.AnalysisScope;
import com.intellij.codeInspection.GlobalInspectionTool;
import com.intellij.codeInspection.InspectionManager;
import com.intellij.codeInspection.ex.GlobalInspectionContextImpl;
import com.intellij.codeInspection.ex.GlobalInspectionToolWrapper;
import com.intellij.codeInspection.ex.InspectionManagerEx;
import com.intellij.facet.FacetManager;
@@ -43,13 +42,14 @@ import com.intellij.testFramework.TestLogger;
import com.intellij.testFramework.builders.JavaModuleFixtureBuilder;
import com.intellij.testFramework.fixtures.*;
import com.intellij.testFramework.fixtures.impl.CodeInsightTestFixtureImpl;
import com.intellij.testFramework.fixtures.impl.GlobalInspectionContextForTests;
import org.jetbrains.android.facet.AndroidFacet;
import org.jetbrains.android.facet.AndroidRootUtil;
import org.jetbrains.annotations.NotNull;
import org.jetbrains.jet.JetTestCaseBuilder;
import org.jetbrains.jet.lang.psi.JetFile;
import org.jetbrains.jet.plugin.actions.internal.KotlinInternalMode;
import org.jetbrains.jet.plugin.references.BuiltInsReferenceResolver;
import org.jetbrains.kotlin.idea.actions.internal.KotlinInternalMode;
import org.jetbrains.kotlin.idea.references.BuiltInsReferenceResolver;
import org.jetbrains.kotlin.psi.JetFile;
import org.jetbrains.kotlin.test.JetTestUtils;
import java.io.File;
import java.io.IOException;
@@ -147,7 +147,7 @@ public abstract class KotlinAndroidTestCase extends KotlinAndroidTestCaseBase {
}
((StartupManagerImpl) StartupManager.getInstance(getProject())).runPostStartupActivities();
VfsRootAccess.allowRootAccess(JetTestCaseBuilder.getHomeDirectory());
VfsRootAccess.allowRootAccess(JetTestUtils.getHomeDirectory());
kotlinInternalModeOriginalValue = KotlinInternalMode.OBJECT$.getEnabled();
KotlinInternalMode.OBJECT$.setEnabled(true);
@@ -233,7 +233,7 @@ public abstract class KotlinAndroidTestCase extends KotlinAndroidTestCaseBase {
@Override
public void tearDown() throws Exception {
KotlinInternalMode.OBJECT$.setEnabled(kotlinInternalModeOriginalValue);
VfsRootAccess.disallowRootAccess(JetTestCaseBuilder.getHomeDirectory());
VfsRootAccess.disallowRootAccess(JetTestUtils.getHomeDirectory());
Set<JetFile> builtInsSources = getProject().getComponent(BuiltInsReferenceResolver.class).getBuiltInsSources();
FileManager fileManager = ((PsiManagerEx) PsiManager.getInstance(getProject())).getFileManager();
@@ -293,10 +293,10 @@ public abstract class KotlinAndroidTestCase extends KotlinAndroidTestCaseBase {
scope.invalidate();
final InspectionManagerEx inspectionManager = (InspectionManagerEx)InspectionManager.getInstance(getProject());
final GlobalInspectionContextImpl globalContext =
final GlobalInspectionContextForTests globalContext =
CodeInsightTestFixtureImpl.createGlobalContextForTool(scope, getProject(), inspectionManager, wrapper);
InspectionTestUtil.runTool(wrapper, scope, globalContext, inspectionManager);
InspectionTestUtil.runTool(wrapper, scope, globalContext);
InspectionTestUtil.compareToolResults(globalContext, wrapper, false, getTestDataPath() + globalTestDir);
}
plugins/android-idea-plugin/tests/org/jetbrains/jet/android/KotlinAndroidTestCaseBase.java
+2 -5
View File
@@ -28,7 +28,6 @@ import com.intellij.openapi.roots.ModuleRootModificationUtil;
import com.intellij.openapi.roots.OrderRootType;
import com.intellij.openapi.util.Segment;
import com.intellij.openapi.util.TextRange;
import com.intellij.openapi.vfs.JarFileSystem;
import com.intellij.openapi.vfs.LocalFileSystem;
import com.intellij.openapi.vfs.VirtualFile;
import com.intellij.openapi.vfs.VirtualFileManager;
@@ -38,13 +37,11 @@ import com.intellij.psi.xml.XmlAttributeValue;
import com.intellij.testFramework.IdeaTestCase;
import com.intellij.testFramework.UsefulTestCase;
import com.intellij.testFramework.fixtures.CodeInsightTestFixture;
import com.intellij.testFramework.fixtures.JavaCodeInsightTestFixture;
import org.jetbrains.android.dom.wrappers.LazyValueResourceElementWrapper;
import org.jetbrains.android.sdk.*;
import org.jetbrains.annotations.NotNull;
import org.jetbrains.annotations.Nullable;
import org.jetbrains.jet.JetTestCaseBuilder;
import org.jetbrains.jet.plugin.PluginTestCaseBase;
import org.jetbrains.kotlin.test.JetTestUtils;
import java.io.File;
@@ -83,7 +80,7 @@ public abstract class KotlinAndroidTestCaseBase extends UsefulTestCase {
}
public static String getPluginTestDataPathBase() {
return JetTestCaseBuilder.getHomeDirectory() + TEST_DATA_PROJECT_RELATIVE;
return JetTestUtils.getHomeDirectory() + TEST_DATA_PROJECT_RELATIVE;
}
public String getTestDataPath() {
plugins/android-idea-plugin/tests/org/jetbrains/jet/android/ParserResultEqualityTestGenerated.java
+3 -4
View File
@@ -17,10 +17,9 @@
package org.jetbrains.jet.android;
import com.intellij.testFramework.TestDataPath;
import org.jetbrains.jet.JUnit3RunnerWithInners;
import org.jetbrains.jet.JetTestUtils;
import org.jetbrains.jet.test.InnerTestClasses;
import org.jetbrains.jet.test.TestMetadata;
import org.jetbrains.kotlin.test.JUnit3RunnerWithInners;
import org.jetbrains.kotlin.test.JetTestUtils;
import org.jetbrains.kotlin.test.TestMetadata;
import org.junit.runner.RunWith;
import java.io.File;