SLCORE-281 Unable to locate node on Windows if multiple candidates

SonarSource · Oct 7, 2020 · 1594a6c · 1594a6c
1 parent 432f344
commit 1594a6c
Show file tree

Hide file tree

Showing 2 changed files with 53 additions and 8 deletions.
diff --git a/core/src/main/java/org/sonarsource/sonarlint/core/NodeJsHelper.java b/core/src/main/java/org/sonarsource/sonarlint/core/NodeJsHelper.java
@@ -154,7 +154,7 @@ private String runSimpleCommand(Command command) {
       msg.append("\nstderr: ").append(String.join("\n", stdErr));
     }
     LOG.debug(msg.toString());
-    if (exitCode != 0 || stdOut.size() != 1) {
+    if (exitCode != 0 || stdOut.isEmpty()) {
       return null;
     }
     return stdOut.get(0);

diff --git a/core/src/test/java/org/sonarsource/sonarlint/core/NodeJsHelperTests.java b/core/src/test/java/org/sonarsource/sonarlint/core/NodeJsHelperTests.java
@@ -29,6 +29,7 @@
 import java.util.Objects;
 import java.util.function.BiFunction;
 import java.util.function.Predicate;
+import java.util.stream.Stream;
 import javax.annotation.Nullable;
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
@@ -42,7 +43,6 @@
 import org.sonar.api.utils.command.StreamConsumer;
 import org.sonar.api.utils.log.LogTesterJUnit5;
 import org.sonar.api.utils.log.LoggerLevel;
-import org.sonarsource.sonarlint.core.NodeJsHelper;
 import org.sonarsource.sonarlint.core.client.api.common.Version;
 
 import static org.assertj.core.api.Assertions.assertThat;
@@ -59,11 +59,11 @@ class NodeJsHelperTests {
   @RegisterExtension
   LogTesterJUnit5 logTester = new LogTesterJUnit5();
 
-  private System2 system2 = mock(System2.class);
+  private final System2 system2 = mock(System2.class);
 
   private CommandExecutor commandExecutor;
 
-  private Map<Predicate<Command>, BiFunction<StreamConsumer, StreamConsumer, Integer>> registeredCommandAnswers = new LinkedHashMap<>();
+  private final Map<Predicate<Command>, BiFunction<StreamConsumer, StreamConsumer, Integer>> registeredCommandAnswers = new LinkedHashMap<>();
 
   @BeforeEach
   public void prepare() {
@@ -143,7 +143,6 @@ void ignoreCommandExecutionError() throws IOException {
 
   @Test
   void handleErrorDuringVersionCheck() throws IOException {
-
     registerNodeVersionAnswer("wrong_version");
 
     NodeJsHelper underTest = new NodeJsHelper(system2, null, commandExecutor);
@@ -200,6 +199,24 @@ void handleErrorDuringPathCheck() throws IOException {
     assertThat(underTest.getNodeJsVersion()).isNull();
   }
 
+  @Test
+  void handleEmptyResponseDuringPathCheck() throws IOException {
+    when(system2.isOsWindows()).thenReturn(true);
+
+    registerWhereAnswer();
+
+    NodeJsHelper underTest = new NodeJsHelper(system2, null, commandExecutor);
+    underTest.detect(null);
+
+    assertThat(logTester.logs()).containsExactly(
+      "Looking for node in the PATH",
+      "Execute command 'where node'...",
+      "Command 'where node' exited with 0",
+      "Unable to locate node");
+    assertThat(underTest.getNodeJsPath()).isNull();
+    assertThat(underTest.getNodeJsVersion()).isNull();
+  }
+
   @Test
   void useWhereOnWindowsToResolveNodePath() throws IOException {
     when(system2.isOsWindows()).thenReturn(true);
@@ -223,6 +240,34 @@ void useWhereOnWindowsToResolveNodePath() throws IOException {
     assertThat(underTest.getNodeJsVersion()).isEqualTo(Version.create("10.5.4"));
   }
 
+  // SLCORE-281
+  @Test
+  void whereOnWindowsCanReturnMultipleCandidates() throws IOException {
+    when(system2.isOsWindows()).thenReturn(true);
+
+    Path fake_node_path2 = Paths.get("foo2/node");
+
+    registerWhereAnswer(FAKE_NODE_PATH.toString(), fake_node_path2.toString());
+    registerNodeVersionAnswer("v10.5.4");
+
+    NodeJsHelper underTest = new NodeJsHelper(system2, null, commandExecutor);
+    underTest.detect(null);
+
+    assertThat(logTester.logs()).containsExactly(
+      "Looking for node in the PATH",
+      "Execute command 'where node'...",
+      "Command 'where node' exited with 0\nstdout: "
+        + FAKE_NODE_PATH.toString() + "\n" + fake_node_path2
+          .toString(),
+      "Found node at " + FAKE_NODE_PATH.toString(),
+      "Checking node version...",
+      "Execute command '" + FAKE_NODE_PATH.toString() + " -v'...",
+      "Command '" + FAKE_NODE_PATH.toString() + " -v' exited with 0\nstdout: v10.5.4",
+      "Detected node version: 10.5.4");
+    assertThat(underTest.getNodeJsPath()).isEqualTo(FAKE_NODE_PATH);
+    assertThat(underTest.getNodeJsVersion()).isEqualTo(Version.create("10.5.4"));
+  }
+
   @Test
   void usePathHelperOnMacToResolveNodePath(@TempDir Path tempDir) throws IOException {
     when(system2.isOsMac()).thenReturn(true);
@@ -314,7 +359,7 @@ void logWhenUnableToGetNodeVersion() {
   }
 
   private void registerNodeVersionAnswer(String version) {
-    registeredCommandAnswers.put(c -> c.toString().endsWith("node -v"), (stdOut, stdErr) -> {
+    registeredCommandAnswers.put(c -> c.toString().endsWith(FAKE_NODE_PATH.toString() + " -v"), (stdOut, stdErr) -> {
       stdOut.consumeLine(version);
       return 0;
     });
@@ -334,9 +379,9 @@ private void registerWhichAnswerIfPathIsSet(String whichOutput, @Nullable String
     });
   }
 
-  private void registerWhereAnswer(String whereOutput) {
+  private void registerWhereAnswer(String... whereOutput) {
     registeredCommandAnswers.put(c -> c.toString().endsWith("where node"), (stdOut, stdErr) -> {
-      stdOut.consumeLine(whereOutput);
+      Stream.of(whereOutput).forEach(l -> stdOut.consumeLine(l));
       return 0;
     });
   }