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

Minor, deduplicate code in CodegenTestCase.doTest

Browse Source
This commit is contained in:
Alexander Udalov
2019-03-29 15:56:39 +01:00
parent 1c1ff3e2b2
commit 648ed92ba3
1 changed files with 7 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/tests-common/tests/org/jetbrains/kotlin/codegen/CodegenTestCase.java
+7 -10
View File
@@ -785,24 +785,21 @@ public abstract class CodegenTestCase extends KtUsefulTestCase {
protected void doTest(String filePath) throws Exception { protected void doTest(String filePath) throws Exception {
File file = new File(filePath); File file = new File(filePath);
String expectedText = KotlinTestUtils.doLoadFile(file);
Ref<File> javaFilesDir = Ref.create(); Ref<File> javaFilesDir = Ref.create();
List<TestFile> testFiles = createTestFiles(file, expectedText, javaFilesDir, ""); String expectedText = KotlinTestUtils.doLoadFile(file);
if (!coroutinesPackage.isEmpty()) {
expectedText = expectedText.replace("COROUTINES_PACKAGE", coroutinesPackage);
}
List<TestFile> testFiles = createTestFiles(file, expectedText, javaFilesDir, coroutinesPackage);
doMultiFileTest(file, testFiles, javaFilesDir.get()); doMultiFileTest(file, testFiles, javaFilesDir.get());
} }
protected void doTestWithCoroutinesPackageReplacement(String filePath, String packageName) throws Exception { protected void doTestWithCoroutinesPackageReplacement(String filePath, String packageName) throws Exception {
File file = new File(filePath);
String expectedText = KotlinTestUtils.doLoadFile(file);
expectedText = expectedText.replace("COROUTINES_PACKAGE", packageName);
this.coroutinesPackage = packageName; this.coroutinesPackage = packageName;
Ref<File> javaFilesDir = Ref.create(); doTest(filePath);
List<TestFile> testFiles = createTestFiles(file, expectedText, javaFilesDir, coroutinesPackage);
doMultiFileTest(file, testFiles, javaFilesDir.get());
} }
@NotNull @NotNull