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

Fix importing classes/objects in tests with multiple files

Browse Source
This commit is contained in:
Pavel Punegov
2020-02-04 19:45:28 +03:00
committed by Pavel Punegov
parent 18d09c7d51
commit 3064ec0a65
1 changed files with 5 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
build-tools/src/main/groovy/org/jetbrains/kotlin/KonanTest.groovy
+5 -3
View File
@@ -370,11 +370,12 @@ class RunExternalTestGroup extends OldKonanTest {
def packagePattern = ~/(?m)^\s*package\s+(${fullQualified}*)/
def boxPattern = ~/(?m)fun\s+box\s*\(\s*\)/
def classPattern = ~/.*(class|object|enum)\s+(${identifier}*).*/
def classPattern = ~/.*(class|object|enum|interface)\s+(${identifier}*).*/
def sourceName = "_" + normalize(project.file(source).name)
def packages = new LinkedHashSet<String>()
def imports = []
def classes = []
def result = super.buildCompileList()
for (String filePath : result) {
@@ -416,8 +417,8 @@ class RunExternalTestGroup extends OldKonanTest {
int dotIdx = indexOf('.')
dotIdx > 0 ? substring(0, dotIdx) : it
}
if (packages.contains(subImport)) {
// add only to those who import packages from the test files
if (packages.contains(subImport) || classes.contains(subImport)) {
// add only to those who import packages or import classes from the test files
text = text.replaceFirst(~/${importRegex}${Pattern.quote(importStatement)}/,
"import $sourceName.$importStatement")
} else if (text =~ classPattern) {
@@ -425,6 +426,7 @@ class RunExternalTestGroup extends OldKonanTest {
def clsMatcher = (text =~ classPattern)
for (int j = 0; j < clsMatcher.count; j++) {
def cl = (text =~ classPattern)[j][2]
classes.add(cl)
if (subImport == cl) {
text = text.replaceFirst(~/${importRegex}${Pattern.quote(importStatement)}/,
"import $sourceName.$importStatement")