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

Change testData for IntentionsTestGenerated to avoid using javax and sql packages

Browse Source 
- Those packages are missing in the mockJdk 1.8 in intellij repository,
and it leads to those tests failing in kotlin-ide repository
This commit is contained in:
Roman Golyshev
2020-06-04 18:12:02 +03:00
committed by Roman Golyshev
parent 22b558110d
commit 7d662bf5d1
36 changed files with 153 additions and 170 deletions
Download Patch File Download Diff File Expand all files Collapse all files
idea/testData/intentions/importAllMembers/AlreadyImported.kt
Vendored
+7 -9
View File
@@ -1,17 +1,15 @@
// INTENTION_TEXT: "Import members from 'javax.swing.SwingUtilities'"
// INTENTION_TEXT: "Import members from 'java.util.regex.Pattern'"
// WITH_RUNTIME
import javax.swing.SwingUtilities
import javax.swing.SwingUtilities.invokeLater
import java.util.regex.Pattern
import java.util.regex.Pattern.matches
fun foo() {
<caret>SwingUtilities.invokeLater { }
<caret>Pattern.matches("", "")
val bottom = SwingUtilities.BOTTOM
val field = Pattern.CASE_INSENSITIVE
SwingUtilities.invokeAndWait {
SwingUtilities.invokeLater { }
}
Pattern.compile("")
val horizontal = javax.swing.SwingUtilities.HORIZONTAL
val fieldFqn = java.util.regex.Pattern.CASE_INSENSITIVE
}
idea/testData/intentions/importAllMembers/AlreadyImported.kt.after
Vendored
+7 -9
View File
@@ -1,17 +1,15 @@
// INTENTION_TEXT: "Import members from 'javax.swing.SwingUtilities'"
// INTENTION_TEXT: "Import members from 'java.util.regex.Pattern'"
// WITH_RUNTIME
import javax.swing.SwingUtilities
import javax.swing.SwingUtilities.*
import java.util.regex.Pattern
import java.util.regex.Pattern.*
fun foo() {
<caret>invokeLater { }
<caret>matches("", "")
val bottom = BOTTOM
val field = CASE_INSENSITIVE
invokeAndWait {
invokeLater { }
}
compile("")
val horizontal = HORIZONTAL
val fieldFqn = CASE_INSENSITIVE
}
idea/testData/intentions/importAllMembers/AlreadyImportedWithStar.kt
Vendored
+7 -9
View File
@@ -1,17 +1,15 @@
// INTENTION_TEXT: "Import members from 'javax.swing.SwingUtilities'"
// INTENTION_TEXT: "Import members from 'java.util.regex.Pattern'"
// WITH_RUNTIME
import javax.swing.SwingUtilities
import javax.swing.SwingUtilities.*
import java.util.regex.Pattern
import java.util.regex.Pattern.*
fun foo() {
<caret>SwingUtilities.invokeLater { }
<caret>Pattern.matches("", "")
val bottom = SwingUtilities.BOTTOM
val field = Pattern.CASE_INSENSITIVE
SwingUtilities.invokeAndWait {
SwingUtilities.invokeLater { }
}
Pattern.compile("")
val horizontal = javax.swing.SwingUtilities.HORIZONTAL
val fieldFqn = java.util.regex.Pattern.CASE_INSENSITIVE
}
idea/testData/intentions/importAllMembers/AlreadyImportedWithStar.kt.after
Vendored
+7 -9
View File
@@ -1,17 +1,15 @@
// INTENTION_TEXT: "Import members from 'javax.swing.SwingUtilities'"
// INTENTION_TEXT: "Import members from 'java.util.regex.Pattern'"
// WITH_RUNTIME
import javax.swing.SwingUtilities
import javax.swing.SwingUtilities.*
import java.util.regex.Pattern
import java.util.regex.Pattern.*
fun foo() {
<caret>invokeLater { }
<caret>matches("", "")
val bottom = BOTTOM
val field = CASE_INSENSITIVE
invokeAndWait {
invokeLater { }
}
compile("")
val horizontal = HORIZONTAL
val fieldFqn = CASE_INSENSITIVE
}
idea/testData/intentions/importAllMembers/AmbiguousCalls.1.java
Vendored
+6
View File
@@ -0,0 +1,6 @@
public class JavaUtilClass {
public static int STATIC_FIELD = 10;
public static void overloadedMethod(int i) {}
public static void overloadedMethod(String i) {}
}
idea/testData/intentions/importAllMembers/AmbiguousCalls.1.java.after
Vendored
+6
View File
@@ -0,0 +1,6 @@
public class JavaUtilClass {
public static int STATIC_FIELD = 10;
public static void overloadedMethod(int i) {}
public static void overloadedMethod(String i) {}
}
idea/testData/intentions/importAllMembers/AmbiguousCalls.kt
Vendored
+7 -9
View File
@@ -1,17 +1,15 @@
// INTENTION_TEXT: "Import members from 'javax.swing.SwingUtilities'"
// INTENTION_TEXT: "Import members from 'JavaUtilClass'"
// WITH_RUNTIME
// ERROR: None of the following functions can be called with the arguments supplied: <br>public open fun convertPoint(source: Component!, aPoint: Point!, destination: Component!): Point! defined in javax.swing.SwingUtilities<br>public open fun convertPoint(source: Component!, x: Int, y: Int, destination: Component!): Point! defined in javax.swing.SwingUtilities
// ERROR: None of the following functions can be called with the arguments supplied: <br>public open fun convertPoint(source: Component!, aPoint: Point!, destination: Component!): Point! defined in javax.swing.SwingUtilities<br>public open fun convertPoint(source: Component!, x: Int, y: Int, destination: Component!): Point! defined in javax.swing.SwingUtilities
// ERROR: None of the following functions can be called with the arguments supplied: <br>public open fun overloadedMethod(i: Int): Unit defined in JavaUtilClass<br>public open fun overloadedMethod(i: String!): Unit defined in JavaUtilClass
// ERROR: None of the following functions can be called with the arguments supplied: <br>public open fun overloadedMethod(i: Int): Unit defined in JavaUtilClass<br>public open fun overloadedMethod(i: String!): Unit defined in JavaUtilClass
// ERROR: Unresolved reference: unresolved
import javax.swing.SwingUtilities
fun foo() {
<caret>SwingUtilities.convertPoint()
<caret>JavaUtilClass.overloadedMethod()
val bottom = SwingUtilities.BOTTOM
val bottom = JavaUtilClass.STATIC_FIELD
SwingUtilities.convertPoint()
JavaUtilClass.overloadedMethod()
SwingUtilities.unresolved
JavaUtilClass.unresolved
}
idea/testData/intentions/importAllMembers/AmbiguousCalls.kt.after
Vendored
+9 -10
View File
@@ -1,18 +1,17 @@
// INTENTION_TEXT: "Import members from 'javax.swing.SwingUtilities'"
import JavaUtilClass.*
// INTENTION_TEXT: "Import members from 'JavaUtilClass'"
// WITH_RUNTIME
// ERROR: None of the following functions can be called with the arguments supplied: <br>public open fun convertPoint(source: Component!, aPoint: Point!, destination: Component!): Point! defined in javax.swing.SwingUtilities<br>public open fun convertPoint(source: Component!, x: Int, y: Int, destination: Component!): Point! defined in javax.swing.SwingUtilities
// ERROR: None of the following functions can be called with the arguments supplied: <br>public open fun convertPoint(source: Component!, aPoint: Point!, destination: Component!): Point! defined in javax.swing.SwingUtilities<br>public open fun convertPoint(source: Component!, x: Int, y: Int, destination: Component!): Point! defined in javax.swing.SwingUtilities
// ERROR: None of the following functions can be called with the arguments supplied: <br>public open fun overloadedMethod(i: Int): Unit defined in JavaUtilClass<br>public open fun overloadedMethod(i: String!): Unit defined in JavaUtilClass
// ERROR: None of the following functions can be called with the arguments supplied: <br>public open fun overloadedMethod(i: Int): Unit defined in JavaUtilClass<br>public open fun overloadedMethod(i: String!): Unit defined in JavaUtilClass
// ERROR: Unresolved reference: unresolved
import javax.swing.SwingUtilities
import javax.swing.SwingUtilities.*
fun foo() {
<caret>convertPoint()
overloadedMethod()
val bottom = BOTTOM
val bottom = STATIC_FIELD
convertPoint()
overloadedMethod()
SwingUtilities.unresolved
JavaUtilClass.unresolved
}
idea/testData/intentions/importAllMembers/ImportAllMembersInImport.kt
Vendored
+1 -1
View File
@@ -1,4 +1,4 @@
// IS_APPLICABLE: false
// WITH_RUNTIME
import javax.swing.<caret>SwingConstants.CENTER
import java.util.regex.<caret>Pattern.CASE_INSENSITIVE
idea/testData/intentions/importAllMembers/QualifiedName.kt
Vendored
+2 -2
View File
@@ -1,6 +1,6 @@
// INTENTION_TEXT: "Import members from 'javax.swing.SwingUtilities'"
// INTENTION_TEXT: "Import members from 'java.util.regex.Pattern'"
// WITH_RUNTIME
fun foo() {
javax.swing.SwingUtilities<caret>.invokeLater { }
java.util.regex.Pattern<caret>.CASE_INSENSITIVE
}
idea/testData/intentions/importAllMembers/QualifiedName.kt.after
Vendored
+3 -3
View File
@@ -1,8 +1,8 @@
import javax.swing.SwingUtilities.*
import java.util.regex.Pattern.*
// INTENTION_TEXT: "Import members from 'javax.swing.SwingUtilities'"
// INTENTION_TEXT: "Import members from 'java.util.regex.Pattern'"
// WITH_RUNTIME
fun foo() {
<caret>invokeLater { }
CASE_INSENSITIVE
}
idea/testData/intentions/importAllMembers/QualifiedName2.kt
Vendored
+2 -2
View File
@@ -1,6 +1,6 @@
// INTENTION_TEXT: "Import members from 'javax.swing.SwingUtilities'"
// INTENTION_TEXT: "Import members from 'java.util.Objects'"
// WITH_RUNTIME
fun foo() {
<caret>javax.swing.SwingUtilities.invokeLater { }
<caret>java.util.Objects.equals(null, null)
}
idea/testData/intentions/importAllMembers/QualifiedName2.kt.after
Vendored
+3 -3
View File
@@ -1,8 +1,8 @@
import javax.swing.SwingUtilities.*
import java.util.Objects.*
// INTENTION_TEXT: "Import members from 'javax.swing.SwingUtilities'"
// INTENTION_TEXT: "Import members from 'java.util.Objects'"
// WITH_RUNTIME
fun foo() {
<caret>invokeLater { }
equals(null, null)
}
idea/testData/intentions/importAllMembers/RemoveSingleImports.kt
Vendored
+7 -9
View File
@@ -1,17 +1,15 @@
// INTENTION_TEXT: "Import members from 'javax.swing.SwingUtilities'"
// INTENTION_TEXT: "Import members from 'java.util.regex.Pattern'"
// WITH_RUNTIME
import javax.swing.SwingUtilities
import javax.swing.SwingUtilities.invokeLater
import java.util.regex.Pattern
import java.util.regex.Pattern.matches
fun foo() {
invokeLater { }
matches("", "")
val bottom = <caret>SwingUtilities.BOTTOM
val field = <caret>Pattern.CASE_INSENSITIVE
SwingUtilities.invokeAndWait {
invokeLater { }
}
Pattern.compile("")
val horizontal = javax.swing.SwingUtilities.HORIZONTAL
val fieldFqn = java.util.regex.Pattern.CASE_INSENSITIVE
}
idea/testData/intentions/importAllMembers/RemoveSingleImports.kt.after
Vendored
+7 -9
View File
@@ -1,17 +1,15 @@
// INTENTION_TEXT: "Import members from 'javax.swing.SwingUtilities'"
// INTENTION_TEXT: "Import members from 'java.util.regex.Pattern'"
// WITH_RUNTIME
import javax.swing.SwingUtilities
import javax.swing.SwingUtilities.*
import java.util.regex.Pattern
import java.util.regex.Pattern.*
fun foo() {
invokeLater { }
matches("", "")
val bottom = <caret>BOTTOM
val field = CASE_INSENSITIVE
invokeAndWait {
invokeLater { }
}
compile("")
val horizontal = HORIZONTAL
val fieldFqn = CASE_INSENSITIVE
}
idea/testData/intentions/importAllMembers/StaticJavaMembers.kt
Vendored
+7 -9
View File
@@ -1,19 +1,17 @@
// INTENTION_TEXT: "Import members from 'javax.swing.SwingUtilities'"
// INTENTION_TEXT: "Import members from 'java.util.regex.Pattern'"
// WITH_RUNTIME
// ERROR: Unresolved reference: unresolved
import javax.swing.SwingUtilities
import java.util.regex.Pattern
fun foo() {
SwingUtilities.invokeLater { }
Pattern.matches("", "")
val bottom = <caret>SwingUtilities.BOTTOM
val field = <caret>Pattern.CASE_INSENSITIVE
SwingUtilities.invokeAndWait {
SwingUtilities.invokeLater { }
}
Pattern.compile("")
val horizontal = javax.swing.SwingUtilities.HORIZONTAL
val fieldFqn = java.util.regex.Pattern.CASE_INSENSITIVE
SwingUtilities.unresolved
Pattern.unresolved
}
idea/testData/intentions/importAllMembers/StaticJavaMembers.kt.after
Vendored
+8 -10
View File
@@ -1,20 +1,18 @@
// INTENTION_TEXT: "Import members from 'javax.swing.SwingUtilities'"
// INTENTION_TEXT: "Import members from 'java.util.regex.Pattern'"
// WITH_RUNTIME
// ERROR: Unresolved reference: unresolved
import javax.swing.SwingUtilities
import javax.swing.SwingUtilities.*
import java.util.regex.Pattern
import java.util.regex.Pattern.*
fun foo() {
invokeLater { }
matches("", "")
val bottom = <caret>BOTTOM
val field = <caret>CASE_INSENSITIVE
invokeAndWait {
invokeLater { }
}
compile("")
val horizontal = HORIZONTAL
val fieldFqn = CASE_INSENSITIVE
SwingUtilities.unresolved
Pattern.unresolved
}
idea/testData/intentions/importAllMembers/UnresolvedMember.kt
Vendored
+2 -2
View File
@@ -2,6 +2,6 @@
// WITH_RUNTIME
// ERROR: Unresolved reference: unresolved
import javax.swing.SwingUtilities
import java.util.Objects
val v = <caret>SwingUtilities.unresolved()
val v = <caret>Objects.unresolved()