From cb46e5cc78c1112f061df893dcf71dcb0e9b6a60 Mon Sep 17 00:00:00 2001 From: Ilia Kebets Date: Tue, 24 Oct 2023 14:25:53 +0200 Subject: [PATCH] fix ITs tests --- .../src/index.php => css-html-project/src/index.html} | 2 +- .../java/com/sonar/javascript/it/plugin/CssIssuesTest.java | 4 ++-- .../sonar/javascript/it/plugin/CssNoCssFileProjectTest.java | 4 ++-- 3 files changed, 5 insertions(+), 5 deletions(-) rename its/plugin/projects/{css-php-project/src/index.php => css-html-project/src/index.html} (86%) diff --git a/its/plugin/projects/css-php-project/src/index.php b/its/plugin/projects/css-html-project/src/index.html similarity index 86% rename from its/plugin/projects/css-php-project/src/index.php rename to its/plugin/projects/css-html-project/src/index.html index 54d36eefa3c..5dcee1c5363 100644 --- a/its/plugin/projects/css-php-project/src/index.php +++ b/its/plugin/projects/css-html-project/src/index.html @@ -8,6 +8,6 @@ - + "Hello World! diff --git a/its/plugin/tests/src/test/java/com/sonar/javascript/it/plugin/CssIssuesTest.java b/its/plugin/tests/src/test/java/com/sonar/javascript/it/plugin/CssIssuesTest.java index e2c8d123e08..19ea7bf3035 100644 --- a/its/plugin/tests/src/test/java/com/sonar/javascript/it/plugin/CssIssuesTest.java +++ b/its/plugin/tests/src/test/java/com/sonar/javascript/it/plugin/CssIssuesTest.java @@ -62,7 +62,6 @@ public static void prepare() { SonarScanner scanner = CssTestsUtils.createScanner(PROJECT_KEY); scanner.setProperty("sonar.exclusions", "**/file-with-parsing-error-excluded.css"); - scanner.setProperty("sonar.html.file.suffixes", ".htm"); buildResult = orchestrator.executeBuild(scanner); } @@ -168,7 +167,8 @@ void issue_list() { tuple("css:S1116", "css-issues-project:src/file6.vue"), tuple("css:S5362", "css-issues-project:src/file1.css"), tuple("css:S5362", "css-issues-project:src/file2.less"), - tuple("css:S5362", "css-issues-project:src/file3.scss") + tuple("css:S5362", "css-issues-project:src/file3.scss"), + tuple("css:S1116", "css-issues-project:src/file5-1.html") ); } } diff --git a/its/plugin/tests/src/test/java/com/sonar/javascript/it/plugin/CssNoCssFileProjectTest.java b/its/plugin/tests/src/test/java/com/sonar/javascript/it/plugin/CssNoCssFileProjectTest.java index da784498cbd..d15bccd381f 100644 --- a/its/plugin/tests/src/test/java/com/sonar/javascript/it/plugin/CssNoCssFileProjectTest.java +++ b/its/plugin/tests/src/test/java/com/sonar/javascript/it/plugin/CssNoCssFileProjectTest.java @@ -37,7 +37,7 @@ @ExtendWith(OrchestratorStarter.class) class CssNoCssFileProjectTest { - private static final String PROJECT_KEY = "css-php-project"; + private static final String PROJECT_KEY = "css-html-project"; private static final Orchestrator orchestrator = OrchestratorStarter.ORCHESTRATOR; @@ -62,6 +62,6 @@ void test() { assertThat(issuesList) .extracting(Issues.Issue::getRule, Issues.Issue::getLine, Issues.Issue::getComponent) - .containsExactlyInAnyOrder(tuple("css:S4658", 7, "css-php-project:src/index.php")); + .containsExactlyInAnyOrder(tuple("css:S4658", 7, PROJECT_KEY + ":src/index.html")); } }