Merge pull request #2 from AnetteTaivere/analysisTests

Analysis tests

Author: AnetteTaivere

src/main/java/goblintserver/GoblintServer.java

@@ -71,20 +71,22 @@ public void abortAnalysis() throws IOException {
      */
     public void preAnalyse() {
         String[] preAnalyzeCommand = configuration.getPreAnalyzeCommand();
-
-        //Miks seda ei ilmu kuhugile??
-        log.info(preAnalyzeCommand);
-        System.out.println(preAnalyzeCommand);
-        System.out.println();
-
-        if (preAnalyzeCommand != null) {
+        if (preAnalyzeCommand != null && preAnalyzeCommand.length != 0) {
             try {
-                log.info("Preanalyze command ran: \"" + Arrays.toString(preAnalyzeCommand) + "\"");
-                runCommand(new File(System.getProperty("user.dir")), preAnalyzeCommand);
-                log.info("Preanalyze command finished.");
+                String preAnalyzeCommandString = Arrays.toString(preAnalyzeCommand);
+                log.info("PreAnalysis command ran: '" + preAnalyzeCommandString + "'");
+                ProcessListener processListener = new ProcessListener() {};
+                StartedProcess preAnalysisProcess = runCommand(new File(System.getProperty("user.dir")), preAnalyzeCommand, processListener);
+                switch (preAnalysisProcess.getProcess().waitFor()) {
+                    case 0 -> log.info("PreAnalysis command finished.");
+                    default -> {
+                        log.warn("Running preAnalysis command failed. (code: " + preAnalysisProcess.getProcess().exitValue() + ")");
+                        magpieServer.forwardMessageToClient(new MessageParams(MessageType.Warning, "Running preAnalysis command failed."));
+                    }
+                }
             } catch (IOException | InvalidExitValueException | InterruptedException | TimeoutException e) {
-                this.magpieServer.forwardMessageToClient(
-                        new MessageParams(MessageType.Warning, "Running preanalysis command failed. " + e.getMessage()));
+                log.warn("Running preAnalysis command failed. " + e.getMessage());
+                this.magpieServer.forwardMessageToClient(new MessageParams(MessageType.Warning, "Running preAnalysis command failed. " + e.getMessage()));
             }
         }
     }
@@ -129,9 +131,26 @@ private String[] constructGoblintVersionCheckCommand() {
      */
     public void startGoblintServer() {
         try {
-            // run command to start goblint
+            // run command to start Goblint
+            ProcessListener listener = new ProcessListener() {
+                public void afterStop(Process process) {
+                    switch (process.exitValue()) {
+                        case 0 -> log.info("Goblint server has stopped.");
+                        case 143 -> {
+                            log.info("Goblint server has been killed.");
+                            magpieServer.forwardMessageToClient(new MessageParams(MessageType.Error, "Goblint server has been killed. Please check the output terminal of GobPie extension for more information."));
+                        }
+                        default -> {
+                            log.error("Goblint server exited due to an error (code: " + process.exitValue() + "). Please fix the issue reported above and rerun the analysis to restart the extension.");
+                            magpieServer.forwardMessageToClient(new MessageParams(MessageType.Error, "Goblint server exited due to an error. Please check the output terminal of GobPie extension for more information."));
+                        }
+                    }
+                    magpieServer.cleanUp();
+                    // TODO: throw an exception? where (and how) can it be caught to be handled though?
+                }
+            };
             log.info("Goblint run with command: " + String.join(" ", goblintRunCommand));
-            goblintRunProcess = runCommand(new File(System.getProperty("user.dir")), goblintRunCommand);
+            goblintRunProcess = runCommand(new File(System.getProperty("user.dir")), goblintRunCommand, listener);
         } catch (IOException | InvalidExitValueException | InterruptedException | TimeoutException e) {
             throw new GobPieException("Running Goblint failed.", e, GOBLINT_EXCEPTION);
         }
@@ -176,23 +195,7 @@ public String checkGoblintVersion() {
      * @param command The command to run.
      * @return An object that represents a process that has started. It may or may not have finished.
      */
-    private StartedProcess runCommand(File dirPath, String[] command) throws IOException, InterruptedException, TimeoutException {
-        ProcessListener listener = new ProcessListener() {
-
-            public void afterStop(Process process) {
-                if (process.exitValue() == 0) {
-                    log.info("Goblint server has stopped.");
-                } else if (process.exitValue() == 143) {
-                    log.info("Goblint server has been killed.");
-                } else {
-                    magpieServer.forwardMessageToClient(new MessageParams(MessageType.Error, "Goblint server exited due to an error. Please check the output terminal of GobPie extension for more information."));
-                    log.error("Goblint server exited due to an error (code: " + process.exitValue() + "). Please fix the issue reported above and rerun the analysis to restart the extension.");
-                }
-                magpieServer.cleanUp();
-                // TODO: throw an exception? where (and how) can it be caught to be handled though?
-            }
-        };
-
+    private StartedProcess runCommand(File dirPath, String[] command, ProcessListener listener) throws IOException, InterruptedException, TimeoutException {
         log.debug("Waiting for command: " + Arrays.toString(command) + " to run...");
         return new ProcessExecutor()
                 .directory(dirPath)