Use SonarJS in ITs (fix support of SQ 7.3)

Author: Janos Gyerik

its/it-tests/src/test/java/com/sonar/scanner/api/it/PropertiesTest.java

@@ -41,7 +41,7 @@ public class PropertiesTest {
   public void testRuntimeEnvironmentPassedAsUserAgent() throws IOException {
     SimpleScanner scanner = new SimpleScanner();
     Map<String, String> params = new HashMap<>();
-    BuildResult buildResult = scanner.executeSimpleProject(project("java-sample"), ORCHESTRATOR.getServer().getUrl(), params);
+    BuildResult buildResult = scanner.executeSimpleProject(project("js-sample"), ORCHESTRATOR.getServer().getUrl(), params);
     assertThat(buildResult.getLastStatus()).isEqualTo(0);
 
     Path accessLogs = ORCHESTRATOR.getServer().getAppLogs().toPath().resolveSibling("access.log");

its/it-tests/src/test/java/com/sonar/scanner/api/it/ProxyTest.java

@@ -176,7 +176,7 @@ public void simple_analysis_with_proxy_no_auth() throws Exception {
     SimpleScanner scanner = new SimpleScanner();
 
     // Don't use proxy
-    BuildResult buildResult = scanner.executeSimpleProject(project("java-sample"), ORCHESTRATOR.getServer().getUrl());
+    BuildResult buildResult = scanner.executeSimpleProject(project("js-sample"), ORCHESTRATOR.getServer().getUrl());
     assertThat(buildResult.getLastStatus()).isEqualTo(0);
     assertThat(seenByProxy).isEmpty();
 
@@ -186,7 +186,7 @@ public void simple_analysis_with_proxy_no_auth() throws Exception {
     params.put("http.proxyHost", "localhost");
     params.put("http.proxyPort", "" + httpProxyPort);
 
-    buildResult = scanner.executeSimpleProject(project("java-sample"), ORCHESTRATOR.getServer().getUrl(), params);
+    buildResult = scanner.executeSimpleProject(project("js-sample"), ORCHESTRATOR.getServer().getUrl(), params);
     assertThat(buildResult.getLastStatus()).isEqualTo(0);
     assertThat(seenByProxy).isNotEmpty();
   }
@@ -202,14 +202,14 @@ public void simple_analysis_with_proxy_auth() throws Exception {
     params.put("http.proxyHost", "localhost");
     params.put("http.proxyPort", "" + httpProxyPort);
 
-    BuildResult buildResult = scanner.executeSimpleProject(project("java-sample"), ORCHESTRATOR.getServer().getUrl(), params);
+    BuildResult buildResult = scanner.executeSimpleProject(project("js-sample"), ORCHESTRATOR.getServer().getUrl(), params);
     assertThat(buildResult.getLastStatus()).isEqualTo(1);
     assertThat(buildResult.getLogs()).contains("Status returned by url", "is not valid: [407]");
     assertThat(seenByProxy).isEmpty();
 
     params.put("http.proxyUser", PROXY_USER);
     params.put("http.proxyPassword", PROXY_PASSWORD);
-    buildResult = scanner.executeSimpleProject(project("java-sample"), ORCHESTRATOR.getServer().getUrl(), params);
+    buildResult = scanner.executeSimpleProject(project("js-sample"), ORCHESTRATOR.getServer().getUrl(), params);
     assertThat(seenByProxy).isNotEmpty();
     if (ORCHESTRATOR.getServer().version().isGreaterThanOrEquals("6.1")) {
       assertThat(buildResult.getLastStatus()).isEqualTo(0);

its/it-tests/src/test/java/com/sonar/scanner/api/it/SSLTest.java

@@ -23,7 +23,6 @@
 import com.sonar.orchestrator.build.BuildResult;
 import com.sonar.orchestrator.util.NetworkUtils;
 import com.sonar.scanner.api.it.tools.SimpleScanner;
-
 import java.nio.file.Path;
 import java.nio.file.Paths;
 import java.util.HashMap;
@@ -160,7 +159,7 @@ private static ServletHandler newServletHandler() {
   public void simple_analysis_with_server_and_client_certificate() throws Exception {
     startSSLTransparentReverseProxy(true);
     SimpleScanner scanner = new SimpleScanner();
-    BuildResult buildResult = scanner.executeSimpleProject(project("java-sample"), "https://localhost:" + httpsPort);
+    BuildResult buildResult = scanner.executeSimpleProject(project("js-sample"), "https://localhost:" + httpsPort);
 
     assertThat(buildResult.getLastStatus()).isNotEqualTo(0);
     assertThat(buildResult.getLogs()).contains("javax.net.ssl.SSLHandshakeException");
@@ -176,7 +175,7 @@ public void simple_analysis_with_server_and_client_certificate() throws Exceptio
     params.put("javax.net.ssl.keyStore", clientKeystore.toString());
     params.put("javax.net.ssl.keyStorePassword", CLIENT_KEYSTORE_PWD);
 
-    buildResult = scanner.executeSimpleProject(project("java-sample"), "https://localhost:" + httpsPort, params);
+    buildResult = scanner.executeSimpleProject(project("js-sample"), "https://localhost:" + httpsPort, params);
     assertThat(buildResult.getLastStatus()).isEqualTo(0);
   }
 
@@ -189,7 +188,7 @@ public void simple_analysis_with_server_certificate() throws Exception {
     startSSLTransparentReverseProxy(false);
     SimpleScanner scanner = new SimpleScanner();
 
-    BuildResult buildResult = scanner.executeSimpleProject(project("java-sample"), "https://localhost:" + httpsPort);
+    BuildResult buildResult = scanner.executeSimpleProject(project("js-sample"), "https://localhost:" + httpsPort);
     assertThat(buildResult.getLastStatus()).isNotEqualTo(0);
     assertThat(buildResult.getLogs()).contains("javax.net.ssl.SSLHandshakeException");
 
@@ -201,7 +200,7 @@ public void simple_analysis_with_server_certificate() throws Exception {
     params.put("javax.net.ssl.trustStore", clientTruststore.toString());
     params.put("javax.net.ssl.trustStorePassword", truststorePassword);
 
-    buildResult = scanner.executeSimpleProject(project("java-sample"), "https://localhost:" + httpsPort, params);
+    buildResult = scanner.executeSimpleProject(project("js-sample"), "https://localhost:" + httpsPort, params);
     assertThat(buildResult.getLastStatus()).isEqualTo(0);
   }
 

its/it-tests/src/test/java/com/sonar/scanner/api/it/ScannerApiTestSuite.java

@@ -20,7 +20,6 @@
 package com.sonar.scanner.api.it;
 
 import com.sonar.orchestrator.Orchestrator;
-import java.io.File;
 import org.junit.ClassRule;
 import org.junit.runner.RunWith;
 import org.junit.runners.Suite;
@@ -32,11 +31,8 @@ public class ScannerApiTestSuite {
 
   @ClassRule
   public static final Orchestrator ORCHESTRATOR = Orchestrator.builderEnv()
-    .setOrchestratorProperty("javaVersion", "4.11")
-    .addPlugin("java")
+    .setOrchestratorProperty("javascriptVersion", "LATEST_RELEASE")
+    .addPlugin("javascript")
     .build();
 
-  static boolean isWindows() {
-    return File.pathSeparatorChar == ';' || System.getProperty("os.name").startsWith("Windows");
-  }
 }

its/projects/java-sample/sonar-project.properties

@@ -0,0 +1,6 @@
+sonar.projectKey=sample
+sonar.projectName=JS Sample, with comma
+sonar.projectDescription=This is a JS sample
+sonar.projectVersion=1.2.3
+
+sonar.sources=src

its/projects/java-sample/src/basic/Hello.java

@@ -0,0 +1,4 @@
+function hello() {
+  let i=356;
+  if (true) i=5658;
+}

its/projects/java-sample/src/basic/World.java

@@ -0,0 +1,3 @@
+function world() {
+    alert("hello world");
+}