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

Simplify and sharpen tests

Browse Source
This commit is contained in:
Nikolay Krasko
2012-10-05 16:03:19 +04:00
parent e41bce013d
commit 0c48fbf959
9 changed files with 19 additions and 37 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/testData/loadJava/kotlinSignature/PropertyArrayTypes.java
-5
View File
@@ -22,11 +22,6 @@ import java.util.ArrayList;
import jet.runtime.typeinfo.KotlinSignature;
public class PropertyArrayTypes<T> {
@KotlinSignature("fun PropertyArrayTypes(genericTypeParam : T)")
public PropertyArrayTypes(T genericTypeParam) {
// For initializing genericType field in kotlin
}
@KotlinSignature("var arrayOfArrays : Array<Array<String>>")
public String[][] arrayOfArrays;
compiler/testData/loadJava/kotlinSignature/PropertyArrayTypes.kt
+4 -4
View File
@@ -2,8 +2,8 @@ package test
import java.util.*
public open class PropertyArrayTypes<T>(p0 : T) : java.lang.Object() {
public var arrayOfArrays : Array<Array<String>> = Array<Array<String>>(0, { Array<String>(0, { "" })})
public var array : Array<String> = Array<String>(0, { "" })
public var genericArray : Array<T> = Array<T>(0, { p0 })
public open class PropertyArrayTypes<T>() : java.lang.Object() {
public var arrayOfArrays : Array<Array<String>> = null!!
public var array : Array<String> = null!!
public var genericArray : Array<T> = null!!
}
compiler/testData/loadJava/kotlinSignature/PropertyArrayTypes.txt
+1 -1
View File
@@ -1,7 +1,7 @@
namespace test
public open class test.PropertyArrayTypes</*0*/ T : jet.Any?> : java.lang.Object {
public final /*constructor*/ fun </*0*/ T : jet.Any?><init>(/*0*/ p0: T): test.PropertyArrayTypes<T>
public final /*constructor*/ fun </*0*/ T : jet.Any?><init>(): test.PropertyArrayTypes<T>
public final var array: jet.Array<jet.String>
public final var arrayOfArrays: jet.Array<jet.Array<jet.String>>
public final var genericArray: jet.Array<T>
compiler/testData/loadJava/kotlinSignature/PropertyComplexTypes.java
-5
View File
@@ -22,11 +22,6 @@ import java.util.ArrayList;
import jet.runtime.typeinfo.KotlinSignature;
public class PropertyComplexTypes<T> {
@KotlinSignature("fun PropertyComplexTypes(genericTypeParam : T)")
public PropertyComplexTypes(T genericTypeParam) {
// For initializing genericType field in kotlin
}
@KotlinSignature("var genericType : T")
public T genericType;
compiler/testData/loadJava/kotlinSignature/PropertyComplexTypes.kt
+5 -5
View File
@@ -2,9 +2,9 @@ package test
import java.util.*
public open class PropertyComplexTypes<T>(p0 : T) : java.lang.Object() {
public var genericType : T = p0
public var listDefinedGeneric : ArrayList<String> = ArrayList<String>()
public var listGeneric : ArrayList<T> = ArrayList<T>()
public var listOfGenericList : ArrayList<ArrayList<T>> = ArrayList<ArrayList<T>>()
public open class PropertyComplexTypes<T>() : java.lang.Object() {
public var genericType : T = null!!
public var listDefinedGeneric : ArrayList<String> = null!!
public var listGeneric : ArrayList<T> = null!!
public var listOfGenericList : ArrayList<ArrayList<T>> = null!!
}
compiler/testData/loadJava/kotlinSignature/PropertyComplexTypes.txt
+1 -1
View File
@@ -1,7 +1,7 @@
namespace test
public open class test.PropertyComplexTypes</*0*/ T : jet.Any?> : java.lang.Object {
public final /*constructor*/ fun </*0*/ T : jet.Any?><init>(/*0*/ p0: T): test.PropertyComplexTypes<T>
public final /*constructor*/ fun </*0*/ T : jet.Any?><init>(): test.PropertyComplexTypes<T>
public final var genericType: T
public final var listDefinedGeneric: java.util.ArrayList<jet.String>
public final var listGeneric: java.util.ArrayList<T>
compiler/testData/loadJava/kotlinSignature/PropertySimpleType.java
+4 -10
View File
@@ -20,15 +20,9 @@ import java.lang.String;
import jet.runtime.typeinfo.KotlinSignature;
public class PropertySimpleType {
@KotlinSignature("val publicFieldVal : String")
public String publicFieldVal;
@KotlinSignature("val fieldOne : String")
public String fieldOne;
@KotlinSignature("var publicFieldVar : String?")
public String publicFieldVar;
@KotlinSignature("var protectedField : String")
protected String protectedField;
@KotlinSignature("var privateField : String")
private String privateField;
@KotlinSignature("var fieldTwo : String?")
public String fieldTwo;
}
compiler/testData/loadJava/kotlinSignature/PropertySimpleType.kt
+2 -3
View File
@@ -3,7 +3,6 @@ package test
import java.util.*
public open class PropertySimpleType : java.lang.Object() {
public var publicFieldVal : String = ""
public var publicFieldVar : String? = null
protected var protectedField : String = ""
public var fieldOne : String = ""
public var fieldTwo : String? = null
}
compiler/testData/loadJava/kotlinSignature/PropertySimpleType.txt
+2 -3
View File
@@ -2,7 +2,6 @@ namespace test
public open class test.PropertySimpleType : java.lang.Object {
public final /*constructor*/ fun <init>(): test.PropertySimpleType
protected final var protectedField: jet.String
public final var publicFieldVal: jet.String
public final var publicFieldVar: jet.String?
public final var fieldOne: jet.String
public final var fieldTwo: jet.String?
}