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

Removed tuples from type checker test.

Browse Source
This commit is contained in:
Evgeny Gerashchenko
2013-03-18 22:01:15 +04:00
parent bf28ce155d
commit ffb67d3a1f
2 changed files with 4 additions and 43 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/testData/type-checker-test.kt
+2
View File
@@ -1,5 +1,7 @@
package testData package testData
class Pair<out A, out B> (val first: A, val second: B}
open class Base_T<T>() open class Base_T<T>()
open class Derived_T<T>() : Base_T<T> open class Derived_T<T>() : Base_T<T>
open class DDerived_T<T>() : Derived_T<T> open class DDerived_T<T>() : Derived_T<T>
compiler/tests/org/jetbrains/jet/types/JetTypeCheckerTest.java
+2 -43
View File
@@ -129,17 +129,11 @@ public class JetTypeCheckerTest extends JetLiteFixture {
assertType("\"d\"", builtIns.getStringType()); assertType("\"d\"", builtIns.getStringType());
assertType("\"\"\"d\"\"\"", builtIns.getStringType()); assertType("\"\"\"d\"\"\"", builtIns.getStringType());
assertType("#()", KotlinBuiltIns.getInstance().getUnitType()); assertType("Unit.VALUE", KotlinBuiltIns.getInstance().getUnitType());
assertType("null", KotlinBuiltIns.getInstance().getNullableNothingType()); assertType("null", KotlinBuiltIns.getInstance().getNullableNothingType());
} }
public void testTupleConstants() throws Exception {
assertType("#()", KotlinBuiltIns.getInstance().getUnitType());
assertType("#(1, 'a')", KotlinBuiltIns.getInstance().getTupleType(builtIns.getIntType(), builtIns.getCharType()));
}
public void testTypeInfo() throws Exception { public void testTypeInfo() throws Exception {
// todo: obsolete since removal of typeinfo // todo: obsolete since removal of typeinfo
// assertType("typeinfo<Int>", "TypeInfo<Int>"); // assertType("typeinfo<Int>", "TypeInfo<Int>");
@@ -269,41 +263,6 @@ public class JetTypeCheckerTest extends JetLiteFixture {
assertNotSubtype("Unit", "Int"); assertNotSubtype("Unit", "Int");
} }
public void testTuples() throws Exception {
assertSubtype("Unit", "#()");
assertSubtype("#()", "Unit");
assertSubtype("#()", "#()");
assertSubtype("#(Boolean)", "#(Boolean)");
assertSubtype("#(Byte)", "#(Byte)");
assertSubtype("#(Char)", "#(Char)");
assertSubtype("#(Short)", "#(Short)");
assertSubtype("#(Int)", "#(Int)");
assertSubtype("#(Long)", "#(Long)");
assertSubtype("#(Float)", "#(Float)");
assertSubtype("#(Double)", "#(Double)");
assertSubtype("#(Unit)", "#(Unit)");
assertSubtype("#(Unit, Unit)", "#(Unit, Unit)");
assertSubtype("#(Boolean)", "#(Boolean)");
assertSubtype("#(Byte)", "#(Byte)");
assertSubtype("#(Char)", "#(Char)");
assertSubtype("#(Short)", "#(Short)");
assertSubtype("#(Int)", "#(Int)");
assertSubtype("#(Long)", "#(Long)");
assertSubtype("#(Float)", "#(Float)");
assertSubtype("#(Double)", "#(Double)");
assertSubtype("#(Unit)", "#(Unit)");
assertSubtype("#(Unit, Unit)", "#(Unit, Unit)");
assertNotSubtype("#(Unit)", "#(Int)");
assertSubtype("#(Unit)", "#(Any)");
assertSubtype("#(Unit, Unit)", "#(Any, Any)");
assertSubtype("#(Unit, Unit)", "#(Any, Unit)");
assertSubtype("#(Unit, Unit)", "#(Unit, Any)");
}
public void testProjections() throws Exception { public void testProjections() throws Exception {
assertSubtype("Base_T<Int>", "Base_T<Int>"); assertSubtype("Base_T<Int>", "Base_T<Int>");
assertNotSubtype("Base_T<Int>", "Base_T<Any>"); assertNotSubtype("Base_T<Int>", "Base_T<Any>");
@@ -433,7 +392,7 @@ public class JetTypeCheckerTest extends JetLiteFixture {
public void testOverloads() throws Exception { public void testOverloads() throws Exception {
assertType("Functions<String>().f()", "Unit"); assertType("Functions<String>().f()", "Unit");
assertType("Functions<String>().f(1)", "Int"); assertType("Functions<String>().f(1)", "Int");
assertType("Functions<Double>().f(#(1, 1))", "Double"); assertType("Functions<Double>().f(Pair(1, 1))", "Double");
assertType("Functions<Double>().f(1.0)", "Any"); assertType("Functions<Double>().f(1.0)", "Any");
assertType("Functions<Byte>().f<String>(\"\")", "Byte"); assertType("Functions<Byte>().f<String>(\"\")", "Byte");