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

Remove API_VERSION 1.3 from tests on JvmDefault

Browse Source 
So that these tests will now check behavior on the latest API version
This commit is contained in:
Alexander Udalov
2018-12-18 17:03:58 +01:00
parent 9b6a52ccba
commit e3c381a298
76 changed files with 51 additions and 113 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/testData/codegen/box/builtinStubMethods/mapRemove/noDefaultImpls.kt
Vendored
-1
View File
@@ -1,4 +1,3 @@
// !API_VERSION: 1.3
// !JVM_DEFAULT_MODE: enable
// SKIP_JDK6
// IGNORE_BACKEND: JVM_IR
compiler/testData/codegen/box/jvm8/defaults/accessor.kt
Vendored
-1
View File
@@ -1,4 +1,3 @@
// !API_VERSION: 1.3
// !JVM_DEFAULT_MODE: enable
// IGNORE_BACKEND: JVM_IR
// TARGET_BACKEND: JVM
compiler/testData/codegen/box/jvm8/defaults/accessorFromCompanion.kt
Vendored
-1
View File
@@ -1,4 +1,3 @@
// !API_VERSION: 1.3
// !JVM_DEFAULT_MODE: enable
// IGNORE_BACKEND: JVM_IR
// TARGET_BACKEND: JVM
compiler/testData/codegen/box/jvm8/defaults/accessorsFromDefaultImpls.kt
Vendored
-1
View File
@@ -1,4 +1,3 @@
// !API_VERSION: 1.3
// !JVM_DEFAULT_MODE: enable
// IGNORE_BACKEND: JVM_IR
// TARGET_BACKEND: JVM
compiler/testData/codegen/box/jvm8/defaults/bridgeInClass.kt
Vendored
-1
View File
@@ -1,4 +1,3 @@
// !API_VERSION: 1.3
// !JVM_DEFAULT_MODE: enable
// TARGET_BACKEND: JVM
// JVM_TARGET: 1.8
compiler/testData/codegen/box/jvm8/defaults/bridgeInInterface.kt
Vendored
-1
View File
@@ -1,4 +1,3 @@
// !API_VERSION: 1.3
// !JVM_DEFAULT_MODE: enable
// TARGET_BACKEND: JVM
// JVM_TARGET: 1.8
compiler/testData/codegen/box/jvm8/defaults/bridgeInInterface2.kt
Vendored
-1
View File
@@ -1,4 +1,3 @@
// !API_VERSION: 1.3
// !JVM_DEFAULT_MODE: enable
// IGNORE_BACKEND: JVM_IR
// TARGET_BACKEND: JVM
compiler/testData/codegen/box/jvm8/defaults/bridgeInInterfaceWithProperties.kt
Vendored
-1
View File
@@ -1,4 +1,3 @@
// !API_VERSION: 1.3
// !JVM_DEFAULT_MODE: enable
// TARGET_BACKEND: JVM
// JVM_TARGET: 1.8
compiler/testData/codegen/box/jvm8/defaults/bridgeInInterfaceWithProperties2.kt
Vendored
-1
View File
@@ -1,4 +1,3 @@
// !API_VERSION: 1.3
// !JVM_DEFAULT_MODE: enable
// IGNORE_BACKEND: JVM_IR
// TARGET_BACKEND: JVM
compiler/testData/codegen/box/jvm8/defaults/bridgeWithJava.kt
Vendored
+2 -1
View File
@@ -1,11 +1,12 @@
// !API_VERSION: 1.3
// !JVM_DEFAULT_MODE: enable
// IGNORE_BACKEND: JVM_IR
// TARGET_BACKEND: JVM
// JVM_TARGET: 1.8
// WITH_RUNTIME
// FULL_JDK
// FILE: Test.java
public interface Test<T> {
default T test(T p) {
return null;
compiler/testData/codegen/box/jvm8/defaults/callableReference.kt
Vendored
-1
View File
@@ -1,4 +1,3 @@
// !API_VERSION: 1.3
// !JVM_DEFAULT_MODE: enable
// IGNORE_BACKEND: JVM_IR
// TARGET_BACKEND: JVM
compiler/testData/codegen/box/jvm8/defaults/capturedSuperCall.kt
Vendored
-1
View File
@@ -1,4 +1,3 @@
// !API_VERSION: 1.3
// !JVM_DEFAULT_MODE: enable
// IGNORE_BACKEND: JVM_IR
// TARGET_BACKEND: JVM
compiler/testData/codegen/box/jvm8/defaults/compatibility/bridge.kt
Vendored
+1 -2
View File
@@ -1,4 +1,3 @@
// !API_VERSION: 1.3
// !JVM_DEFAULT_MODE: compatibility
// IGNORE_BACKEND: JVM_IR
// TARGET_BACKEND: JVM
@@ -37,4 +36,4 @@ fun box(): String {
if (result != "OK") return "fail 1: ${result}"
return Foo().test2("OK")
}
}
compiler/testData/codegen/box/jvm8/defaults/compatibility/bridge2.kt
Vendored
+1 -2
View File
@@ -1,4 +1,3 @@
// !API_VERSION: 1.3
// !JVM_DEFAULT_MODE: compatibility
// TARGET_BACKEND: JVM
// FILE: Simple.java
@@ -34,4 +33,4 @@ interface KInterface2 : KInterface<String> {
fun box(): String {
return Foo().test()
}
}
compiler/testData/codegen/box/jvm8/defaults/compatibility/bridge3.kt
Vendored
+1 -2
View File
@@ -1,4 +1,3 @@
// !API_VERSION: 1.3
// !JVM_DEFAULT_MODE: compatibility
// TARGET_BACKEND: JVM
// FILE: Simple.java
@@ -38,4 +37,4 @@ interface KInterface3 : KInterface2 {
fun box(): String {
return Foo().test()
}
}
compiler/testData/codegen/box/jvm8/defaults/compatibility/bridgeWithProperties.kt
Vendored
+1 -2
View File
@@ -1,4 +1,3 @@
// !API_VERSION: 1.3
// !JVM_DEFAULT_MODE: compatibility
// IGNORE_BACKEND: JVM_IR
// TARGET_BACKEND: JVM
@@ -42,4 +41,4 @@ fun box(): String {
return Foo().bar
}
}
compiler/testData/codegen/box/jvm8/defaults/compatibility/bridgeWithProperties2.kt
Vendored
+1 -2
View File
@@ -1,4 +1,3 @@
// !API_VERSION: 1.3
// !JVM_DEFAULT_MODE: compatibility
// IGNORE_BACKEND: JVM_IR
// TARGET_BACKEND: JVM
@@ -39,4 +38,4 @@ interface KInterface2 : KInterface<String> {
fun box(): String {
return Foo().test()
}
}
compiler/testData/codegen/box/jvm8/defaults/compatibility/bridgeWithProperties3.kt
Vendored
+1 -2
View File
@@ -1,4 +1,3 @@
// !API_VERSION: 1.3
// !JVM_DEFAULT_MODE: compatibility
// IGNORE_BACKEND: JVM_IR
// TARGET_BACKEND: JVM
@@ -41,4 +40,4 @@ interface KInterface3 : KInterface2 {
fun box(): String {
return Foo().test()
}
}
compiler/testData/codegen/box/jvm8/defaults/compatibility/defaultArgs.kt
Vendored
+1 -1
View File
@@ -1,9 +1,9 @@
// !API_VERSION: 1.3
// !JVM_DEFAULT_MODE: compatibility
// TARGET_BACKEND: JVM
// JVM_TARGET: 1.8
// WITH_RUNTIME
// FULL_JDK
interface Test {
@JvmDefault
fun test(s: String ="OK"): String {
compiler/testData/codegen/box/jvm8/defaults/compatibility/inheritedJvmDefault.kt
Vendored
+1 -2
View File
@@ -1,4 +1,3 @@
// !API_VERSION: 1.3
// !JVM_DEFAULT_MODE: compatibility
// IGNORE_BACKEND: JVM_IR
// TARGET_BACKEND: JVM
@@ -36,4 +35,4 @@ fun box(): String {
if (result != "OK") return "fail 1: ${result}"
return Foo().test2()
}
}
compiler/testData/codegen/box/jvm8/defaults/compatibility/propertyAnnotation.kt
Vendored
+1 -2
View File
@@ -1,4 +1,3 @@
// !API_VERSION: 1.3
// !JVM_DEFAULT_MODE: compatibility
// IGNORE_BACKEND: JVM_IR
// TARGET_BACKEND: JVM
@@ -23,4 +22,4 @@ fun box() : String {
val value = Z::z.annotations.filterIsInstance<Property>().single().value
if (value != "OK") return value
return (Z::z.getter.annotations.single() as Accessor).value
}
}
compiler/testData/codegen/box/jvm8/defaults/compatibility/simpleFunction.kt
Vendored
+1 -2
View File
@@ -1,4 +1,3 @@
// !API_VERSION: 1.3
// !JVM_DEFAULT_MODE: compatibility
// IGNORE_BACKEND: JVM_IR
// TARGET_BACKEND: JVM
@@ -32,4 +31,4 @@ fun box(): String {
if (result != "OK") return "fail 1: ${result}"
return Foo().test2()
}
}
compiler/testData/codegen/box/jvm8/defaults/defaultArgs.kt
Vendored
+2 -2
View File
@@ -1,9 +1,9 @@
// !API_VERSION: 1.3
// !JVM_DEFAULT_MODE: enable
// IGNORE_BACKEND: JVM_IR
// TARGET_BACKEND: JVM
// JVM_TARGET: 1.8
// WITH_RUNTIME
interface Z {
@JvmDefault
fun test(s: String = "OK"): String {
@@ -15,4 +15,4 @@ class Test: Z
fun box(): String {
return Test().test()
}
}
compiler/testData/codegen/box/jvm8/defaults/delegationBy/simple.kt
Vendored
-1
View File
@@ -1,4 +1,3 @@
// !API_VERSION: 1.3
// !JVM_DEFAULT_MODE: enable
// TARGET_BACKEND: JVM
// JVM_TARGET: 1.8
compiler/testData/codegen/box/jvm8/defaults/delegationBy/simpleProperty.kt
Vendored
-1
View File
@@ -1,4 +1,3 @@
// !API_VERSION: 1.3
// !JVM_DEFAULT_MODE: enable
// TARGET_BACKEND: JVM
// JVM_TARGET: 1.8
compiler/testData/codegen/box/jvm8/defaults/diamond.kt
Vendored
-1
View File
@@ -1,4 +1,3 @@
// !API_VERSION: 1.3
// !JVM_DEFAULT_MODE: enable
// IGNORE_BACKEND: JVM_IR
// TARGET_BACKEND: JVM
compiler/testData/codegen/box/jvm8/defaults/inline.kt
Vendored
-1
View File
@@ -1,4 +1,3 @@
// !API_VERSION: 1.3
// !JVM_DEFAULT_MODE: enable
// IGNORE_BACKEND: JVM_IR
// TARGET_BACKEND: JVM
compiler/testData/codegen/box/jvm8/defaults/inlineProperty.kt
Vendored
-1
View File
@@ -1,4 +1,3 @@
// !API_VERSION: 1.3
// !JVM_DEFAULT_MODE: enable
// IGNORE_BACKEND: JVM_IR
// TARGET_BACKEND: JVM
compiler/testData/codegen/box/jvm8/defaults/kt11969.kt
Vendored
-1
View File
@@ -1,4 +1,3 @@
// !API_VERSION: 1.3
// !JVM_DEFAULT_MODE: enable
// IGNORE_BACKEND: JVM_IR
// TARGET_BACKEND: JVM
compiler/testData/codegen/box/jvm8/defaults/kt14243.kt
Vendored
+1 -2
View File
@@ -1,4 +1,3 @@
// !API_VERSION: 1.3
// !JVM_DEFAULT_MODE: enable
// IGNORE_BACKEND: JVM_IR
// TARGET_BACKEND: JVM
@@ -23,4 +22,4 @@ class ZImpl2 : ZImpl() {
fun box(): String {
return ZImpl2().test("OK")
}
}
compiler/testData/codegen/box/jvm8/defaults/kt14243_2.kt
Vendored
+1 -2
View File
@@ -1,4 +1,3 @@
// !API_VERSION: 1.3
// !JVM_DEFAULT_MODE: enable
// IGNORE_BACKEND: JVM_IR
// TARGET_BACKEND: JVM
@@ -25,4 +24,4 @@ class ZImpl3 : ZImpl2() {
fun box(): String {
return ZImpl3().test("OK")
}
}
compiler/testData/codegen/box/jvm8/defaults/kt14243_prop.kt
Vendored
+1 -2
View File
@@ -1,4 +1,3 @@
// !API_VERSION: 1.3
// !JVM_DEFAULT_MODE: enable
// TARGET_BACKEND: JVM
// JVM_TARGET: 1.8
@@ -26,4 +25,4 @@ open class ZImpl2 : ZImpl() {
fun box(): String {
return ZImpl2().value
}
}
compiler/testData/codegen/box/jvm8/defaults/noDelegation/noDelegationToDefaultMethodInClass.kt
Vendored
-1
View File
@@ -1,4 +1,3 @@
// !API_VERSION: 1.3
// !JVM_DEFAULT_MODE: enable
// IGNORE_BACKEND: JVM_IR
// TARGET_BACKEND: JVM
compiler/testData/codegen/box/jvm8/defaults/noDelegation/noDelegationToDefaultMethodInInterface.kt
Vendored
-1
View File
@@ -1,4 +1,3 @@
// !API_VERSION: 1.3
// !JVM_DEFAULT_MODE: enable
// TARGET_BACKEND: JVM
// JVM_TARGET: 1.8
compiler/testData/codegen/box/jvm8/defaults/noDelegation/noDelegationToDefaultMethodInInterface2.kt
Vendored
-1
View File
@@ -1,4 +1,3 @@
// !API_VERSION: 1.3
// !JVM_DEFAULT_MODE: enable
// TARGET_BACKEND: JVM
// JVM_TARGET: 1.8
compiler/testData/codegen/box/jvm8/defaults/oneImplementation.kt
Vendored
+1 -2
View File
@@ -1,4 +1,3 @@
// !API_VERSION: 1.3
// !JVM_DEFAULT_MODE: enable
// TARGET_BACKEND: JVM
// JVM_TARGET: 1.8
@@ -23,4 +22,4 @@ open class KMutableProperty1Impl : KProperty1Impl(), KCallable
fun box(): String {
return KMutableProperty1Impl().returnType
}
}
compiler/testData/codegen/box/jvm8/defaults/oneImplementation2.kt
Vendored
+1 -2
View File
@@ -1,4 +1,3 @@
// !API_VERSION: 1.3
// !JVM_DEFAULT_MODE: enable
// TARGET_BACKEND: JVM
// JVM_TARGET: 1.8
@@ -28,4 +27,4 @@ open class KMutableProperty1Impl : KProperty1Impl(), KMutableProperty1, KMutable
fun box(): String {
return KMutableProperty1Impl().returnType
}
}
compiler/testData/codegen/box/jvm8/defaults/privateDefaultFromDefaultImpl.kt
Vendored
+1 -2
View File
@@ -1,4 +1,3 @@
// !API_VERSION: 1.3
// !JVM_DEFAULT_MODE: enable
// IGNORE_BACKEND: JVM_IR
// TARGET_BACKEND: JVM
@@ -24,4 +23,4 @@ class TestImpl: Test
fun box(): String {
return TestImpl().test()
}
}
compiler/testData/codegen/box/jvm8/defaults/privateInDefaultImpls.kt
Vendored
+1 -2
View File
@@ -1,4 +1,3 @@
// !API_VERSION: 1.3
// !JVM_DEFAULT_MODE: enable
// IGNORE_BACKEND: JVM_IR
// TARGET_BACKEND: JVM
@@ -23,4 +22,4 @@ class TestImpl: Test
fun box(): String {
return TestImpl().test()
}
}
compiler/testData/codegen/box/jvm8/defaults/reflection/propertyAnnotations.kt
Vendored
+1 -2
View File
@@ -1,4 +1,3 @@
// !API_VERSION: 1.3
// !JVM_DEFAULT_MODE: enable
// IGNORE_BACKEND: JVM_IR
// TARGET_BACKEND: JVM
@@ -23,4 +22,4 @@ fun box() : String {
val value = Z::z.annotations.filterIsInstance<Property>().single().value
if (value != "OK") return value
return (Z::z.getter.annotations.single() as Accessor).value
}
}
compiler/testData/codegen/box/jvm8/defaults/simpleCall.kt
Vendored
-1
View File
@@ -1,4 +1,3 @@
// !API_VERSION: 1.3
// !JVM_DEFAULT_MODE: enable
// TARGET_BACKEND: JVM
// JVM_TARGET: 1.8
compiler/testData/codegen/box/jvm8/defaults/simpleProperty.kt
Vendored
+1 -2
View File
@@ -1,4 +1,3 @@
// !API_VERSION: 1.3
// !JVM_DEFAULT_MODE: enable
// TARGET_BACKEND: JVM
// JVM_TARGET: 1.8
@@ -15,4 +14,4 @@ class Test : Z
fun box() : String {
return Test().z
}
}
compiler/testData/codegen/box/jvm8/defaults/superCall.kt
Vendored
+1 -2
View File
@@ -1,4 +1,3 @@
// !API_VERSION: 1.3
// !JVM_DEFAULT_MODE: enable
// IGNORE_BACKEND: JVM_IR
// TARGET_BACKEND: JVM
@@ -27,4 +26,4 @@ class TestClass : Test2 {
fun box(): String {
return TestClass().test()
}
}
compiler/testData/codegen/bytecodeText/jvm8/jvmDefault/compatibility/defaultArgs.kt
Vendored
+2 -2
View File
@@ -1,8 +1,8 @@
// !API_VERSION: 1.3
// !JVM_DEFAULT_MODE: compatibility
// JVM_TARGET: 1.8
// WITH_RUNTIME
// FULL_JDK
interface KInterface {
@JvmDefault
fun test(s: String ="OK"): String {
@@ -17,4 +17,4 @@ interface KInterface {
// 1 INVOKEINTERFACE KInterface.test
//from $jd
// 1 INVOKESPECIAL KInterface.test
// 1 INVOKESPECIAL KInterface.test
compiler/testData/codegen/bytecodeText/jvm8/jvmDefault/compatibility/simpleFunction.kt
Vendored
+1 -2
View File
@@ -1,4 +1,3 @@
// !API_VERSION: 1.3
// !JVM_DEFAULT_MODE: compatibility
// JVM_TARGET: 1.8
@@ -17,4 +16,4 @@ interface KInterface2 : KInterface {
// 1 INVOKESTATIC KInterface.access\$test2\$jd
// 1 INVOKESPECIAL KInterface2.test2
// 1 INVOKESPECIAL KInterface.test2
// 1 INVOKESPECIAL KInterface.test2
compiler/testData/codegen/bytecodeText/jvm8/jvmDefault/compatibility/simpleFunctionWithAbstractOverride.kt
Vendored
-1
View File
@@ -1,4 +1,3 @@
// !API_VERSION: 1.3
// !JVM_DEFAULT_MODE: compatibility
// JVM_TARGET: 1.8
compiler/testData/codegen/bytecodeText/jvm8/jvmDefault/compatibility/simpleProperty.kt
Vendored
+1 -2
View File
@@ -1,4 +1,3 @@
// !API_VERSION: 1.3
// !JVM_DEFAULT_MODE: compatibility
// JVM_TARGET: 1.8
// WITH_RUNTIME
@@ -23,4 +22,4 @@ interface KInterface2 : KInterface {
// 1 INVOKESPECIAL KInterface2.getBar
// 1 INVOKESPECIAL KInterface2.setBar
// 1 INVOKESPECIAL KInterface.getBar
// 1 INVOKESPECIAL KInterface.setBar
// 1 INVOKESPECIAL KInterface.setBar