From 54d864bc4a1edce0b8f38ab97ac413bb5191eba6 Mon Sep 17 00:00:00 2001 From: Evgeny Gerashchenko Date: Thu, 7 Feb 2013 21:03:27 +0400 Subject: [PATCH] Simplified test a bit. --- .../{test => }/FinalJavaSupertype.before.kt | 0 .../jet/plugin/quickfix/FinalJavaSupertypeTest.java | 6 +++--- 2 files changed, 3 insertions(+), 3 deletions(-) rename idea/testData/quickfix/modifiers/finalSupertype/finalJavaSupertype/{test => }/FinalJavaSupertype.before.kt (100%) diff --git a/idea/testData/quickfix/modifiers/finalSupertype/finalJavaSupertype/test/FinalJavaSupertype.before.kt b/idea/testData/quickfix/modifiers/finalSupertype/finalJavaSupertype/FinalJavaSupertype.before.kt similarity index 100% rename from idea/testData/quickfix/modifiers/finalSupertype/finalJavaSupertype/test/FinalJavaSupertype.before.kt rename to idea/testData/quickfix/modifiers/finalSupertype/finalJavaSupertype/FinalJavaSupertype.before.kt diff --git a/idea/tests/org/jetbrains/jet/plugin/quickfix/FinalJavaSupertypeTest.java b/idea/tests/org/jetbrains/jet/plugin/quickfix/FinalJavaSupertypeTest.java index 65b55634d0d..d3a23ce73a9 100644 --- a/idea/tests/org/jetbrains/jet/plugin/quickfix/FinalJavaSupertypeTest.java +++ b/idea/tests/org/jetbrains/jet/plugin/quickfix/FinalJavaSupertypeTest.java @@ -19,7 +19,7 @@ package org.jetbrains.jet.plugin.quickfix; import com.intellij.openapi.vfs.VirtualFile; import com.intellij.psi.PsiDocumentManager; import com.intellij.testFramework.PsiTestUtil; -import org.jetbrains.jet.JetTestCaseBuilder; +import org.jetbrains.jet.plugin.PluginTestCaseBase; import org.jetbrains.jet.testing.LocalFileSystemUtils; public class FinalJavaSupertypeTest extends AbstractQuickFixMultiFileTest { @@ -31,7 +31,7 @@ public class FinalJavaSupertypeTest extends AbstractQuickFixMultiFileTest { } public void testFinalJavaSupertype() throws Exception { - String path = getTestDataPath() + "/../javaCode/"; + String path = getTestDataPath() + "javaCode/"; final VirtualFile rootDir = PsiTestUtil.createTestProjectStructure(myProject, myModule, path, myFilesToDelete, false); addSourceContentToRoots(myModule, rootDir); PsiDocumentManager.getInstance(myProject).commitAllDocuments(); @@ -40,6 +40,6 @@ public class FinalJavaSupertypeTest extends AbstractQuickFixMultiFileTest { @Override protected String getTestDataPath() { - return JetTestCaseBuilder.getHomeDirectory() + "/idea/testData/quickfix/modifiers/finalSupertype/" + getTestName(true) + "/test/"; + return PluginTestCaseBase.getTestDataPathBase() + "/quickfix/modifiers/finalSupertype/" + getTestName(true) + "/"; } }