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

Remove LANGUAGE_VERSION from compileKotlinAgainstKotlin tests

Browse Source 
Support test directives not at the beginning of the test file for
multi-file tests where separate files need separate language features
This commit is contained in:
Alexander Udalov
2018-12-18 16:47:28 +01:00
parent ec2dd58165
commit a0a70dd60d
9 changed files with 9 additions and 59 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/tests-common/tests/org/jetbrains/kotlin/test/KotlinTestUtils.java
-5
View File
@@ -842,16 +842,11 @@ public class KotlinTestUtils {
public static Map<String, String> parseDirectives(String expectedText) {
Map<String, String> directives = new HashMap<>();
Matcher directiveMatcher = DIRECTIVE_PATTERN.matcher(expectedText);
int start = 0;
while (directiveMatcher.find()) {
if (directiveMatcher.start() != start) {
Assert.fail("Directives should only occur at the beginning of a file: " + directiveMatcher.group());
}
String name = directiveMatcher.group(1);
String value = directiveMatcher.group(3);
String oldValue = directives.put(name, value);
Assert.assertNull("Directive overwritten: " + name + " old value: " + oldValue + " new value: " + value, oldValue);
start = directiveMatcher.end() + 1;
}
return directives;
}
compiler/tests-common/tests/org/jetbrains/kotlin/test/KotlinTestUtils.java.173
-5
View File
@@ -838,16 +838,11 @@ public class KotlinTestUtils {
public static Map<String, String> parseDirectives(String expectedText) {
Map<String, String> directives = new HashMap<>();
Matcher directiveMatcher = DIRECTIVE_PATTERN.matcher(expectedText);
int start = 0;
while (directiveMatcher.find()) {
if (directiveMatcher.start() != start) {
Assert.fail("Directives should only occur at the beginning of a file: " + directiveMatcher.group());
}
String name = directiveMatcher.group(1);
String value = directiveMatcher.group(3);
String oldValue = directives.put(name, value);
Assert.assertNull("Directive overwritten: " + name + " old value: " + oldValue + " new value: " + value, oldValue);
start = directiveMatcher.end() + 1;
}
return directives;
}
compiler/tests-common/tests/org/jetbrains/kotlin/test/KotlinTestUtils.java.as31
-5
View File
@@ -838,16 +838,11 @@ public class KotlinTestUtils {
public static Map<String, String> parseDirectives(String expectedText) {
Map<String, String> directives = new HashMap<>();
Matcher directiveMatcher = DIRECTIVE_PATTERN.matcher(expectedText);
int start = 0;
while (directiveMatcher.find()) {
if (directiveMatcher.start() != start) {
Assert.fail("Directives should only occur at the beginning of a file: " + directiveMatcher.group());
}
String name = directiveMatcher.group(1);
String value = directiveMatcher.group(3);
String oldValue = directives.put(name, value);
Assert.assertNull("Directive overwritten: " + name + " old value: " + oldValue + " new value: " + value, oldValue);
start = directiveMatcher.end() + 1;
}
return directives;
}
compiler/tests-common/tests/org/jetbrains/kotlin/test/KotlinTestUtils.java.as32
-5
View File
@@ -838,16 +838,11 @@ public class KotlinTestUtils {
public static Map<String, String> parseDirectives(String expectedText) {
Map<String, String> directives = new HashMap<>();
Matcher directiveMatcher = DIRECTIVE_PATTERN.matcher(expectedText);
int start = 0;
while (directiveMatcher.find()) {
if (directiveMatcher.start() != start) {
Assert.fail("Directives should only occur at the beginning of a file: " + directiveMatcher.group());
}
String name = directiveMatcher.group(1);
String value = directiveMatcher.group(3);
String oldValue = directives.put(name, value);
Assert.assertNull("Directive overwritten: " + name + " old value: " + oldValue + " new value: " + value, oldValue);
start = directiveMatcher.end() + 1;
}
return directives;
}