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

Update MockJDK to include Pattern.class required in tests for #KT-7732

Browse Source
This commit is contained in:
Ilya Gorbunov
2015-10-06 20:50:02 +03:00
parent 4ae2491ab6
commit 7ff0e140f0
4 changed files with 3 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/testData/mockJDK/jre/lib/rt.jar
Vendored
BIN
View File
Binary file not shown.
compiler/testData/mockJDK/src.zip
Vendored
BIN
View File
Binary file not shown.
generators/src/org/jetbrains/kotlin/generators/mockJDK/GenerateMockJdk.java
+1
View File
@@ -254,6 +254,7 @@ public class GenerateMockJdk {
"java/util/Properties.class", "java/util/Properties.class",
"java/util/Random.class", "java/util/Random.class",
"java/util/RandomAccess.class", "java/util/RandomAccess.class",
"java/util/regex/Pattern.class",
"java/util/Objects.class", "java/util/Objects.class",
"java/util/Set.class", "java/util/Set.class",
"java/util/SortedMap.class", "java/util/SortedMap.class",
j2k/testData/fileOrElement/methodCallExpression/stringMethods.kt
Vendored
+2 -9
View File
@@ -1,10 +1,3 @@
// ERROR: Overload resolution ambiguity: public fun kotlin.String.split(regex: [ERROR : java.util.regex.Pattern], limit: kotlin.Int = ...): kotlin.List<kotlin.String> defined in kotlin public fun kotlin.String.split(pattern: kotlin.text.Regex, limit: kotlin.Int = ...): kotlin.List<kotlin.String> defined in kotlin
// ERROR: Unresolved reference: it
// ERROR: Overload resolution ambiguity: public fun kotlin.String.split(regex: [ERROR : java.util.regex.Pattern], limit: kotlin.Int = ...): kotlin.List<kotlin.String> defined in kotlin public fun kotlin.String.split(pattern: kotlin.text.Regex, limit: kotlin.Int = ...): kotlin.List<kotlin.String> defined in kotlin
// ERROR: Unresolved reference: it
// ERROR: Overload resolution ambiguity: public fun kotlin.String.split(regex: [ERROR : java.util.regex.Pattern], limit: kotlin.Int = ...): kotlin.List<kotlin.String> defined in kotlin public fun kotlin.String.split(pattern: kotlin.text.Regex, limit: kotlin.Int = ...): kotlin.List<kotlin.String> defined in kotlin
// ERROR: Overload resolution ambiguity: public fun kotlin.String.split(regex: [ERROR : java.util.regex.Pattern], limit: kotlin.Int = ...): kotlin.List<kotlin.String> defined in kotlin public fun kotlin.String.split(pattern: kotlin.text.Regex, limit: kotlin.Int = ...): kotlin.List<kotlin.String> defined in kotlin
// ERROR: Overload resolution ambiguity: public fun kotlin.String.split(regex: [ERROR : java.util.regex.Pattern], limit: kotlin.Int = ...): kotlin.List<kotlin.String> defined in kotlin public fun kotlin.String.split(pattern: kotlin.text.Regex, limit: kotlin.Int = ...): kotlin.List<kotlin.String> defined in kotlin
import java.nio.charset.Charset import java.nio.charset.Charset
import java.util.* import java.util.*
@@ -84,8 +77,8 @@ internal class A {
s.matches("\\w+".toRegex()) s.matches("\\w+".toRegex())
s.replace("\\w+".toRegex(), "---") s.replace("\\w+".toRegex(), "---")
s.replaceFirst("([s-t])".toRegex(), "A$1") s.replaceFirst("([s-t])".toRegex(), "A$1")
useSplit(s.split("\\s+".toRegex()).dropLastWhile({ it.isEmpty() }).toTypedArray()) useSplit(s.split("\\s+".toRegex()).dropLastWhile { it.isEmpty() }.toTypedArray())
useSplit(s.split("\\s+".toRegex()).dropLastWhile({ it.isEmpty() }).toTypedArray()) useSplit(s.split("\\s+".toRegex()).dropLastWhile { it.isEmpty() }.toTypedArray())
useSplit(s.split("\\s+".toRegex()).toTypedArray()) useSplit(s.split("\\s+".toRegex()).toTypedArray())
useSplit(s.split("\\s+".toRegex(), 2).toTypedArray()) useSplit(s.split("\\s+".toRegex(), 2).toTypedArray())
val limit = 5 val limit = 5