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

Cleanup in tests.

Browse Source
This commit is contained in:
Evgeny Gerashchenko
2012-11-13 20:10:45 +04:00
parent 5ff718b94c
commit f20c4dac15
48 changed files with 300 additions and 303 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/testData/loadJava/kotlinSignature/propagation/return/AddNotNullJavaSubtype.java
+5 -9
View File
@@ -1,19 +1,15 @@
package test;
import org.jetbrains.annotations.NotNull;
import java.lang.CharSequence;
import jet.runtime.typeinfo.KotlinSignature;
public interface AddNotNullJavaSubtype {
public class AddNotNullJavaSubtype {
public CharSequence foo() {
throw new UnsupportedOperationException();
public interface Super {
CharSequence foo();
}
public class Sub extends AddNotNullJavaSubtype {
public interface Sub extends Super {
@NotNull
public String foo() {
throw new UnsupportedOperationException();
}
String foo();
}
}
compiler/testData/loadJava/kotlinSignature/propagation/return/AddNotNullJavaSubtype.kt
+6 -5
View File
@@ -1,11 +1,12 @@
package test
import org.jetbrains.annotations.NotNull
public trait AddNotNullJavaSubtype : Object {
public open class AddNotNullJavaSubtype : java.lang.Object() {
public open fun foo(): CharSequence? = throw UnsupportedOperationException()
public trait Super: Object {
public fun foo(): CharSequence?
}
public open class Sub: AddNotNullJavaSubtype() {
override fun foo(): String = throw UnsupportedOperationException()
public trait Sub: Super {
override fun foo(): String
}
}
compiler/testData/loadJava/kotlinSignature/propagation/return/AddNotNullJavaSubtype.txt
+6 -6
View File
@@ -1,10 +1,10 @@
namespace test
public open class test.AddNotNullJavaSubtype : java.lang.Object {
public final /*constructor*/ fun <init>(): test.AddNotNullJavaSubtype
public open fun foo(): jet.CharSequence?
public open class test.AddNotNullJavaSubtype.Sub : test.AddNotNullJavaSubtype {
public final /*constructor*/ fun <init>(): test.AddNotNullJavaSubtype.Sub
public open override /*1*/ fun foo(): jet.String
public abstract trait test.AddNotNullJavaSubtype : java.lang.Object {
public abstract trait test.AddNotNullJavaSubtype.Sub : test.AddNotNullJavaSubtype.Super {
public abstract override /*1*/ fun foo(): jet.String
}
public abstract trait test.AddNotNullJavaSubtype.Super : java.lang.Object {
public abstract fun foo(): jet.CharSequence?
}
}
compiler/testData/loadJava/kotlinSignature/propagation/return/AddNotNullSameJavaType.java
+5 -9
View File
@@ -1,19 +1,15 @@
package test;
import org.jetbrains.annotations.NotNull;
import java.lang.CharSequence;
import jet.runtime.typeinfo.KotlinSignature;
public interface AddNotNullSameJavaType {
public class AddNotNullSameJavaType {
public CharSequence foo() {
throw new UnsupportedOperationException();
public interface Super {
CharSequence foo();
}
public class Sub extends AddNotNullSameJavaType {
public interface Sub extends Super {
@NotNull
public CharSequence foo() {
throw new UnsupportedOperationException();
}
CharSequence foo();
}
}
compiler/testData/loadJava/kotlinSignature/propagation/return/AddNotNullSameJavaType.kt
+6 -5
View File
@@ -1,11 +1,12 @@
package test
import org.jetbrains.annotations.NotNull
public trait AddNotNullSameJavaType: Object {
public open class AddNotNullSameJavaType : java.lang.Object() {
public open fun foo(): CharSequence? = throw UnsupportedOperationException()
public trait Super: Object {
public fun foo(): CharSequence?
}
public open class Sub: AddNotNullSameJavaType() {
override fun foo(): CharSequence = throw UnsupportedOperationException()
public trait Sub: Super {
override fun foo(): CharSequence
}
}
compiler/testData/loadJava/kotlinSignature/propagation/return/AddNotNullSameJavaType.txt
+6 -6
View File
@@ -1,10 +1,10 @@
namespace test
public open class test.AddNotNullSameJavaType : java.lang.Object {
public final /*constructor*/ fun <init>(): test.AddNotNullSameJavaType
public open fun foo(): jet.CharSequence?
public open class test.AddNotNullSameJavaType.Sub : test.AddNotNullSameJavaType {
public final /*constructor*/ fun <init>(): test.AddNotNullSameJavaType.Sub
public open override /*1*/ fun foo(): jet.CharSequence
public abstract trait test.AddNotNullSameJavaType : java.lang.Object {
public abstract trait test.AddNotNullSameJavaType.Sub : test.AddNotNullSameJavaType.Super {
public abstract override /*1*/ fun foo(): jet.CharSequence
}
public abstract trait test.AddNotNullSameJavaType.Super : java.lang.Object {
public abstract fun foo(): jet.CharSequence?
}
}
compiler/testData/loadJava/kotlinSignature/propagation/return/AddNullabilityJavaSubtype.java
+7 -10
View File
@@ -1,20 +1,17 @@
package test;
import org.jetbrains.annotations.NotNull;
import java.lang.CharSequence;
import jet.runtime.typeinfo.KotlinSignature;
public class AddNullabilityJavaSubtype {
@NotNull
public CharSequence foo() {
throw new UnsupportedOperationException();
public interface AddNullabilityJavaSubtype {
public interface Super {
@NotNull
CharSequence foo();
}
public class Sub extends AddNullabilityJavaSubtype {
public interface Sub extends Super {
@KotlinSignature("fun String? foo()")
public String foo() {
throw new UnsupportedOperationException();
}
String foo();
}
}
compiler/testData/loadJava/kotlinSignature/propagation/return/AddNullabilityJavaSubtype.kt
+6 -5
View File
@@ -1,11 +1,12 @@
package test
import org.jetbrains.annotations.NotNull
public trait AddNullabilityJavaSubtype: Object {
public open class AddNullabilityJavaSubtype : java.lang.Object() {
public open fun foo(): CharSequence = throw UnsupportedOperationException()
public trait Super: Object {
public fun foo(): CharSequence
}
public open class Sub: AddNullabilityJavaSubtype() {
override fun foo(): String = throw UnsupportedOperationException()
public trait Sub: Super {
override fun foo(): String
}
}
compiler/testData/loadJava/kotlinSignature/propagation/return/AddNullabilityJavaSubtype.txt
+6 -6
View File
@@ -1,10 +1,10 @@
namespace test
public open class test.AddNullabilityJavaSubtype : java.lang.Object {
public final /*constructor*/ fun <init>(): test.AddNullabilityJavaSubtype
public open fun foo(): jet.CharSequence
public open class test.AddNullabilityJavaSubtype.Sub : test.AddNullabilityJavaSubtype {
public final /*constructor*/ fun <init>(): test.AddNullabilityJavaSubtype.Sub
public open override /*1*/ fun foo(): jet.String
public abstract trait test.AddNullabilityJavaSubtype : java.lang.Object {
public abstract trait test.AddNullabilityJavaSubtype.Sub : test.AddNullabilityJavaSubtype.Super {
public abstract override /*1*/ fun foo(): jet.String
}
public abstract trait test.AddNullabilityJavaSubtype.Super : java.lang.Object {
public abstract fun foo(): jet.CharSequence
}
}
compiler/testData/loadJava/kotlinSignature/propagation/return/AddNullabilitySameGenericType1.java
+7 -9
View File
@@ -2,19 +2,17 @@ package test;
import org.jetbrains.annotations.NotNull;
import java.util.List;
import jet.runtime.typeinfo.KotlinSignature;
public class AddNullabilitySameGenericType1 {
@KotlinSignature("fun foo(): MutableList<String>")
public List<String> foo() {
throw new UnsupportedOperationException();
public interface AddNullabilitySameGenericType1 {
public interface Super {
@KotlinSignature("fun foo(): MutableList<String>")
List<String> foo();
}
public class Sub extends AddNullabilitySameGenericType1 {
public interface Sub extends Super {
@KotlinSignature("fun foo(): MutableList<String?>")
public List<String> foo() {
throw new UnsupportedOperationException();
}
List<String> foo();
}
}
compiler/testData/loadJava/kotlinSignature/propagation/return/AddNullabilitySameGenericType1.kt
+6 -5
View File
@@ -1,11 +1,12 @@
package test
import org.jetbrains.annotations.NotNull
public trait AddNullabilitySameGenericType1: Object {
public open class AddNullabilitySameGenericType1 : java.lang.Object() {
public open fun foo(): MutableList<String> = throw UnsupportedOperationException()
public trait Super: Object {
public fun foo(): MutableList<String>
}
public open class Sub: AddNullabilitySameGenericType1() {
override fun foo(): MutableList<String> = throw UnsupportedOperationException()
public trait Sub: Super {
override fun foo(): MutableList<String>
}
}
compiler/testData/loadJava/kotlinSignature/propagation/return/AddNullabilitySameGenericType1.txt
+6 -6
View File
@@ -1,10 +1,10 @@
namespace test
public open class test.AddNullabilitySameGenericType1 : java.lang.Object {
public final /*constructor*/ fun <init>(): test.AddNullabilitySameGenericType1
public open fun foo(): jet.MutableList<jet.String>
public open class test.AddNullabilitySameGenericType1.Sub : test.AddNullabilitySameGenericType1 {
public final /*constructor*/ fun <init>(): test.AddNullabilitySameGenericType1.Sub
public open override /*1*/ fun foo(): jet.MutableList<jet.String>
public abstract trait test.AddNullabilitySameGenericType1 : java.lang.Object {
public abstract trait test.AddNullabilitySameGenericType1.Sub : test.AddNullabilitySameGenericType1.Super {
public abstract override /*1*/ fun foo(): jet.MutableList<jet.String>
}
public abstract trait test.AddNullabilitySameGenericType1.Super : java.lang.Object {
public abstract fun foo(): jet.MutableList<jet.String>
}
}
compiler/testData/loadJava/kotlinSignature/propagation/return/AddNullabilitySameGenericType2.java
+7 -9
View File
@@ -2,19 +2,17 @@ package test;
import org.jetbrains.annotations.NotNull;
import java.util.List;
import jet.runtime.typeinfo.KotlinSignature;
public class AddNullabilitySameGenericType2 {
@KotlinSignature("fun foo(): MutableList<String>")
public List<String> foo() {
throw new UnsupportedOperationException();
public interface AddNullabilitySameGenericType2 {
public interface Super {
@KotlinSignature("fun foo(): MutableList<String>")
List<String> foo();
}
public class Sub extends AddNullabilitySameGenericType2 {
public interface Sub extends Super {
@KotlinSignature("fun foo(): MutableList<String>?")
public List<String> foo() {
throw new UnsupportedOperationException();
}
List<String> foo();
}
}
compiler/testData/loadJava/kotlinSignature/propagation/return/AddNullabilitySameGenericType2.kt
+6 -5
View File
@@ -1,11 +1,12 @@
package test
import org.jetbrains.annotations.NotNull
public trait AddNullabilitySameGenericType2: Object {
public open class AddNullabilitySameGenericType2 : java.lang.Object() {
public open fun foo(): MutableList<String> = throw UnsupportedOperationException()
public trait Super: Object {
public fun foo(): MutableList<String>
}
public open class Sub: AddNullabilitySameGenericType2() {
override fun foo(): MutableList<String> = throw UnsupportedOperationException()
public trait Sub: Super {
override fun foo(): MutableList<String>
}
}
compiler/testData/loadJava/kotlinSignature/propagation/return/AddNullabilitySameGenericType2.txt
+6 -6
View File
@@ -1,10 +1,10 @@
namespace test
public open class test.AddNullabilitySameGenericType2 : java.lang.Object {
public final /*constructor*/ fun <init>(): test.AddNullabilitySameGenericType2
public open fun foo(): jet.MutableList<jet.String>
public open class test.AddNullabilitySameGenericType2.Sub : test.AddNullabilitySameGenericType2 {
public final /*constructor*/ fun <init>(): test.AddNullabilitySameGenericType2.Sub
public open override /*1*/ fun foo(): jet.MutableList<jet.String>
public abstract trait test.AddNullabilitySameGenericType2 : java.lang.Object {
public abstract trait test.AddNullabilitySameGenericType2.Sub : test.AddNullabilitySameGenericType2.Super {
public abstract override /*1*/ fun foo(): jet.MutableList<jet.String>
}
public abstract trait test.AddNullabilitySameGenericType2.Super : java.lang.Object {
public abstract fun foo(): jet.MutableList<jet.String>
}
}
compiler/testData/loadJava/kotlinSignature/propagation/return/AddNullabilitySameJavaType.java
+7 -9
View File
@@ -2,19 +2,17 @@ package test;
import org.jetbrains.annotations.NotNull;
import java.lang.CharSequence;
import jet.runtime.typeinfo.KotlinSignature;
public class AddNullabilitySameJavaType {
@NotNull
public CharSequence foo() {
throw new UnsupportedOperationException();
public interface AddNullabilitySameJavaType {
public interface Super {
@NotNull
CharSequence foo();
}
public class Sub extends AddNullabilitySameJavaType {
public interface Sub extends Super {
@KotlinSignature("fun CharSequence? foo()")
public CharSequence foo() {
throw new UnsupportedOperationException();
}
CharSequence foo();
}
}
compiler/testData/loadJava/kotlinSignature/propagation/return/AddNullabilitySameJavaType.kt
+6 -5
View File
@@ -1,11 +1,12 @@
package test
import org.jetbrains.annotations.NotNull
public trait AddNullabilitySameJavaType: Object {
public open class AddNullabilitySameJavaType : java.lang.Object() {
public open fun foo(): CharSequence = throw UnsupportedOperationException()
public trait Super: Object {
public fun foo(): CharSequence
}
public open class Sub: AddNullabilitySameJavaType() {
override fun foo(): CharSequence = throw UnsupportedOperationException()
public trait Sub: Super {
override fun foo(): CharSequence
}
}
compiler/testData/loadJava/kotlinSignature/propagation/return/AddNullabilitySameJavaType.txt
+6 -6
View File
@@ -1,10 +1,10 @@
namespace test
public open class test.AddNullabilitySameJavaType : java.lang.Object {
public final /*constructor*/ fun <init>(): test.AddNullabilitySameJavaType
public open fun foo(): jet.CharSequence
public open class test.AddNullabilitySameJavaType.Sub : test.AddNullabilitySameJavaType {
public final /*constructor*/ fun <init>(): test.AddNullabilitySameJavaType.Sub
public open override /*1*/ fun foo(): jet.CharSequence
public abstract trait test.AddNullabilitySameJavaType : java.lang.Object {
public abstract trait test.AddNullabilitySameJavaType.Sub : test.AddNullabilitySameJavaType.Super {
public abstract override /*1*/ fun foo(): jet.CharSequence
}
public abstract trait test.AddNullabilitySameJavaType.Super : java.lang.Object {
public abstract fun foo(): jet.CharSequence
}
}
compiler/testData/loadJava/kotlinSignature/propagation/return/InheritNullabilityGenericSubclassSimple.java
+7 -8
View File
@@ -6,15 +6,14 @@ import java.util.Collection;
import jet.runtime.typeinfo.KotlinSignature;
public class InheritNullabilityGenericSubclassSimple {
@KotlinSignature("fun foo(): MutableCollection<String>")
public Collection<String> foo() {
throw new UnsupportedOperationException();
public interface InheritNullabilityGenericSubclassSimple {
public interface Super {
@KotlinSignature("fun foo(): MutableCollection<String>")
Collection<String> foo();
}
public class Sub extends InheritNullabilityGenericSubclassSimple {
public List<String> foo() {
throw new UnsupportedOperationException();
}
public interface Sub extends Super {
List<String> foo();
}
}
compiler/testData/loadJava/kotlinSignature/propagation/return/InheritNullabilityGenericSubclassSimple.kt
+6 -5
View File
@@ -1,11 +1,12 @@
package test
import org.jetbrains.annotations.NotNull
public trait InheritNullabilityGenericSubclassSimple: Object {
public open class InheritNullabilityGenericSubclassSimple : java.lang.Object() {
public open fun foo(): MutableCollection<String> = throw UnsupportedOperationException()
public trait Super: Object {
public fun foo(): MutableCollection<String>
}
public open class Sub: InheritNullabilityGenericSubclassSimple() {
override fun foo(): MutableList<String> = throw UnsupportedOperationException()
public trait Sub: Super {
override fun foo(): MutableList<String>
}
}
compiler/testData/loadJava/kotlinSignature/propagation/return/InheritNullabilityGenericSubclassSimple.txt
+6 -6
View File
@@ -1,10 +1,10 @@
namespace test
public open class test.InheritNullabilityGenericSubclassSimple : java.lang.Object {
public final /*constructor*/ fun <init>(): test.InheritNullabilityGenericSubclassSimple
public open fun foo(): jet.MutableCollection<jet.String>
public open class test.InheritNullabilityGenericSubclassSimple.Sub : test.InheritNullabilityGenericSubclassSimple {
public final /*constructor*/ fun <init>(): test.InheritNullabilityGenericSubclassSimple.Sub
public open override /*1*/ fun foo(): jet.MutableList<jet.String>
public abstract trait test.InheritNullabilityGenericSubclassSimple : java.lang.Object {
public abstract trait test.InheritNullabilityGenericSubclassSimple.Sub : test.InheritNullabilityGenericSubclassSimple.Super {
public abstract override /*1*/ fun foo(): jet.MutableList<jet.String>
}
public abstract trait test.InheritNullabilityGenericSubclassSimple.Super : java.lang.Object {
public abstract fun foo(): jet.MutableCollection<jet.String>
}
}
compiler/testData/loadJava/kotlinSignature/propagation/return/InheritNullabilityJavaSubtype.java
+7 -8
View File
@@ -5,15 +5,14 @@ import java.lang.CharSequence;
import jet.runtime.typeinfo.KotlinSignature;
public class InheritNullabilityJavaSubtype {
@NotNull
public CharSequence foo() {
throw new UnsupportedOperationException();
public interface InheritNullabilityJavaSubtype {
public interface Super {
@NotNull
CharSequence foo();
}
public class Sub extends InheritNullabilityJavaSubtype {
public String foo() {
throw new UnsupportedOperationException();
}
public interface Sub extends Super {
String foo();
}
}
compiler/testData/loadJava/kotlinSignature/propagation/return/InheritNullabilityJavaSubtype.kt
+6 -5
View File
@@ -1,11 +1,12 @@
package test
import org.jetbrains.annotations.NotNull
public trait InheritNullabilityJavaSubtype: Object {
public open class InheritNullabilityJavaSubtype : java.lang.Object() {
public open fun foo(): CharSequence = throw UnsupportedOperationException()
public trait Super: Object {
public fun foo(): CharSequence
}
public open class Sub: InheritNullabilityJavaSubtype() {
override fun foo(): String = throw UnsupportedOperationException()
public trait Sub: Super {
override fun foo(): String
}
}
compiler/testData/loadJava/kotlinSignature/propagation/return/InheritNullabilityJavaSubtype.txt
+6 -6
View File
@@ -1,10 +1,10 @@
namespace test
public open class test.InheritNullabilityJavaSubtype : java.lang.Object {
public final /*constructor*/ fun <init>(): test.InheritNullabilityJavaSubtype
public open fun foo(): jet.CharSequence
public open class test.InheritNullabilityJavaSubtype.Sub : test.InheritNullabilityJavaSubtype {
public final /*constructor*/ fun <init>(): test.InheritNullabilityJavaSubtype.Sub
public open override /*1*/ fun foo(): jet.String
public abstract trait test.InheritNullabilityJavaSubtype : java.lang.Object {
public abstract trait test.InheritNullabilityJavaSubtype.Sub : test.InheritNullabilityJavaSubtype.Super {
public abstract override /*1*/ fun foo(): jet.String
}
public abstract trait test.InheritNullabilityJavaSubtype.Super : java.lang.Object {
public abstract fun foo(): jet.CharSequence
}
}
compiler/testData/loadJava/kotlinSignature/propagation/return/InheritNullabilitySameGenericType.java
+7 -8
View File
@@ -5,15 +5,14 @@ import java.util.List;
import jet.runtime.typeinfo.KotlinSignature;
public class InheritNullabilitySameGenericType {
@KotlinSignature("fun foo(): MutableList<String>")
public List<String> foo() {
throw new UnsupportedOperationException();
public interface InheritNullabilitySameGenericType {
public interface Super {
@KotlinSignature("fun foo(): MutableList<String>")
List<String> foo();
}
public class Sub extends InheritNullabilitySameGenericType {
public List<String> foo() {
throw new UnsupportedOperationException();
}
public interface Sub extends Super {
List<String> foo();
}
}
compiler/testData/loadJava/kotlinSignature/propagation/return/InheritNullabilitySameGenericType.kt
+6 -5
View File
@@ -1,11 +1,12 @@
package test
import org.jetbrains.annotations.NotNull
public trait InheritNullabilitySameGenericType: Object {
public open class InheritNullabilitySameGenericType : java.lang.Object() {
public open fun foo(): MutableList<String> = throw UnsupportedOperationException()
public trait Super: Object {
public fun foo(): MutableList<String>
}
public open class Sub: InheritNullabilitySameGenericType() {
override fun foo(): MutableList<String> = throw UnsupportedOperationException()
public trait Sub: Super {
override fun foo(): MutableList<String>
}
}
compiler/testData/loadJava/kotlinSignature/propagation/return/InheritNullabilitySameGenericType.txt
+6 -6
View File
@@ -1,10 +1,10 @@
namespace test
public open class test.InheritNullabilitySameGenericType : java.lang.Object {
public final /*constructor*/ fun <init>(): test.InheritNullabilitySameGenericType
public open fun foo(): jet.MutableList<jet.String>
public open class test.InheritNullabilitySameGenericType.Sub : test.InheritNullabilitySameGenericType {
public final /*constructor*/ fun <init>(): test.InheritNullabilitySameGenericType.Sub
public open override /*1*/ fun foo(): jet.MutableList<jet.String>
public abstract trait test.InheritNullabilitySameGenericType : java.lang.Object {
public abstract trait test.InheritNullabilitySameGenericType.Sub : test.InheritNullabilitySameGenericType.Super {
public abstract override /*1*/ fun foo(): jet.MutableList<jet.String>
}
public abstract trait test.InheritNullabilitySameGenericType.Super : java.lang.Object {
public abstract fun foo(): jet.MutableList<jet.String>
}
}
compiler/testData/loadJava/kotlinSignature/propagation/return/InheritNullabilitySameJavaType.java
+7 -8
View File
@@ -5,15 +5,14 @@ import java.lang.CharSequence;
import jet.runtime.typeinfo.KotlinSignature;
public class InheritNullabilitySameJavaType {
@NotNull
public CharSequence foo() {
throw new UnsupportedOperationException();
public interface InheritNullabilitySameJavaType {
public interface Super {
@NotNull
CharSequence foo();
}
public class Sub extends InheritNullabilitySameJavaType {
public CharSequence foo() {
throw new UnsupportedOperationException();
}
public interface Sub extends Super {
CharSequence foo();
}
}
compiler/testData/loadJava/kotlinSignature/propagation/return/InheritNullabilitySameJavaType.kt
+6 -5
View File
@@ -1,11 +1,12 @@
package test
import org.jetbrains.annotations.NotNull
public trait InheritNullabilitySameJavaType: Object {
public open class InheritNullabilitySameJavaType : java.lang.Object() {
public open fun foo(): CharSequence = throw UnsupportedOperationException()
public trait Super: Object {
public fun foo(): CharSequence
}
public open class Sub: InheritNullabilitySameJavaType() {
override fun foo(): CharSequence = throw UnsupportedOperationException()
public trait Sub: Super {
override fun foo(): CharSequence
}
}
compiler/testData/loadJava/kotlinSignature/propagation/return/InheritNullabilitySameJavaType.txt
+6 -6
View File
@@ -1,10 +1,10 @@
namespace test
public open class test.InheritNullabilitySameJavaType : java.lang.Object {
public final /*constructor*/ fun <init>(): test.InheritNullabilitySameJavaType
public open fun foo(): jet.CharSequence
public open class test.InheritNullabilitySameJavaType.Sub : test.InheritNullabilitySameJavaType {
public final /*constructor*/ fun <init>(): test.InheritNullabilitySameJavaType.Sub
public open override /*1*/ fun foo(): jet.CharSequence
public abstract trait test.InheritNullabilitySameJavaType : java.lang.Object {
public abstract trait test.InheritNullabilitySameJavaType.Sub : test.InheritNullabilitySameJavaType.Super {
public abstract override /*1*/ fun foo(): jet.CharSequence
}
public abstract trait test.InheritNullabilitySameJavaType.Super : java.lang.Object {
public abstract fun foo(): jet.CharSequence
}
}
compiler/testData/loadJava/kotlinSignature/propagation/return/InheritReadOnlinessOfArgument.java
+7 -8
View File
@@ -6,15 +6,14 @@ import java.util.Collection;
import jet.runtime.typeinfo.KotlinSignature;
public class InheritReadOnlinessOfArgument {
@KotlinSignature("fun foo(): List<List<String>>>")
public List<List<String>> foo() {
throw new UnsupportedOperationException();
public interface InheritReadOnlinessOfArgument {
public interface Super {
@KotlinSignature("fun foo(): List<List<String>>>")
List<List<String>> foo();
}
public class Sub extends InheritReadOnlinessOfArgument {
public List<List<String>> foo() {
throw new UnsupportedOperationException();
}
public interface Sub extends Super {
List<List<String>> foo();
}
}
compiler/testData/loadJava/kotlinSignature/propagation/return/InheritReadOnlinessOfArgument.kt
+6 -5
View File
@@ -1,11 +1,12 @@
package test
import org.jetbrains.annotations.NotNull
public trait InheritReadOnlinessOfArgument: Object {
public open class InheritReadOnlinessOfArgument : java.lang.Object() {
public open fun foo(): List<List<String>> = throw UnsupportedOperationException()
public trait Super: Object {
public fun foo(): List<List<String>>
}
public open class Sub: InheritReadOnlinessOfArgument() {
override fun foo(): List<List<String>> = throw UnsupportedOperationException()
public trait Sub: Super {
override fun foo(): List<List<String>>
}
}
compiler/testData/loadJava/kotlinSignature/propagation/return/InheritReadOnlinessOfArgument.txt
+6 -6
View File
@@ -1,10 +1,10 @@
namespace test
public open class test.InheritReadOnlinessOfArgument : java.lang.Object {
public final /*constructor*/ fun <init>(): test.InheritReadOnlinessOfArgument
public open fun foo(): jet.List<jet.List<jet.String>>
public open class test.InheritReadOnlinessOfArgument.Sub : test.InheritReadOnlinessOfArgument {
public final /*constructor*/ fun <init>(): test.InheritReadOnlinessOfArgument.Sub
public open override /*1*/ fun foo(): jet.List<jet.List<jet.String>>
public abstract trait test.InheritReadOnlinessOfArgument : java.lang.Object {
public abstract trait test.InheritReadOnlinessOfArgument.Sub : test.InheritReadOnlinessOfArgument.Super {
public abstract override /*1*/ fun foo(): jet.List<jet.List<jet.String>>
}
public abstract trait test.InheritReadOnlinessOfArgument.Super : java.lang.Object {
public abstract fun foo(): jet.List<jet.List<jet.String>>
}
}
compiler/testData/loadJava/kotlinSignature/propagation/return/InheritReadOnlinessSameClass.java
+7 -8
View File
@@ -6,15 +6,14 @@ import java.util.Collection;
import jet.runtime.typeinfo.KotlinSignature;
public class InheritReadOnlinessSameClass {
@KotlinSignature("fun foo(): List<String>")
public List<String> foo() {
throw new UnsupportedOperationException();
public interface InheritReadOnlinessSameClass {
public interface Super {
@KotlinSignature("fun foo(): List<String>")
List<String> foo();
}
public class Sub extends InheritReadOnlinessSameClass {
public List<String> foo() {
throw new UnsupportedOperationException();
}
public interface Sub extends Super {
List<String> foo();
}
}
compiler/testData/loadJava/kotlinSignature/propagation/return/InheritReadOnlinessSameClass.kt
+6 -5
View File
@@ -1,11 +1,12 @@
package test
import org.jetbrains.annotations.NotNull
public trait InheritReadOnlinessSameClass: Object {
public open class InheritReadOnlinessSameClass : java.lang.Object() {
public open fun foo(): List<String> = throw UnsupportedOperationException()
public trait Super: Object {
public fun foo(): List<String>
}
public open class Sub: InheritReadOnlinessSameClass() {
override fun foo(): List<String> = throw UnsupportedOperationException()
public trait Sub: Super {
override fun foo(): List<String>
}
}
compiler/testData/loadJava/kotlinSignature/propagation/return/InheritReadOnlinessSameClass.txt
+6 -6
View File
@@ -1,10 +1,10 @@
namespace test
public open class test.InheritReadOnlinessSameClass : java.lang.Object {
public final /*constructor*/ fun <init>(): test.InheritReadOnlinessSameClass
public open fun foo(): jet.List<jet.String>
public open class test.InheritReadOnlinessSameClass.Sub : test.InheritReadOnlinessSameClass {
public final /*constructor*/ fun <init>(): test.InheritReadOnlinessSameClass.Sub
public open override /*1*/ fun foo(): jet.List<jet.String>
public abstract trait test.InheritReadOnlinessSameClass : java.lang.Object {
public abstract trait test.InheritReadOnlinessSameClass.Sub : test.InheritReadOnlinessSameClass.Super {
public abstract override /*1*/ fun foo(): jet.List<jet.String>
}
public abstract trait test.InheritReadOnlinessSameClass.Super : java.lang.Object {
public abstract fun foo(): jet.List<jet.String>
}
}
compiler/testData/loadJava/kotlinSignature/propagation/return/InheritReadOnlinessSubclass.java
+7 -8
View File
@@ -6,15 +6,14 @@ import java.util.Collection;
import jet.runtime.typeinfo.KotlinSignature;
public class InheritReadOnlinessSubclass {
@KotlinSignature("fun foo(): Collection<String>")
public Collection<String> foo() {
throw new UnsupportedOperationException();
public interface InheritReadOnlinessSubclass {
public interface Super {
@KotlinSignature("fun foo(): Collection<String>")
Collection<String> foo();
}
public class Sub extends InheritReadOnlinessSubclass {
public List<String> foo() {
throw new UnsupportedOperationException();
}
public interface Sub extends Super {
List<String> foo();
}
}
compiler/testData/loadJava/kotlinSignature/propagation/return/InheritReadOnlinessSubclass.kt
+6 -5
View File
@@ -1,11 +1,12 @@
package test
import org.jetbrains.annotations.NotNull
public trait InheritReadOnlinessSubclass: Object {
public open class InheritReadOnlinessSubclass : java.lang.Object() {
public open fun foo(): Collection<String> = throw UnsupportedOperationException()
public trait Super: Object {
public fun foo(): Collection<String>
}
public open class Sub: InheritReadOnlinessSubclass() {
override fun foo(): List<String> = throw UnsupportedOperationException()
public trait Sub: Super {
override fun foo(): List<String>
}
}
compiler/testData/loadJava/kotlinSignature/propagation/return/InheritReadOnlinessSubclass.txt
+6 -6
View File
@@ -1,10 +1,10 @@
namespace test
public open class test.InheritReadOnlinessSubclass : java.lang.Object {
public final /*constructor*/ fun <init>(): test.InheritReadOnlinessSubclass
public open fun foo(): jet.Collection<jet.String>
public open class test.InheritReadOnlinessSubclass.Sub : test.InheritReadOnlinessSubclass {
public final /*constructor*/ fun <init>(): test.InheritReadOnlinessSubclass.Sub
public open override /*1*/ fun foo(): jet.List<jet.String>
public abstract trait test.InheritReadOnlinessSubclass : java.lang.Object {
public abstract trait test.InheritReadOnlinessSubclass.Sub : test.InheritReadOnlinessSubclass.Super {
public abstract override /*1*/ fun foo(): jet.List<jet.String>
}
public abstract trait test.InheritReadOnlinessSubclass.Super : java.lang.Object {
public abstract fun foo(): jet.Collection<jet.String>
}
}
compiler/testData/loadJava/kotlinSignature/propagation/return/InheritVariance.java
+7 -8
View File
@@ -6,15 +6,14 @@ import java.util.Collection;
import jet.runtime.typeinfo.KotlinSignature;
public class InheritVariance {
@KotlinSignature("fun foo(): MutableCollection<out Number>")
public Collection<Number> foo() {
throw new UnsupportedOperationException();
public interface InheritVariance {
public interface Super {
@KotlinSignature("fun foo(): MutableCollection<out Number>")
Collection<Number> foo();
}
public class Sub extends InheritVariance {
public List<Number> foo() {
throw new UnsupportedOperationException();
}
public interface Sub extends Super {
List<Number> foo();
}
}
compiler/testData/loadJava/kotlinSignature/propagation/return/InheritVariance.kt
+6 -5
View File
@@ -1,11 +1,12 @@
package test
import org.jetbrains.annotations.NotNull
public trait InheritVariance: Object {
public open class InheritVariance : java.lang.Object() {
public open fun foo(): MutableCollection<out Number> = throw UnsupportedOperationException()
public trait Super: Object {
public fun foo(): MutableCollection<out Number>
}
public open class Sub: InheritVariance() {
override fun foo(): MutableList<out Number> = throw UnsupportedOperationException()
public trait Sub: Super {
override fun foo(): MutableList<out Number>
}
}
compiler/testData/loadJava/kotlinSignature/propagation/return/InheritVariance.txt
+6 -6
View File
@@ -1,10 +1,10 @@
namespace test
public open class test.InheritVariance : java.lang.Object {
public final /*constructor*/ fun <init>(): test.InheritVariance
public open fun foo(): jet.MutableCollection<out jet.Number>
public open class test.InheritVariance.Sub : test.InheritVariance {
public final /*constructor*/ fun <init>(): test.InheritVariance.Sub
public open override /*1*/ fun foo(): jet.MutableList<out jet.Number>
public abstract trait test.InheritVariance : java.lang.Object {
public abstract trait test.InheritVariance.Sub : test.InheritVariance.Super {
public abstract override /*1*/ fun foo(): jet.MutableList<out jet.Number>
}
public abstract trait test.InheritVariance.Super : java.lang.Object {
public abstract fun foo(): jet.MutableCollection<out jet.Number>
}
}
compiler/testData/loadJava/kotlinSignature/propagation/return/TwoSuperclassesReturnJavaSubtype.java
+6 -5
View File
@@ -1,19 +1,20 @@
package test;
import org.jetbrains.annotations.NotNull;
import java.lang.CharSequence;
import jet.runtime.typeinfo.KotlinSignature;
public interface TwoSuperclassesReturnJavaSubtype {
public CharSequence foo();
public interface Other {
public interface Super1 {
public CharSequence foo();
}
public interface Super2 {
@NotNull
public CharSequence foo();
}
public interface Sub extends TwoSuperclassesReturnJavaSubtype, Other {
public interface Sub extends Super1, Super2 {
public String foo();
}
}
compiler/testData/loadJava/kotlinSignature/propagation/return/TwoSuperclassesReturnJavaSubtype.kt
+6 -5
View File
@@ -1,15 +1,16 @@
package test
import org.jetbrains.annotations.NotNull
public trait TwoSuperclassesReturnJavaSubtype: Object {
public fun foo(): CharSequence?
public trait Other: Object {
public trait Super1: Object {
public fun foo(): CharSequence?
}
public trait Super2: Object {
public fun foo(): CharSequence
}
public trait Sub: TwoSuperclassesReturnJavaSubtype, Other {
public trait Sub: Super1, Super2 {
override fun foo(): String
}
}
compiler/testData/loadJava/kotlinSignature/propagation/return/TwoSuperclassesReturnJavaSubtype.txt
+7 -5
View File
@@ -1,11 +1,13 @@
namespace test
public abstract trait test.TwoSuperclassesReturnJavaSubtype : java.lang.Object {
public abstract fun foo(): jet.CharSequence?
public abstract trait test.TwoSuperclassesReturnJavaSubtype.Other : java.lang.Object {
public abstract fun foo(): jet.CharSequence
}
public abstract trait test.TwoSuperclassesReturnJavaSubtype.Sub : test.TwoSuperclassesReturnJavaSubtype, test.TwoSuperclassesReturnJavaSubtype.Other {
public abstract trait test.TwoSuperclassesReturnJavaSubtype.Sub : test.TwoSuperclassesReturnJavaSubtype.Super1, test.TwoSuperclassesReturnJavaSubtype.Super2 {
public abstract override /*2*/ fun foo(): jet.String
}
public abstract trait test.TwoSuperclassesReturnJavaSubtype.Super1 : java.lang.Object {
public abstract fun foo(): jet.CharSequence?
}
public abstract trait test.TwoSuperclassesReturnJavaSubtype.Super2 : java.lang.Object {
public abstract fun foo(): jet.CharSequence
}
}
compiler/testData/loadJava/kotlinSignature/propagation/return/TwoSuperclassesReturnSameJavaType.java
+6 -5
View File
@@ -1,19 +1,20 @@
package test;
import org.jetbrains.annotations.NotNull;
import java.lang.CharSequence;
import jet.runtime.typeinfo.KotlinSignature;
public interface TwoSuperclassesReturnSameJavaType {
public CharSequence foo();
public interface Other {
public interface Super1 {
public CharSequence foo();
}
public interface Super2 {
@NotNull
public CharSequence foo();
}
public interface Sub extends TwoSuperclassesReturnSameJavaType, Other {
public interface Sub extends Super1, Super2 {
public CharSequence foo();
}
}
compiler/testData/loadJava/kotlinSignature/propagation/return/TwoSuperclassesReturnSameJavaType.kt
+6 -5
View File
@@ -1,15 +1,16 @@
package test
import org.jetbrains.annotations.NotNull
public trait TwoSuperclassesReturnSameJavaType: Object {
public fun foo(): CharSequence?
public trait Other: Object {
public trait Super1: Object {
public fun foo(): CharSequence?
}
public trait Super2: Object {
public fun foo(): CharSequence
}
public trait Sub: TwoSuperclassesReturnSameJavaType, Other {
public trait Sub: Super1, Super2 {
override fun foo(): CharSequence
}
}
compiler/testData/loadJava/kotlinSignature/propagation/return/TwoSuperclassesReturnSameJavaType.txt
+7 -5
View File
@@ -1,11 +1,13 @@
namespace test
public abstract trait test.TwoSuperclassesReturnSameJavaType : java.lang.Object {
public abstract fun foo(): jet.CharSequence?
public abstract trait test.TwoSuperclassesReturnSameJavaType.Other : java.lang.Object {
public abstract fun foo(): jet.CharSequence
}
public abstract trait test.TwoSuperclassesReturnSameJavaType.Sub : test.TwoSuperclassesReturnSameJavaType, test.TwoSuperclassesReturnSameJavaType.Other {
public abstract trait test.TwoSuperclassesReturnSameJavaType.Sub : test.TwoSuperclassesReturnSameJavaType.Super1, test.TwoSuperclassesReturnSameJavaType.Super2 {
public abstract override /*2*/ fun foo(): jet.CharSequence
}
public abstract trait test.TwoSuperclassesReturnSameJavaType.Super1 : java.lang.Object {
public abstract fun foo(): jet.CharSequence?
}
public abstract trait test.TwoSuperclassesReturnSameJavaType.Super2 : java.lang.Object {
public abstract fun foo(): jet.CharSequence
}
}