diff --git a/kotlin-native/backend.native/tests/stdlib_external/utils.kt b/kotlin-native/backend.native/tests/stdlib_external/utils.kt index 984da44bba5..d613b8767b1 100644 --- a/kotlin-native/backend.native/tests/stdlib_external/utils.kt +++ b/kotlin-native/backend.native/tests/stdlib_external/utils.kt @@ -20,8 +20,6 @@ public actual val TestPlatform.Companion.current: TestPlatform get() = TestPlatf public actual val isFloat32RangeEnforced: Boolean get() = true -public actual val supportsNamedCapturingGroup: Boolean get() = true - public actual val supportsOctalLiteralInRegex: Boolean get() = true public actual val supportsEscapeAnyCharInRegex: Boolean get() = true diff --git a/libraries/stdlib/common/test/testUtils.kt b/libraries/stdlib/common/test/testUtils.kt index 34c239f24e2..b4138967138 100644 --- a/libraries/stdlib/common/test/testUtils.kt +++ b/libraries/stdlib/common/test/testUtils.kt @@ -9,8 +9,6 @@ public expect fun assertTypeEquals(expected: Any?, actual: Any?) public expect val isFloat32RangeEnforced: Boolean -public expect val supportsNamedCapturingGroup: Boolean - public expect val supportsOctalLiteralInRegex: Boolean public expect val supportsEscapeAnyCharInRegex: Boolean diff --git a/libraries/stdlib/jdk7/build.gradle b/libraries/stdlib/jdk7/build.gradle index 7bb69c6ad7e..6f3a1dfa2a6 100644 --- a/libraries/stdlib/jdk7/build.gradle +++ b/libraries/stdlib/jdk7/build.gradle @@ -53,10 +53,6 @@ compileKotlin { compileTestKotlin { } -tasks.withType(Test) { - systemProperty("supportsNamedCapturingGroup", false) -} - configureFrontendIr(project) LibrariesCommon.configureJava9Compilation(project, 'kotlin.stdlib.jdk7') diff --git a/libraries/stdlib/js/test/core/testUtils.kt b/libraries/stdlib/js/test/core/testUtils.kt index 0a5f63af950..b829856a846 100644 --- a/libraries/stdlib/js/test/core/testUtils.kt +++ b/libraries/stdlib/js/test/core/testUtils.kt @@ -17,8 +17,6 @@ public actual val TestPlatform.Companion.current: TestPlatform get() = TestPlatf // TODO: should be true at least in JS IR after implementing KT-24975 public actual val isFloat32RangeEnforced: Boolean = false -public actual val supportsNamedCapturingGroup: Boolean get() = true - public actual val supportsOctalLiteralInRegex: Boolean get() = false public actual val supportsEscapeAnyCharInRegex: Boolean get() = false diff --git a/libraries/stdlib/jvm/test/testUtilsJVM.kt b/libraries/stdlib/jvm/test/testUtilsJVM.kt index d1cf01c2bb4..236ca471b57 100644 --- a/libraries/stdlib/jvm/test/testUtilsJVM.kt +++ b/libraries/stdlib/jvm/test/testUtilsJVM.kt @@ -19,9 +19,6 @@ public fun platformNull() = Collections.singletonList(null as T).first() public actual val isFloat32RangeEnforced: Boolean = true -public actual val supportsNamedCapturingGroup: Boolean - get() = System.getProperty("supportsNamedCapturingGroup")?.toBooleanStrict() ?: true - public actual val supportsOctalLiteralInRegex: Boolean get() = true public actual val supportsEscapeAnyCharInRegex: Boolean get() = true diff --git a/libraries/stdlib/test/text/RegexTest.kt b/libraries/stdlib/test/text/RegexTest.kt index 10dc9891f7c..08584a96050 100644 --- a/libraries/stdlib/test/text/RegexTest.kt +++ b/libraries/stdlib/test/text/RegexTest.kt @@ -8,7 +8,6 @@ package test.text import test.regexSplitUnicodeCodePointHandling -import test.supportsNamedCapturingGroup import test.supportsOctalLiteralInRegex import test.supportsEscapeAnyCharInRegex import test.BackReferenceHandling @@ -174,8 +173,6 @@ class RegexTest { } @Test fun matchNamedGroups() { - if (!supportsNamedCapturingGroup) return - val regex = "\\b(?[A-Za-z\\s]+),\\s(?[A-Z]{2}):\\s(?[0-9]{3})\\b".toRegex() val input = "Coordinates: Austin, TX: 123" @@ -190,16 +187,12 @@ class RegexTest { } @Test fun matchDuplicateGroupName() { - if (!supportsNamedCapturingGroup) return - // should fail with IllegalArgumentException, but JS fails with SyntaxError assertFails { "(?hi)|(?bye)".toRegex() } assertFails { "(?\\d+)-(?\\d+)".toRegex() } } @Test fun matchOptionalNamedGroup() { - if (!supportsNamedCapturingGroup) return - "(?hi)|(?bye)".toRegex(RegexOption.IGNORE_CASE).let { regex -> val hiMatch = regex.find("Hi!")!! val hiGroups = hiMatch.groups @@ -278,8 +271,6 @@ class RegexTest { } @Test fun matchNamedGroupsWithBackReference() { - if (!supportsNamedCapturingGroup) return - "(?\\w+), yes \\k<title>".toRegex().let { regex -> val match = regex.find("Do you copy? Sir, yes Sir!")!! assertEquals("Sir, yes Sir", match.value) @@ -313,8 +304,6 @@ class RegexTest { } @Test fun invalidNamedGroupDeclaration() { - if (!supportsNamedCapturingGroup) return - // should fail with IllegalArgumentException, but JS fails with SyntaxError assertFails { @@ -467,8 +456,6 @@ class RegexTest { } @Test fun replaceWithNamedGroups() { - if (!supportsNamedCapturingGroup) return - val pattern = Regex("(?<first>\\d+)-(?<second>\\d+)") "123-456".let { input -> @@ -499,8 +486,6 @@ class RegexTest { } @Test fun replaceWithNamedOptionalGroups() { - if (!supportsNamedCapturingGroup) return - val regex = "(?<hi>hi)|(?<bye>bye)".toRegex(RegexOption.IGNORE_CASE) assertEquals("[Hi, ]gh wall", regex.replace("High wall", "[$1, $2]")) diff --git a/libraries/stdlib/wasm/test/testUtils.kt b/libraries/stdlib/wasm/test/testUtils.kt index 1ff3e8f07dc..7f60d75bbac 100644 --- a/libraries/stdlib/wasm/test/testUtils.kt +++ b/libraries/stdlib/wasm/test/testUtils.kt @@ -17,8 +17,6 @@ public actual val TestPlatform.Companion.current: TestPlatform get() = TestPlatf // TODO: See KT-24975 public actual val isFloat32RangeEnforced: Boolean = false -public actual val supportsNamedCapturingGroup: Boolean get() = true - public actual val supportsOctalLiteralInRegex: Boolean get() = true public actual val supportsEscapeAnyCharInRegex: Boolean get() = true