Apache/commons-lang
1
0
Fork 0
mirror of https://github.com/apache/commons-lang.git synced 2025-02-13 05:25:20 +00:00
Code Issues Packages Projects Releases Wiki Activity

LANG-677 DateUtils isSameLocalTime() compares the hour using 12hour Calendar.HOUR instead of 24hour Calendar.HOUR_OF_DAY - thanks to Christian

Browse Source 
git-svn-id: https://svn.apache.org/repos/asf/commons/proper/lang/trunk@1066645 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Niall Pemberton 2011-02-02 21:55:15 +00:00
parent a655a3fafb
commit 3e5d5dc9c0
2 changed files with 9 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/main/java/org/apache/commons/lang3/time/DateUtils.java
View File

@ -262,7 +262,7 @@ public static boolean isSameLocalTime(Calendar cal1, Calendar cal2) {
return (cal1.get(Calendar.MILLISECOND) == cal2.get(Calendar.MILLISECOND) &&
cal1.get(Calendar.SECOND) == cal2.get(Calendar.SECOND) &&
cal1.get(Calendar.MINUTE) == cal2.get(Calendar.MINUTE) &&
cal1.get(Calendar.HOUR) == cal2.get(Calendar.HOUR) &&
cal1.get(Calendar.HOUR_OF_DAY) == cal2.get(Calendar.HOUR_OF_DAY) &&
cal1.get(Calendar.DAY_OF_YEAR) == cal2.get(Calendar.DAY_OF_YEAR) &&
cal1.get(Calendar.YEAR) == cal2.get(Calendar.YEAR) &&
cal1.get(Calendar.ERA) == cal2.get(Calendar.ERA) &&

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

@ -227,6 +227,14 @@ public void testIsSameLocalTime_Cal() {
cal2.set(2004, 6, 9, 13, 45, 0);
cal2.set(Calendar.MILLISECOND, 0);
assertEquals(true, DateUtils.isSameLocalTime(cal1, cal2));
Calendar cal3 = Calendar.getInstance();
Calendar cal4 = Calendar.getInstance();
cal3.set(2004, 6, 9, 4, 0, 0);
cal4.set(2004, 6, 9, 16, 0, 0);
cal3.set(Calendar.MILLISECOND, 0);
cal4.set(Calendar.MILLISECOND, 0);
assertFalse("LANG-677", DateUtils.isSameLocalTime(cal3, cal4));
cal2.set(2004, 6, 9, 11, 45, 0);
assertEquals(false, DateUtils.isSameLocalTime(cal1, cal2));