Tests for *intellij.jvm.analysis* moved to specific packages and Java-tests added to [JAVA_TESTS]

This commit is contained in:
Nicolay Mitropolsky
2018-08-22 18:25:35 +03:00
parent b17e6f08ec
commit 5c523507f9
13 changed files with 24 additions and 15 deletions
@@ -1,5 +1,5 @@
// 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.codeInspection;
package com.intellij.codeInspection.tests.java;
import com.intellij.codeInspection.blockingCallsDetection.BlockingMethodInNonBlockingContextInspection;
import com.intellij.openapi.application.ex.PathManagerEx;
@@ -1,4 +1,4 @@
package com.intellij.codeInspection;
package com.intellij.codeInspection.tests.java;
import com.intellij.jvm.analysis.JvmAnalysisTestsUtil;
import com.intellij.psi.PsiFile;
@@ -12,7 +12,7 @@ import org.jetbrains.uast.ULiteralExpression;
import java.util.Set;
import static com.intellij.codeInspection.NonNlsUastUtil.isNonNlsStringLiteral;
import static com.intellij.codeInspection.JvmAnalysisTestsUastUtil.getUElementsOfTypeFromFile;
import static com.intellij.codeInspection.tests.JvmAnalysisTestsUastUtil.getUElementsOfTypeFromFile;
@TestDataPath("$CONTENT_ROOT/testData/codeInspection/nonNls")
public class NonNlsUastUtilTest extends JavaCodeInsightFixtureTestCase {
@@ -1,5 +1,6 @@
package com.intellij.codeInspection;
package com.intellij.codeInspection.tests.java;
import com.intellij.codeInspection.tests.StringToUpperWithoutLocaleInspectionTestBase;
import com.intellij.jvm.analysis.JvmAnalysisTestsUtil;
import com.intellij.testFramework.TestDataPath;
@@ -1,5 +1,6 @@
package com.intellij.codeInspection;
package com.intellij.codeInspection.tests.java;
import com.intellij.codeInspection.tests.UastCallMatcherTestBase;
import com.intellij.jvm.analysis.JvmAnalysisTestsUtil;
import com.intellij.pom.java.LanguageLevel;
import com.intellij.testFramework.TestDataPath;
@@ -1,6 +1,7 @@
// 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.codeInspection
package com.intellij.codeInspection.tests.java
import com.intellij.codeInspection.tests.UnstableApiUsageInspectionTestBase
import com.intellij.jvm.analysis.JvmAnalysisTestsUtil.TEST_DATA_PROJECT_RELATIVE_BASE_PATH
import com.intellij.testFramework.TestDataPath
@@ -1,4 +1,4 @@
package com.intellij.codeInspection;
package com.intellij.codeInspection.tests.kotlin;
import com.intellij.jvm.analysis.JvmAnalysisKtTestsUtil;
import com.intellij.psi.PsiFile;
@@ -13,8 +13,8 @@ import org.junit.Assume;
import java.util.Set;
import static com.intellij.codeInspection.JvmAnalysisTestsUastUtil.getUElementsOfTypeFromFile;
import static com.intellij.codeInspection.NonNlsUastUtil.isNonNlsStringLiteral;
import static com.intellij.codeInspection.tests.JvmAnalysisTestsUastUtil.getUElementsOfTypeFromFile;
@TestDataPath("$CONTENT_ROOT/testData/codeInspection/nonNls")
public class KtNonNlsUastUtilTest extends JavaCodeInsightFixtureTestCase {
@@ -1,5 +1,6 @@
package com.intellij.codeInspection;
package com.intellij.codeInspection.tests.kotlin;
import com.intellij.codeInspection.tests.UastCallMatcherTestBase;
import com.intellij.jvm.analysis.JvmAnalysisKtTestsUtil;
import com.intellij.openapi.application.PathManager;
import com.intellij.testFramework.TestDataPath;
@@ -1,6 +1,7 @@
// 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.codeInspection
package com.intellij.codeInspection.tests.kotlin
import com.intellij.codeInspection.tests.UnstableApiUsageInspectionTestBase
import com.intellij.jvm.analysis.JvmAnalysisKtTestsUtil.TEST_DATA_PROJECT_RELATIVE_BASE_PATH
import com.intellij.openapi.vfs.VirtualFileFilter
import com.intellij.testFramework.TestDataPath
@@ -1,4 +1,4 @@
package com.intellij.codeInspection;
package com.intellij.codeInspection.tests;
import com.intellij.psi.PsiElement;
import com.intellij.psi.PsiFile;
@@ -1,5 +1,6 @@
package com.intellij.codeInspection;
package com.intellij.codeInspection.tests;
import com.intellij.codeInspection.StringToUpperWithoutLocale2Inspection;
import com.intellij.pom.java.LanguageLevel;
import com.intellij.testFramework.IdeaTestUtil;
import com.intellij.testFramework.builders.JavaModuleFixtureBuilder;
@@ -1,5 +1,6 @@
package com.intellij.codeInspection;
package com.intellij.codeInspection.tests;
import com.intellij.codeInspection.UastCallMatcher;
import com.intellij.psi.PsiFile;
import com.intellij.testFramework.IdeaTestUtil;
import com.intellij.testFramework.TestDataFile;
@@ -14,8 +15,8 @@ import org.jetbrains.uast.UastCallKind;
import java.util.Locale;
import java.util.Set;
import static com.intellij.codeInspection.JvmAnalysisTestsUastUtil.getUElementsOfTypeFromFile;
import static com.intellij.codeInspection.UastCallMatcher.builder;
import static com.intellij.codeInspection.tests.JvmAnalysisTestsUastUtil.getUElementsOfTypeFromFile;
public abstract class UastCallMatcherTestBase extends JavaCodeInsightFixtureTestCase {
@Override
@@ -1,6 +1,7 @@
// 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.codeInspection
package com.intellij.codeInspection.tests
import com.intellij.codeInspection.UnstableApiUsageInspection
import com.intellij.testFramework.builders.JavaModuleFixtureBuilder
import com.intellij.testFramework.fixtures.JavaCodeInsightFixtureTestCase
import com.intellij.util.PathUtil
@@ -123,6 +123,7 @@ com.intellij.*.*GuiTestSuite
[JAVA_TESTS]
com.intellij.java.*
org.jetbrains.uast.test.java.*
com.intellij.codeInspection.tests.java.*
com.siyeh.*
-com.intellij.javaee.*
-com.intellij.javascript.*