From: Julien HENRY <henryju@yahoo.fr>
Date: Wed, 14 Mar 2018 16:54:44 +0000 (+0100)
Subject: Don't use assumeTrue to not break the quality gate
X-Git-Tag: 7.5~1534
X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=d151f025a96dbe48f4b4ec56a669a27f90d67952;p=sonarqube.git

Don't use assumeTrue to not break the quality gate
---

diff --git a/sonar-plugin-api/src/test/java/org/sonar/api/scan/filesystem/PathResolverTest.java b/sonar-plugin-api/src/test/java/org/sonar/api/scan/filesystem/PathResolverTest.java
index 574ffed83cc..fab947f9eb1 100644
--- a/sonar-plugin-api/src/test/java/org/sonar/api/scan/filesystem/PathResolverTest.java
+++ b/sonar-plugin-api/src/test/java/org/sonar/api/scan/filesystem/PathResolverTest.java
@@ -30,7 +30,6 @@ import org.junit.Test;
 import org.junit.rules.TemporaryFolder;
 
 import static org.assertj.core.api.Assertions.assertThat;
-import static org.junit.Assume.assumeTrue;
 
 public class PathResolverTest {
   @Rule
@@ -111,13 +110,15 @@ public class PathResolverTest {
 
   @Test
   public void relative_path_for_case_insensitive_fs() throws IOException {
-    assumeTrue(SystemUtils.IS_OS_WINDOWS);
-    PathResolver resolver = new PathResolver();
-    File rootDir = temp.newFolder();
-    File baseDir = new File(rootDir, "level1");
-    File file = new File(baseDir, "../Level1/dir/file.c");
-
-    assertThat(resolver.relativePath(baseDir, file)).isEqualTo("dir/file.c");
+    // To please the quality gate, don't use assumeTrue, or the test will be reported as skipped
+    if (SystemUtils.IS_OS_WINDOWS) {
+      PathResolver resolver = new PathResolver();
+      File rootDir = temp.newFolder();
+      File baseDir = new File(rootDir, "level1");
+      File file = new File(baseDir, "../Level1/dir/file.c");
+
+      assertThat(resolver.relativePath(baseDir, file)).isEqualTo("dir/file.c");
+    }
   }
 
   @Test
diff --git a/sonar-scanner-engine/src/test/java/org/sonar/scanner/mediumtest/fs/FileSystemMediumTest.java b/sonar-scanner-engine/src/test/java/org/sonar/scanner/mediumtest/fs/FileSystemMediumTest.java
index 919881ecd6e..1ec6df35104 100644
--- a/sonar-scanner-engine/src/test/java/org/sonar/scanner/mediumtest/fs/FileSystemMediumTest.java
+++ b/sonar-scanner-engine/src/test/java/org/sonar/scanner/mediumtest/fs/FileSystemMediumTest.java
@@ -629,19 +629,21 @@ public class FileSystemMediumTest {
   // SONAR-6719
   @Test
   public void scanProjectWithWrongCase() {
-    assumeTrue(System2.INSTANCE.isOsWindows());
-    File projectDir = new File("src/test/resources/mediumtest/xoo/sample");
-    TaskResult result = tester
-      .newScanTask(new File(projectDir, "sonar-project.properties"))
-      .property("sonar.sources", "XOURCES")
-      .property("sonar.tests", "TESTX")
-      .execute();
+    // To please the quality gate, don't use assumeTrue, or the test will be reported as skipped
+    if (System2.INSTANCE.isOsWindows()) {
+      File projectDir = new File("src/test/resources/mediumtest/xoo/sample");
+      TaskResult result = tester
+        .newScanTask(new File(projectDir, "sonar-project.properties"))
+        .property("sonar.sources", "XOURCES")
+        .property("sonar.tests", "TESTX")
+        .execute();
 
-    assertThat(result.inputFiles()).hasSize(3);
-    assertThat(result.inputFiles()).extractingResultOf("relativePath").containsOnly(
-      "xources/hello/HelloJava.xoo",
-      "xources/hello/helloscala.xoo",
-      "testx/ClassOneTest.xoo");
+      assertThat(result.inputFiles()).hasSize(3);
+      assertThat(result.inputFiles()).extractingResultOf("relativePath").containsOnly(
+        "xources/hello/HelloJava.xoo",
+        "xources/hello/helloscala.xoo",
+        "testx/ClassOneTest.xoo");
+    }
   }
 
   @Test