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

It's confusing to re-use field names locally 

git-svn-id: https://svn.apache.org/repos/asf/commons/proper/lang/trunk@1533556 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Sebastian Bazley 2013-10-18 16:53:41 +00:00
parent 1d97f23c08
commit 602038dcff
1 changed files with 52 additions and 52 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -159,15 +159,15 @@ public class DateUtilsTest {
//----------------------------------------------------------------------- //-----------------------------------------------------------------------
@Test @Test
public void testIsSameDay_Date() { public void testIsSameDay_Date() {
Date date1 = new GregorianCalendar(2004, 6, 9, 13, 45).getTime(); Date datea = new GregorianCalendar(2004, 6, 9, 13, 45).getTime();
Date date2 = new GregorianCalendar(2004, 6, 9, 13, 45).getTime(); Date dateb = new GregorianCalendar(2004, 6, 9, 13, 45).getTime();
assertTrue(DateUtils.isSameDay(date1, date2)); assertTrue(DateUtils.isSameDay(datea, dateb));
date2 = new GregorianCalendar(2004, 6, 10, 13, 45).getTime(); dateb = new GregorianCalendar(2004, 6, 10, 13, 45).getTime();
assertFalse(DateUtils.isSameDay(date1, date2)); assertFalse(DateUtils.isSameDay(datea, dateb));
date1 = new GregorianCalendar(2004, 6, 10, 13, 45).getTime(); datea = new GregorianCalendar(2004, 6, 10, 13, 45).getTime();
assertTrue(DateUtils.isSameDay(date1, date2)); assertTrue(DateUtils.isSameDay(datea, dateb));
date2 = new GregorianCalendar(2005, 6, 10, 13, 45).getTime(); dateb = new GregorianCalendar(2005, 6, 10, 13, 45).getTime();
assertFalse(DateUtils.isSameDay(date1, date2)); assertFalse(DateUtils.isSameDay(datea, dateb));
try { try {
DateUtils.isSameDay((Date) null, (Date) null); DateUtils.isSameDay((Date) null, (Date) null);
fail(); fail();
@ -177,15 +177,15 @@ public class DateUtilsTest {
//----------------------------------------------------------------------- //-----------------------------------------------------------------------
@Test @Test
public void testIsSameDay_Cal() { public void testIsSameDay_Cal() {
final GregorianCalendar cal1 = new GregorianCalendar(2004, 6, 9, 13, 45); final GregorianCalendar cala = new GregorianCalendar(2004, 6, 9, 13, 45);
final GregorianCalendar cal2 = new GregorianCalendar(2004, 6, 9, 13, 45); final GregorianCalendar calb = new GregorianCalendar(2004, 6, 9, 13, 45);
assertTrue(DateUtils.isSameDay(cal1, cal2)); assertTrue(DateUtils.isSameDay(cala, calb));
cal2.add(Calendar.DAY_OF_YEAR, 1); calb.add(Calendar.DAY_OF_YEAR, 1);
assertFalse(DateUtils.isSameDay(cal1, cal2)); assertFalse(DateUtils.isSameDay(cala, calb));
cal1.add(Calendar.DAY_OF_YEAR, 1); cala.add(Calendar.DAY_OF_YEAR, 1);
assertTrue(DateUtils.isSameDay(cal1, cal2)); assertTrue(DateUtils.isSameDay(cala, calb));
cal2.add(Calendar.YEAR, 1); calb.add(Calendar.YEAR, 1);
assertFalse(DateUtils.isSameDay(cal1, cal2)); assertFalse(DateUtils.isSameDay(cala, calb));
try { try {
DateUtils.isSameDay((Calendar) null, (Calendar) null); DateUtils.isSameDay((Calendar) null, (Calendar) null);
fail(); fail();
@ -195,15 +195,15 @@ public class DateUtilsTest {
//----------------------------------------------------------------------- //-----------------------------------------------------------------------
@Test @Test
public void testIsSameInstant_Date() { public void testIsSameInstant_Date() {
Date date1 = new GregorianCalendar(2004, 6, 9, 13, 45).getTime(); Date datea = new GregorianCalendar(2004, 6, 9, 13, 45).getTime();
Date date2 = new GregorianCalendar(2004, 6, 9, 13, 45).getTime(); Date dateb = new GregorianCalendar(2004, 6, 9, 13, 45).getTime();
assertTrue(DateUtils.isSameInstant(date1, date2)); assertTrue(DateUtils.isSameInstant(datea, dateb));
date2 = new GregorianCalendar(2004, 6, 10, 13, 45).getTime(); dateb = new GregorianCalendar(2004, 6, 10, 13, 45).getTime();
assertFalse(DateUtils.isSameInstant(date1, date2)); assertFalse(DateUtils.isSameInstant(datea, dateb));
date1 = new GregorianCalendar(2004, 6, 10, 13, 45).getTime(); datea = new GregorianCalendar(2004, 6, 10, 13, 45).getTime();
assertTrue(DateUtils.isSameInstant(date1, date2)); assertTrue(DateUtils.isSameInstant(datea, dateb));
date2 = new GregorianCalendar(2005, 6, 10, 13, 45).getTime(); dateb = new GregorianCalendar(2005, 6, 10, 13, 45).getTime();
assertFalse(DateUtils.isSameInstant(date1, date2)); assertFalse(DateUtils.isSameInstant(datea, dateb));
try { try {
DateUtils.isSameInstant((Date) null, (Date) null); DateUtils.isSameInstant((Date) null, (Date) null);
fail(); fail();
@ -213,16 +213,16 @@ public class DateUtilsTest {
//----------------------------------------------------------------------- //-----------------------------------------------------------------------
@Test @Test
public void testIsSameInstant_Cal() { public void testIsSameInstant_Cal() {
final GregorianCalendar cal1 = new GregorianCalendar(TimeZone.getTimeZone("GMT+1")); final GregorianCalendar cala = new GregorianCalendar(TimeZone.getTimeZone("GMT+1"));
final GregorianCalendar cal2 = new GregorianCalendar(TimeZone.getTimeZone("GMT-1")); final GregorianCalendar calb = new GregorianCalendar(TimeZone.getTimeZone("GMT-1"));
cal1.set(2004, 6, 9, 13, 45, 0); cala.set(2004, 6, 9, 13, 45, 0);
cal1.set(Calendar.MILLISECOND, 0); cala.set(Calendar.MILLISECOND, 0);
cal2.set(2004, 6, 9, 13, 45, 0); calb.set(2004, 6, 9, 13, 45, 0);
cal2.set(Calendar.MILLISECOND, 0); calb.set(Calendar.MILLISECOND, 0);
assertFalse(DateUtils.isSameInstant(cal1, cal2)); assertFalse(DateUtils.isSameInstant(cala, calb));
cal2.set(2004, 6, 9, 11, 45, 0); calb.set(2004, 6, 9, 11, 45, 0);
assertTrue(DateUtils.isSameInstant(cal1, cal2)); assertTrue(DateUtils.isSameInstant(cala, calb));
try { try {
DateUtils.isSameInstant((Calendar) null, (Calendar) null); DateUtils.isSameInstant((Calendar) null, (Calendar) null);
fail(); fail();
@ -232,24 +232,24 @@ public class DateUtilsTest {
//----------------------------------------------------------------------- //-----------------------------------------------------------------------
@Test @Test
public void testIsSameLocalTime_Cal() { public void testIsSameLocalTime_Cal() {
final GregorianCalendar cal1 = new GregorianCalendar(TimeZone.getTimeZone("GMT+1")); final GregorianCalendar cala = new GregorianCalendar(TimeZone.getTimeZone("GMT+1"));
final GregorianCalendar cal2 = new GregorianCalendar(TimeZone.getTimeZone("GMT-1")); final GregorianCalendar calb = new GregorianCalendar(TimeZone.getTimeZone("GMT-1"));
cal1.set(2004, 6, 9, 13, 45, 0); cala.set(2004, 6, 9, 13, 45, 0);
cal1.set(Calendar.MILLISECOND, 0); cala.set(Calendar.MILLISECOND, 0);
cal2.set(2004, 6, 9, 13, 45, 0); calb.set(2004, 6, 9, 13, 45, 0);
cal2.set(Calendar.MILLISECOND, 0); calb.set(Calendar.MILLISECOND, 0);
assertTrue(DateUtils.isSameLocalTime(cal1, cal2)); assertTrue(DateUtils.isSameLocalTime(cala, calb));
final Calendar cal3 = Calendar.getInstance(); final Calendar calc = Calendar.getInstance();
final Calendar cal4 = Calendar.getInstance(); final Calendar cald = Calendar.getInstance();
cal3.set(2004, 6, 9, 4, 0, 0); calc.set(2004, 6, 9, 4, 0, 0);
cal4.set(2004, 6, 9, 16, 0, 0); cald.set(2004, 6, 9, 16, 0, 0);
cal3.set(Calendar.MILLISECOND, 0); calc.set(Calendar.MILLISECOND, 0);
cal4.set(Calendar.MILLISECOND, 0); cald.set(Calendar.MILLISECOND, 0);
assertFalse("LANG-677", DateUtils.isSameLocalTime(cal3, cal4)); assertFalse("LANG-677", DateUtils.isSameLocalTime(calc, cald));
cal2.set(2004, 6, 9, 11, 45, 0); calb.set(2004, 6, 9, 11, 45, 0);
assertFalse(DateUtils.isSameLocalTime(cal1, cal2)); assertFalse(DateUtils.isSameLocalTime(cala, calb));
try { try {
DateUtils.isSameLocalTime((Calendar) null, (Calendar) null); DateUtils.isSameLocalTime((Calendar) null, (Calendar) null);
fail(); fail();