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

New J2K: use default test file directives for choosing SDK in tests instead of by filename approach

Browse Source
This commit is contained in:
Ilya Kirillov
2019-06-10 18:25:47 +03:00
parent 8375a12733
commit 04fe51b0aa
2 changed files with 14 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
nj2k/testData/newJ2k/postProcessing/java8MapForEachWithFullJdk.java
Vendored
+2
View File
@@ -1,3 +1,5 @@
// RUNTIME_WITH_FULL_JDK
import java.util.HashMap;
class Test {
nj2k/tests/org/jetbrains/kotlin/nj2k/AbstractNewJavaToKotlinConverterSingleFileTest.kt
+12 -1
View File
@@ -21,12 +21,15 @@ import com.intellij.openapi.project.Project
import com.intellij.openapi.projectRoots.Sdk
import com.intellij.openapi.projectRoots.SdkModificator
import com.intellij.openapi.projectRoots.impl.JavaSdkImpl
import com.intellij.openapi.util.io.FileUtil
import com.intellij.psi.codeStyle.JavaCodeStyleSettings
import com.intellij.testFramework.LightProjectDescriptor
import org.jetbrains.kotlin.idea.j2k.IdeaJavaToKotlinServices
import org.jetbrains.kotlin.idea.test.KotlinWithJdkAndRuntimeLightProjectDescriptor
import org.jetbrains.kotlin.j2k.AbstractJavaToKotlinConverterSingleFileTest
import org.jetbrains.kotlin.j2k.ConverterSettings
import org.jetbrains.kotlin.nj2k.postProcessing.NewJ2kPostProcessor
import org.jetbrains.kotlin.test.InTextDirectivesUtils
import org.jetbrains.kotlin.test.KotlinTestUtils
import java.io.File
@@ -58,10 +61,18 @@ abstract class AbstractNewJavaToKotlinConverterSingleFileTest : AbstractJavaToKo
File(javaPath.replace(".java", ".new.kt")).takeIf { it.exists() }
?: super.provideExpectedFile(javaPath)
private fun projectDescriptorByFileDirective(): LightProjectDescriptor {
if (isAllFilesPresentInTest()) return KotlinWithJdkAndRuntimeLightProjectDescriptor.INSTANCE
val fileText = FileUtil.loadFile(File(testDataPath, fileName()), true)
return if (InTextDirectivesUtils.isDirectiveDefined(fileText, "RUNTIME_WITH_FULL_JDK"))
KotlinWithJdkAndRuntimeLightProjectDescriptor.INSTANCE_FULL_JDK
else KotlinWithJdkAndRuntimeLightProjectDescriptor.INSTANCE
}
override fun getProjectDescriptor(): KotlinWithJdkAndRuntimeLightProjectDescriptor =
object : KotlinWithJdkAndRuntimeLightProjectDescriptor() {
override fun getSdk(): Sdk? {
val sdk = super@AbstractNewJavaToKotlinConverterSingleFileTest.getProjectDescriptor().sdk ?: return null
val sdk = projectDescriptorByFileDirective().sdk ?: return null
runWriteAction {
val modificator: SdkModificator = sdk.sdkModificator
JavaSdkImpl.attachJdkAnnotations(modificator)