From 01095bc65257f399a97768e1f0f9ae7d31144a23 Mon Sep 17 00:00:00 2001
From: Nikolay Krasko <nikolay.krasko@jetbrains.com>
Date: Fri, 18 Dec 2015 19:02:17 +0300
Subject: [PATCH] More usages for getTestRoots method

---
 .../tests/org/jetbrains/kotlin/test/KotlinTestUtils.java    | 4 +---
 .../kotlin/idea/navigation/AbstractKotlinGotoTest.java      | 6 ++----
 .../kotlin/idea/quickfix/AbstractQuickFixTest.java          | 5 +----
 3 files changed, 4 insertions(+), 11 deletions(-)

diff --git a/compiler/tests/org/jetbrains/kotlin/test/KotlinTestUtils.java b/compiler/tests/org/jetbrains/kotlin/test/KotlinTestUtils.java
index ee7203864d9..3731e20caf6 100644
--- a/compiler/tests/org/jetbrains/kotlin/test/KotlinTestUtils.java
+++ b/compiler/tests/org/jetbrains/kotlin/test/KotlinTestUtils.java
@@ -833,9 +833,7 @@ public class KotlinTestUtils {
             @NotNull File testDataDir,
             @NotNull final Pattern filenamePattern
     ) {
-        TestMetadata testClassMetadata = testCaseClass.getAnnotation(TestMetadata.class);
-        Assert.assertNotNull("No metadata for class: " + testCaseClass, testClassMetadata);
-        final File rootFile = new File(testClassMetadata.value());
+        final File rootFile = new File(getTestsRoot(testCaseClass));
 
         final Set<String> filePaths = collectPathsMetadata(testCaseClass);
 
diff --git a/idea/tests/org/jetbrains/kotlin/idea/navigation/AbstractKotlinGotoTest.java b/idea/tests/org/jetbrains/kotlin/idea/navigation/AbstractKotlinGotoTest.java
index c9b32b5efd7..279f6ac01a8 100644
--- a/idea/tests/org/jetbrains/kotlin/idea/navigation/AbstractKotlinGotoTest.java
+++ b/idea/tests/org/jetbrains/kotlin/idea/navigation/AbstractKotlinGotoTest.java
@@ -32,8 +32,8 @@ import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
 import org.jetbrains.kotlin.idea.test.KotlinLightCodeInsightFixtureTestCase;
 import org.jetbrains.kotlin.test.InTextDirectivesUtils;
+import org.jetbrains.kotlin.test.KotlinTestUtils;
 import org.jetbrains.kotlin.test.ReferenceUtils;
-import org.jetbrains.kotlin.test.TestMetadata;
 import org.junit.Assert;
 
 import java.util.ArrayList;
@@ -55,9 +55,7 @@ public abstract class AbstractKotlinGotoTest extends KotlinLightCodeInsightFixtu
 
     @Override
     protected void setUp() {
-        TestMetadata annotation = getClass().getAnnotation(TestMetadata.class);
-        dirPath = annotation.value();
-
+        dirPath = KotlinTestUtils.getTestsRoot(getClass());
         super.setUp();
     }
 
diff --git a/idea/tests/org/jetbrains/kotlin/idea/quickfix/AbstractQuickFixTest.java b/idea/tests/org/jetbrains/kotlin/idea/quickfix/AbstractQuickFixTest.java
index b7493a92055..55b153c48c1 100644
--- a/idea/tests/org/jetbrains/kotlin/idea/quickfix/AbstractQuickFixTest.java
+++ b/idea/tests/org/jetbrains/kotlin/idea/quickfix/AbstractQuickFixTest.java
@@ -45,8 +45,6 @@ import org.apache.commons.lang.SystemUtils;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
 import org.jetbrains.kotlin.idea.KotlinLightQuickFixTestCase;
-import org.jetbrains.kotlin.idea.inspections.KotlinUnusedImportInspection;
-import org.jetbrains.kotlin.idea.intentions.IfNullToElvisInspection;
 import org.jetbrains.kotlin.idea.quickfix.utils.QuickfixTestUtilsKt;
 import org.jetbrains.kotlin.idea.test.ConfigLibraryUtil;
 import org.jetbrains.kotlin.idea.test.DirectiveBasedActionUtils;
@@ -54,7 +52,6 @@ import org.jetbrains.kotlin.idea.test.PluginTestCaseBase;
 import org.jetbrains.kotlin.psi.KtFile;
 import org.jetbrains.kotlin.test.InTextDirectivesUtils;
 import org.jetbrains.kotlin.test.KotlinTestUtils;
-import org.jetbrains.kotlin.test.TestMetadata;
 import org.junit.Assert;
 
 import java.io.File;
@@ -308,7 +305,7 @@ public abstract class AbstractQuickFixTest extends KotlinLightQuickFixTestCase {
 
     @Override
     protected String getBasePath() {
-        return getClass().getAnnotation(TestMetadata.class).value();
+        return KotlinTestUtils.getTestsRoot(getClass());
     }
 
     @NotNull