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

Apply common header directives to second file in AbstractCompileKotlinAgainstKotlinTest

Browse Source
This commit is contained in:
Mikhael Bogdanov
2017-12-18 12:27:20 +01:00
parent 819a3a95b3
commit ef433d163e
1 changed files with 3 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/tests-common/tests/org/jetbrains/kotlin/codegen/AbstractCompileKotlinAgainstKotlinTest.java
+3 -1
View File
@@ -20,6 +20,7 @@ import com.google.common.collect.Lists;
import com.intellij.openapi.Disposable; import com.intellij.openapi.Disposable;
import com.intellij.openapi.util.Disposer; import com.intellij.openapi.util.Disposer;
import kotlin.Pair; import kotlin.Pair;
import kotlin.text.StringsKt;
import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.NotNull;
import org.jetbrains.annotations.Nullable; import org.jetbrains.annotations.Nullable;
import org.jetbrains.kotlin.cli.common.modules.ModuleBuilder; import org.jetbrains.kotlin.cli.common.modules.ModuleBuilder;
@@ -113,10 +114,11 @@ public abstract class AbstractCompileKotlinAgainstKotlinTest extends CodegenTest
@NotNull @NotNull
private ClassFileFactory compileB(@NotNull TestFile testFile, List<TestFile> files) throws IOException { private ClassFileFactory compileB(@NotNull TestFile testFile, List<TestFile> files) throws IOException {
String commonHeader = StringsKt.substringBefore(files.get(0).content, "FILE:", "");
CompilerConfiguration configurationWithADirInClasspath = CompilerConfiguration configurationWithADirInClasspath =
createConfiguration(ConfigurationKind.ALL, getJdkKind(files), createConfiguration(ConfigurationKind.ALL, getJdkKind(files),
Lists.newArrayList(KotlinTestUtils.getAnnotationsJar(), aDir), Lists.newArrayList(KotlinTestUtils.getAnnotationsJar(), aDir),
Collections.emptyList(), Collections.singletonList(testFile)); Collections.emptyList(), Lists.newArrayList(testFile, new TestFile("header", commonHeader)));
Disposable compileDisposable = createDisposable("compileB"); Disposable compileDisposable = createDisposable("compileB");
KotlinCoreEnvironment environment = KotlinCoreEnvironment.createForTests( KotlinCoreEnvironment environment = KotlinCoreEnvironment.createForTests(