Commit 9ff46eed authored by Alexander's avatar Alexander
Browse files

Remove null warnings

parent 37b6fd95
...@@ -211,26 +211,26 @@ public abstract class TestBase { ...@@ -211,26 +211,26 @@ public abstract class TestBase {
switch (testPair.getType()) { switch (testPair.getType()) {
case CHECK_EQUALS: case CHECK_EQUALS:
if (!output.equals(testPair.getOutput())) { if (!testPair.getOutput().equals(output)) {
log.info(" Failed!\n"); log.info(" Failed!\n");
printLog(); printLog();
assertEquals(testPair.getOutput(), output); assertEquals(testPair.getOutput(), output);
} }
break; break;
case CHECK_STARTS_WITH: case CHECK_STARTS_WITH:
if (!output.startsWith(testPair.getOutput())) { if (!(output != null && output.startsWith(testPair.getOutput()))) {
log.info(" Failed!\n"); log.info(" Failed!\n");
failAndLog(testPair.getFailMessage(output)); failAndLog(testPair.getFailMessage(output));
} }
break; break;
case CHECK_CONTAINS: case CHECK_CONTAINS:
if (!output.contains(testPair.getOutput())) { if (!(output != null && output.contains(testPair.getOutput()))) {
log.info(" Failed!\n"); log.info(" Failed!\n");
failAndLog(testPair.getFailMessage(output)); failAndLog(testPair.getFailMessage(output));
} }
break; break;
case CHECK_FOR_ERROR: case CHECK_FOR_ERROR:
if (!output.startsWith(ERROR_PREFIX)) { if (!(output != null && output.startsWith(ERROR_PREFIX))) {
log.info(" Failed!\n"); log.info(" Failed!\n");
failAndLog(testPair.getFailMessage(output)); failAndLog(testPair.getFailMessage(output));
} }
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment