From 16bb0ed2142ce2a394b1bff9b6b29a4c82c8d0df Mon Sep 17 00:00:00 2001 From: Sergey Ignatov Date: Sun, 7 Oct 2018 10:40:52 +0100 Subject: [PATCH] fix test data finding for jvm.java tests in community configuration --- .../codeInspection/tests/java/NonNlsUastUtilTest.java | 2 +- .../tests/java/ScheduledForRemovalInspectionTest.kt | 4 +++- .../tests/java/StringToUpperWithoutLocaleInspectionTest.java | 2 +- .../codeInspection/tests/java/UastCallMatcherTest.java | 2 +- .../tests/java/UnstableApiUsageInspectionTest.kt | 4 +++- .../com/intellij/jvm/analysis/JvmAnalysisTestsUtil.java | 5 ++++- 6 files changed, 13 insertions(+), 6 deletions(-) diff --git a/jvm/jvm-analysis-java-tests/testSrc/com/intellij/codeInspection/tests/java/NonNlsUastUtilTest.java b/jvm/jvm-analysis-java-tests/testSrc/com/intellij/codeInspection/tests/java/NonNlsUastUtilTest.java index 77ba219638f2..7e2ac8d4ce6a 100644 --- a/jvm/jvm-analysis-java-tests/testSrc/com/intellij/codeInspection/tests/java/NonNlsUastUtilTest.java +++ b/jvm/jvm-analysis-java-tests/testSrc/com/intellij/codeInspection/tests/java/NonNlsUastUtilTest.java @@ -17,7 +17,7 @@ import static com.intellij.codeInspection.tests.JvmAnalysisTestsUastUtil.getUEle @TestDataPath("$CONTENT_ROOT/testData/codeInspection/nonNls") public class NonNlsUastUtilTest extends JavaCodeInsightFixtureTestCase { @Override - protected String getBasePath() { + protected String getTestDataPath() { return JvmAnalysisTestsUtil.TEST_DATA_PROJECT_RELATIVE_BASE_PATH + "/codeInspection/nonNls"; } diff --git a/jvm/jvm-analysis-java-tests/testSrc/com/intellij/codeInspection/tests/java/ScheduledForRemovalInspectionTest.kt b/jvm/jvm-analysis-java-tests/testSrc/com/intellij/codeInspection/tests/java/ScheduledForRemovalInspectionTest.kt index 56a861b89e28..f79b90094be2 100644 --- a/jvm/jvm-analysis-java-tests/testSrc/com/intellij/codeInspection/tests/java/ScheduledForRemovalInspectionTest.kt +++ b/jvm/jvm-analysis-java-tests/testSrc/com/intellij/codeInspection/tests/java/ScheduledForRemovalInspectionTest.kt @@ -6,7 +6,9 @@ import com.intellij.testFramework.TestDataPath @TestDataPath("/testData/codeInspection/scheduledForRemoval") class ScheduledForRemovalInspectionTest: ScheduledForRemovalInspectionTestBase() { - override fun getBasePath() = "${TEST_DATA_PROJECT_RELATIVE_BASE_PATH}/codeInspection/scheduledForRemoval" + override fun getBasePath() = "" + + override fun getTestDataPath() = "${TEST_DATA_PROJECT_RELATIVE_BASE_PATH}/codeInspection/scheduledForRemoval" fun testInspection() { getInspection().myIgnoreInsideImports = false diff --git a/jvm/jvm-analysis-java-tests/testSrc/com/intellij/codeInspection/tests/java/StringToUpperWithoutLocaleInspectionTest.java b/jvm/jvm-analysis-java-tests/testSrc/com/intellij/codeInspection/tests/java/StringToUpperWithoutLocaleInspectionTest.java index f6daf79eed86..998686394e2a 100644 --- a/jvm/jvm-analysis-java-tests/testSrc/com/intellij/codeInspection/tests/java/StringToUpperWithoutLocaleInspectionTest.java +++ b/jvm/jvm-analysis-java-tests/testSrc/com/intellij/codeInspection/tests/java/StringToUpperWithoutLocaleInspectionTest.java @@ -7,7 +7,7 @@ import com.intellij.testFramework.TestDataPath; @TestDataPath("$CONTENT_ROOT/testData/codeInspection/toUpperWithoutLocale") public class StringToUpperWithoutLocaleInspectionTest extends StringToUpperWithoutLocaleInspectionTestBase { @Override - protected String getBasePath() { + protected String getTestDataPath() { return JvmAnalysisTestsUtil.TEST_DATA_PROJECT_RELATIVE_BASE_PATH + "/codeInspection/toUpperWithoutLocale"; } diff --git a/jvm/jvm-analysis-java-tests/testSrc/com/intellij/codeInspection/tests/java/UastCallMatcherTest.java b/jvm/jvm-analysis-java-tests/testSrc/com/intellij/codeInspection/tests/java/UastCallMatcherTest.java index 86a94bc464b7..ca6fa47f393b 100644 --- a/jvm/jvm-analysis-java-tests/testSrc/com/intellij/codeInspection/tests/java/UastCallMatcherTest.java +++ b/jvm/jvm-analysis-java-tests/testSrc/com/intellij/codeInspection/tests/java/UastCallMatcherTest.java @@ -9,7 +9,7 @@ import com.intellij.testFramework.builders.JavaModuleFixtureBuilder; @TestDataPath("$CONTENT_ROOT/testData/codeInspection/uastCallMatcher") public class UastCallMatcherTest extends UastCallMatcherTestBase { @Override - protected String getBasePath() { + protected String getTestDataPath() { return JvmAnalysisTestsUtil.TEST_DATA_PROJECT_RELATIVE_BASE_PATH + "/codeInspection/uastCallMatcher"; } diff --git a/jvm/jvm-analysis-java-tests/testSrc/com/intellij/codeInspection/tests/java/UnstableApiUsageInspectionTest.kt b/jvm/jvm-analysis-java-tests/testSrc/com/intellij/codeInspection/tests/java/UnstableApiUsageInspectionTest.kt index f0b60d813c63..1b509c20d78d 100644 --- a/jvm/jvm-analysis-java-tests/testSrc/com/intellij/codeInspection/tests/java/UnstableApiUsageInspectionTest.kt +++ b/jvm/jvm-analysis-java-tests/testSrc/com/intellij/codeInspection/tests/java/UnstableApiUsageInspectionTest.kt @@ -7,7 +7,9 @@ import com.intellij.testFramework.TestDataPath @TestDataPath("/testData/codeInspection/unstableApiUsage") class UnstableApiUsageInspectionTest : UnstableApiUsageInspectionTestBase() { - override fun getBasePath() = "${TEST_DATA_PROJECT_RELATIVE_BASE_PATH}/codeInspection/unstableApiUsage" + override fun getBasePath() = "" + + override fun getTestDataPath() = "${TEST_DATA_PROJECT_RELATIVE_BASE_PATH}/codeInspection/unstableApiUsage" fun testInspection() { getInspection().myIgnoreInsideImports = false diff --git a/jvm/jvm-analysis-java-tests/testSrc/com/intellij/jvm/analysis/JvmAnalysisTestsUtil.java b/jvm/jvm-analysis-java-tests/testSrc/com/intellij/jvm/analysis/JvmAnalysisTestsUtil.java index f288b36b6744..c5fceb6655da 100644 --- a/jvm/jvm-analysis-java-tests/testSrc/com/intellij/jvm/analysis/JvmAnalysisTestsUtil.java +++ b/jvm/jvm-analysis-java-tests/testSrc/com/intellij/jvm/analysis/JvmAnalysisTestsUtil.java @@ -1,6 +1,9 @@ // Copyright 2000-2018 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file. package com.intellij.jvm.analysis; +import com.intellij.openapi.application.ex.PathManagerEx; + public final class JvmAnalysisTestsUtil { - public static final String TEST_DATA_PROJECT_RELATIVE_BASE_PATH = "/community/jvm/jvm-analysis-java-tests/testData"; + public static final String TEST_DATA_PROJECT_RELATIVE_BASE_PATH = + PathManagerEx.getCommunityHomePath() + "/jvm/jvm-analysis-java-tests/testData"; }