Apache
/
commons-lang
mirror of https://github.com/apache/commons-lang.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

DateUtilsTest asserts (closes #246) 

Use JUnit's assertFalse for assertions with conditions instead of
re-implementing the logic here by testing the condition and throwing an
AssertionFailureException if the condition is met.
This commit is contained in:
Allon Mureinik 2017-02-27 21:35:03 +02:00 committed by pascalschumacher
parent 44516f77ec
commit 98fa164cd8
1 changed files with 4 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
src/test/java/org/apache/commons/lang3/time/DateUtilsTest.java
View File

@ -43,8 +43,6 @@
import org.junit.Rule;
import org.junit.Test;
import junit.framework.AssertionFailedError;
/**
* Unit tests {@link org.apache.commons.lang3.time.DateUtils}.
*/
@ -1722,9 +1720,8 @@ private static void assertWeekIterator(final Iterator<?> it, final Calendar star
last.add(Calendar.DATE, 1);
assertCalendarsEquals("", last, cal, 0);
}
if (count % 7 != 0) {
throw new AssertionFailedError("There were " + count + " days in this iterator");
}
assertFalse("There were " + count + " days in this iterator", count % 7 != 0);
assertCalendarsEquals("", end, cal, 0);
}
@ -1733,10 +1730,8 @@ private static void assertWeekIterator(final Iterator<?> it, final Calendar star
* delta is in milliseconds
*/
private static void assertCalendarsEquals(final String message, final Calendar cal1, final Calendar cal2, final long delta) {
if (Math.abs(cal1.getTime().getTime() - cal2.getTime().getTime()) > delta) {
throw new AssertionFailedError(
message + " expected " + cal1.getTime() + " but got " + cal2.getTime());
}
assertFalse(message + " expected " + cal1.getTime() + " but got " + cal2.getTime(),
Math.abs(cal1.getTime().getTime() - cal2.getTime().getTime()) > delta);
}
@Test