Improve coverage for #35.

Author: begarco

src/main/java/fr/cnes/sonar/plugins/icode/check/ICodeSensor.java

@@ -100,31 +100,10 @@ public void execute(SensorContext sensorContext) {
         final Configuration config = sensorContext.config();
         // Represent the active rules used for the analysis.
         final ActiveRules activeRules = sensorContext.activeRules();
+
         // run i-Code CNES execution
         if(config.getBoolean(ICodePluginProperties.AUTOLAUNCH_PROP_KEY).orElse(Boolean.getBoolean(ICodePluginProperties.AUTOLAUNCH_PROP_DEFAULT))) {
-            LOGGER.info("i-Code CNES auto-launch enabled.");
-            final String executable = config.get(ICodePluginProperties.ICODE_PATH_KEY).orElse(ICodePluginProperties.ICODE_PATH_DEFAULT);
-            final String[] files = sensorContext.fileSystem().baseDir().list();
-            final String outputFile = config.get(ICodePluginProperties.REPORT_PATH_KEY).orElse(ICodePluginProperties.REPORT_PATH_DEFAULT);
-            final String outputPath = Paths.get(sensorContext.fileSystem().baseDir().toString(),outputFile).toString();
-            final String outputOption = "-o";
-            final String command = String.join(" ", executable, String.join(" ",files), outputOption, outputPath);
-
-            LOGGER.info("Running i-Code CNES and generating results to "+ outputPath);
-            try {
-                final Process icode =  Runtime.getRuntime().exec(command);
-                int success = icode.waitFor();
-                if(0!=success){
-                    final String message = String.format("i-Code CNES auto-launch analysis failed with exit code %d.",success);
-                    throw new ICodeException(message);
-                }
-                LOGGER.info("Auto-launch successfully executed i-Code CNES.");
-            } catch (InterruptedException | IOException | ICodeException e) {
-                LOGGER.error(e.getMessage(), e);
-                sensorContext.newAnalysisError().message(e.getMessage()).save();
-            }
-
-
+            executeICode(sensorContext);
         }
 
         // Report files found in file system and corresponding to SQ property.
@@ -162,6 +141,48 @@ public void execute(SensorContext sensorContext) {
 
     }
 
+    /**
+     * Execute i-Code through a system process.
+     *
+     * @param sensorContext Context of the sensor.
+     */
+    protected void executeICode(final SensorContext sensorContext) {
+        LOGGER.info("i-Code CNES auto-launch enabled.");
+        final Configuration config = sensorContext.config();
+        final String executable = config.get(ICodePluginProperties.ICODE_PATH_KEY).orElse(ICodePluginProperties.ICODE_PATH_DEFAULT);
+        final String[] files = sensorContext.fileSystem().baseDir().list();
+        final String outputFile = config.get(ICodePluginProperties.REPORT_PATH_KEY).orElse(ICodePluginProperties.REPORT_PATH_DEFAULT);
+        final String outputPath = Paths.get(sensorContext.fileSystem().baseDir().toString(),outputFile).toString();
+        final String outputOption = "-o";
+        final String command = String.join(" ", executable, String.join(" ",files), outputOption, outputPath);
+
+        LOGGER.info("Running i-Code CNES and generating results to "+ outputPath);
+        try {
+            int success = runICode(command);
+            if(0!=success){
+                final String message = String.format("i-Code CNES auto-launch analysis failed with exit code %d.",success);
+                throw new ICodeException(message);
+            }
+            LOGGER.info("Auto-launch successfully executed i-Code CNES.");
+        } catch (InterruptedException | IOException | ICodeException e) {
+            LOGGER.error(e.getMessage(), e);
+            sensorContext.newAnalysisError().message(e.getMessage()).save();
+        }
+    }
+
+    /**
+     * Run the i-Code command.
+     *
+     * @param command The i-Code Command to execute.
+     * @return 0 if all was fine.
+     * @throws IOException On possible unknown file.
+     * @throws InterruptedException On possible process problem.
+     */
+    protected int runICode(final String command) throws IOException, InterruptedException {
+        final Process icode =  Runtime.getRuntime().exec(command);
+        return icode.waitFor();
+    }
+
     /**
      * This method save an issue into the SonarQube service.
      *

src/test/java/fr/cnes/sonar/plugins/icode/check/ICodeSensorTest.java

@@ -24,6 +24,7 @@
 import org.junit.Before;
 import org.junit.Test;
 import org.mockito.Mockito;
+import org.mockito.internal.matchers.Null;
 import org.sonar.api.batch.fs.FilePredicate;
 import org.sonar.api.batch.fs.InputFile;
 import org.sonar.api.batch.fs.internal.DefaultFileSystem;
@@ -111,15 +112,36 @@ public void test_normal_work() {
         Assert.assertTrue(context.config().hasKey("sonar.icode.reports.path"));
     }
 
-    @Test(expected = NullPointerException.class)
+    @Test
     public void test_normal_work_with_icode_launch_failed() {
         final ICodeSensor sensor = new ICodeSensor();
 
         final MapSettings settings = new MapSettings();
         settings.setProperty("sonar.icode.launch",true);
         context.setSettings(settings);
 
+        try {
+            sensor.execute(context);
+        } catch(Exception e) {
+            assert(true);
+        }
+    }
+
+    @Test
+    public void test_normal_work_with_icode_launch_success() {
+        final ICodeSensor sensor = new ICodeSensor() {
+            @Override
+            protected int runICode(final String command) {
+                return 0;
+            }
+        };
+
+        final MapSettings settings = new MapSettings();
+        settings.setProperty("sonar.icode.launch",true);
+        context.setSettings(settings);
+
         sensor.execute(context);
+        assert(true);
     }
 
     @Test
@@ -130,8 +152,8 @@ public void test_get_scanned_files() {
         final AnalysisFile file = new AnalysisFile();
         final AnalysisFile file2 = new AnalysisFile();
 
-        file.fileName = "badaboum.sh";
-        file2.fileName = "bash.sh";
+        file.fileName = "badaboum.sh";file.language="shell";
+        file2.fileName = "bash.sh";file2.language="shell";
 
         project.analysisFile = new AnalysisFile[]{file, file2};