591 |
591 |
592 traceAssert(String.format("assertNotNull(%s): %s", value, msg)); |
592 traceAssert(String.format("assertNotNull(%s): %s", value, msg)); |
593 } |
593 } |
594 |
594 |
595 public static void assertTrue(boolean actual, String msg) { |
595 public static void assertTrue(boolean actual, String msg) { |
|
596 assertTrue(actual, msg, null); |
|
597 } |
|
598 |
|
599 public static void assertFalse(boolean actual, String msg) { |
|
600 assertFalse(actual, msg, null); |
|
601 } |
|
602 |
|
603 public static void assertTrue(boolean actual, String msg, Runnable onFail) { |
596 currentTest.notifyAssert(); |
604 currentTest.notifyAssert(); |
597 if (!actual) { |
605 if (!actual) { |
598 error(concatMessages("Unexpected FALSE", msg)); |
606 if (onFail != null) { |
|
607 onFail.run(); |
|
608 } |
|
609 error(concatMessages("Failed", msg)); |
599 } |
610 } |
600 |
611 |
601 traceAssert(String.format("assertTrue(): %s", msg)); |
612 traceAssert(String.format("assertTrue(): %s", msg)); |
602 } |
613 } |
603 |
614 |
604 public static void assertFalse(boolean actual, String msg) { |
615 public static void assertFalse(boolean actual, String msg, Runnable onFail) { |
605 currentTest.notifyAssert(); |
616 currentTest.notifyAssert(); |
606 if (actual) { |
617 if (actual) { |
607 error(concatMessages("Unexpected TRUE", msg)); |
618 if (onFail != null) { |
|
619 onFail.run(); |
|
620 } |
|
621 error(concatMessages("Failed", msg)); |
608 } |
622 } |
609 |
623 |
610 traceAssert(String.format("assertFalse(): %s", msg)); |
624 traceAssert(String.format("assertFalse(): %s", msg)); |
611 } |
625 } |
612 |
626 |