diff --git a/its/plugin/pom.xml b/its/plugin/pom.xml index f012e22a9..4d3138371 100644 --- a/its/plugin/pom.xml +++ b/its/plugin/pom.xml @@ -40,7 +40,7 @@ org.sonarsource.sonarlint.core sonarlint-core - ${sonarlint.api.impl.version} + 9.0.0.74282 test diff --git a/its/plugin/src/test/java/com/sonar/it/web/SonarLintTest.java b/its/plugin/src/test/java/com/sonar/it/web/SonarLintTest.java index 7b73fc58d..0f849e0cf 100644 --- a/its/plugin/src/test/java/com/sonar/it/web/SonarLintTest.java +++ b/its/plugin/src/test/java/com/sonar/it/web/SonarLintTest.java @@ -35,15 +35,17 @@ import org.junit.Test; import org.junit.rules.TemporaryFolder; import org.sonarsource.sonarlint.core.StandaloneSonarLintEngineImpl; -import org.sonarsource.sonarlint.core.client.api.common.Language; -import org.sonarsource.sonarlint.core.client.api.common.analysis.ClientInputFile; +import org.sonarsource.sonarlint.core.analysis.api.ClientInputFile; +import org.sonarsource.sonarlint.core.analysis.api.WithTextRange; import org.sonarsource.sonarlint.core.client.api.common.analysis.Issue; import org.sonarsource.sonarlint.core.client.api.standalone.StandaloneAnalysisConfiguration; import org.sonarsource.sonarlint.core.client.api.standalone.StandaloneGlobalConfiguration; import org.sonarsource.sonarlint.core.client.api.standalone.StandaloneSonarLintEngine; +import org.sonarsource.sonarlint.core.commons.Language; import static org.assertj.core.api.Assertions.assertThat; import static org.assertj.core.api.Assertions.tuple; +import static org.sonarsource.sonarlint.core.commons.IssueSeverity.MAJOR; public class SonarLintTest { @@ -57,7 +59,7 @@ public class SonarLintTest { @BeforeClass public static void prepare() throws Exception { StandaloneGlobalConfiguration sonarLintConfig = StandaloneGlobalConfiguration.builder() - .addPlugin(FileLocation.byWildcardMavenFilename(new File("../../sonar-html-plugin/target"), "sonar-html-plugin-*.jar").getFile().toURI().toURL()) + .addPlugin(FileLocation.byWildcardMavenFilename(new File("../../sonar-html-plugin/target"), "sonar-html-plugin-*.jar").getFile().toPath()) .setSonarLintUserHome(temp.newFolder().toPath()) .addEnabledLanguage(Language.HTML) .setLogOutput((formattedMessage, level) -> { /* Don't pollute logs */ }) @@ -88,11 +90,12 @@ public void should_raise_four_issues() throws IOException { .build(); sonarlintEngine.analyze(config, issues::add, (s, level) -> System.out.println(s), null); - assertThat(issues).extracting("ruleKey", "startLine", "inputFile.path", "severity").containsOnly( - tuple("Web:DoctypePresenceCheck", 1, inputFile.getPath(), "MAJOR"), - tuple("Web:S5254", 1, inputFile.getPath(), "MAJOR"), - tuple("Web:LinkToImageCheck", 3, inputFile.getPath(), "MAJOR"), - tuple("Web:PageWithoutTitleCheck", 1, inputFile.getPath(), "MAJOR")); + assertThat(issues) + .extracting(Issue::getRuleKey, WithTextRange::getStartLine, i -> i.getInputFile().getPath(), Issue::getSeverity).containsOnly( + tuple("Web:DoctypePresenceCheck", 1, inputFile.getPath(), MAJOR), + tuple("Web:S5254", 1, inputFile.getPath(), MAJOR), + tuple("Web:LinkToImageCheck", 3, inputFile.getPath(), MAJOR), + tuple("Web:PageWithoutTitleCheck", 1, inputFile.getPath(), MAJOR)); } private ClientInputFile prepareInputFile(String relativePath, String content, final boolean isTest) throws IOException { diff --git a/pom.xml b/pom.xml index 97535cecc..35b6e2299 100644 --- a/pom.xml +++ b/pom.xml @@ -68,7 +68,6 @@ 2.5.0.1358 10.1.0.809 - 6.3.0.36253 10.1.0.73491 10.1.0.73491 3.40.0.183