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

removing static type assertions work in progress

Browse Source
This commit is contained in:
Dmitry Jemerov
2015-10-07 12:19:37 +02:00
parent 8f87efc0a2
commit 1523d5bcbf
149 changed files with 514 additions and 867 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/tests/org/jetbrains/kotlin/checkers/JetDiagnosticsTestGenerated.java
-6
View File
@@ -4578,12 +4578,6 @@ public class JetDiagnosticsTestGenerated extends AbstractJetDiagnosticsTest {
doTest(fileName);
}
@TestMetadata("ArrayAccessAssignment.kt")
public void testArrayAccessAssignment() throws Exception {
String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/deparenthesize/ArrayAccessAssignment.kt");
doTest(fileName);
}
@TestMetadata("checkDeparenthesizedType.kt")
public void testCheckDeparenthesizedType() throws Exception {
String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/deparenthesize/checkDeparenthesizedType.kt");
compiler/tests/org/jetbrains/kotlin/types/JetTypeCheckerTest.java
+12 -12
View File
@@ -403,7 +403,7 @@ public class JetTypeCheckerTest extends JetLiteFixture {
assertType("Props<out Int>().p", "Int");
assertType("Props<Properties>().p.p", "Int");
assertType("(return : Props<in Int>).p", "Any?");
assertType("(return as Props<in Int>).p", "Any?");
}
public void testOverloads() throws Exception {
@@ -444,18 +444,18 @@ public class JetTypeCheckerTest extends JetLiteFixture {
assertType("'1'.minus(1)", "Char");
assertType("'1'.minus('1')", "Int");
assertType("(1:Short).plus(1.toDouble())", "Double");
assertType("(1:Short).plus(1.toFloat())", "Float");
assertType("(1:Short).plus(1.toLong())", "Long");
assertType("(1:Short).plus(1)", "Int");
assertType("(1:Short).plus(1:Short)", "Int");
assertType("(1.toShort()).plus(1.toDouble())", "Double");
assertType("(1.toShort()).plus(1.toFloat())", "Float");
assertType("(1.toShort()).plus(1.toLong())", "Long");
assertType("(1.toShort()).plus(1)", "Int");
assertType("(1.toShort()).plus(1.toShort())", "Int");
assertType("(1:Byte).plus(1.toDouble())", "Double");
assertType("(1:Byte).plus(1.toFloat())", "Float");
assertType("(1:Byte).plus(1.toLong())", "Long");
assertType("(1:Byte).plus(1)", "Int");
assertType("(1:Byte).plus(1:Short)", "Int");
assertType("(1:Byte).plus(1:Byte)", "Int");
assertType("(1.toByte()).plus(1.toDouble())", "Double");
assertType("(1.toByte()).plus(1.toFloat())", "Float");
assertType("(1.toByte()).plus(1.toLong())", "Long");
assertType("(1.toByte()).plus(1)", "Int");
assertType("(1.toByte()).plus(1.toShort())", "Int");
assertType("(1.toByte()).plus(1.toByte())", "Int");
assertType("\"1\".plus(1.toDouble())", "String");
assertType("\"1\".plus(1.toFloat())", "String");