Change testData for ShortenRefsTestGenerated to not use sql package

- Those packages are missing in the mockJdk 1.8 in intellij repository,
and it leads to those tests failing in kotlin-ide repository
- Test in `ShortenRefsTestGenerated` do not fail, but they are working
for the wrong reason (they do not shorten unresolved references)
This commit is contained in:
Roman Golyshev
2020-06-04 19:25:27 +03:00
committed by Roman Golyshev
parent 7d662bf5d1
commit f9b3daabd1
23 changed files with 37 additions and 17 deletions
@@ -0,0 +1,3 @@
package dependency
class Date
+1 -1
View File
@@ -1,3 +1,3 @@
import java.util.Date
val x = <selection>java.sql.Date(1)</selection>
val x = <selection>dependency.Date(1)</selection>
@@ -1,3 +1,3 @@
import java.util.Date
val x = java.sql.Date(1)
val x = dependency.Date(1)
@@ -0,0 +1,3 @@
package dependency
class Date
@@ -1,3 +1,3 @@
import java.util.Date
val x = <selection>java.sql.Date(1)</selection>
val x = <selection>dependency.Date(1)</selection>
@@ -1,3 +1,3 @@
import java.util.Date
val x = java.sql.Date(1)
val x = dependency.Date(1)
@@ -0,0 +1,3 @@
package dependency
class Date
+1 -1
View File
@@ -1,3 +1,3 @@
import java.util.Date
class A : <selection>java.sql.Date</selection>
class A : <selection>dependency.Date</selection>
@@ -1,3 +1,3 @@
import java.util.Date
class A : java.sql.Date
class A : dependency.Date
+1 -1
View File
@@ -1,3 +1,3 @@
class A {
var x: <selection>((java.io.File, java.util.ArrayList<String>) -> java.awt.Container)?</selection> = null
var x: <selection>((java.io.File) -> java.util.ArrayList<String>)?</selection> = null
}
+1 -2
View File
@@ -1,7 +1,6 @@
import java.awt.Container
import java.io.File
import java.util.ArrayList
class A {
var x: ((File, ArrayList<String>) -> Container)? = null
var x: ((File) -> ArrayList<String>)? = null
}
@@ -0,0 +1,3 @@
package dependency
class Array
+1 -1
View File
@@ -1 +1 @@
val x: <selection>kotlin.collections.Map.Entry<kotlin.Array<kotlin.String>, java.sql.Array></selection>
val x: <selection>kotlin.collections.Map.Entry<kotlin.Array<kotlin.String>, dependency.Array></selection>
+1 -1
View File
@@ -1 +1 @@
val x: Map.Entry<Array<String>, java.sql.Array>
val x: Map.Entry<Array<String>, dependency.Array>
@@ -0,0 +1,3 @@
package dependency
class Date
+1 -1
View File
@@ -1,3 +1,3 @@
import java.util.Date
class A : <selection>java.sql.Date</selection>
class A : <selection>dependency.Date</selection>
+1 -1
View File
@@ -1,3 +1,3 @@
import java.util.Date
class A : java.sql.Date
class A : dependency.Date
@@ -0,0 +1,3 @@
package dependency
class Date
@@ -1,3 +1,3 @@
import java.util.*
val v: ArrayList<<selection>java.sql.Date</selection>>
val v: ArrayList<<selection>dependency.Date</selection>>
@@ -1,4 +1,4 @@
import java.sql.Date
import dependency.Date
import java.util.*
val v: ArrayList<Date>
@@ -0,0 +1,3 @@
package dependency
class Date
+1 -1
View File
@@ -1,3 +1,3 @@
class A {
val x: <selection>java.util.HashMap<java.util.Date, java.sql.Date></selection>
val x: <selection>java.util.HashMap<java.util.Date, dependency.Date></selection>
}
@@ -2,5 +2,5 @@ import java.util.Date
import java.util.HashMap
class A {
val x: HashMap<Date, java.sql.Date>
val x: HashMap<Date, dependency.Date>
}