More usages for getTestRoots method

This commit is contained in:
Nikolay Krasko
2015-12-18 19:02:17 +03:00
parent 2c1bf4dbd9
commit 01095bc652
3 changed files with 4 additions and 11 deletions
@@ -833,9 +833,7 @@ public class KotlinTestUtils {
@NotNull File testDataDir, @NotNull File testDataDir,
@NotNull final Pattern filenamePattern @NotNull final Pattern filenamePattern
) { ) {
TestMetadata testClassMetadata = testCaseClass.getAnnotation(TestMetadata.class); final File rootFile = new File(getTestsRoot(testCaseClass));
Assert.assertNotNull("No metadata for class: " + testCaseClass, testClassMetadata);
final File rootFile = new File(testClassMetadata.value());
final Set<String> filePaths = collectPathsMetadata(testCaseClass); final Set<String> filePaths = collectPathsMetadata(testCaseClass);
@@ -32,8 +32,8 @@ import org.jetbrains.annotations.NotNull;
import org.jetbrains.annotations.Nullable; import org.jetbrains.annotations.Nullable;
import org.jetbrains.kotlin.idea.test.KotlinLightCodeInsightFixtureTestCase; import org.jetbrains.kotlin.idea.test.KotlinLightCodeInsightFixtureTestCase;
import org.jetbrains.kotlin.test.InTextDirectivesUtils; import org.jetbrains.kotlin.test.InTextDirectivesUtils;
import org.jetbrains.kotlin.test.KotlinTestUtils;
import org.jetbrains.kotlin.test.ReferenceUtils; import org.jetbrains.kotlin.test.ReferenceUtils;
import org.jetbrains.kotlin.test.TestMetadata;
import org.junit.Assert; import org.junit.Assert;
import java.util.ArrayList; import java.util.ArrayList;
@@ -55,9 +55,7 @@ public abstract class AbstractKotlinGotoTest extends KotlinLightCodeInsightFixtu
@Override @Override
protected void setUp() { protected void setUp() {
TestMetadata annotation = getClass().getAnnotation(TestMetadata.class); dirPath = KotlinTestUtils.getTestsRoot(getClass());
dirPath = annotation.value();
super.setUp(); super.setUp();
} }
@@ -45,8 +45,6 @@ import org.apache.commons.lang.SystemUtils;
import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.NotNull;
import org.jetbrains.annotations.Nullable; import org.jetbrains.annotations.Nullable;
import org.jetbrains.kotlin.idea.KotlinLightQuickFixTestCase; 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.quickfix.utils.QuickfixTestUtilsKt;
import org.jetbrains.kotlin.idea.test.ConfigLibraryUtil; import org.jetbrains.kotlin.idea.test.ConfigLibraryUtil;
import org.jetbrains.kotlin.idea.test.DirectiveBasedActionUtils; 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.psi.KtFile;
import org.jetbrains.kotlin.test.InTextDirectivesUtils; import org.jetbrains.kotlin.test.InTextDirectivesUtils;
import org.jetbrains.kotlin.test.KotlinTestUtils; import org.jetbrains.kotlin.test.KotlinTestUtils;
import org.jetbrains.kotlin.test.TestMetadata;
import org.junit.Assert; import org.junit.Assert;
import java.io.File; import java.io.File;
@@ -308,7 +305,7 @@ public abstract class AbstractQuickFixTest extends KotlinLightQuickFixTestCase {
@Override @Override
protected String getBasePath() { protected String getBasePath() {
return getClass().getAnnotation(TestMetadata.class).value(); return KotlinTestUtils.getTestsRoot(getClass());
} }
@NotNull @NotNull