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

Logic related to command-line options moved to android-compiler-plugin

Browse Source
This commit is contained in:
Andrey Breslav
2014-09-23 18:23:39 +04:00
committed by Yan Zhulanow
parent febfdde89e
commit 1e70369cf8
11 changed files with 152 additions and 32 deletions
Download Patch File Download Diff File Expand all files Collapse all files
idea/tests/org/jetbrains/jet/android/AbstractCrossParserTest.kt
+3 -14
View File
@@ -16,7 +16,6 @@
package org.jetbrains.jet.android
import com.intellij.testFramework.UsefulTestCase
import org.jetbrains.jet.cli.jvm.compiler.JetCoreEnvironment
import org.jetbrains.jet.lang.resolve.android.CliAndroidUIXmlProcessor
import org.jetbrains.jet.JetTestUtils
@@ -24,20 +23,10 @@ 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 junit.framework.TestCase
import kotlin.test.assertEquals
import org.jetbrains.jet.plugin.android.TestConst
import com.intellij.testFramework.LightCodeInsightTestCase
import com.intellij.testFramework.fixtures.LightCodeInsightFixtureTestCase
import org.jetbrains.jet.plugin.PluginTestCaseBase
import org.jetbrains.jet.test.TestMetadata
import org.jetbrains.jet.plugin.JetLightCodeInsightFixtureTestCase
import com.intellij.ide.startup.impl.StartupManagerImpl
import com.intellij.openapi.vfs.newvfs.impl.VfsRootAccess
import org.jetbrains.jet.JetTestCaseBuilder
import com.intellij.openapi.startup.StartupManager
import com.android.SdkConstants
import com.intellij.openapi.application.PathManager
import org.jetbrains.kotlin.android.AndroidConfigurationKeys
public abstract class AbstractCrossParserTest : KotlinAndroidTestCase() {
public fun doTest(path: String) {
@@ -55,8 +44,8 @@ public abstract class AbstractCrossParserTest : KotlinAndroidTestCase() {
private fun getEnvironment(testPath: String): JetCoreEnvironment {
val configuration = JetTestUtils.compilerConfigurationForTests(ConfigurationKind.ALL, TestJdkKind.MOCK_JDK)
configuration.put<String>(JVMConfigurationKeys.ANDROID_RES_PATH, testPath + "/layout")
configuration.put<String>(JVMConfigurationKeys.ANDROID_MANIFEST, testPath + "/AndroidManifest.xml")
configuration.put<String>(AndroidConfigurationKeys.ANDROID_RES_PATH, testPath + "/layout")
configuration.put<String>(AndroidConfigurationKeys.ANDROID_MANIFEST, testPath + "/AndroidManifest.xml")
return JetCoreEnvironment.createForTests(getTestRootDisposable()!!, configuration)
}