From 4eea2ea76ae40cc228b4e262c5255f8c37397a4a Mon Sep 17 00:00:00 2001 From: Damien Urruty Date: Tue, 25 May 2021 11:30:37 +0200 Subject: [PATCH] Delete a medium test The test will be moved to clients, because we don't want to depend on an unreleased version of python --- core/pom.xml | 2 +- .../StandaloneIssueMediumTests.java | 24 ------------------- .../sonarlint/core/util/PluginLocator.java | 2 +- 3 files changed, 2 insertions(+), 26 deletions(-) diff --git a/core/pom.xml b/core/pom.xml index f032cec599..bfaf6e5f84 100644 --- a/core/pom.xml +++ b/core/pom.xml @@ -273,7 +273,7 @@ org.sonarsource.python sonar-python-plugin - 3.5.0.8200 + 1.14.0.3086 jar diff --git a/core/src/test/java/org/sonarsource/sonarlint/core/mediumtest/StandaloneIssueMediumTests.java b/core/src/test/java/org/sonarsource/sonarlint/core/mediumtest/StandaloneIssueMediumTests.java index 145e137a36..fcb7a42b56 100644 --- a/core/src/test/java/org/sonarsource/sonarlint/core/mediumtest/StandaloneIssueMediumTests.java +++ b/core/src/test/java/org/sonarsource/sonarlint/core/mediumtest/StandaloneIssueMediumTests.java @@ -873,30 +873,6 @@ void stop_module_should_stop_the_module_container() { assertThat(moduleContainer.getPicoContainer().getLifecycleState().isStarted()).isFalse(); } - @Test - void python_symbol_table_should_bring_cross_file_issues() throws IOException { - ClientInputFile mainFile = prepareInputFile("main.py", - "from mod import add\n" - + "def main():\n" - + " add(1, 2)\n" - + " add(1)\n", - false); - ClientInputFile moduleFile = prepareInputFile("mod.py", - "def add(a, b): return a+b", - false); - sonarlint.declareModule(new ModuleInfo("key", aClientFileSystemWith(mainFile, moduleFile))); - - final List issues = new ArrayList<>(); - sonarlint.analyze(StandaloneAnalysisConfiguration.builder() - .setBaseDir(baseDir.toPath()) - .addInputFile(mainFile) - .setModuleKey("key") - .build(), issues::add, null, null); - - assertThat(issues).extracting(Issue::getRuleKey, Issue::getStartLine, i -> i.getInputFile().relativePath()) - .containsExactly(tuple("python:S930", 4, "main.py")); - } - private ClientInputFile prepareInputFile(String relativePath, String content, final boolean isTest, Charset encoding, @Nullable Language language) throws IOException { final File file = new File(baseDir, relativePath); FileUtils.write(file, content, encoding); diff --git a/core/src/test/java/org/sonarsource/sonarlint/core/util/PluginLocator.java b/core/src/test/java/org/sonarsource/sonarlint/core/util/PluginLocator.java index 15f98a902d..8ec7e10c8c 100644 --- a/core/src/test/java/org/sonarsource/sonarlint/core/util/PluginLocator.java +++ b/core/src/test/java/org/sonarsource/sonarlint/core/util/PluginLocator.java @@ -34,7 +34,7 @@ public class PluginLocator { public static final String SONAR_JAVASCRIPT_PLUGIN_JAR_HASH = "2fab92be44e07f1d367f891a55258736"; public static final String SONAR_XOO_PLUGIN_NAME = "sonar-xoo-plugin"; public static final String SONAR_PHP_PLUGIN_JAR = "sonar-php-plugin-3.2.0.4868.jar"; - public static final String SONAR_PYTHON_PLUGIN_JAR = "sonar-python-plugin-3.5.0.8200.jar"; + public static final String SONAR_PYTHON_PLUGIN_JAR = "sonar-python-plugin-1.14.0.3086.jar"; public static URL getJavaPluginUrl() { return getPluginUrl(SONAR_JAVA_PLUGIN_JAR);