From: David G. <mu...@us...> - 2006-10-05 14:40:28
|
Update of /cvsroot/jfreechart/jfreechart/tests/org/jfree/data/time/junit In directory sc8-pr-cvs6.sourceforge.net:/tmp/cvs-serv6302/tests/org/jfree/data/time/junit Modified Files: Tag: STABLE_1-0-0 MinuteTests.java Log Message: 2006-10-05 David Gilbert <dav...@ob...> * tests/org/jfree/data/time/junit/MinuteTests.java (testGetFirstMillisecond): New test, (testGetFirstMillisecondWithTimeZone): Likewise, (testGetFirstMillisecondWithCalendar): Likewise, (testGetLastMillisecond): Likewise, (testGetLastMillisecondWithTimeZone): Likewise, (testGetLastMillisecondWithCalendar): Likewise, (testGetSerialIndex): Likewise, (testNext): Likewise, (testGetStart): Likewise, (testGetEnd): Likewise. Index: MinuteTests.java =================================================================== RCS file: /cvsroot/jfreechart/jfreechart/tests/org/jfree/data/time/junit/Attic/MinuteTests.java,v retrieving revision 1.1.2.1 retrieving revision 1.1.2.2 diff -C2 -d -r1.1.2.1 -r1.1.2.2 *** MinuteTests.java 3 Oct 2006 15:41:39 -0000 1.1.2.1 --- MinuteTests.java 5 Oct 2006 14:40:19 -0000 1.1.2.2 *************** *** 3,7 **** * =========================================================== * ! * (C) Copyright 2000-2005, by Object Refinery Limited and Contributors. * * Project Info: http://www.jfree.org/jfreechart/index.html --- 3,7 ---- * =========================================================== * ! * (C) Copyright 2000-2006, by Object Refinery Limited and Contributors. * * Project Info: http://www.jfree.org/jfreechart/index.html *************** *** 28,32 **** * MinuteTests.java * ---------------- ! * (C) Copyright 2002-2005 by Object Refinery Limited. * * Original Author: David Gilbert (for Object Refinery Limited); --- 28,32 ---- * MinuteTests.java * ---------------- ! * (C) Copyright 2002-2006 by Object Refinery Limited. * * Original Author: David Gilbert (for Object Refinery Limited); *************** *** 42,45 **** --- 42,46 ---- * 21-Oct-2003 : Added hashCode test (DG); * 11-Jan-2005 : Added test for non-clonability (DG); + * 05-Oct-2006 : Added new tests (DG); * */ *************** *** 53,57 **** --- 54,61 ---- import java.io.ObjectOutput; import java.io.ObjectOutputStream; + import java.util.Calendar; import java.util.Date; + import java.util.GregorianCalendar; + import java.util.Locale; import java.util.TimeZone; *************** *** 202,205 **** --- 206,360 ---- assertFalse(m instanceof Cloneable); } + + /** + * Some checks for the getFirstMillisecond() method. + */ + public void testGetFirstMillisecond() { + Locale saved = Locale.getDefault(); + Locale.setDefault(Locale.UK); + Minute m = new Minute(43, 15, 1, 4, 2006); + assertEquals(1143902580000L, m.getFirstMillisecond()); + Locale.setDefault(saved); + } + + /** + * Some checks for the getFirstMillisecond(TimeZone) method. + */ + public void testGetFirstMillisecondWithTimeZone() { + Minute m = new Minute(59, 15, 1, 4, 1950); + TimeZone zone = TimeZone.getTimeZone("America/Los_Angeles"); + assertEquals(-623289660000L, m.getFirstMillisecond(zone)); + + // try null calendar + boolean pass = false; + try { + m.getFirstMillisecond((TimeZone) null); + } + catch (NullPointerException e) { + pass = true; + } + assertTrue(pass); + } + + /** + * Some checks for the getFirstMillisecond(TimeZone) method. + */ + public void testGetFirstMillisecondWithCalendar() { + Minute m = new Minute(40, 2, 15, 4, 2000); + GregorianCalendar calendar = new GregorianCalendar(Locale.GERMANY); + assertEquals(955762800000L, m.getFirstMillisecond(calendar)); + + // try null calendar + boolean pass = false; + try { + m.getFirstMillisecond((Calendar) null); + } + catch (NullPointerException e) { + pass = true; + } + assertTrue(pass); + } + + /** + * Some checks for the getLastMillisecond() method. + */ + public void testGetLastMillisecond() { + Locale saved = Locale.getDefault(); + Locale.setDefault(Locale.UK); + Minute m = new Minute(1, 1, 1, 1, 1970); + assertEquals(119999L, m.getLastMillisecond()); + Locale.setDefault(saved); + } + + /** + * Some checks for the getLastMillisecond(TimeZone) method. + */ + public void testGetLastMillisecondWithTimeZone() { + Minute m = new Minute(1, 2, 7, 7, 1950); + TimeZone zone = TimeZone.getTimeZone("America/Los_Angeles"); + assertEquals(-614962680001L, m.getLastMillisecond(zone)); + + // try null calendar + boolean pass = false; + try { + m.getLastMillisecond((TimeZone) null); + } + catch (NullPointerException e) { + pass = true; + } + assertTrue(pass); + } + + /** + * Some checks for the getLastMillisecond(TimeZone) method. + */ + public void testGetLastMillisecondWithCalendar() { + Minute m = new Minute(45, 21, 21, 4, 2001); + GregorianCalendar calendar = new GregorianCalendar(Locale.GERMANY); + assertEquals(987885959999L, m.getLastMillisecond(calendar)); + + // try null calendar + boolean pass = false; + try { + m.getLastMillisecond((Calendar) null); + } + catch (NullPointerException e) { + pass = true; + } + assertTrue(pass); + } + + /** + * Some checks for the getSerialIndex() method. + */ + public void testGetSerialIndex() { + Minute m = new Minute(1, 1, 1, 1, 2000); + assertEquals(52597501L, m.getSerialIndex()); + m = new Minute(1, 1, 1, 1, 1900); + assertEquals(2941L, m.getSerialIndex()); + } + + /** + * Some checks for the testNext() method. + */ + public void testNext() { + Minute m = new Minute(30, 1, 12, 12, 2000); + m = (Minute) m.next(); + assertEquals(2000, m.getHour().getYear()); + assertEquals(12, m.getHour().getMonth()); + assertEquals(12, m.getHour().getDayOfMonth()); + assertEquals(1, m.getHour().getHour()); + assertEquals(31, m.getMinute()); + m = new Minute(59, 23, 31, 12, 9999); + assertNull(m.next()); + } + + /** + * Some checks for the getStart() method. + */ + public void testGetStart() { + Locale saved = Locale.getDefault(); + Locale.setDefault(Locale.ITALY); + Calendar cal = Calendar.getInstance(Locale.ITALY); + cal.set(2006, Calendar.JANUARY, 16, 3, 47, 0); + cal.set(Calendar.MILLISECOND, 0); + Minute m = new Minute(47, 3, 16, 1, 2006); + assertEquals(cal.getTime(), m.getStart()); + Locale.setDefault(saved); + } + + /** + * Some checks for the getEnd() method. + */ + public void testGetEnd() { + Locale saved = Locale.getDefault(); + Locale.setDefault(Locale.ITALY); + Calendar cal = Calendar.getInstance(Locale.ITALY); + cal.set(2006, Calendar.JANUARY, 16, 3, 47, 59); + cal.set(Calendar.MILLISECOND, 999); + Minute m = new Minute(47, 3, 16, 1, 2006); + assertEquals(cal.getTime(), m.getEnd()); + Locale.setDefault(saved); + } } \ No newline at end of file |