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

Use 'JVM_TARGET: 1.8' directive in codegen tests on 1.8 target

Browse Source
This commit is contained in:
Alexander Udalov
2016-06-15 17:23:38 +03:00
parent ac03d98cb2
commit b4f81d4bb5
18 changed files with 55 additions and 35 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/testData/codegen/java8/compileKotlinAgainstKotlin/jvm8against6/delegation/delegationToDefaultMethodInClass.kt
Vendored
+2 -2
View File
@@ -8,7 +8,7 @@ interface Test {
}
// FILE: 2.kt
// KOTLIN_CONFIGURATION_FLAGS: +JVM.JVM_8_TARGET
// JVM_TARGET: 1.8
class TestClass : Test {
}
@@ -21,4 +21,4 @@ fun box(): String {
return "fail"
}
return "OK"
}
}
compiler/testData/codegen/java8/compileKotlinAgainstKotlin/jvm8against6/delegation/delegationToDefaultMethodInInterface.kt
Vendored
+2 -2
View File
@@ -8,7 +8,7 @@ interface Test {
}
// FILE: 2.kt
// KOTLIN_CONFIGURATION_FLAGS: +JVM.JVM_8_TARGET
// JVM_TARGET: 1.8
interface Test2 : Test {
}
@@ -21,4 +21,4 @@ fun box(): String {
return "fail"
}
return "OK"
}
}
compiler/testData/codegen/java8/compileKotlinAgainstKotlin/jvm8against6/delegation/delegationToDefaultMethodInInterface2.kt
Vendored
+3 -2
View File
@@ -9,7 +9,7 @@ interface Test {
}
// FILE: 2.kt
// KOTLIN_CONFIGURATION_FLAGS: +JVM.JVM_8_TARGET
// JVM_TARGET: 1.8
interface Test2 : Test {
}
@@ -21,6 +21,7 @@ class TestClass : Test3
fun box(): String {
checkPresent(Test2::class.java, "test")
// TODO: enable this test once the required behavior is specified
// checkNoMethod(Test3::class.java, "test")
return TestClass().test()
@@ -44,4 +45,4 @@ fun checkPresent(clazz: Class<*>, name: String) {
throw java.lang.AssertionError("Method $name doesn't exist in $clazz")
}
return
}
}
compiler/testData/codegen/java8/compileKotlinAgainstKotlin/jvm8against6/delegation/diamond.kt
Vendored
+3 -2
View File
@@ -9,7 +9,7 @@ interface Test {
}
// FILE: 2.kt
// KOTLIN_CONFIGURATION_FLAGS: +JVM.JVM_8_TARGET
// JVM_TARGET: 1.8
interface Test2 : Test {
}
@@ -31,6 +31,7 @@ class TestClass : Test4 {
fun box(): String {
checkPresent(Test2::class.java, "test")
checkPresent(Test3::class.java, "test")
// TODO: enable this test once the required behavior is specified
//checkNoMethod(Test4::class.java, "test")
return TestClass().test()
@@ -53,4 +54,4 @@ fun checkPresent(clazz: Class<*>, name: String) {
throw java.lang.AssertionError("Method $name doesn't exist in $clazz")
}
return
}
}
compiler/testData/codegen/java8/compileKotlinAgainstKotlin/jvm8against6/delegation/diamond2.kt
Vendored
+2 -2
View File
@@ -9,7 +9,7 @@ interface Test {
}
// FILE: 2.kt
// KOTLIN_CONFIGURATION_FLAGS: +JVM.JVM_8_TARGET
// JVM_TARGET: 1.8
open class TestClass : Test {
}
@@ -47,4 +47,4 @@ fun checkPresent(clazz: Class<*>, name: String) {
throw java.lang.AssertionError("Method $name doesn't exist in $clazz")
}
return
}
}
compiler/testData/codegen/java8/compileKotlinAgainstKotlin/jvm8against6/delegation/diamond3.kt
Vendored
+2 -2
View File
@@ -9,7 +9,7 @@ interface Test {
}
// FILE: 2.kt
// KOTLIN_CONFIGURATION_FLAGS: +JVM.JVM_8_TARGET
// JVM_TARGET: 1.8
open class TestClass : Test {
}
@@ -49,4 +49,4 @@ fun checkPresent(clazz: Class<*>, name: String) {
throw java.lang.AssertionError("Method $name doesn't exist in $clazz")
}
return
}
}
compiler/testData/codegen/java8/compileKotlinAgainstKotlin/jvm8against6/simpleCall.kt
Vendored
+2 -2
View File
@@ -7,11 +7,11 @@ interface Test {
}
// FILE: 2.kt
// KOTLIN_CONFIGURATION_FLAGS: +JVM.JVM_8_TARGET
// JVM_TARGET: 1.8
class TestClass : Test {
}
fun box(): String {
return TestClass().test()
}
}
compiler/testData/codegen/java8/compileKotlinAgainstKotlin/jvm8against6/simpleCallWithHierarchy.kt
Vendored
+2 -2
View File
@@ -7,7 +7,7 @@ interface Test {
}
// FILE: 2.kt
// KOTLIN_CONFIGURATION_FLAGS: +JVM.JVM_8_TARGET
// JVM_TARGET: 1.8
interface Test2 : Test {
}
@@ -19,4 +19,4 @@ class TestClass : Test2 {
fun box(): String {
return TestClass().test()
}
}