New J2K: add better support of implicit functional interfaces

#KT-32702 fixed
#KT-19327 fixed
This commit is contained in:
Ilya Kirillov
2019-07-17 17:13:33 +03:00
parent 96ca4712a0
commit f79b282c60
34 changed files with 425 additions and 208 deletions
@@ -985,7 +985,7 @@ fun main(args: Array<String>) {
testGroup("nj2k/tests", "nj2k/testData") {
testClass<AbstractNewJavaToKotlinConverterSingleFileTest> {
model("newJ2k", extension = "java")
model("newJ2k", pattern = """^([^\.]+)\.java$""")
}
testClass<AbstractNewJavaToKotlinCopyPasteConversionTest> {
model("copyPaste", pattern = """^([^\.]+)\.java$""")
@@ -990,7 +990,7 @@ fun main(args: Array<String>) {
testGroup("nj2k/tests", "nj2k/testData") {
testClass<AbstractNewJavaToKotlinConverterSingleFileTest> {
model("newJ2k", extension = "java")
model("newJ2k", pattern = """^([^\.]+)\.java$""")
}
testClass<AbstractNewJavaToKotlinCopyPasteConversionTest> {
model("copyPaste", pattern = """^([^\.]+)\.java$""")
@@ -950,7 +950,7 @@ fun main(args: Array<String>) {
testGroup("nj2k/tests", "nj2k/testData") {
testClass<AbstractNewJavaToKotlinConverterSingleFileTest> {
model("newJ2k", extension = "java")
model("newJ2k", pattern = """^([^\.]+)\.java$""")
}
testClass<AbstractNewJavaToKotlinCopyPasteConversionTest> {
model("copyPaste", pattern = """^([^\.]+)\.java$""")
@@ -954,7 +954,7 @@ fun main(args: Array<String>) {
testGroup("nj2k/tests", "nj2k/testData") {
testClass<AbstractNewJavaToKotlinConverterSingleFileTest> {
model("newJ2k", extension = "java")
model("newJ2k", pattern = """^([^\.]+)\.java$""")
}
testClass<AbstractNewJavaToKotlinCopyPasteConversionTest> {
model("copyPaste", pattern = """^([^\.]+)\.java$""")
@@ -950,19 +950,7 @@ fun main(args: Array<String>) {
testGroup("nj2k/tests", "nj2k/testData") {
testClass<AbstractNewJavaToKotlinConverterSingleFileTest> {
model("newJ2k", extension = "java")
}
testClass<AbstractNewJavaToKotlinCopyPasteConversionTest> {
model("copyPaste", pattern = """^([^\.]+)\.java$""")
}
testClass<AbstractNullabilityAnalysisTest> {
model("nullabilityAnalysis")
}
}
testGroup("nj2k/tests", "nj2k/testData") {
testClass<AbstractNewJavaToKotlinConverterSingleFileTest> {
model("newJ2k", extension = "java")
model("newJ2k", pattern = """^([^\.]+)\.java$""")
}
testClass<AbstractNewJavaToKotlinCopyPasteConversionTest> {
model("copyPaste", pattern = """^([^\.]+)\.java$""")