2 files changed, 23 insertions, 6 deletions
diff --git a/src/test/java/org/sonarsource/scanner/cli/SystemInfoTest.java b/src/test/java/org/sonarsource/scanner/cli/SystemInfoTest.java
index da00b00..6e8698c 100644
--- a/src/test/java/org/sonarsource/scanner/cli/SystemInfoTest.java
+++ b/src/test/java/org/sonarsource/scanner/cli/SystemInfoTest.java
@@ -74,7 +74,21 @@ class SystemInfoTest {
   }
 
   @Test
-  void should_print() {
+  void should_print_scanner_version_and_os_at_info() {
+    mockOs();
+    mockJava();
+
+    SystemInfo.print();
+
+    verify(mockSystem).getProperty("os.version");
+
+    assertThat(logTester.logs(Level.INFO))
+      .containsOnly("SonarScanner CLI " + ScannerVersion.version(), "linux 2.5 x64");
+  }
+
+  @Test
+  void should_print_jvm_version_and_opts_at_debug() {
+    logTester.setLevel(Level.DEBUG);
     mockOs();
     mockJava();
     when(mockSystem.getenv("SONAR_SCANNER_OPTS")).thenReturn("arg");
@@ -85,12 +99,13 @@ class SystemInfoTest {
     verify(mockSystem).getProperty("os.version");
     verify(mockSystem).getenv("SONAR_SCANNER_OPTS");
 
-    assertThat(logTester.logs(Level.INFO))
-      .containsOnly("SonarScanner CLI " + ScannerVersion.version(), "Java 1.9 oracle (64-bit)", "linux 2.5 x64", "SONAR_SCANNER_OPTS=arg");
+    assertThat(logTester.logs(Level.DEBUG))
+      .containsOnly("Java 1.9 oracle (64-bit)", "SONAR_SCANNER_OPTS=arg");
   }
 
   @Test
   void should_not_print_sensitive_data() {
+    logTester.setLevel(Level.DEBUG);
     mockOs();
     mockJava();
     when(mockSystem.getenv("SONAR_SCANNER_OPTS"))
@@ -98,6 +113,6 @@ class SystemInfoTest {
 
     SystemInfo.print();
 
-    assertThat(logTester.logs(Level.INFO)).contains("SONAR_SCANNER_OPTS=-Dsonar.login=* -Dsonar.whatever=whatever -Dsonar.password=* -Dsonar.whatever2=whatever2 -Dsonar.token=*");
+    assertThat(logTester.logs(Level.DEBUG)).contains("SONAR_SCANNER_OPTS=-Dsonar.login=* -Dsonar.whatever=whatever -Dsonar.password=* -Dsonar.whatever2=whatever2 -Dsonar.token=*");
   }
 }
diff --git a/src/test/java/testutils/LogTester.java b/src/test/java/testutils/LogTester.java
index 4b87c52..8a9d0f0 100644
--- a/src/test/java/testutils/LogTester.java
+++ b/src/test/java/testutils/LogTester.java
@@ -28,6 +28,8 @@ import org.junit.jupiter.api.extension.ExtensionContext;
 import org.slf4j.LoggerFactory;
 import org.slf4j.event.Level;
 
+import static java.util.stream.Collectors.*;
+
 public class LogTester implements BeforeEachCallback, AfterEachCallback {
 
   private final ConcurrentListAppender<ILoggingEvent> listAppender = new ConcurrentListAppender<>();
@@ -55,7 +57,7 @@ public class LogTester implements BeforeEachCallback, AfterEachCallback {
   public List<String> logs() {
     return listAppender.list.stream().map(e -> (LoggingEvent) e)
       .map(LoggingEvent::getFormattedMessage)
-      .toList();
+      .collect(toList());
   }
 
   /**
@@ -66,7 +68,7 @@ public class LogTester implements BeforeEachCallback, AfterEachCallback {
     return listAppender.list.stream().map(e -> (LoggingEvent) e)
       .filter(e -> e.getLevel().equals(ch.qos.logback.classic.Level.fromLocationAwareLoggerInteger(level.toInt())))
       .map(LoggingEvent::getFormattedMessage)
-      .toList();
+      .collect(toList());
   }
 
   public LogTester clear() {