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

Add explicit WITH_RUNTIME to boxAgainstJava tests which need stdlib

Browse Source
This commit is contained in:
Alexander Udalov
2019-03-27 15:09:30 +01:00
parent 15928c5b46
commit cb7727d51a
23 changed files with 21 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/testData/codegen/boxAgainstJava/annotations/javaAnnotationArrayValueDefault.kt
Vendored
+1
View File
@@ -1,3 +1,4 @@
// WITH_RUNTIME
// FILE: JavaAnn.java
import java.lang.annotation.Retention;
compiler/testData/codegen/boxAgainstJava/annotations/javaAnnotationArrayValueNoDefault.kt
Vendored
+1
View File
@@ -1,3 +1,4 @@
// WITH_RUNTIME
// FILE: JavaAnn.java
import java.lang.annotation.Retention;
compiler/testData/codegen/boxAgainstJava/annotations/javaAnnotationCall.kt
Vendored
+1
View File
@@ -1,3 +1,4 @@
// WITH_RUNTIME
// FILE: JavaAnn.java
import java.lang.annotation.Retention;
compiler/testData/codegen/boxAgainstJava/annotations/javaAnnotationDefault.kt
Vendored
+1
View File
@@ -1,3 +1,4 @@
// WITH_RUNTIME
// FILE: JavaAnn.java
import java.lang.annotation.Retention;
compiler/testData/codegen/boxAgainstJava/annotations/javaNegativePropertyAsAnnotationParameter.kt
Vendored
+1
View File
@@ -1,3 +1,4 @@
// WITH_RUNTIME
// FILE: Foo.java
class Foo {
compiler/testData/codegen/boxAgainstJava/annotations/javaPropertyAsAnnotationParameter.kt
Vendored
+1
View File
@@ -1,3 +1,4 @@
// WITH_RUNTIME
// FILE: Foo.java
class Foo {
compiler/testData/codegen/boxAgainstJava/annotations/javaPropertyWithIntInitializer.kt
Vendored
+1
View File
@@ -1,3 +1,4 @@
// WITH_RUNTIME
// FILE: Foo.java
class Foo {
compiler/testData/codegen/boxAgainstJava/annotations/kClassMapping/arrayClassParameter.kt
Vendored
+1
View File
@@ -1,4 +1,5 @@
// IGNORE_BACKEND: JVM_IR
// WITH_RUNTIME
// FILE: JavaAnn.java
import java.lang.annotation.Retention;
compiler/testData/codegen/boxAgainstJava/annotations/kClassMapping/arrayClassParameterOnJavaClass.kt
Vendored
+1
View File
@@ -1,4 +1,5 @@
// IGNORE_BACKEND: JVM_IR
// WITH_RUNTIME
// FILE: JavaAnn.java
import java.lang.annotation.Retention;
compiler/testData/codegen/boxAgainstJava/annotations/kClassMapping/classParameter.kt
Vendored
+1
View File
@@ -1,4 +1,5 @@
// IGNORE_BACKEND: JVM_IR
// WITH_RUNTIME
// FILE: JavaAnn.java
import java.lang.annotation.Retention;
compiler/testData/codegen/boxAgainstJava/annotations/kClassMapping/classParameterOnJavaClass.kt
Vendored
+1
View File
@@ -1,4 +1,5 @@
// IGNORE_BACKEND: JVM_IR
// WITH_RUNTIME
// FILE: JavaAnn.java
import java.lang.annotation.Retention;
compiler/testData/codegen/boxAgainstJava/annotations/kClassMapping/varargClassParameter.kt
Vendored
+1
View File
@@ -1,4 +1,5 @@
// IGNORE_BACKEND: JVM_IR
// WITH_RUNTIME
// FILE: JavaAnn.java
import java.lang.annotation.Retention;
compiler/testData/codegen/boxAgainstJava/annotations/kClassMapping/varargClassParameterOnJavaClass.kt
Vendored
+1
View File
@@ -1,4 +1,5 @@
// IGNORE_BACKEND: JVM_IR
// WITH_RUNTIME
// FILE: JavaAnn.java
import java.lang.annotation.Retention;
compiler/testData/codegen/boxAgainstJava/notNullAssertions/delegation.kt
Vendored
-1
View File
@@ -28,7 +28,6 @@ fun box(): String {
return "Fail: should have been an exception"
}
catch(e: IllegalStateException) {
println(e.message)
return "OK"
}
}
compiler/testData/codegen/boxAgainstJava/reflection/mapping/jClass2kClass.kt
Vendored
+1 -1
View File
@@ -1,10 +1,10 @@
// WITH_RUNTIME
// FILE: J.java
public class J {}
// FILE: 1.kt
import kotlin.reflect.jvm.*
import kotlin.test.assertEquals
fun box(): String {
compiler/testData/codegen/boxAgainstJava/sam/adapters/implementAdapter.kt
Vendored
+1
View File
@@ -1,3 +1,4 @@
// WITH_RUNTIME
// FILE: JavaInterface.java
interface JavaInterface {
compiler/testData/codegen/boxAgainstJava/sam/adapters/inheritedOverriddenAdapter.kt
Vendored
+1
View File
@@ -1,4 +1,5 @@
// IGNORE_BACKEND: JVM_IR
// WITH_RUNTIME
// FILE: Super.java
class Super {
compiler/testData/codegen/boxAgainstJava/sam/differentFqNames.kt
Vendored
+1
View File
@@ -1,4 +1,5 @@
// IGNORE_BACKEND: JVM_IR
// WITH_RUNTIME
// FILE: Custom.java
class Custom {
compiler/testData/codegen/boxAgainstJava/sam/kt11696.kt
Vendored
+1
View File
@@ -1,4 +1,5 @@
// IGNORE_BACKEND: JVM_IR
// WITH_RUNTIME
// FILE: Promise.java
import org.jetbrains.annotations.NotNull;
compiler/testData/codegen/boxAgainstJava/sam/samConstructorGenericSignature.kt
Vendored
+1
View File
@@ -1,5 +1,6 @@
// SKIP_JDK6
// IGNORE_BACKEND: JVM_IR
// WITH_RUNTIME
// FILE: JavaClass.java
class JavaClass {
compiler/testData/codegen/boxAgainstJava/syntheticExtensions/setterNonVoid1.kt
Vendored
+1 -1
View File
@@ -17,7 +17,7 @@ class JavaClass {
fun box(): String {
val javaClass = JavaClass()
if (javaClass.x.isEmpty()) {
if (javaClass.x == "") {
javaClass.x = "OK"
}
return javaClass.x
compiler/testData/codegen/boxAgainstJava/syntheticExtensions/setterNonVoid2.kt
Vendored
+1 -1
View File
@@ -17,7 +17,7 @@ class JavaClass {
fun box(): String {
val javaClass = JavaClass()
if (javaClass.x.isEmpty()) {
if (javaClass.x == "") {
javaClass.x = "OK"
}
return javaClass.x
compiler/tests-common/tests/org/jetbrains/kotlin/codegen/AbstractBlackBoxAgainstJavaCodegenTest.kt
-5
View File
@@ -19,7 +19,6 @@ package org.jetbrains.kotlin.codegen
import org.jetbrains.kotlin.cli.jvm.config.addJvmClasspathRoot
import org.jetbrains.kotlin.config.CompilerConfiguration
import org.jetbrains.kotlin.config.JVMConfigurationKeys
import org.jetbrains.kotlin.test.ConfigurationKind
import java.io.File
abstract class AbstractBlackBoxAgainstJavaCodegenTest : AbstractBlackBoxCodegenTest() {
@@ -39,8 +38,4 @@ abstract class AbstractBlackBoxAgainstJavaCodegenTest : AbstractBlackBoxCodegenT
configuration.put(JVMConfigurationKeys.USE_FAST_CLASS_FILES_READING, true)
}
}
override fun extractConfigurationKind(files: MutableList<TestFile>): ConfigurationKind {
return ConfigurationKind.ALL
}
}