Fix test

SonarSource · Dec 3, 2024 · 71f249a · 71f249a
1 parent 3960422
commit 71f249a
Show file tree

Hide file tree

Showing 2 changed files with 43 additions and 19 deletions.
diff --git a/...plugin/bridge/src/test/java/org/sonar/plugins/javascript/bridge/BridgeServerImplTest.java b/...plugin/bridge/src/test/java/org/sonar/plugins/javascript/bridge/BridgeServerImplTest.java
@@ -16,6 +16,24 @@
  */
 package org.sonar.plugins.javascript.bridge;
 
+import static java.util.Collections.emptyList;
+import static java.util.Collections.singletonList;
+import static org.assertj.core.api.Assertions.assertThat;
+import static org.assertj.core.api.Assertions.assertThatThrownBy;
+import static org.awaitility.Awaitility.await;
+import static org.mockito.Mockito.doReturn;
+import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.spy;
+import static org.mockito.Mockito.when;
+import static org.slf4j.event.Level.DEBUG;
+import static org.slf4j.event.Level.ERROR;
+import static org.slf4j.event.Level.INFO;
+import static org.slf4j.event.Level.WARN;
+import static org.sonar.plugins.javascript.bridge.AnalysisMode.DEFAULT_LINTER_ID;
+import static org.sonar.plugins.javascript.nodejs.NodeCommandBuilderImpl.NODE_EXECUTABLE_PROPERTY;
+import static org.sonar.plugins.javascript.nodejs.NodeCommandBuilderImpl.NODE_FORCE_HOST_PROPERTY;
+import static org.sonar.plugins.javascript.nodejs.NodeCommandBuilderImpl.SKIP_NODE_PROVISIONING_PROPERTY;
+
 import java.io.File;
 import java.io.IOException;
 import java.nio.file.Files;
@@ -54,24 +72,6 @@
 import org.sonar.plugins.javascript.nodejs.ProcessWrapper;
 import org.sonar.plugins.javascript.nodejs.ProcessWrapperImpl;
 
-import static java.util.Collections.emptyList;
-import static java.util.Collections.singletonList;
-import static org.assertj.core.api.Assertions.assertThat;
-import static org.assertj.core.api.Assertions.assertThatThrownBy;
-import static org.awaitility.Awaitility.await;
-import static org.mockito.Mockito.doReturn;
-import static org.mockito.Mockito.mock;
-import static org.mockito.Mockito.spy;
-import static org.mockito.Mockito.when;
-import static org.slf4j.event.Level.DEBUG;
-import static org.slf4j.event.Level.ERROR;
-import static org.slf4j.event.Level.INFO;
-import static org.slf4j.event.Level.WARN;
-import static org.sonar.plugins.javascript.bridge.AnalysisMode.DEFAULT_LINTER_ID;
-import static org.sonar.plugins.javascript.nodejs.NodeCommandBuilderImpl.NODE_EXECUTABLE_PROPERTY;
-import static org.sonar.plugins.javascript.nodejs.NodeCommandBuilderImpl.NODE_FORCE_HOST_PROPERTY;
-import static org.sonar.plugins.javascript.nodejs.NodeCommandBuilderImpl.SKIP_NODE_PROVISIONING_PROPERTY;
-
 class BridgeServerImplTest {
 
   private static final String START_SERVER_SCRIPT = "startServer.js";
@@ -837,7 +837,7 @@ void should_start_bridge_from_path() throws IOException {
     var config = BridgeServerConfig.fromSensorContext(context);
     bridgeServer.startServerLazily(config);
     assertThat(logTester.logs(DEBUG))
-      .contains("Setting deploy location to " + deployLocation);
+      .contains("Setting deploy location to " + deployLocation.replace("/", File.separator));
   }
 
   @Test

diff --git a/sonar-plugin/bridge/src/test/resources/package/bin/server.cjs b/sonar-plugin/bridge/src/test/resources/package/bin/server.cjs
@@ -0,0 +1,24 @@
+#!/usr/bin/env node
+
+const http = require('http');
+const port = process.argv[2];
+const host = process.argv[3];
+
+const requestHandler = (request, response) => {
+  if (request.url === '/status') {
+    response.writeHead(200, { 'Content-Type': 'text/plain' });
+    response.end('OK!');
+    server.close();
+  }
+};
+
+const server = http.createServer(requestHandler);
+server.keepAliveTimeout = 100; // this is used so server disconnects faster
+
+server.listen(port, host, err => {
+  if (err) {
+    return console.log('something bad happened', err);
+  }
+
+  console.log(`server is listening on ${host} ${port}`);
+});