Generalize leinigenRunner to stop taking main command arg

Author: fsantiag

src/main/java/org/sonar/plugins/clojure/sensors/LeiningenRunner.java

@@ -28,11 +28,10 @@ public LeiningenRunner() {
         this(LOG, CommandExecutor.create());
     }
 
-    CommandStreamConsumer run(String plugin, CommandStreamConsumer stdout,
-                              CommandStreamConsumer stderr, Long timeOut, String operatingSystem, String... options) {
+    CommandStreamConsumer run(CommandStreamConsumer stdout,
+                              CommandStreamConsumer stderr, Long timeOut, String operatingSystem, String... args) {
         Command cmd = Command.create(getCommand(operatingSystem));
-        cmd.addArgument(plugin);
-        Arrays.stream(options).filter(Objects::nonNull).forEach(cmd::addArgument);
+        Arrays.stream(args).filter(Objects::nonNull).forEach(cmd::addArgument);
 
         int returnCode = commandExecutor.execute(cmd, stdout, stderr, fromSecondsToMilliseconds(timeOut));
 
@@ -58,14 +57,13 @@ private Long fromSecondsToMilliseconds(long seconds) {
         return seconds * 1000;
     }
 
-    public CommandStreamConsumer run(Long timeOut, String command, String... pluginOptions) {
+    public CommandStreamConsumer run(Long timeOut, String... args) {
         return run(
-                command,
                 new CommandStreamConsumer(),
                 new CommandStreamConsumer(),
                 timeOut,
                 System.getProperty("os.name"),
-                pluginOptions
+                args
         );
     }
 }

src/main/java/org/sonar/plugins/clojure/sensors/kondo/KondoSensor.java

@@ -31,8 +31,7 @@ public class KondoSensor extends AbstractSensor implements Sensor {
     private static final Logger LOG = Loggers.get(KondoSensor.class);
 
     private static final String PLUGIN_NAME = "clj-kondo";
-    private static final String COMMAND_RUN = "run";
-    private static final String[] COMMAND_OPTS = {"-m", "clj-kondo.main"};
+    private static final String[] KONDO_ARGS = {"run", "-m", "clj-kondo.main"};
 
     public KondoSensor(LeiningenRunner leiningenRunner) {
         super(leiningenRunner);
@@ -92,7 +91,7 @@ public void execute(SensorContext context) {
 
             String config = context.config().get(CONFIG).orElse(DEFAULT_CONFIG);
             String[] options = context.config().get(OPTIONS).orElse(DEFAULT_OPTIONS).split("\\s+");
-            List<String> commandAsList = new ArrayList(Arrays.asList(COMMAND_OPTS));
+            List<String> commandAsList = new ArrayList(Arrays.asList(KONDO_ARGS));
             commandAsList.addAll(Arrays.asList(options));
             if (config != null && !config.isEmpty()) {
                 commandAsList.add("--config");
@@ -103,7 +102,7 @@ public void execute(SensorContext context) {
             long timeOut = context.config().getLong(SENSORS_TIMEOUT_PROPERTY)
                     .orElse(Long.valueOf(SENSORS_TIMEOUT_PROPERTY_DEFAULT));
 
-            CommandStreamConsumer stdOut = this.leiningenRunner.run(timeOut, COMMAND_RUN, command);
+            CommandStreamConsumer stdOut = this.leiningenRunner.run(timeOut, command);
 
             List<Finding> issues = KondoIssueParser.parse(stdOut);
             LOG.info("Saving issues " + issues.size());

src/test/java/org/sonar/plugins/clojure/sensors/LeiningenRunnerTest.java

@@ -59,11 +59,11 @@ public void shouldLogStdoutStderrAndCommandInDebugMode() {
         stderr.consumeLine("line in stderr");
 
         leiningenRunner.run(
-                "eastwood",
                 stdout,
                 stderr,
                 300L,
                 "Linux",
+                "eastwood",
                 "argument1",
                 "argument2"
         );
@@ -79,11 +79,11 @@ public void shouldLogErrorForReturnCodeDifferentThanZero() {
         CommandStreamConsumer dummyStreamConsumer = new CommandStreamConsumer();
 
         leiningenRunner.run(
-                "eastwood",
                 dummyStreamConsumer,
                 dummyStreamConsumer,
                 300L,
                 "Linux",
+                "eastwood",
                 "argument1",
                 "argument2"
         );
@@ -98,7 +98,7 @@ public void shouldUseBatFileWhenOperatingSystemIsWindows() {
         CommandStreamConsumer stderr = new CommandStreamConsumer();
         when(commandExecutor.execute(any(),any(),any(),anyLong())).thenReturn(0);
 
-        leiningenRunner.run("eastwood", stdout, stderr, 300L, "windows");
+        leiningenRunner.run(stdout, stderr, 300L, "windows", "eastwood");
 
         ArgumentCaptor<Command> commandCaptor = ArgumentCaptor.forClass(Command.class);
         verify(commandExecutor).execute(commandCaptor.capture(), any(CommandStreamConsumer.class), any(CommandStreamConsumer.class), anyLong());

src/test/java/org/sonar/plugins/clojure/sensors/kondo/KondoSensorTest.java

@@ -2,7 +2,9 @@
 
 import org.junit.Before;
 import org.junit.Test;
+import org.junit.runner.RunWith;
 import org.mockito.Mock;
+import org.mockito.junit.MockitoJUnitRunner;
 import org.sonar.api.batch.fs.internal.DefaultInputFile;
 import org.sonar.api.batch.fs.internal.TestInputFileBuilder;
 import org.sonar.api.batch.sensor.internal.DefaultSensorDescriptor;
@@ -20,12 +22,12 @@
 import java.util.List;
 
 import static org.hamcrest.CoreMatchers.is;
-import static org.junit.Assert.assertThat;
-import static org.junit.Assert.assertTrue;
+import static org.hamcrest.MatcherAssert.assertThat;
 import static org.mockito.Mockito.when;
 import static org.mockito.MockitoAnnotations.initMocks;
 import static org.sonar.plugins.clojure.settings.KondoProperties.*;
 
+@RunWith(MockitoJUnitRunner.class)
 public class KondoSensorTest {
 
     @Mock
@@ -35,7 +37,6 @@ public class KondoSensorTest {
 
     @Before
     public void setUp() {
-        initMocks(this);
         kondoSensor = new KondoSensor(commandRunner);
     }
 
@@ -44,7 +45,7 @@ public void shouldConfigureSensor() {
         DefaultSensorDescriptor descriptor = new DefaultSensorDescriptor();
         kondoSensor.describe(descriptor);
         assertThat(descriptor.name(), is("clj-kondo"));
-        assertTrue(descriptor.languages().contains("clj"));
+        assertThat(descriptor.languages().contains("clj"), is(true));
         assertThat(descriptor.languages().size(), is(1));
     }