Convert JetCoreEnvironment: migrate other code

This commit is contained in:
Pavel V. Talanov
2015-03-27 17:36:05 +03:00
parent 2dcf935b99
commit 5cb431c5c4
11 changed files with 13 additions and 13 deletions
@@ -93,7 +93,7 @@ public abstract class AbstractAndroidBoxTest : AbstractBlackBoxCodegenTest() {
files.addAll(additionalFiles)
}
myFiles = CodegenTestFiles.create(
myEnvironment!!.getProject(),
myEnvironment!!.project,
ArrayUtil.toStringArray(files),
JetTestUtils.getHomeDirectory() + "/plugins/android-compiler-plugin/testData"
)
@@ -31,7 +31,7 @@ public abstract class AbstractAndroidXml2KConversionTest : UsefulTestCase() {
public fun doTest(path: String) {
val jetCoreEnvironment = getEnvironment(path)
val parser = CliAndroidUIXmlProcessor(jetCoreEnvironment.getProject(), path + "AndroidManifest.xml", path + "/res")
val parser = CliAndroidUIXmlProcessor(jetCoreEnvironment.project, path + "AndroidManifest.xml", path + "/res")
val actual = parser.parse(false)
@@ -50,7 +50,7 @@ fun UsefulTestCase.createAndroidTestEnvironment(
configuration.put(AndroidConfigurationKeys.ANDROID_RES_PATH, resPath)
configuration.put(AndroidConfigurationKeys.ANDROID_MANIFEST, manifestPath)
val myEnvironment = JetCoreEnvironment.createForTests(getTestRootDisposable()!!, configuration, EnvironmentConfigFiles.JVM_CONFIG_FILES)
val project = myEnvironment.getProject()
val project = myEnvironment.project
ExternalDeclarationsProvider.registerExtension(project, AndroidTestExternalDeclarationsProvider(project, resPath, manifestPath))
ExpressionCodegenExtension.registerExtension(project, AndroidExpressionCodegenExtension())
return myEnvironment