From 4501adf5f1867e6a202f1e7eaec0158f76349f4f Mon Sep 17 00:00:00 2001 From: "Pavel V. Talanov" Date: Mon, 10 Feb 2014 18:57:49 +0400 Subject: [PATCH] AbstractInsertImportOnPasteTest: use test framework to create correct file structure for java files --- .../AbstractInsertImportOnPasteTest.java | 13 ++++++++++--- 1 file changed, 10 insertions(+), 3 deletions(-) diff --git a/idea/tests/org/jetbrains/jet/plugin/codeInsight/AbstractInsertImportOnPasteTest.java b/idea/tests/org/jetbrains/jet/plugin/codeInsight/AbstractInsertImportOnPasteTest.java index 572c0277b45..0d6c36f440d 100644 --- a/idea/tests/org/jetbrains/jet/plugin/codeInsight/AbstractInsertImportOnPasteTest.java +++ b/idea/tests/org/jetbrains/jet/plugin/codeInsight/AbstractInsertImportOnPasteTest.java @@ -125,9 +125,16 @@ public abstract class AbstractInsertImportOnPasteTest extends JetLightCodeInsigh }); } - private void configureByDependencyIfExists(@NotNull String dependencyFileName) { - if (new File(BASE_PATH + "/" + dependencyFileName).exists()) { - myFixture.configureByFile(dependencyFileName); + private void configureByDependencyIfExists(@NotNull String dependencyFileName) throws Exception { + File file = new File(BASE_PATH + "/" + dependencyFileName); + if (file.exists()) { + if (dependencyFileName.endsWith(".java")) { + //allow test framework to put it under right directory + myFixture.addClass(FileUtil.loadFile(file)); + } + else { + myFixture.configureByFile(dependencyFileName); + } } }