Convert JetCoreEnvironment: migrate other code

compiler/tests/org/jetbrains/kotlin/codegen/MethodOrderTest.kt

@@ -110,7 +110,7 @@ public class MethodOrderTest: CodegenTestCase() {
 
     private fun doTest(sourceText: String, classSuffix: String, expectedOrder: List<String>) {
         createEnvironmentWithMockJdkAndIdeaAnnotations(ConfigurationKind.JDK_AND_ANNOTATIONS)
-        myFiles = CodegenTestFiles.create("file.kt", sourceText, myEnvironment!!.getProject())
+        myFiles = CodegenTestFiles.create("file.kt", sourceText, myEnvironment!!.project)
 
         val classFileForObject = generateClassesInFile().asList().first { it.relativePath.endsWith("$classSuffix.class") }
         val classReader = ClassReader(classFileForObject.asByteArray())

compiler/tests/org/jetbrains/kotlin/jvm/compiler/KotlinClassFinderTest.kt

@@ -42,7 +42,7 @@ public class KotlinClassFinderTest : KotlinTestWithEnvironmentManagement() {
                                                                     ConfigurationKind.ALL, TestJdkKind.MOCK_JDK, tmpdir),
                                                             EnvironmentConfigFiles.JVM_CONFIG_FILES)
 
-        val project = environment.getProject()
+        val project = environment.project
         val className = "test.A.B.C"
         val psiClass = JavaPsiFacade.getInstance(project).findClass(className, GlobalSearchScope.allScope(project))
         assertNotNull(psiClass, "Psi class not found for $className")

compiler/tests/org/jetbrains/kotlin/jvm/compiler/MultiModuleJavaAnalysisCustomTest.kt

@@ -57,7 +57,7 @@ public class MultiModuleJavaAnalysisCustomTest : UsefulTestCase() {
         val environment = createEnvironment(moduleDirs)
         val modules = setupModules(environment, moduleDirs)
         val resolverForProject = JvmAnalyzerFacade.setupResolverForProject(
-                GlobalContext(), environment.getProject(), modules,
+                GlobalContext(), environment.project, modules,
                 { m -> ModuleContent(m.kotlinFiles, m.javaFilesScope) },
                 JvmPlatformParameters {
                     javaClass ->
@@ -76,7 +76,7 @@ public class MultiModuleJavaAnalysisCustomTest : UsefulTestCase() {
     }
 
     private fun setupModules(environment: JetCoreEnvironment, moduleDirs: Array<File>): List<TestModule> {
-        val project = environment.getProject()
+        val project = environment.project
         val modules = HashMap<String, TestModule>()
         for (dir in moduleDirs) {
             val name = dir.getName()

compiler/tests/org/jetbrains/kotlin/jvm/runtime/AbstractJvmRuntimeDescriptorLoaderTest.kt

@@ -119,7 +119,7 @@ public abstract class AbstractJvmRuntimeDescriptorLoaderTest : TestCaseWithTmpdi
             }
             fileName.endsWith(".kt") -> {
                 val environment = JetTestUtils.createEnvironmentWithFullJdk(myTestRootDisposable)
-                val jetFile = JetTestUtils.createFile(file.getPath(), addRuntimeRetentionToKotlinSource(text), environment.getProject())
+                val jetFile = JetTestUtils.createFile(file.getPath(), addRuntimeRetentionToKotlinSource(text), environment.project)
                 GenerationUtils.compileFileGetClassFileFactoryForTest(jetFile).writeAllTo(tmpdir)
             }
         }

compiler/tests/org/jetbrains/kotlin/resolve/MutableDiagnosticsTest.kt

@@ -130,7 +130,7 @@ class MutableDiagnosticsTest : KotlinTestWithEnvironment() {
     }
 
     private inner class DummyDiagnostic : Diagnostic {
-        val dummyElement = JetPsiFactory(getEnvironment().getProject()).createType("Int")
+        val dummyElement = JetPsiFactory(getEnvironment().project).createType("Int")
 
         ;{
             dummyElement.getContainingJetFile().doNotAnalyze = null

compiler/tests/org/jetbrains/kotlin/serialization/AbstractLocalClassProtoTest.kt

@@ -63,8 +63,8 @@ public abstract class AbstractLocalClassProtoTest : TestCaseWithTmpdir() {
         val providerFactory = FileBasedDeclarationProviderFactory(globalContext.storageManager, emptyList())
 
         val injector = InjectorForTopDownAnalyzerForJvm(
-                environment.getProject(), params, CliLightClassGenerationSupport.NoScopeRecordCliBindingTrace(), module,
-                providerFactory, GlobalSearchScope.allScope(environment.getProject())
+                environment.project, params, CliLightClassGenerationSupport.NoScopeRecordCliBindingTrace(), module,
+                providerFactory, GlobalSearchScope.allScope(environment.project)
         )
         module.initialize(injector.getJavaDescriptorResolver().packageFragmentProvider)
 

compiler/tests/org/jetbrains/kotlin/serialization/js/KotlinJavascriptSerializerTest.kt

@@ -70,7 +70,7 @@ public class KotlinJavascriptSerializerTest : TestCaseWithTmpdir() {
         try {
             val environment = JetCoreEnvironment.createForTests(rootDisposable, configuration, EnvironmentConfigFiles.JS_CONFIG_FILES)
             val files = environment.getSourceFiles()
-            val config = LibrarySourcesConfigWithCaching(environment.getProject(), MODULE_NAME, EcmaVersion.defaultVersion(), false, true, false)
+            val config = LibrarySourcesConfigWithCaching(environment.project, MODULE_NAME, EcmaVersion.defaultVersion(), false, true, false)
             val analysisResult = TopDownAnalyzerFacadeForJS.analyzeFiles(files, config)
             KotlinJavaScriptSerializer().serialize(MODULE_NAME, analysisResult.moduleDescriptor, metaFile)
         }