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

Test data fixed

Browse Source
This commit is contained in:
Andrey Breslav
2014-06-30 17:14:34 +04:00
parent 195274370f
commit 0cbbb6a0db
72 changed files with 219 additions and 216 deletions
Download Patch File Download Diff File Expand all files Collapse all files
idea/testData/completion/handlers/smart/JavaStaticMethodInsertsImport.kt
+1 -1
View File
@@ -2,4 +2,4 @@ fun foo(){
val l : java.util.Calendar = <caret>
}
// ELEMENT_TEXT: Calendar.getInstance(TimeZone)
// ELEMENT_TEXT: Calendar.getInstance(TimeZone!)
idea/testData/completion/handlers/smart/JavaStaticMethodInsertsImport.kt.after
+1 -1
View File
@@ -4,4 +4,4 @@ fun foo(){
val l : java.util.Calendar = Calendar.getInstance(<caret>)
}
// ELEMENT_TEXT: Calendar.getInstance(TimeZone)
// ELEMENT_TEXT: Calendar.getInstance(TimeZone!)
idea/testData/completion/smart/JavaStaticFields.kt
+2 -2
View File
@@ -2,5 +2,5 @@ fun foo(){
var l : java.util.Locale = <caret>
}
// EXIST: { lookupString:"Locale.ENGLISH", itemText:"Locale.ENGLISH", tailText:" (java.util)", typeText:"Locale" }
// EXIST: { lookupString:"Locale.FRENCH", itemText:"Locale.FRENCH", tailText:" (java.util)", typeText:"Locale" }
// EXIST: { lookupString:"Locale.ENGLISH", itemText:"Locale.ENGLISH", tailText:" (java.util)", typeText:"Locale!" }
// EXIST: { lookupString:"Locale.FRENCH", itemText:"Locale.FRENCH", tailText:" (java.util)", typeText:"Locale!" }
idea/testData/completion/smart/JavaStaticFieldsForNullable.kt
+2 -2
View File
@@ -2,5 +2,5 @@ fun foo(){
var l : java.util.Locale? = <caret>
}
// EXIST: { lookupString:"Locale.ENGLISH", itemText:"Locale.ENGLISH", tailText:" (java.util)", typeText:"Locale" }
// EXIST: { lookupString:"Locale.FRENCH", itemText:"Locale.FRENCH", tailText:" (java.util)", typeText:"Locale" }
// EXIST: { lookupString:"Locale.ENGLISH", itemText:"Locale.ENGLISH", tailText:" (java.util)", typeText:"Locale!" }
// EXIST: { lookupString:"Locale.FRENCH", itemText:"Locale.FRENCH", tailText:" (java.util)", typeText:"Locale!" }
idea/testData/completion/smart/JavaStaticMethods.kt
+3 -3
View File
@@ -2,6 +2,6 @@ fun foo(){
val l : java.util.Calendar = <caret>
}
// EXIST: { lookupString:"Calendar.getInstance", itemText:"Calendar.getInstance()", tailText:" (java.util)", typeText:"Calendar" }
// EXIST: { lookupString:"Calendar.getInstance", itemText:"Calendar.getInstance(TimeZone)", tailText:" (java.util)", typeText:"Calendar" }
// EXIST: { lookupString:"Calendar.getInstance", itemText:"Calendar.getInstance(TimeZone, Locale)", tailText:" (java.util)", typeText:"Calendar" }
// EXIST: { lookupString:"Calendar.getInstance", itemText:"Calendar.getInstance()", tailText:" (java.util)", typeText:"Calendar!" }
// EXIST: { lookupString:"Calendar.getInstance", itemText:"Calendar.getInstance(TimeZone!)", tailText:" (java.util)", typeText:"Calendar!" }
// EXIST: { lookupString:"Calendar.getInstance", itemText:"Calendar.getInstance(TimeZone!, Locale!)", tailText:" (java.util)", typeText:"Calendar!" }
idea/testData/debugger/tinyApp/src/evaluate/multipleBreakpoints/exceptions.kt
+2 -2
View File
@@ -37,7 +37,7 @@ fun genericClassCast() {
val c = ArrayList<Int>()
c.add(1)
// EXPRESSION: c.get(0)
// RESULT: 1: I
// RESULT: instance of java.lang.Integer(id=ID): Ljava/lang/Integer;
//Breakpoint!
val b = 1
}
@@ -46,7 +46,7 @@ fun genericClassCast() {
val c = ArrayList<String>()
c.add("a")
// EXPRESSION: c.get(0)
// RESULT: java.lang.ClassCastException: java.lang.String cannot be cast to java.lang.Number: Ljava/lang/ClassCastException;
// RESULT: java.lang.ClassCastException: java.lang.String cannot be cast to java.lang.Integer: Ljava/lang/ClassCastException;
//Breakpoint!
val b = 1
}
idea/testData/editor/quickDoc/JavaClassUsedInKotlin.kt
+1 -1
View File
@@ -2,4 +2,4 @@ fun testing() {
<caret>SomeClass<List<String>>()
}
// INFO: <b>public</b> <b>constructor</b> SomeClass&lt;T : List&lt;Any?&gt;?&gt;()<br/>Java declaration:<br/>[light_idea_test_case] public class SomeClass&lt;T extends java.util.List&gt; extends Object
// INFO: <b>public</b> <b>constructor</b> SomeClass&lt;T : (MutableList&lt;out Any?&gt;..List&lt;Any?&gt;?)&gt;()<br/>Java declaration:<br/>[light_idea_test_case] public class SomeClass&lt;T extends java.util.List&gt; extends Object
idea/testData/editor/quickDoc/JavaMethodUsedInKotlin.kt
+1 -1
View File
@@ -2,4 +2,4 @@ fun ktTest() {
Test.<caret>foo("SomeTest")
}
// INFO: <b>public</b> <b>open</b> <b>fun</b> foo(param: String): Array&lt;out Any&gt;<br/>Java declaration:<br/>Test...
// INFO: <b>public</b> <b>open</b> <b>fun</b> foo(param: String!): (Array&lt;Any!&gt;..Array&lt;out Any!&gt;?)<br/>Java declaration:<br/>Test...
idea/testData/intentions/specifyType/loopParameter.kt.after
+1 -1
View File
@@ -3,7 +3,7 @@
import java.util.HashMap
fun foo(map : HashMap<String, Int>) {
for (entry: MutableMap.MutableEntry<String, Int><caret> in map.entrySet()) {
for (entry: MutableMap.MutableEntry<String, Int>?<caret> in map.entrySet()) {
}
}
idea/testData/quickfix/changeSignature/beforeAddParameterNotAvailableForLibrary.kt
+1 -1
View File
@@ -1,5 +1,5 @@
// "class org.jetbrains.jet.plugin.quickfix.AddFunctionParametersFix" "false"
// ERROR: Too many arguments for public open fun equals(other: kotlin.Any?): kotlin.Boolean defined in java.lang.Object
// ERROR: Too many arguments for public open fun equals(other: kotlin.Any!): kotlin.Boolean defined in java.lang.Object
fun f(d: java.lang.Object) {
d.equals("a", <caret>"b")
idea/testData/structureView/fileStructure/InheritedJavaMembers.after
+1 -1
View File
@@ -1,6 +1,6 @@
-InheritedJavaMembers.kt
-InheritedJavaMembers
call(): String? location=→Callable
call(): String! location=→Callable
equals(Any?): Boolean location=→Any
hashCode(): Int location=→Any
test(): Unit
idea/testData/structureView/fileStructure/InheritedSAMConversion.after
+1 -1
View File
@@ -1,6 +1,6 @@
-InheritedSAMConversion.kt
-KotlinTest
equals(Any?): Boolean location=→Any
foo((() -> Unit)?): Unit
foo((() -> Unit)!): Unit
hashCode(): Int location=→Any
toString(): String location=→Any