Merge remote-tracking branch 'origin/development' into development

src/test/TestBase.java

@@ -211,26 +211,26 @@ public abstract class TestBase {
 
             switch (testPair.getType()) {
                 case CHECK_EQUALS:
-                    if (!output.equals(testPair.getOutput())) {
+                    if (!testPair.getOutput().equals(output)) {
                         log.info(" Failed!\n");
                         printLog();
                         assertEquals(testPair.getOutput(), output);
                     }
                     break;
                 case CHECK_STARTS_WITH:
-                    if (!output.startsWith(testPair.getOutput())) {
+                    if (!(output != null && output.startsWith(testPair.getOutput()))) {
                         log.info(" Failed!\n");
                         failAndLog(testPair.getFailMessage(output));
                     }
                     break;
                 case CHECK_CONTAINS:
-                    if (!output.contains(testPair.getOutput())) {
+                    if (!(output != null && output.contains(testPair.getOutput()))) {
                         log.info(" Failed!\n");
                         failAndLog(testPair.getFailMessage(output));
                     }
                     break;
                 case CHECK_FOR_ERROR:
-                    if (!output.startsWith(ERROR_PREFIX)) {
+                    if (!(output != null && output.startsWith(ERROR_PREFIX))) {
                         log.info(" Failed!\n");
                         failAndLog(testPair.getFailMessage(output));
                     }