Upstream/Essentials
1
0
Fork 0
mirror of https://github.com/EssentialsX/Essentials.git synced 2024-11-20 09:36:19 +01:00
Code Issues Projects Releases Wiki Activity

Fix unit tests.

Browse Source
This commit is contained in:
KHobbits 2012-04-04 03:21:14 +01:00
parent 2ddd31a37d
commit 98b716dfbf
1 changed files with 41 additions and 41 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

82
Essentials/test/com/earth2me/essentials/UtilTest.java
View File

@ -44,67 +44,67 @@ public class UtilTest extends TestCase
Calendar a, b;
a = new GregorianCalendar(2010, 1, 1, 10, 0, 0);
b = new GregorianCalendar(2010, 1, 1, 10, 0, 1);
assertEquals(" 1 second", Util.formatDateDiff(a, b));
assertEquals("1 second", Util.formatDateDiff(a, b));
a = new GregorianCalendar(2010, 1, 1, 10, 0, 0);
b = new GregorianCalendar(2010, 1, 1, 10, 0, 2);
assertEquals(" 2 seconds", Util.formatDateDiff(a, b));
assertEquals("2 seconds", Util.formatDateDiff(a, b));
a = new GregorianCalendar(2010, 1, 1, 10, 0, 0);
b = new GregorianCalendar(2010, 1, 1, 10, 0, 3);
assertEquals(" 3 seconds", Util.formatDateDiff(a, b));
assertEquals("3 seconds", Util.formatDateDiff(a, b));
a = new GregorianCalendar(2010, 1, 1, 10, 0, 0);
b = new GregorianCalendar(2010, 1, 1, 10, 1, 0);
assertEquals(" 1 minute", Util.formatDateDiff(a, b));
assertEquals("1 minute", Util.formatDateDiff(a, b));
a = new GregorianCalendar(2010, 1, 1, 10, 0, 0);
b = new GregorianCalendar(2010, 1, 1, 10, 2, 0);
assertEquals(" 2 minutes", Util.formatDateDiff(a, b));
assertEquals("2 minutes", Util.formatDateDiff(a, b));
a = new GregorianCalendar(2010, 1, 1, 10, 0, 0);
b = new GregorianCalendar(2010, 1, 1, 10, 3, 0);
assertEquals(" 3 minutes", Util.formatDateDiff(a, b));
assertEquals("3 minutes", Util.formatDateDiff(a, b));
a = new GregorianCalendar(2010, 1, 1, 10, 0, 0);
b = new GregorianCalendar(2010, 1, 1, 11, 0, 0);
assertEquals(" 1 hour", Util.formatDateDiff(a, b));
assertEquals("1 hour", Util.formatDateDiff(a, b));
a = new GregorianCalendar(2010, 1, 1, 10, 0, 0);
b = new GregorianCalendar(2010, 1, 1, 12, 0, 0);
assertEquals(" 2 hours", Util.formatDateDiff(a, b));
assertEquals("2 hours", Util.formatDateDiff(a, b));
a = new GregorianCalendar(2010, 1, 1, 10, 0, 0);
b = new GregorianCalendar(2010, 1, 1, 13, 0, 0);
assertEquals(" 3 hours", Util.formatDateDiff(a, b));
assertEquals("3 hours", Util.formatDateDiff(a, b));
a = new GregorianCalendar(2010, 1, 1, 10, 0, 0);
b = new GregorianCalendar(2010, 1, 2, 10, 0, 0);
assertEquals(" 1 day", Util.formatDateDiff(a, b));
assertEquals("1 day", Util.formatDateDiff(a, b));
a = new GregorianCalendar(2010, 1, 1, 10, 0, 0);
b = new GregorianCalendar(2010, 1, 3, 10, 0, 0);
assertEquals(" 2 days", Util.formatDateDiff(a, b));
assertEquals("2 days", Util.formatDateDiff(a, b));
a = new GregorianCalendar(2010, 1, 1, 10, 0, 0);
b = new GregorianCalendar(2010, 1, 4, 10, 0, 0);
assertEquals(" 3 days", Util.formatDateDiff(a, b));
assertEquals("3 days", Util.formatDateDiff(a, b));
a = new GregorianCalendar(2010, 1, 1, 10, 0, 0);
b = new GregorianCalendar(2010, 2, 1, 10, 0, 0);
assertEquals(" 1 month", Util.formatDateDiff(a, b));
assertEquals("1 month", Util.formatDateDiff(a, b));
a = new GregorianCalendar(2010, 1, 1, 10, 0, 0);
b = new GregorianCalendar(2010, 3, 1, 10, 0, 0);
assertEquals(" 2 months", Util.formatDateDiff(a, b));
assertEquals("2 months", Util.formatDateDiff(a, b));
a = new GregorianCalendar(2010, 1, 1, 10, 0, 0);
b = new GregorianCalendar(2010, 4, 1, 10, 0, 0);
assertEquals(" 3 months", Util.formatDateDiff(a, b));
assertEquals("3 months", Util.formatDateDiff(a, b));
a = new GregorianCalendar(2010, 1, 1, 10, 0, 0);
b = new GregorianCalendar(2011, 1, 1, 10, 0, 0);
assertEquals(" 1 year", Util.formatDateDiff(a, b));
assertEquals("1 year", Util.formatDateDiff(a, b));
a = new GregorianCalendar(2010, 1, 1, 10, 0, 0);
b = new GregorianCalendar(2012, 1, 1, 10, 0, 0);
assertEquals(" 2 years", Util.formatDateDiff(a, b));
assertEquals("2 years", Util.formatDateDiff(a, b));
a = new GregorianCalendar(2010, 1, 1, 10, 0, 0);
b = new GregorianCalendar(2013, 1, 1, 10, 0, 0);
assertEquals(" 3 years", Util.formatDateDiff(a, b));
assertEquals("3 years", Util.formatDateDiff(a, b));
a = new GregorianCalendar(2010, 1, 1, 10, 0, 0);
b = new GregorianCalendar(2011, 4, 5, 23, 38, 12);
assertEquals(" 1 year 3 months 4 days 13 hours 38 minutes 12 seconds", Util.formatDateDiff(a, b));
assertEquals("1 year 3 months 4 days", Util.formatDateDiff(a, b));
a = new GregorianCalendar(2010, 9, 17, 23, 45, 45);
b = new GregorianCalendar(2015, 3, 7, 10, 0, 0);
assertEquals(" 4 years 5 months 20 days 10 hours 14 minutes 15 seconds", Util.formatDateDiff(a, b));
assertEquals("4 years 5 months 20 days", Util.formatDateDiff(a, b));
a = new GregorianCalendar(2011, 4, 31, 10, 0, 0);
b = new GregorianCalendar(2011, 4, 31, 10, 5, 0);
assertEquals(" 5 minutes", Util.formatDateDiff(a, b));
assertEquals("5 minutes", Util.formatDateDiff(a, b));
}
public void testFDDpast()
@ -112,63 +112,63 @@ public class UtilTest extends TestCase
Calendar a, b;
a = new GregorianCalendar(2010, 1, 1, 10, 0, 0);
b = new GregorianCalendar(2010, 1, 1, 9, 59, 59);
assertEquals(" 1 second", Util.formatDateDiff(a, b));
assertEquals("1 second", Util.formatDateDiff(a, b));
a = new GregorianCalendar(2010, 1, 1, 10, 0, 0);
b = new GregorianCalendar(2010, 1, 1, 9, 59, 58);
assertEquals(" 2 seconds", Util.formatDateDiff(a, b));
assertEquals("2 seconds", Util.formatDateDiff(a, b));
a = new GregorianCalendar(2010, 1, 1, 10, 0, 0);
b = new GregorianCalendar(2010, 1, 1, 9, 59, 57);
assertEquals(" 3 seconds", Util.formatDateDiff(a, b));
assertEquals("3 seconds", Util.formatDateDiff(a, b));
a = new GregorianCalendar(2010, 1, 1, 10, 0, 0);
b = new GregorianCalendar(2010, 1, 1, 9, 59, 0);
assertEquals(" 1 minute", Util.formatDateDiff(a, b));
assertEquals("1 minute", Util.formatDateDiff(a, b));
a = new GregorianCalendar(2010, 1, 1, 10, 0, 0);
b = new GregorianCalendar(2010, 1, 1, 9, 58, 0);
assertEquals(" 2 minutes", Util.formatDateDiff(a, b));
assertEquals("2 minutes", Util.formatDateDiff(a, b));
a = new GregorianCalendar(2010, 1, 1, 10, 0, 0);
b = new GregorianCalendar(2010, 1, 1, 9, 57, 0);
assertEquals(" 3 minutes", Util.formatDateDiff(a, b));
assertEquals("3 minutes", Util.formatDateDiff(a, b));
a = new GregorianCalendar(2010, 1, 1, 10, 0, 0);
b = new GregorianCalendar(2010, 1, 1, 9, 0, 0);
assertEquals(" 1 hour", Util.formatDateDiff(a, b));
assertEquals("1 hour", Util.formatDateDiff(a, b));
a = new GregorianCalendar(2010, 1, 1, 10, 0, 0);
b = new GregorianCalendar(2010, 1, 1, 8, 0, 0);
assertEquals(" 2 hours", Util.formatDateDiff(a, b));
assertEquals("2 hours", Util.formatDateDiff(a, b));
a = new GregorianCalendar(2010, 1, 1, 10, 0, 0);
b = new GregorianCalendar(2010, 1, 1, 7, 0, 0);
assertEquals(" 3 hours", Util.formatDateDiff(a, b));
assertEquals("3 hours", Util.formatDateDiff(a, b));
a = new GregorianCalendar(2010, 1, 5, 10, 0, 0);
b = new GregorianCalendar(2010, 1, 4, 10, 0, 0);
assertEquals(" 1 day", Util.formatDateDiff(a, b));
assertEquals("1 day", Util.formatDateDiff(a, b));
a = new GregorianCalendar(2010, 1, 5, 10, 0, 0);
b = new GregorianCalendar(2010, 1, 3, 10, 0, 0);
assertEquals(" 2 days", Util.formatDateDiff(a, b));
assertEquals("2 days", Util.formatDateDiff(a, b));
a = new GregorianCalendar(2010, 1, 5, 10, 0, 0);
b = new GregorianCalendar(2010, 1, 2, 10, 0, 0);
assertEquals(" 3 days", Util.formatDateDiff(a, b));
assertEquals("3 days", Util.formatDateDiff(a, b));
a = new GregorianCalendar(2010, 5, 1, 10, 0, 0);
b = new GregorianCalendar(2010, 4, 1, 10, 0, 0);
assertEquals(" 1 month", Util.formatDateDiff(a, b));
assertEquals("1 month", Util.formatDateDiff(a, b));
a = new GregorianCalendar(2010, 5, 1, 10, 0, 0);
b = new GregorianCalendar(2010, 3, 1, 10, 0, 0);
assertEquals(" 2 months", Util.formatDateDiff(a, b));
assertEquals("2 months", Util.formatDateDiff(a, b));
a = new GregorianCalendar(2010, 5, 1, 10, 0, 0);
b = new GregorianCalendar(2010, 2, 1, 10, 0, 0);
assertEquals(" 3 months", Util.formatDateDiff(a, b));
assertEquals("3 months", Util.formatDateDiff(a, b));
a = new GregorianCalendar(2010, 1, 1, 10, 0, 0);
b = new GregorianCalendar(2009, 1, 1, 10, 0, 0);
assertEquals(" 1 year", Util.formatDateDiff(a, b));
assertEquals("1 year", Util.formatDateDiff(a, b));
a = new GregorianCalendar(2010, 1, 1, 10, 0, 0);
b = new GregorianCalendar(2008, 1, 1, 10, 0, 0);
assertEquals(" 2 years", Util.formatDateDiff(a, b));
assertEquals("2 years", Util.formatDateDiff(a, b));
a = new GregorianCalendar(2010, 1, 1, 10, 0, 0);
b = new GregorianCalendar(2007, 1, 1, 10, 0, 0);
assertEquals(" 3 years", Util.formatDateDiff(a, b));
assertEquals("3 years", Util.formatDateDiff(a, b));
a = new GregorianCalendar(2010, 1, 1, 10, 0, 0);
b = new GregorianCalendar(2009, 4, 5, 23, 38, 12);
assertEquals(" 8 months 26 days 10 hours 21 minutes 48 seconds", Util.formatDateDiff(a, b));
assertEquals("8 months 26 days 10 hours", Util.formatDateDiff(a, b));
a = new GregorianCalendar(2010, 9, 17, 23, 45, 45);
b = new GregorianCalendar(2000, 3, 7, 10, 0, 0);
assertEquals(" 10 years 6 months 10 days 13 hours 45 minutes 45 seconds", Util.formatDateDiff(a, b));
assertEquals("10 years 6 months 10 days", Util.formatDateDiff(a, b));
}
}