From: <mu...@us...> - 2007-10-12 14:13:54
|
Revision: 333 http://jfreechart.svn.sourceforge.net/jfreechart/?rev=333&view=rev Author: mungady Date: 2007-10-12 07:13:46 -0700 (Fri, 12 Oct 2007) Log Message: ----------- Removed CVS $Id tags. Modified Paths: -------------- trunk/tests/org/jfree/chart/axis/junit/AxisLocationTests.java trunk/tests/org/jfree/chart/axis/junit/AxisSpaceTests.java trunk/tests/org/jfree/chart/axis/junit/AxisTests.java trunk/tests/org/jfree/chart/axis/junit/CategoryAnchorTests.java trunk/tests/org/jfree/chart/axis/junit/CategoryAxis3DTests.java trunk/tests/org/jfree/chart/axis/junit/CategoryAxisTests.java trunk/tests/org/jfree/chart/axis/junit/CategoryLabelPositionTests.java trunk/tests/org/jfree/chart/axis/junit/CategoryLabelPositionsTests.java trunk/tests/org/jfree/chart/axis/junit/CategoryLabelWidthTypeTests.java trunk/tests/org/jfree/chart/axis/junit/CategoryTickTests.java trunk/tests/org/jfree/chart/axis/junit/CyclicNumberAxisTests.java trunk/tests/org/jfree/chart/axis/junit/DateAxisTests.java trunk/tests/org/jfree/chart/axis/junit/DateTickMarkPositionTests.java trunk/tests/org/jfree/chart/axis/junit/DateTickTests.java trunk/tests/org/jfree/chart/axis/junit/DateTickUnitTests.java trunk/tests/org/jfree/chart/axis/junit/ExtendedCategoryAxisTests.java trunk/tests/org/jfree/chart/axis/junit/LogarithmicAxisTests.java Modified: trunk/tests/org/jfree/chart/axis/junit/AxisLocationTests.java =================================================================== --- trunk/tests/org/jfree/chart/axis/junit/AxisLocationTests.java 2007-10-11 14:53:49 UTC (rev 332) +++ trunk/tests/org/jfree/chart/axis/junit/AxisLocationTests.java 2007-10-12 14:13:46 UTC (rev 333) @@ -2,7 +2,7 @@ * JFreeChart : a free chart library for the Java(tm) platform * =========================================================== * - * (C) Copyright 2000-2005, by Object Refinery Limited and Contributors. + * (C) Copyright 2000-2007, by Object Refinery Limited and Contributors. * * Project Info: http://www.jfree.org/jfreechart/index.html * @@ -27,13 +27,11 @@ * ---------------------- * AxisLocationTests.java * ---------------------- - * (C) Copyright 2003-2005, by Object Refinery Limited and Contributors. + * (C) Copyright 2003-2007, by Object Refinery Limited and Contributors. * * Original Author: David Gilbert (for Object Refinery Limited); * Contributor(s): -; * - * $Id: AxisLocationTests.java,v 1.1.2.1 2006/10/03 15:41:22 mungady Exp $ - * * Changes * ------- * 10-Jul-2003 : Version 1 (DG); Modified: trunk/tests/org/jfree/chart/axis/junit/AxisSpaceTests.java =================================================================== --- trunk/tests/org/jfree/chart/axis/junit/AxisSpaceTests.java 2007-10-11 14:53:49 UTC (rev 332) +++ trunk/tests/org/jfree/chart/axis/junit/AxisSpaceTests.java 2007-10-12 14:13:46 UTC (rev 333) @@ -2,7 +2,7 @@ * JFreeChart : a free chart library for the Java(tm) platform * =========================================================== * - * (C) Copyright 2000-2005, by Object Refinery Limited and Contributors. + * (C) Copyright 2000-2007, by Object Refinery Limited and Contributors. * * Project Info: http://www.jfree.org/jfreechart/index.html * @@ -27,13 +27,11 @@ * ------------------- * AxisSpaceTests.java * ------------------- - * (C) Copyright 2003-2005, by Object Refinery Limited and Contributors. + * (C) Copyright 2003-2007, by Object Refinery Limited and Contributors. * * Original Author: David Gilbert (for Object Refinery Limited); * Contributor(s): -; * - * $Id: AxisSpaceTests.java,v 1.1.2.1 2006/10/03 15:41:24 mungady Exp $ - * * Changes * ------- * 14-Aug-2003 : Version 1 (DG); Modified: trunk/tests/org/jfree/chart/axis/junit/AxisTests.java =================================================================== --- trunk/tests/org/jfree/chart/axis/junit/AxisTests.java 2007-10-11 14:53:49 UTC (rev 332) +++ trunk/tests/org/jfree/chart/axis/junit/AxisTests.java 2007-10-12 14:13:46 UTC (rev 333) @@ -30,10 +30,8 @@ * (C) Copyright 2003-2007, by Object Refinery Limited and Contributors. * * Original Author: David Gilbert (for Object Refinery Limited); - * Contributor(s): -; + * Contributor(s): - * - * $Id: AxisTests.java,v 1.1.2.1 2006/10/03 15:41:23 mungady Exp $ - * * Changes * ------- * 13-Aug-2003 : Version 1 (DG); Modified: trunk/tests/org/jfree/chart/axis/junit/CategoryAnchorTests.java =================================================================== --- trunk/tests/org/jfree/chart/axis/junit/CategoryAnchorTests.java 2007-10-11 14:53:49 UTC (rev 332) +++ trunk/tests/org/jfree/chart/axis/junit/CategoryAnchorTests.java 2007-10-12 14:13:46 UTC (rev 333) @@ -2,7 +2,7 @@ * JFreeChart : a free chart library for the Java(tm) platform * =========================================================== * - * (C) Copyright 2000-2005, by Object Refinery Limited and Contributors. + * (C) Copyright 2000-2007, by Object Refinery Limited and Contributors. * * Project Info: http://www.jfree.org/jfreechart/index.html * @@ -27,13 +27,11 @@ * ------------------------ * CategoryAnchorTests.java * ------------------------ - * (C) Copyright 2004, 2005, by Object Refinery Limited and Contributors. + * (C) Copyright 2004-2007, by Object Refinery Limited and Contributors. * * Original Author: David Gilbert (for Object Refinery Limited); * Contributor(s): -; * - * $Id: CategoryAnchorTests.java,v 1.1.2.1 2006/10/03 15:41:23 mungady Exp $ - * * Changes * ------- * 13-May-2004 : Version 1 (DG); Modified: trunk/tests/org/jfree/chart/axis/junit/CategoryAxis3DTests.java =================================================================== --- trunk/tests/org/jfree/chart/axis/junit/CategoryAxis3DTests.java 2007-10-11 14:53:49 UTC (rev 332) +++ trunk/tests/org/jfree/chart/axis/junit/CategoryAxis3DTests.java 2007-10-12 14:13:46 UTC (rev 333) @@ -2,7 +2,7 @@ * JFreeChart : a free chart library for the Java(tm) platform * =========================================================== * - * (C) Copyright 2000-2005, by Object Refinery Limited and Contributors. + * (C) Copyright 2000-2007, by Object Refinery Limited and Contributors. * * Project Info: http://www.jfree.org/jfreechart/index.html * @@ -27,13 +27,11 @@ * ------------------------ * CategoryAxis3DTests.java * ------------------------ - * (C) Copyright 2003-2005, by Object Refinery Limited and Contributors. + * (C) Copyright 2003-2007, by Object Refinery Limited and Contributors. * * Original Author: David Gilbert (for Object Refinery Limited); * Contributor(s): -; * - * $Id: CategoryAxis3DTests.java,v 1.1.2.1 2006/10/03 15:41:22 mungady Exp $ - * * Changes * ------- * 18-Mar-2003 : Version 1 (DG); Modified: trunk/tests/org/jfree/chart/axis/junit/CategoryAxisTests.java =================================================================== --- trunk/tests/org/jfree/chart/axis/junit/CategoryAxisTests.java 2007-10-11 14:53:49 UTC (rev 332) +++ trunk/tests/org/jfree/chart/axis/junit/CategoryAxisTests.java 2007-10-12 14:13:46 UTC (rev 333) @@ -2,7 +2,7 @@ * JFreeChart : a free chart library for the Java(tm) platform * =========================================================== * - * (C) Copyright 2000-2005, by Object Refinery Limited and Contributors. + * (C) Copyright 2000-2007, by Object Refinery Limited and Contributors. * * Project Info: http://www.jfree.org/jfreechart/index.html * @@ -27,13 +27,11 @@ * ---------------------- * CategoryAxisTests.java * ---------------------- - * (C) Copyright 2003-2005, by Object Refinery Limited and Contributors. + * (C) Copyright 2003-2007, by Object Refinery Limited and Contributors. * * Original Author: David Gilbert (for Object Refinery Limited); * Contributor(s): -; * - * $Id: CategoryAxisTests.java,v 1.1.2.1 2006/10/03 15:41:22 mungady Exp $ - * * Changes * ------- * 18-Mar-2003 : Version 1 (DG); Modified: trunk/tests/org/jfree/chart/axis/junit/CategoryLabelPositionTests.java =================================================================== --- trunk/tests/org/jfree/chart/axis/junit/CategoryLabelPositionTests.java 2007-10-11 14:53:49 UTC (rev 332) +++ trunk/tests/org/jfree/chart/axis/junit/CategoryLabelPositionTests.java 2007-10-12 14:13:46 UTC (rev 333) @@ -32,8 +32,6 @@ * Original Author: David Gilbert (for Object Refinery Limited); * Contributor(s): -; * - * $Id: CategoryLabelPositionTests.java,v 1.1.2.1 2006/10/03 15:41:22 mungady Exp $ - * * Changes * ------- * 17-Feb-2004 : Version 1 (DG); Modified: trunk/tests/org/jfree/chart/axis/junit/CategoryLabelPositionsTests.java =================================================================== --- trunk/tests/org/jfree/chart/axis/junit/CategoryLabelPositionsTests.java 2007-10-11 14:53:49 UTC (rev 332) +++ trunk/tests/org/jfree/chart/axis/junit/CategoryLabelPositionsTests.java 2007-10-12 14:13:46 UTC (rev 333) @@ -32,8 +32,6 @@ * Original Author: David Gilbert (for Object Refinery Limited); * Contributor(s): -; * - * $Id: CategoryLabelPositionsTests.java,v 1.1.2.1 2006/10/03 15:41:23 mungady Exp $ - * * Changes * ------- * 17-Feb-2004 : Version 1 (DG); Modified: trunk/tests/org/jfree/chart/axis/junit/CategoryLabelWidthTypeTests.java =================================================================== --- trunk/tests/org/jfree/chart/axis/junit/CategoryLabelWidthTypeTests.java 2007-10-11 14:53:49 UTC (rev 332) +++ trunk/tests/org/jfree/chart/axis/junit/CategoryLabelWidthTypeTests.java 2007-10-12 14:13:46 UTC (rev 333) @@ -2,7 +2,7 @@ * JFreeChart : a free chart library for the Java(tm) platform * =========================================================== * - * (C) Copyright 2000-2005, by Object Refinery Limited and Contributors. + * (C) Copyright 2000-2007, by Object Refinery Limited and Contributors. * * Project Info: http://www.jfree.org/jfreechart/index.html * @@ -27,13 +27,11 @@ * -------------------------------- * CategoryLabelWidthTypeTests.java * -------------------------------- - * (C) Copyright 2004, 2005, by Object Refinery Limited and Contributors. + * (C) Copyright 2004-2007, by Object Refinery Limited and Contributors. * * Original Author: David Gilbert (for Object Refinery Limited); * Contributor(s): -; * - * $Id: CategoryLabelWidthTypeTests.java,v 1.1.2.1 2006/10/03 15:41:22 mungady Exp $ - * * Changes * ------- * 13-May-2004 : Version 1 (DG); Modified: trunk/tests/org/jfree/chart/axis/junit/CategoryTickTests.java =================================================================== --- trunk/tests/org/jfree/chart/axis/junit/CategoryTickTests.java 2007-10-11 14:53:49 UTC (rev 332) +++ trunk/tests/org/jfree/chart/axis/junit/CategoryTickTests.java 2007-10-12 14:13:46 UTC (rev 333) @@ -32,8 +32,6 @@ * Original Author: David Gilbert (for Object Refinery Limited); * Contributor(s): -; * - * $Id: CategoryTickTests.java,v 1.1.2.1 2006/10/03 15:41:23 mungady Exp $ - * * Changes * ------- * 13-May-2004 : Version 1 (DG); Modified: trunk/tests/org/jfree/chart/axis/junit/CyclicNumberAxisTests.java =================================================================== --- trunk/tests/org/jfree/chart/axis/junit/CyclicNumberAxisTests.java 2007-10-11 14:53:49 UTC (rev 332) +++ trunk/tests/org/jfree/chart/axis/junit/CyclicNumberAxisTests.java 2007-10-12 14:13:46 UTC (rev 333) @@ -32,8 +32,6 @@ * Original Author: Nicolas Brodu * Contributor(s): -; * - * $Id: CyclicNumberAxisTests.java,v 1.1.2.3 2007/02/02 14:33:11 mungady Exp $ - * * Changes * ------- * 19-Nov-2003 : First version (NB); Modified: trunk/tests/org/jfree/chart/axis/junit/DateAxisTests.java =================================================================== --- trunk/tests/org/jfree/chart/axis/junit/DateAxisTests.java 2007-10-11 14:53:49 UTC (rev 332) +++ trunk/tests/org/jfree/chart/axis/junit/DateAxisTests.java 2007-10-12 14:13:46 UTC (rev 333) @@ -32,8 +32,6 @@ * Original Author: David Gilbert (for Object Refinery Limited); * Contributor(s): -; * - * $Id: DateAxisTests.java,v 1.1.2.3 2007/05/03 14:27:11 mungady Exp $ - * * Changes * ------- * 22-Apr-2003 : Version 1 (DG); Modified: trunk/tests/org/jfree/chart/axis/junit/DateTickMarkPositionTests.java =================================================================== --- trunk/tests/org/jfree/chart/axis/junit/DateTickMarkPositionTests.java 2007-10-11 14:53:49 UTC (rev 332) +++ trunk/tests/org/jfree/chart/axis/junit/DateTickMarkPositionTests.java 2007-10-12 14:13:46 UTC (rev 333) @@ -2,7 +2,7 @@ * JFreeChart : a free chart library for the Java(tm) platform * =========================================================== * - * (C) Copyright 2000-2005, by Object Refinery Limited and Contributors. + * (C) Copyright 2000-2007, by Object Refinery Limited and Contributors. * * Project Info: http://www.jfree.org/jfreechart/index.html * @@ -27,13 +27,11 @@ * ------------------------------ * DateTickMarkPositionTests.java * ------------------------------ - * (C) Copyright 2004, 2005, by Object Refinery Limited and Contributors. + * (C) Copyright 2004-2007, by Object Refinery Limited and Contributors. * * Original Author: David Gilbert (for Object Refinery Limited); * Contributor(s): -; * - * $Id: DateTickMarkPositionTests.java,v 1.1.2.1 2006/10/03 15:41:23 mungady Exp $ - * * Changes * ------- * 19-May-2004 : Version 1 (DG); Modified: trunk/tests/org/jfree/chart/axis/junit/DateTickTests.java =================================================================== --- trunk/tests/org/jfree/chart/axis/junit/DateTickTests.java 2007-10-11 14:53:49 UTC (rev 332) +++ trunk/tests/org/jfree/chart/axis/junit/DateTickTests.java 2007-10-12 14:13:46 UTC (rev 333) @@ -32,8 +32,6 @@ * Original Author: David Gilbert (for Object Refinery Limited); * Contributor(s): -; * - * $Id: DateTickTests.java,v 1.1.2.1 2006/10/03 15:41:23 mungady Exp $ - * * Changes * ------- * 13-May-2004 : Version 1 (DG); Modified: trunk/tests/org/jfree/chart/axis/junit/DateTickUnitTests.java =================================================================== --- trunk/tests/org/jfree/chart/axis/junit/DateTickUnitTests.java 2007-10-11 14:53:49 UTC (rev 332) +++ trunk/tests/org/jfree/chart/axis/junit/DateTickUnitTests.java 2007-10-12 14:13:46 UTC (rev 333) @@ -2,7 +2,7 @@ * JFreeChart : a free chart library for the Java(tm) platform * =========================================================== * - * (C) Copyright 2000-2005, by Object Refinery Limited and Contributors. + * (C) Copyright 2000-2007, by Object Refinery Limited and Contributors. * * Project Info: http://www.jfree.org/jfreechart/index.html * @@ -27,13 +27,11 @@ * ---------------------- * DateTickUnitTests.java * ---------------------- - * (C) Copyright 2003-2005, by Object Refinery Limited and Contributors. + * (C) Copyright 2003-2007, by Object Refinery Limited and Contributors. * * Original Author: David Gilbert (for Object Refinery Limited); * Contributor(s): -; * - * $Id: DateTickUnitTests.java,v 1.1.2.1 2006/10/03 15:41:24 mungady Exp $ - * * Changes * ------- * 26-Mar-2003 : Version 1 (DG); Modified: trunk/tests/org/jfree/chart/axis/junit/ExtendedCategoryAxisTests.java =================================================================== --- trunk/tests/org/jfree/chart/axis/junit/ExtendedCategoryAxisTests.java 2007-10-11 14:53:49 UTC (rev 332) +++ trunk/tests/org/jfree/chart/axis/junit/ExtendedCategoryAxisTests.java 2007-10-12 14:13:46 UTC (rev 333) @@ -32,8 +32,6 @@ * Original Author: David Gilbert (for Object Refinery Limited); * Contributor(s): -; * - * $Id: ExtendedCategoryAxisTests.java,v 1.1.2.1 2007/03/21 11:16:59 mungady Exp $ - * * Changes * ------- * 21-Mar-2007 : Version 1 (DG); Modified: trunk/tests/org/jfree/chart/axis/junit/LogarithmicAxisTests.java =================================================================== --- trunk/tests/org/jfree/chart/axis/junit/LogarithmicAxisTests.java 2007-10-11 14:53:49 UTC (rev 332) +++ trunk/tests/org/jfree/chart/axis/junit/LogarithmicAxisTests.java 2007-10-12 14:13:46 UTC (rev 333) @@ -32,8 +32,6 @@ * Original Author: David Gilbert (for Object Refinery Limited); * Contributor(s): -; * - * $Id: LogarithmicAxisTests.java,v 1.1.2.2 2007/03/02 15:35:58 mungady Exp $ - * * Changes * ------- * 26-Mar-2003 : Version 1 (DG); This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <mu...@us...> - 2007-10-12 14:14:48
|
Revision: 334 http://jfreechart.svn.sourceforge.net/jfreechart/?rev=334&view=rev Author: mungady Date: 2007-10-12 07:14:46 -0700 (Fri, 12 Oct 2007) Log Message: ----------- Removed CVS $Id tags. Modified Paths: -------------- trunk/tests/org/jfree/chart/axis/junit/MarkerAxisBandTests.java trunk/tests/org/jfree/chart/axis/junit/MonthDateFormatTests.java trunk/tests/org/jfree/chart/axis/junit/NumberAxis3DTests.java trunk/tests/org/jfree/chart/axis/junit/NumberAxisTests.java trunk/tests/org/jfree/chart/axis/junit/NumberTickUnitTests.java trunk/tests/org/jfree/chart/axis/junit/PeriodAxisLabelInfoTests.java trunk/tests/org/jfree/chart/axis/junit/PeriodAxisTests.java trunk/tests/org/jfree/chart/axis/junit/QuarterDateFormatTests.java trunk/tests/org/jfree/chart/axis/junit/SegmentedTimelineTests.java trunk/tests/org/jfree/chart/axis/junit/SegmentedTimelineTests2.java trunk/tests/org/jfree/chart/axis/junit/SubCategoryAxisTests.java trunk/tests/org/jfree/chart/axis/junit/SymbolAxisTests.java trunk/tests/org/jfree/chart/axis/junit/ValueAxisTests.java Modified: trunk/tests/org/jfree/chart/axis/junit/MarkerAxisBandTests.java =================================================================== --- trunk/tests/org/jfree/chart/axis/junit/MarkerAxisBandTests.java 2007-10-12 14:13:46 UTC (rev 333) +++ trunk/tests/org/jfree/chart/axis/junit/MarkerAxisBandTests.java 2007-10-12 14:14:46 UTC (rev 334) @@ -2,7 +2,7 @@ * JFreeChart : a free chart library for the Java(tm) platform * =========================================================== * - * (C) Copyright 2000-2005, by Object Refinery Limited and Contributors. + * (C) Copyright 2000-2007, by Object Refinery Limited and Contributors. * * Project Info: http://www.jfree.org/jfreechart/index.html * @@ -27,13 +27,11 @@ * ------------------------ * MarkerAxisBandTests.java * ------------------------ - * (C) Copyright 2003-2005, by Object Refinery Limited and Contributors. + * (C) Copyright 2003-2007, by Object Refinery Limited and Contributors. * * Original Author: David Gilbert (for Object Refinery Limited); * Contributor(s): -; * - * $Id: MarkerAxisBandTests.java,v 1.1.2.1 2006/10/03 15:41:20 mungady Exp $ - * * Changes * ------- * 26-Mar-2003 : Version 1 (DG); Modified: trunk/tests/org/jfree/chart/axis/junit/MonthDateFormatTests.java =================================================================== --- trunk/tests/org/jfree/chart/axis/junit/MonthDateFormatTests.java 2007-10-12 14:13:46 UTC (rev 333) +++ trunk/tests/org/jfree/chart/axis/junit/MonthDateFormatTests.java 2007-10-12 14:14:46 UTC (rev 334) @@ -2,7 +2,7 @@ * JFreeChart : a free chart library for the Java(tm) platform * =========================================================== * - * (C) Copyright 2000-2005, by Object Refinery Limited and Contributors. + * (C) Copyright 2000-2007, by Object Refinery Limited and Contributors. * * Project Info: http://www.jfree.org/jfreechart/index.html * @@ -27,13 +27,11 @@ * ------------------------- * MonthDateFormatTests.java * ------------------------- - * (C) Copyright 2005, by Object Refinery Limited and Contributors. + * (C) Copyright 2005, 2007, by Object Refinery Limited and Contributors. * * Original Author: David Gilbert (for Object Refinery Limited); * Contributor(s): -; * - * $Id: MonthDateFormatTests.java,v 1.1.2.1 2006/10/03 15:41:24 mungady Exp $ - * * Changes * ------- * 10-May-2005 : Version 1 (DG); Modified: trunk/tests/org/jfree/chart/axis/junit/NumberAxis3DTests.java =================================================================== --- trunk/tests/org/jfree/chart/axis/junit/NumberAxis3DTests.java 2007-10-12 14:13:46 UTC (rev 333) +++ trunk/tests/org/jfree/chart/axis/junit/NumberAxis3DTests.java 2007-10-12 14:14:46 UTC (rev 334) @@ -2,7 +2,7 @@ * JFreeChart : a free chart library for the Java(tm) platform * =========================================================== * - * (C) Copyright 2000-2005, by Object Refinery Limited and Contributors. + * (C) Copyright 2000-2007, by Object Refinery Limited and Contributors. * * Project Info: http://www.jfree.org/jfreechart/index.html * @@ -27,13 +27,11 @@ * ---------------------- * NumberAxis3DTests.java * ---------------------- - * (C) Copyright 2003-2005, by Object Refinery Limited and Contributors. + * (C) Copyright 2003-2007, by Object Refinery Limited and Contributors. * * Original Author: David Gilbert (for Object Refinery Limited); * Contributor(s): -; * - * $Id: NumberAxis3DTests.java,v 1.1.2.1 2006/10/03 15:41:23 mungady Exp $ - * * Changes * ------- * 26-Mar-2003 : Version 1 (DG); Modified: trunk/tests/org/jfree/chart/axis/junit/NumberAxisTests.java =================================================================== --- trunk/tests/org/jfree/chart/axis/junit/NumberAxisTests.java 2007-10-12 14:13:46 UTC (rev 333) +++ trunk/tests/org/jfree/chart/axis/junit/NumberAxisTests.java 2007-10-12 14:14:46 UTC (rev 334) @@ -32,8 +32,6 @@ * Original Author: David Gilbert (for Object Refinery Limited); * Contributor(s): -; * - * $Id: NumberAxisTests.java,v 1.1.2.4 2007/02/02 14:16:48 mungady Exp $ - * * Changes * ------- * 26-Mar-2003 : Version 1 (DG); Modified: trunk/tests/org/jfree/chart/axis/junit/NumberTickUnitTests.java =================================================================== --- trunk/tests/org/jfree/chart/axis/junit/NumberTickUnitTests.java 2007-10-12 14:13:46 UTC (rev 333) +++ trunk/tests/org/jfree/chart/axis/junit/NumberTickUnitTests.java 2007-10-12 14:14:46 UTC (rev 334) @@ -2,7 +2,7 @@ * JFreeChart : a free chart library for the Java(tm) platform * =========================================================== * - * (C) Copyright 2000-2005, by Object Refinery Limited and Contributors. + * (C) Copyright 2000-2007, by Object Refinery Limited and Contributors. * * Project Info: http://www.jfree.org/jfreechart/index.html * @@ -27,13 +27,11 @@ * ------------------------ * NumberTickUnitTests.java * ------------------------ - * (C) Copyright 2005, by Object Refinery Limited and Contributors. + * (C) Copyright 2005, 2007, by Object Refinery Limited and Contributors. * * Original Author: David Gilbert (for Object Refinery Limited); * Contributor(s): -; * - * $Id: NumberTickUnitTests.java,v 1.1.2.1 2006/10/03 15:41:24 mungady Exp $ - * * Changes * ------- * 5-Jul-2005 : Version 1 (DG); Modified: trunk/tests/org/jfree/chart/axis/junit/PeriodAxisLabelInfoTests.java =================================================================== --- trunk/tests/org/jfree/chart/axis/junit/PeriodAxisLabelInfoTests.java 2007-10-12 14:13:46 UTC (rev 333) +++ trunk/tests/org/jfree/chart/axis/junit/PeriodAxisLabelInfoTests.java 2007-10-12 14:14:46 UTC (rev 334) @@ -32,8 +32,6 @@ * Original Author: David Gilbert (for Object Refinery Limited); * Contributor(s): -; * - * $Id: PeriodAxisLabelInfoTests.java,v 1.1.2.1 2006/10/03 15:41:23 mungady Exp $ - * * Changes * ------- * 10-Jun-2003 : Version 1 (DG); Modified: trunk/tests/org/jfree/chart/axis/junit/PeriodAxisTests.java =================================================================== --- trunk/tests/org/jfree/chart/axis/junit/PeriodAxisTests.java 2007-10-12 14:13:46 UTC (rev 333) +++ trunk/tests/org/jfree/chart/axis/junit/PeriodAxisTests.java 2007-10-12 14:14:46 UTC (rev 334) @@ -2,7 +2,7 @@ * JFreeChart : a free chart library for the Java(tm) platform * =========================================================== * - * (C) Copyright 2000-2005, by Object Refinery Limited and Contributors. + * (C) Copyright 2000-2007, by Object Refinery Limited and Contributors. * * Project Info: http://www.jfree.org/jfreechart/index.html * @@ -27,13 +27,11 @@ * -------------------- * PeriodAxisTests.java * -------------------- - * (C) Copyright 2004, 2005, by Object Refinery Limited and Contributors. + * (C) Copyright 2004-2007, by Object Refinery Limited and Contributors. * * Original Author: David Gilbert (for Object Refinery Limited); * Contributor(s): -; * - * $Id: PeriodAxisTests.java,v 1.1.2.1 2006/10/03 15:41:22 mungady Exp $ - * * Changes * ------- * 10-Jun-2003 : Version 1 (DG); Modified: trunk/tests/org/jfree/chart/axis/junit/QuarterDateFormatTests.java =================================================================== --- trunk/tests/org/jfree/chart/axis/junit/QuarterDateFormatTests.java 2007-10-12 14:13:46 UTC (rev 333) +++ trunk/tests/org/jfree/chart/axis/junit/QuarterDateFormatTests.java 2007-10-12 14:14:46 UTC (rev 334) @@ -32,8 +32,6 @@ * Original Author: David Gilbert (for Object Refinery Limited); * Contributor(s): -; * - * $Id: QuarterDateFormatTests.java,v 1.1.2.2 2007/06/08 15:20:15 mungady Exp $ - * * Changes * ------- * 10-May-2005 : Version 1 (DG); Modified: trunk/tests/org/jfree/chart/axis/junit/SegmentedTimelineTests.java =================================================================== --- trunk/tests/org/jfree/chart/axis/junit/SegmentedTimelineTests.java 2007-10-12 14:13:46 UTC (rev 333) +++ trunk/tests/org/jfree/chart/axis/junit/SegmentedTimelineTests.java 2007-10-12 14:14:46 UTC (rev 334) @@ -32,8 +32,6 @@ * Original Author: Bill Kelemen; * Contributor(s): David Gilbert (for Object Refinery Limited); * - * $Id: SegmentedTimelineTests.java,v 1.1.2.3 2007/02/02 15:10:21 mungady Exp $ - * * Changes * ------- * 24-May-2003 : Version 1 (BK); Modified: trunk/tests/org/jfree/chart/axis/junit/SegmentedTimelineTests2.java =================================================================== --- trunk/tests/org/jfree/chart/axis/junit/SegmentedTimelineTests2.java 2007-10-12 14:13:46 UTC (rev 333) +++ trunk/tests/org/jfree/chart/axis/junit/SegmentedTimelineTests2.java 2007-10-12 14:14:46 UTC (rev 334) @@ -32,8 +32,6 @@ * Original Author: David Gilbert (for Object Refinery Limited); * Contributor(s): -; * - * $Id: SegmentedTimelineTests2.java,v 1.1.2.3 2007/02/02 15:10:21 mungady Exp $ - * * Changes * ------- * 02-Aug-2004 : Added standard header (DG); Modified: trunk/tests/org/jfree/chart/axis/junit/SubCategoryAxisTests.java =================================================================== --- trunk/tests/org/jfree/chart/axis/junit/SubCategoryAxisTests.java 2007-10-12 14:13:46 UTC (rev 333) +++ trunk/tests/org/jfree/chart/axis/junit/SubCategoryAxisTests.java 2007-10-12 14:14:46 UTC (rev 334) @@ -2,7 +2,7 @@ * JFreeChart : a free chart library for the Java(tm) platform * =========================================================== * - * (C) Copyright 2000-2005, by Object Refinery Limited and Contributors. + * (C) Copyright 2000-2007, by Object Refinery Limited and Contributors. * * Project Info: http://www.jfree.org/jfreechart/index.html * @@ -27,13 +27,11 @@ * ------------------------- * SubCategoryAxisTests.java * ------------------------- - * (C) Copyright 2004, 2005, by Object Refinery Limited and Contributors. + * (C) Copyright 2004-2007, by Object Refinery Limited and Contributors. * * Original Author: David Gilbert (for Object Refinery Limited); * Contributor(s): -; * - * $Id: SubCategoryAxisTests.java,v 1.1.2.1 2006/10/03 15:41:21 mungady Exp $ - * * Changes * ------- * 12-May-2004 : Version 1 (DG); Modified: trunk/tests/org/jfree/chart/axis/junit/SymbolAxisTests.java =================================================================== --- trunk/tests/org/jfree/chart/axis/junit/SymbolAxisTests.java 2007-10-12 14:13:46 UTC (rev 333) +++ trunk/tests/org/jfree/chart/axis/junit/SymbolAxisTests.java 2007-10-12 14:14:46 UTC (rev 334) @@ -32,8 +32,6 @@ * Original Author: David Gilbert (for Object Refinery Limited); * Contributor(s): -; * - * $Id: SymbolAxisTests.java,v 1.1.2.2 2007/02/28 13:39:50 mungady Exp $ - * * Changes * ------- * 26-Mar-2003 : Version 1 (DG); Modified: trunk/tests/org/jfree/chart/axis/junit/ValueAxisTests.java =================================================================== --- trunk/tests/org/jfree/chart/axis/junit/ValueAxisTests.java 2007-10-12 14:13:46 UTC (rev 333) +++ trunk/tests/org/jfree/chart/axis/junit/ValueAxisTests.java 2007-10-12 14:14:46 UTC (rev 334) @@ -32,8 +32,6 @@ * Original Author: David Gilbert (for Object Refinery Limited); * Contributor(s): -; * - * $Id: ValueAxisTests.java,v 1.1.2.3 2007/03/22 12:30:30 mungady Exp $ - * * Changes * ------- * 13-Aug-2003 : Version 1 (DG); This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <mu...@us...> - 2008-06-10 13:06:19
|
Revision: 1122 http://jfreechart.svn.sourceforge.net/jfreechart/?rev=1122&view=rev Author: mungady Date: 2008-06-10 06:06:17 -0700 (Tue, 10 Jun 2008) Log Message: ----------- Clean up tests. Modified Paths: -------------- trunk/tests/org/jfree/chart/axis/junit/CategoryAxisTests.java trunk/tests/org/jfree/chart/axis/junit/CategoryLabelPositionTests.java trunk/tests/org/jfree/chart/axis/junit/CategoryLabelPositionsTests.java trunk/tests/org/jfree/chart/axis/junit/CategoryLabelWidthTypeTests.java trunk/tests/org/jfree/chart/axis/junit/CategoryTickTests.java trunk/tests/org/jfree/chart/axis/junit/CyclicNumberAxisTests.java trunk/tests/org/jfree/chart/axis/junit/DateAxisTests.java trunk/tests/org/jfree/chart/axis/junit/DateTickMarkPositionTests.java trunk/tests/org/jfree/chart/axis/junit/DateTickTests.java trunk/tests/org/jfree/chart/axis/junit/DateTickUnitTests.java trunk/tests/org/jfree/chart/axis/junit/ExtendedCategoryAxisTests.java Modified: trunk/tests/org/jfree/chart/axis/junit/CategoryAxisTests.java =================================================================== --- trunk/tests/org/jfree/chart/axis/junit/CategoryAxisTests.java 2008-06-10 13:05:43 UTC (rev 1121) +++ trunk/tests/org/jfree/chart/axis/junit/CategoryAxisTests.java 2008-06-10 13:06:17 UTC (rev 1122) @@ -2,32 +2,32 @@ * JFreeChart : a free chart library for the Java(tm) platform * =========================================================== * - * (C) Copyright 2000-2007, by Object Refinery Limited and Contributors. + * (C) Copyright 2000-2008, by Object Refinery Limited and Contributors. * * Project Info: http://www.jfree.org/jfreechart/index.html * - * This library is free software; you can redistribute it and/or modify it - * under the terms of the GNU Lesser General Public License as published by - * the Free Software Foundation; either version 2.1 of the License, or + * This library is free software; you can redistribute it and/or modify it + * under the terms of the GNU Lesser General Public License as published by + * the Free Software Foundation; either version 2.1 of the License, or * (at your option) any later version. * - * This library is distributed in the hope that it will be useful, but - * WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY - * or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public + * This library is distributed in the hope that it will be useful, but + * WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY + * or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public * License for more details. * * You should have received a copy of the GNU Lesser General Public * License along with this library; if not, write to the Free Software - * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, - * USA. + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, + * USA. * - * [Java is a trademark or registered trademark of Sun Microsystems, Inc. + * [Java is a trademark or registered trademark of Sun Microsystems, Inc. * in the United States and other countries.] * * ---------------------- * CategoryAxisTests.java * ---------------------- - * (C) Copyright 2003-2007, by Object Refinery Limited and Contributors. + * (C) Copyright 2003-2008, by Object Refinery Limited and Contributors. * * Original Author: David Gilbert (for Object Refinery Limited); * Contributor(s): -; @@ -86,59 +86,59 @@ * Confirm that the equals method can distinguish all the required fields. */ public void testEquals() { - + CategoryAxis a1 = new CategoryAxis("Test"); CategoryAxis a2 = new CategoryAxis("Test"); assertTrue(a1.equals(a2)); - - // lowerMargin + + // lowerMargin a1.setLowerMargin(0.15); assertFalse(a1.equals(a2)); a2.setLowerMargin(0.15); assertTrue(a1.equals(a2)); - // upperMargin + // upperMargin a1.setUpperMargin(0.15); assertFalse(a1.equals(a2)); a2.setUpperMargin(0.15); assertTrue(a1.equals(a2)); - - // categoryMargin + + // categoryMargin a1.setCategoryMargin(0.15); assertFalse(a1.equals(a2)); a2.setCategoryMargin(0.15); assertTrue(a1.equals(a2)); - + // maxCategoryLabelWidthRatio a1.setMaximumCategoryLabelWidthRatio(0.98f); assertFalse(a1.equals(a2)); a2.setMaximumCategoryLabelWidthRatio(0.98f); assertTrue(a1.equals(a2)); - + // categoryLabelPositionOffset a1.setCategoryLabelPositionOffset(11); assertFalse(a1.equals(a2)); a2.setCategoryLabelPositionOffset(11); assertTrue(a1.equals(a2)); - + // categoryLabelPositions a1.setCategoryLabelPositions(CategoryLabelPositions.DOWN_45); assertFalse(a1.equals(a2)); a2.setCategoryLabelPositions(CategoryLabelPositions.DOWN_45); assertTrue(a1.equals(a2)); - + // categoryLabelToolTips a1.addCategoryLabelToolTip("Test", "Check"); assertFalse(a1.equals(a2)); a2.addCategoryLabelToolTip("Test", "Check"); assertTrue(a1.equals(a2)); - + // tickLabelFont a1.setTickLabelFont("C1", new Font("Dialog", Font.PLAIN, 21)); assertFalse(a1.equals(a2)); a2.setTickLabelFont("C1", new Font("Dialog", Font.PLAIN, 21)); assertTrue(a1.equals(a2)); - + // tickLabelPaint a1.setTickLabelPaint("C1", Color.red); assertFalse(a1.equals(a2)); @@ -146,17 +146,17 @@ assertTrue(a1.equals(a2)); // tickLabelPaint2 - a1.setTickLabelPaint("C1", new GradientPaint(1.0f, 2.0f, Color.red, + a1.setTickLabelPaint("C1", new GradientPaint(1.0f, 2.0f, Color.red, 3.0f, 4.0f, Color.yellow)); assertFalse(a1.equals(a2)); - a2.setTickLabelPaint("C1", new GradientPaint(1.0f, 2.0f, Color.red, + a2.setTickLabelPaint("C1", new GradientPaint(1.0f, 2.0f, Color.red, 3.0f, 4.0f, Color.yellow)); assertTrue(a1.equals(a2)); - + } /** - * Two objects that are equal are required to return the same hashCode. + * Two objects that are equal are required to return the same hashCode. */ public void testHashCode() { CategoryAxis a1 = new CategoryAxis("Test"); @@ -191,7 +191,7 @@ public void testCloning2() { CategoryAxis a1 = new CategoryAxis("Test"); a1.setTickLabelFont("C1", new Font("Dialog", Font.PLAIN, 15)); - a1.setTickLabelPaint("C1", new GradientPaint(1.0f, 2.0f, Color.red, + a1.setTickLabelPaint("C1", new GradientPaint(1.0f, 2.0f, Color.red, 3.0f, 4.0f, Color.white)); CategoryAxis a2 = null; try { @@ -203,13 +203,13 @@ assertTrue(a1 != a2); assertTrue(a1.getClass() == a2.getClass()); assertTrue(a1.equals(a2)); - + // check that changing a tick label font in a1 doesn't change a2 a1.setTickLabelFont("C1", null); assertFalse(a1.equals(a2)); a2.setTickLabelFont("C1", null); assertTrue(a1.equals(a2)); - + // check that changing a tick label paint in a1 doesn't change a2 a1.setTickLabelPaint("C1", Color.yellow); assertFalse(a1.equals(a2)); @@ -228,7 +228,7 @@ */ public void testSerialization() { CategoryAxis a1 = new CategoryAxis("Test Axis"); - a1.setTickLabelPaint("C1", new GradientPaint(1.0f, 2.0f, Color.red, + a1.setTickLabelPaint("C1", new GradientPaint(1.0f, 2.0f, Color.red, 3.0f, 4.0f, Color.white)); CategoryAxis a2 = null; @@ -245,7 +245,7 @@ in.close(); } catch (Exception e) { - System.out.println(e.toString()); + e.printStackTrace(); } assertEquals(a1, a2); } Modified: trunk/tests/org/jfree/chart/axis/junit/CategoryLabelPositionTests.java =================================================================== --- trunk/tests/org/jfree/chart/axis/junit/CategoryLabelPositionTests.java 2008-06-10 13:05:43 UTC (rev 1121) +++ trunk/tests/org/jfree/chart/axis/junit/CategoryLabelPositionTests.java 2008-06-10 13:06:17 UTC (rev 1122) @@ -2,32 +2,32 @@ * JFreeChart : a free chart library for the Java(tm) platform * =========================================================== * - * (C) Copyright 2000-2007, by Object Refinery Limited and Contributors. + * (C) Copyright 2000-2008, by Object Refinery Limited and Contributors. * * Project Info: http://www.jfree.org/jfreechart/index.html * - * This library is free software; you can redistribute it and/or modify it - * under the terms of the GNU Lesser General Public License as published by - * the Free Software Foundation; either version 2.1 of the License, or + * This library is free software; you can redistribute it and/or modify it + * under the terms of the GNU Lesser General Public License as published by + * the Free Software Foundation; either version 2.1 of the License, or * (at your option) any later version. * - * This library is distributed in the hope that it will be useful, but - * WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY - * or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public + * This library is distributed in the hope that it will be useful, but + * WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY + * or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public * License for more details. * * You should have received a copy of the GNU Lesser General Public * License along with this library; if not, write to the Free Software - * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, - * USA. + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, + * USA. * - * [Java is a trademark or registered trademark of Sun Microsystems, Inc. + * [Java is a trademark or registered trademark of Sun Microsystems, Inc. * in the United States and other countries.] * * ------------------------------- * CategoryLabelPositionTests.java * ------------------------------- - * (C) Copyright 2004-2007, by Object Refinery Limited and Contributors. + * (C) Copyright 2004-2008, by Object Refinery Limited and Contributors. * * Original Author: David Gilbert (for Object Refinery Limited); * Contributor(s): -; @@ -37,7 +37,7 @@ * 17-Feb-2004 : Version 1 (DG); * 07-Jan-2005 : Improved testEquals() code and added hashCode() test (DG); * 20-Jun-2007 : Removed JCommon dependencies (DG); - * + * */ package org.jfree.chart.axis.junit; @@ -81,79 +81,79 @@ public CategoryLabelPositionTests(String name) { super(name); } - + /** * Check that the equals() method can distinguish all fields. */ public void testEquals() { CategoryLabelPosition p1 = new CategoryLabelPosition( - RectangleAnchor.BOTTOM_LEFT, TextBlockAnchor.CENTER_RIGHT, - TextAnchor.BASELINE_LEFT, Math.PI / 4.0, + RectangleAnchor.BOTTOM_LEFT, TextBlockAnchor.CENTER_RIGHT, + TextAnchor.BASELINE_LEFT, Math.PI / 4.0, CategoryLabelWidthType.RANGE, 0.44f); CategoryLabelPosition p2 = new CategoryLabelPosition( - RectangleAnchor.BOTTOM_LEFT, TextBlockAnchor.CENTER_RIGHT, - TextAnchor.BASELINE_LEFT, Math.PI / 4.0, + RectangleAnchor.BOTTOM_LEFT, TextBlockAnchor.CENTER_RIGHT, + TextAnchor.BASELINE_LEFT, Math.PI / 4.0, CategoryLabelWidthType.RANGE, 0.44f); assertTrue(p1.equals(p2)); assertTrue(p2.equals(p1)); - - p1 = new CategoryLabelPosition(RectangleAnchor.TOP, - TextBlockAnchor.CENTER_RIGHT, TextAnchor.BASELINE_LEFT, + + p1 = new CategoryLabelPosition(RectangleAnchor.TOP, + TextBlockAnchor.CENTER_RIGHT, TextAnchor.BASELINE_LEFT, Math.PI / 4.0, CategoryLabelWidthType.RANGE, 0.44f); assertFalse(p1.equals(p2)); - p2 = new CategoryLabelPosition(RectangleAnchor.TOP, - TextBlockAnchor.CENTER_RIGHT, TextAnchor.BASELINE_LEFT, + p2 = new CategoryLabelPosition(RectangleAnchor.TOP, + TextBlockAnchor.CENTER_RIGHT, TextAnchor.BASELINE_LEFT, Math.PI / 4.0, CategoryLabelWidthType.RANGE, 0.44f); assertTrue(p1.equals(p2)); - p1 = new CategoryLabelPosition(RectangleAnchor.TOP, - TextBlockAnchor.CENTER, TextAnchor.BASELINE_LEFT, Math.PI / 4.0, + p1 = new CategoryLabelPosition(RectangleAnchor.TOP, + TextBlockAnchor.CENTER, TextAnchor.BASELINE_LEFT, Math.PI / 4.0, CategoryLabelWidthType.RANGE, 0.44f); assertFalse(p1.equals(p2)); - p2 = new CategoryLabelPosition(RectangleAnchor.TOP, - TextBlockAnchor.CENTER, TextAnchor.BASELINE_LEFT, Math.PI / 4.0, + p2 = new CategoryLabelPosition(RectangleAnchor.TOP, + TextBlockAnchor.CENTER, TextAnchor.BASELINE_LEFT, Math.PI / 4.0, CategoryLabelWidthType.RANGE, 0.44f); assertTrue(p1.equals(p2)); - - p1 = new CategoryLabelPosition(RectangleAnchor.TOP, - TextBlockAnchor.CENTER, TextAnchor.CENTER, Math.PI / 4.0, + + p1 = new CategoryLabelPosition(RectangleAnchor.TOP, + TextBlockAnchor.CENTER, TextAnchor.CENTER, Math.PI / 4.0, CategoryLabelWidthType.RANGE, 0.44f); assertFalse(p1.equals(p2)); - p2 = new CategoryLabelPosition(RectangleAnchor.TOP, - TextBlockAnchor.CENTER, TextAnchor.CENTER, Math.PI / 4.0, + p2 = new CategoryLabelPosition(RectangleAnchor.TOP, + TextBlockAnchor.CENTER, TextAnchor.CENTER, Math.PI / 4.0, CategoryLabelWidthType.RANGE, 0.44f); assertTrue(p1.equals(p2)); - - p1 = new CategoryLabelPosition(RectangleAnchor.TOP, - TextBlockAnchor.CENTER, TextAnchor.CENTER, Math.PI / 6.0, + + p1 = new CategoryLabelPosition(RectangleAnchor.TOP, + TextBlockAnchor.CENTER, TextAnchor.CENTER, Math.PI / 6.0, CategoryLabelWidthType.RANGE, 0.44f); assertFalse(p1.equals(p2)); - p2 = new CategoryLabelPosition(RectangleAnchor.TOP, - TextBlockAnchor.CENTER, TextAnchor.CENTER, Math.PI / 6.0, + p2 = new CategoryLabelPosition(RectangleAnchor.TOP, + TextBlockAnchor.CENTER, TextAnchor.CENTER, Math.PI / 6.0, CategoryLabelWidthType.RANGE, 0.44f); assertTrue(p1.equals(p2)); - - p1 = new CategoryLabelPosition(RectangleAnchor.TOP, - TextBlockAnchor.CENTER, TextAnchor.CENTER, Math.PI / 6.0, + + p1 = new CategoryLabelPosition(RectangleAnchor.TOP, + TextBlockAnchor.CENTER, TextAnchor.CENTER, Math.PI / 6.0, CategoryLabelWidthType.CATEGORY, 0.44f); assertFalse(p1.equals(p2)); - p2 = new CategoryLabelPosition(RectangleAnchor.TOP, - TextBlockAnchor.CENTER, TextAnchor.CENTER, Math.PI / 6.0, + p2 = new CategoryLabelPosition(RectangleAnchor.TOP, + TextBlockAnchor.CENTER, TextAnchor.CENTER, Math.PI / 6.0, CategoryLabelWidthType.CATEGORY, 0.44f); assertTrue(p1.equals(p2)); - - p1 = new CategoryLabelPosition(RectangleAnchor.TOP, - TextBlockAnchor.CENTER, TextAnchor.CENTER, Math.PI / 6.0, + + p1 = new CategoryLabelPosition(RectangleAnchor.TOP, + TextBlockAnchor.CENTER, TextAnchor.CENTER, Math.PI / 6.0, CategoryLabelWidthType.CATEGORY, 0.55f); assertFalse(p1.equals(p2)); - p2 = new CategoryLabelPosition(RectangleAnchor.TOP, - TextBlockAnchor.CENTER, TextAnchor.CENTER, Math.PI / 6.0, + p2 = new CategoryLabelPosition(RectangleAnchor.TOP, + TextBlockAnchor.CENTER, TextAnchor.CENTER, Math.PI / 6.0, CategoryLabelWidthType.CATEGORY, 0.55f); - assertTrue(p1.equals(p2)); + assertTrue(p1.equals(p2)); } - + /** - * Two objects that are equal are required to return the same hashCode. + * Two objects that are equal are required to return the same hashCode. */ public void testHashCode() { CategoryLabelPosition a1 = new CategoryLabelPosition(); @@ -186,7 +186,7 @@ catch (Exception e) { e.printStackTrace(); } - assertEquals(p1, p2); + assertEquals(p1, p2); } } Modified: trunk/tests/org/jfree/chart/axis/junit/CategoryLabelPositionsTests.java =================================================================== --- trunk/tests/org/jfree/chart/axis/junit/CategoryLabelPositionsTests.java 2008-06-10 13:05:43 UTC (rev 1121) +++ trunk/tests/org/jfree/chart/axis/junit/CategoryLabelPositionsTests.java 2008-06-10 13:06:17 UTC (rev 1122) @@ -2,32 +2,32 @@ * JFreeChart : a free chart library for the Java(tm) platform * =========================================================== * - * (C) Copyright 2000-2007, by Object Refinery Limited and Contributors. + * (C) Copyright 2000-2008, by Object Refinery Limited and Contributors. * * Project Info: http://www.jfree.org/jfreechart/index.html * - * This library is free software; you can redistribute it and/or modify it - * under the terms of the GNU Lesser General Public License as published by - * the Free Software Foundation; either version 2.1 of the License, or + * This library is free software; you can redistribute it and/or modify it + * under the terms of the GNU Lesser General Public License as published by + * the Free Software Foundation; either version 2.1 of the License, or * (at your option) any later version. * - * This library is distributed in the hope that it will be useful, but - * WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY - * or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public + * This library is distributed in the hope that it will be useful, but + * WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY + * or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public * License for more details. * * You should have received a copy of the GNU Lesser General Public * License along with this library; if not, write to the Free Software - * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, - * USA. + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, + * USA. * - * [Java is a trademark or registered trademark of Sun Microsystems, Inc. + * [Java is a trademark or registered trademark of Sun Microsystems, Inc. * in the United States and other countries.] * * -------------------------------- * CategoryLabelPositionsTests.java * -------------------------------- - * (C) Copyright 2004-2007, by Object Refinery Limited and Contributors. + * (C) Copyright 2004-2008, by Object Refinery Limited and Contributors. * * Original Author: David Gilbert (for Object Refinery Limited); * Contributor(s): -; @@ -80,105 +80,112 @@ public CategoryLabelPositionsTests(String name) { super(name); } - + private static final RectangleAnchor RA_TOP = RectangleAnchor.TOP; private static final RectangleAnchor RA_BOTTOM = RectangleAnchor.BOTTOM; - + /** * Check that the equals method distinguishes all fields. */ public void testEquals() { CategoryLabelPositions p1 = new CategoryLabelPositions( - new CategoryLabelPosition(RA_TOP, TextBlockAnchor.CENTER), - new CategoryLabelPosition(RA_TOP, TextBlockAnchor.CENTER), - new CategoryLabelPosition(RA_TOP, TextBlockAnchor.CENTER), - new CategoryLabelPosition(RA_TOP, TextBlockAnchor.CENTER) - ); + new CategoryLabelPosition(RA_TOP, TextBlockAnchor.CENTER), + new CategoryLabelPosition(RA_TOP, TextBlockAnchor.CENTER), + new CategoryLabelPosition(RA_TOP, TextBlockAnchor.CENTER), + new CategoryLabelPosition(RA_TOP, TextBlockAnchor.CENTER)); CategoryLabelPositions p2 = new CategoryLabelPositions( - new CategoryLabelPosition(RA_TOP, TextBlockAnchor.CENTER), - new CategoryLabelPosition(RA_TOP, TextBlockAnchor.CENTER), - new CategoryLabelPosition(RA_TOP, TextBlockAnchor.CENTER), - new CategoryLabelPosition(RA_TOP, TextBlockAnchor.CENTER) - ); + new CategoryLabelPosition(RA_TOP, TextBlockAnchor.CENTER), + new CategoryLabelPosition(RA_TOP, TextBlockAnchor.CENTER), + new CategoryLabelPosition(RA_TOP, TextBlockAnchor.CENTER), + new CategoryLabelPosition(RA_TOP, TextBlockAnchor.CENTER)); assertEquals(p1, p2); p1 = new CategoryLabelPositions( - new CategoryLabelPosition(RA_BOTTOM, TextBlockAnchor.TOP_CENTER), - new CategoryLabelPosition(RA_TOP, TextBlockAnchor.CENTER), - new CategoryLabelPosition(RA_TOP, TextBlockAnchor.CENTER), - new CategoryLabelPosition(RA_TOP, TextBlockAnchor.CENTER) - ); + new CategoryLabelPosition(RA_BOTTOM, + TextBlockAnchor.TOP_CENTER), + new CategoryLabelPosition(RA_TOP, TextBlockAnchor.CENTER), + new CategoryLabelPosition(RA_TOP, TextBlockAnchor.CENTER), + new CategoryLabelPosition(RA_TOP, TextBlockAnchor.CENTER)); assertTrue(!p1.equals(p2)); p2 = new CategoryLabelPositions( - new CategoryLabelPosition(RA_BOTTOM, TextBlockAnchor.TOP_CENTER), - new CategoryLabelPosition(RA_TOP, TextBlockAnchor.CENTER), - new CategoryLabelPosition(RA_TOP, TextBlockAnchor.CENTER), - new CategoryLabelPosition(RA_TOP, TextBlockAnchor.CENTER) - ); + new CategoryLabelPosition(RA_BOTTOM, + TextBlockAnchor.TOP_CENTER), + new CategoryLabelPosition(RA_TOP, TextBlockAnchor.CENTER), + new CategoryLabelPosition(RA_TOP, TextBlockAnchor.CENTER), + new CategoryLabelPosition(RA_TOP, TextBlockAnchor.CENTER)); assertTrue(p1.equals(p2)); p1 = new CategoryLabelPositions( - new CategoryLabelPosition(RA_BOTTOM, TextBlockAnchor.TOP_CENTER), - new CategoryLabelPosition(RA_BOTTOM, TextBlockAnchor.TOP_CENTER), - new CategoryLabelPosition(RA_TOP, TextBlockAnchor.CENTER), - new CategoryLabelPosition(RA_TOP, TextBlockAnchor.CENTER) - ); + new CategoryLabelPosition(RA_BOTTOM, + TextBlockAnchor.TOP_CENTER), + new CategoryLabelPosition(RA_BOTTOM, TextBlockAnchor.TOP_CENTER), + new CategoryLabelPosition(RA_TOP, TextBlockAnchor.CENTER), + new CategoryLabelPosition(RA_TOP, TextBlockAnchor.CENTER)); assertTrue(!p1.equals(p2)); p2 = new CategoryLabelPositions( - new CategoryLabelPosition(RA_BOTTOM, TextBlockAnchor.TOP_CENTER), - new CategoryLabelPosition(RA_BOTTOM, TextBlockAnchor.TOP_CENTER), - new CategoryLabelPosition(RA_TOP, TextBlockAnchor.CENTER), - new CategoryLabelPosition(RA_TOP, TextBlockAnchor.CENTER) - ); + new CategoryLabelPosition(RA_BOTTOM, + TextBlockAnchor.TOP_CENTER), + new CategoryLabelPosition(RA_BOTTOM, + TextBlockAnchor.TOP_CENTER), + new CategoryLabelPosition(RA_TOP, TextBlockAnchor.CENTER), + new CategoryLabelPosition(RA_TOP, TextBlockAnchor.CENTER)); assertTrue(p1.equals(p2)); p1 = new CategoryLabelPositions( - new CategoryLabelPosition(RA_BOTTOM, TextBlockAnchor.TOP_CENTER), - new CategoryLabelPosition(RA_BOTTOM, TextBlockAnchor.TOP_CENTER), - new CategoryLabelPosition(RA_BOTTOM, TextBlockAnchor.TOP_CENTER), - new CategoryLabelPosition(RA_TOP, TextBlockAnchor.CENTER) - ); + new CategoryLabelPosition(RA_BOTTOM, + TextBlockAnchor.TOP_CENTER), + new CategoryLabelPosition(RA_BOTTOM, + TextBlockAnchor.TOP_CENTER), + new CategoryLabelPosition(RA_BOTTOM, + TextBlockAnchor.TOP_CENTER), + new CategoryLabelPosition(RA_TOP, TextBlockAnchor.CENTER)); assertTrue(!p1.equals(p2)); p2 = new CategoryLabelPositions( - new CategoryLabelPosition(RA_BOTTOM, TextBlockAnchor.TOP_CENTER), - new CategoryLabelPosition(RA_BOTTOM, TextBlockAnchor.TOP_CENTER), - new CategoryLabelPosition(RA_BOTTOM, TextBlockAnchor.TOP_CENTER), - new CategoryLabelPosition(RA_TOP, TextBlockAnchor.CENTER) - ); + new CategoryLabelPosition(RA_BOTTOM, + TextBlockAnchor.TOP_CENTER), + new CategoryLabelPosition(RA_BOTTOM, + TextBlockAnchor.TOP_CENTER), + new CategoryLabelPosition(RA_BOTTOM, + TextBlockAnchor.TOP_CENTER), + new CategoryLabelPosition(RA_TOP, TextBlockAnchor.CENTER)); assertTrue(p1.equals(p2)); p1 = new CategoryLabelPositions( - new CategoryLabelPosition(RA_BOTTOM, TextBlockAnchor.TOP_CENTER), - new CategoryLabelPosition(RA_BOTTOM, TextBlockAnchor.TOP_CENTER), - new CategoryLabelPosition(RA_BOTTOM, TextBlockAnchor.TOP_CENTER), - new CategoryLabelPosition(RA_BOTTOM, TextBlockAnchor.TOP_CENTER) - ); + new CategoryLabelPosition(RA_BOTTOM, + TextBlockAnchor.TOP_CENTER), + new CategoryLabelPosition(RA_BOTTOM, + TextBlockAnchor.TOP_CENTER), + new CategoryLabelPosition(RA_BOTTOM, + TextBlockAnchor.TOP_CENTER), + new CategoryLabelPosition(RA_BOTTOM, + TextBlockAnchor.TOP_CENTER)); assertTrue(!p1.equals(p2)); p2 = new CategoryLabelPositions( - new CategoryLabelPosition(RA_BOTTOM, TextBlockAnchor.TOP_CENTER), - new CategoryLabelPosition(RA_BOTTOM, TextBlockAnchor.TOP_CENTER), - new CategoryLabelPosition(RA_BOTTOM, TextBlockAnchor.TOP_CENTER), - new CategoryLabelPosition(RA_BOTTOM, TextBlockAnchor.TOP_CENTER) - ); + new CategoryLabelPosition(RA_BOTTOM, + TextBlockAnchor.TOP_CENTER), + new CategoryLabelPosition(RA_BOTTOM, + TextBlockAnchor.TOP_CENTER), + new CategoryLabelPosition(RA_BOTTOM, + TextBlockAnchor.TOP_CENTER), + new CategoryLabelPosition(RA_BOTTOM, + TextBlockAnchor.TOP_CENTER)); assertTrue(p1.equals(p2)); } - + /** - * Two objects that are equal are required to return the same hashCode. + * Two objects that are equal are required to return the same hashCode. */ public void testHashCode() { CategoryLabelPositions p1 = new CategoryLabelPositions( - new CategoryLabelPosition(RA_TOP, TextBlockAnchor.CENTER), - new CategoryLabelPosition(RA_TOP, TextBlockAnchor.CENTER), - new CategoryLabelPosition(RA_TOP, TextBlockAnchor.CENTER), - new CategoryLabelPosition(RA_TOP, TextBlockAnchor.CENTER) - ); + new CategoryLabelPosition(RA_TOP, TextBlockAnchor.CENTER), + new CategoryLabelPosition(RA_TOP, TextBlockAnchor.CENTER), + new CategoryLabelPosition(RA_TOP, TextBlockAnchor.CENTER), + new CategoryLabelPosition(RA_TOP, TextBlockAnchor.CENTER)); CategoryLabelPositions p2 = new CategoryLabelPositions( - new CategoryLabelPosition(RA_TOP, TextBlockAnchor.CENTER), - new CategoryLabelPosition(RA_TOP, TextBlockAnchor.CENTER), - new CategoryLabelPosition(RA_TOP, TextBlockAnchor.CENTER), - new CategoryLabelPosition(RA_TOP, TextBlockAnchor.CENTER) - ); + new CategoryLabelPosition(RA_TOP, TextBlockAnchor.CENTER), + new CategoryLabelPosition(RA_TOP, TextBlockAnchor.CENTER), + new CategoryLabelPosition(RA_TOP, TextBlockAnchor.CENTER), + new CategoryLabelPosition(RA_TOP, TextBlockAnchor.CENTER)); assertTrue(p1.equals(p2)); int h1 = p1.hashCode(); int h2 = p2.hashCode(); Modified: trunk/tests/org/jfree/chart/axis/junit/CategoryLabelWidthTypeTests.java =================================================================== --- trunk/tests/org/jfree/chart/axis/junit/CategoryLabelWidthTypeTests.java 2008-06-10 13:05:43 UTC (rev 1121) +++ trunk/tests/org/jfree/chart/axis/junit/CategoryLabelWidthTypeTests.java 2008-06-10 13:06:17 UTC (rev 1122) @@ -2,26 +2,26 @@ * JFreeChart : a free chart library for the Java(tm) platform * =========================================================== * - * (C) Copyright 2000-2007, by Object Refinery Limited and Contributors. + * (C) Copyright 2000-2008, by Object Refinery Limited and Contributors. * * Project Info: http://www.jfree.org/jfreechart/index.html * - * This library is free software; you can redistribute it and/or modify it - * under the terms of the GNU Lesser General Public License as published by - * the Free Software Foundation; either version 2.1 of the License, or + * This library is free software; you can redistribute it and/or modify it + * under the terms of the GNU Lesser General Public License as published by + * the Free Software Foundation; either version 2.1 of the License, or * (at your option) any later version. * - * This library is distributed in the hope that it will be useful, but - * WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY - * or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public + * This library is distributed in the hope that it will be useful, but + * WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY + * or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public * License for more details. * * You should have received a copy of the GNU Lesser General Public * License along with this library; if not, write to the Free Software - * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, - * USA. + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, + * USA. * - * [Java is a trademark or registered trademark of Sun Microsystems, Inc. + * [Java is a trademark or registered trademark of Sun Microsystems, Inc. * in the United States and other countries.] * * -------------------------------- @@ -75,21 +75,19 @@ public CategoryLabelWidthTypeTests(String name) { super(name); } - + /** * Confirm that the equals() method distinguishes the known values. */ public void testEquals() { - assertEquals( - CategoryLabelWidthType.CATEGORY, CategoryLabelWidthType.CATEGORY - ); - assertEquals( - CategoryLabelWidthType.RANGE, CategoryLabelWidthType.RANGE - ); + assertEquals(CategoryLabelWidthType.CATEGORY, + CategoryLabelWidthType.CATEGORY); + assertEquals(CategoryLabelWidthType.RANGE, + CategoryLabelWidthType.RANGE); } - + /** - * Two objects that are equal are required to return the same hashCode. + * Two objects that are equal are required to return the same hashCode. */ public void testHashCode() { CategoryLabelWidthType a1 = CategoryLabelWidthType.CATEGORY; @@ -114,16 +112,15 @@ out.close(); ObjectInput in = new ObjectInputStream( - new ByteArrayInputStream(buffer.toByteArray()) - ); + new ByteArrayInputStream(buffer.toByteArray())); w2 = (CategoryLabelWidthType) in.readObject(); in.close(); } catch (Exception e) { - System.out.println(e.toString()); + e.printStackTrace(); } assertEquals(w1, w2); - assertTrue(w1 == w2); + assertTrue(w1 == w2); } } Modified: trunk/tests/org/jfree/chart/axis/junit/CategoryTickTests.java =================================================================== --- trunk/tests/org/jfree/chart/axis/junit/CategoryTickTests.java 2008-06-10 13:05:43 UTC (rev 1121) +++ trunk/tests/org/jfree/chart/axis/junit/CategoryTickTests.java 2008-06-10 13:06:17 UTC (rev 1122) @@ -2,32 +2,32 @@ * JFreeChart : a free chart library for the Java(tm) platform * =========================================================== * - * (C) Copyright 2000-2007, by Object Refinery Limited and Contributors. + * (C) Copyright 2000-2008, by Object Refinery Limited and Contributors. * * Project Info: http://www.jfree.org/jfreechart/index.html * - * This library is free software; you can redistribute it and/or modify it - * under the terms of the GNU Lesser General Public License as published by - * the Free Software Foundation; either version 2.1 of the License, or + * This library is free software; you can redistribute it and/or modify it + * under the terms of the GNU Lesser General Public License as published by + * the Free Software Foundation; either version 2.1 of the License, or * (at your option) any later version. * - * This library is distributed in the hope that it will be useful, but - * WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY - * or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public + * This library is distributed in the hope that it will be useful, but + * WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY + * or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public * License for more details. * * You should have received a copy of the GNU Lesser General Public * License along with this library; if not, write to the Free Software - * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, - * USA. + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, + * USA. * - * [Java is a trademark or registered trademark of Sun Microsystems, Inc. + * [Java is a trademark or registered trademark of Sun Microsystems, Inc. * in the United States and other countries.] * * ---------------------- * CategoryTickTests.java * ---------------------- - * (C) Copyright 2004-2007, by Object Refinery Limited and Contributors. + * (C) Copyright 2004-2008, by Object Refinery Limited and Contributors. * * Original Author: David Gilbert (for Object Refinery Limited); * Contributor(s): -; @@ -86,7 +86,7 @@ * Confirm that the equals method can distinguish all the required fields. */ public void testEquals() { - + Comparable c1 = "C1"; Comparable c2 = "C2"; TextBlock tb1 = new TextBlock(); @@ -97,11 +97,11 @@ TextBlockAnchor tba2 = TextBlockAnchor.BOTTOM_CENTER; TextAnchor ta1 = TextAnchor.CENTER; TextAnchor ta2 = TextAnchor.BASELINE_LEFT; - + CategoryTick t1 = new CategoryTick(c1, tb1, tba1, ta1, 1.0f); CategoryTick t2 = new CategoryTick(c1, tb1, tba1, ta1, 1.0f); assertTrue(t1.equals(t2)); - + t1 = new CategoryTick(c2, tb1, tba1, ta1, 1.0f); assertFalse(t1.equals(t2)); t2 = new CategoryTick(c2, tb1, tba1, ta1, 1.0f); @@ -126,11 +126,11 @@ assertFalse(t1.equals(t2)); t2 = new CategoryTick(c2, tb2, tba2, ta2, 2.0f); assertTrue(t1.equals(t2)); - + } /** - * Two objects that are equal are required to return the same hashCode. + * Two objects that are equal are required to return the same hashCode. */ public void testHashCode() { Comparable c1 = "C1"; @@ -139,7 +139,7 @@ tb1.addLine(new TextLine("Block 2")); TextBlockAnchor tba1 = TextBlockAnchor.CENTER; TextAnchor ta1 = TextAnchor.CENTER; - + CategoryTick t1 = new CategoryTick(c1, tb1, tba1, ta1, 1.0f); CategoryTick t2 = new CategoryTick(c1, tb1, tba1, ta1, 1.0f); assertTrue(t1.equals(t2)); @@ -153,7 +153,7 @@ */ public void testCloning() { CategoryTick t1 = new CategoryTick( - "C1", new TextBlock(), TextBlockAnchor.CENTER, + "C1", new TextBlock(), TextBlockAnchor.CENTER, TextAnchor.CENTER, 1.5f ); CategoryTick t2 = null; @@ -173,10 +173,8 @@ */ public void testSerialization() { - CategoryTick t1 = new CategoryTick( - "C1", new TextBlock(), TextBlockAnchor.CENTER, - TextAnchor.CENTER, 1.5f - ); + CategoryTick t1 = new CategoryTick("C1", new TextBlock(), + TextBlockAnchor.CENTER, TextAnchor.CENTER, 1.5f); CategoryTick t2 = null; try { @@ -186,13 +184,12 @@ out.close(); ObjectInput in = new ObjectInputStream( - new ByteArrayInputStream(buffer.toByteArray()) - ); + new ByteArrayInputStream(buffer.toByteArray())); t2 = (CategoryTick) in.readObject(); in.close(); } catch (Exception e) { - System.out.println(e.toString()); + e.printStackTrace(); } assertEquals(t1, t2); Modified: trunk/tests/org/jfree/chart/axis/junit/CyclicNumberAxisTests.java =================================================================== --- trunk/tests/org/jfree/chart/axis/junit/CyclicNumberAxisTests.java 2008-06-10 13:05:43 UTC (rev 1121) +++ trunk/tests/org/jfree/chart/axis/junit/CyclicNumberAxisTests.java 2008-06-10 13:06:17 UTC (rev 1122) @@ -2,32 +2,32 @@ * JFreeChart : a free chart library for the Java(tm) platform * =========================================================== * - * (C) Copyright 2000-2007, by Object Refinery Limited and Contributors. + * (C) Copyright 2000-2008, by Object Refinery Limited and Contributors. * * Project Info: http://www.jfree.org/jfreechart/index.html * - * This library is free software; you can redistribute it and/or modify it - * under the terms of the GNU Lesser General Public License as published by - * the Free Software Foundation; either version 2.1 of the License, or + * This library is free software; you can redistribute it and/or modify it + * under the terms of the GNU Lesser General Public License as published by + * the Free Software Foundation; either version 2.1 of the License, or * (at your option) any later version. * - * This library is distributed in the hope that it will be useful, but - * WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY - * or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public + * This library is distributed in the hope that it will be useful, but + * WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY + * or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public * License for more details. * * You should have received a copy of the GNU Lesser General Public * License along with this library; if not, write to the Free Software - * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, - * USA. + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, + * USA. * - * [Java is a trademark or registered trademark of Sun Microsystems, Inc. + * [Java is a trademark or registered trademark of Sun Microsystems, Inc. * in the United States and other countries.] * * -------------------- * CyclicAxisTests.java * -------------------- - * (C) Copyright 2003-2007, by Object Refinery Limited and Contributors. + * (C) Copyright 2003-2008, by Object Refinery Limited and Contributors. * * Original Author: Nicolas Brodu * Contributor(s): -; @@ -104,11 +104,11 @@ * Confirm that the equals method can distinguish all the required fields. */ public void testEquals() { - + CyclicNumberAxis a1 = new CyclicNumberAxis(10, 0, "Test"); CyclicNumberAxis a2 = new CyclicNumberAxis(10, 0, "Test"); assertTrue(a1.equals(a2)); - + // period a1.setPeriod(5); assertFalse(a1.equals(a2)); @@ -122,13 +122,13 @@ assertTrue(a1.equals(a2)); // advance line Paint - a1.setAdvanceLinePaint(new GradientPaint(1.0f, 2.0f, Color.red, + a1.setAdvanceLinePaint(new GradientPaint(1.0f, 2.0f, Color.red, 3.0f, 4.0f, Color.black)); assertFalse(a1.equals(a2)); - a2.setAdvanceLinePaint(new GradientPaint(1.0f, 2.0f, Color.red, + a2.setAdvanceLinePaint(new GradientPaint(1.0f, 2.0f, Color.red, 3.0f, 4.0f, Color.black)); assertTrue(a1.equals(a2)); - + // advance line Stroke Stroke stroke = new BasicStroke(0.2f); a1.setAdvanceLineStroke(stroke); @@ -147,11 +147,11 @@ assertFalse(a1.equals(a2)); a2.setBoundMappedToLastCycle(a1.isBoundMappedToLastCycle()); assertTrue(a1.equals(a2)); - + } /** - * Two objects that are equal are required to return the same hashCode. + * Two objects that are equal are required to return the same hashCode. */ public void testHashCode() { CyclicNumberAxis a1 = new CyclicNumberAxis(10, 0, "Test"); @@ -177,17 +177,16 @@ out.close(); ObjectInput in = new ObjectInputStream( - new ByteArrayInputStream(buffer.toByteArray()) - ); + new ByteArrayInputStream(buffer.toByteArray())); a2 = (CyclicNumberAxis) in.readObject(); in.close(); } catch (Exception e) { - System.out.println(e.toString()); + e.printStackTrace(); } assertEquals(a1, a2); } - + } Modified: trunk/tests/org/jfree/chart/axis/junit/DateAxisTests.java =================================================================== --- trunk/tests/org/jfree/chart/axis/junit/DateAxisTests.java 2008-06-10 13:05:43 UTC (rev 1121) +++ trunk/tests/org/jfree/chart/axis/junit/DateAxisTests.java 2008-06-10 13:06:17 UTC (rev 1122) @@ -2,32 +2,32 @@ * JFreeChart : a free chart library for the Java(tm) platform * =========================================================== * - * (C) Copyright 2000-2007, by Object Refinery Limited and Contributors. + * (C) Copyright 2000-2008, by Object Refinery Limited and Contributors. * * Project Info: http://www.jfree.org/jfreechart/index.html * - * This library is free software; you can redistribute it and/or modify it - * under the terms of the GNU Lesser General Public License as published by - * the Free Software Foundation; either version 2.1 of the License, or + * This library is free software; you can redistribute it and/or modify it + * under the terms of the GNU Lesser General Public License as published by + * the Free Software Foundation; either version 2.1 of the License, or * (at your option) any later version. * - * This library is distributed in the hope that it will be useful, but - * WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY - * or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public + * This library is distributed in the hope that it will be useful, but + * WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY + * or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public * License for more details. * * You should have received a copy of the GNU Lesser General Public * License along with this library; if not, write to the Free Software - * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, - * USA. + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, + * USA. * - * [Java is a trademark or registered trademark of Sun Microsystems, Inc. + * [Java is a trademark or registered trademark of Sun Microsystems, Inc. * in the United States and other countries.] * * ------------------ * DateAxisTests.java * ------------------ - * (C) Copyright 2003-2007, by Object Refinery Limited and Contributors. + * (C) Copyright 2003-2008, by Object Refinery Limited and Contributors. * * Original Author: David Gilbert (for Object Refinery Limited); * Contributor(s): -; @@ -37,12 +37,12 @@ * 22-Apr-2003 : Version 1 (DG); * 07-Jan-2005 : Added test for hashCode() method (DG); * 25-Sep-2005 : New tests for bug 1564977 (DG); - * 19-Apr-2007 : Added further checks for setMinimumDate() and + * 19-Apr-2007 : Added further checks for setMinimumDate() and * setMaximumDate() (DG); * 03-May-2007 : Replaced the tests for the previousStandardDate() method with * new tests that check that the previousStandardDate and the * next standard date do in fact span the reference date (DG); - * 20-Jun-2007 + * 20-Jun-2007 * */ @@ -82,21 +82,21 @@ public class DateAxisTests extends TestCase { static class MyDateAxis extends DateAxis { - + /** * Creates a new instance. - * + * * @param label the label. */ public MyDateAxis(String label) { super(label); } - + public Date previousStandardDate(Date d, DateTickUnit unit) { return super.previousStandardDate(d, unit); } } - + /** * Returns the tests as a test suite. * @@ -119,20 +119,20 @@ * Confirm that the equals method can distinguish all the required fields. */ public void testEquals() { - + DateAxis a1 = new DateAxis("Test"); DateAxis a2 = new DateAxis("Test"); assertTrue(a1.equals(a2)); assertFalse(a1.equals(null)); assertFalse(a1.equals("Some non-DateAxis object")); - - // tickUnit + + // tickUnit a1.setTickUnit(new DateTickUnit(DateTickUnit.DAY, 7)); assertFalse(a1.equals(a2)); a2.setTickUnit(new DateTickUnit(DateTickUnit.DAY, 7)); assertTrue(a1.equals(a2)); - // dateFormatOverride + // dateFormatOverride a1.setDateFormatOverride(new SimpleDateFormat("yyyy")); assertFalse(a1.equals(a2)); a2.setDateFormatOverride(new SimpleDateFormat("yyyy")); @@ -143,15 +143,15 @@ assertFalse(a1.equals(a2)); a2.setTickMarkPosition(DateTickMarkPosition.END); assertTrue(a1.equals(a2)); - + // timeline a1.setTimeline(SegmentedTimeline.newMondayThroughFridayTimeline()); assertFalse(a1.equals(a2)); a2.setTimeline(SegmentedTimeline.newMondayThroughFridayTimeline()); assertTrue(a1.equals(a2)); - + } - + /** * A test for bug report 1472942. The DateFormat.equals() method is not * checking the range attribute. @@ -167,9 +167,9 @@ a2.setRange(new Date(1L), new Date(2L)); assertTrue(a1.equals(a2)); } - + /** - * Two objects that are equal are required to return the same hashCode. + * Two objects that are equal are required to return the same hashCode. */ public void testHashCode() { DateAxis a1 = new DateAxis("Test"); @@ -179,7 +179,7 @@ int h2 = a2.hashCode(); assertEquals(h1, h2); } - + /** * Confirm that cloning works. */ @@ -225,7 +225,7 @@ axis.setMaximumDate(date); assertEquals(date, axis.getMaximumDate()); - // check that setting the max date to something on or before the + // check that setting the max date to something on or before the // current min date works... Date d1 = new Date(); Date d2 = new Date(d1.getTime() + 1); @@ -246,53 +246,53 @@ axis.setMaximumDate(d2); axis.setMinimumDate(d1); assertEquals(d1, axis.getMinimumDate()); - - // check that setting the min date to something on or after the + + // check that setting the min date to something on or after the // current min date works... Date d3 = new Date(d2.getTime() + 1); axis.setMinimumDate(d2); assertEquals(d3, axis.getMaximumDate()); } - + /** * Tests two doubles for 'near enough' equality. - * + * * @param d1 number 1. * @param d2 number 2. * @param tolerance maximum tolerance. - * + * * @return A boolean. */ private boolean same(double d1, double d2, double tolerance) { return (Math.abs(d1 - d2) < tolerance); } - + /** * Test the translation of Java2D values to data values. */ public void testJava2DToValue() { DateAxis axis = new DateAxis(); - axis.setRange(50.0, 100.0); + axis.setRange(50.0, 100.0); Rectangle2D dataArea = new Rectangle2D.Double(10.0, 50.0, 400.0, 300.0); - double y1 = axis.java2DToValue(75.0, dataArea, RectangleEdge.LEFT); - assertTrue(same(y1, 95.8333333, 1.0)); - double y2 = axis.java2DToValue(75.0, dataArea, RectangleEdge.RIGHT); - assertTrue(same(y2, 95.8333333, 1.0)); - double x1 = axis.java2DToValue(75.0, dataArea, RectangleEdge.TOP); - assertTrue(same(x1, 58.125, 1.0)); - double x2 = axis.java2DToValue(75.0, dataArea, RectangleEdge.BOTTOM); - assertTrue(same(x2, 58.125, 1.0)); + double y1 = axis.java2DToValue(75.0, dataArea, RectangleEdge.LEFT); + assertTrue(same(y1, 95.8333333, 1.0)); + double y2 = axis.java2DToValue(75.0, dataArea, RectangleEdge.RIGHT); + assertTrue(same(y2, 95.8333333, 1.0)); + double x1 = axis.java2DToValue(75.0, dataArea, RectangleEdge.TOP); + assertTrue(same(x1, 58.125, 1.0)); + double x2 = axis.java2DToValue(75.0, dataArea, RectangleEdge.BOTTOM); + assertTrue(same(x2, 58.125, 1.0)); axis.setInverted(true); - double y3 = axis.java2DToValue(75.0, dataArea, RectangleEdge.LEFT); - assertTrue(same(y3, 54.1666667, 1.0)); - double y4 = axis.java2DToValue(75.0, dataArea, RectangleEdge.RIGHT); - assertTrue(same(y4, 54.1666667, 1.0)); - double x3 = axis.java2DToValue(75.0, dataArea, RectangleEdge.TOP); - assertTrue(same(x3, 91.875, 1.0)); - double x4 = axis.java2DToValue(75.0, dataArea, RectangleEdge.BOTTOM); - assertTrue(same(x4, 91.875, 1.0)); + double y3 = axis.java2DToValue(75.0, dataArea, RectangleEdge.LEFT); + assertTrue(same(y3, 54.1666667, 1.0)); + double y4 = axis.java2DToValue(75.0, dataArea, RectangleEdge.RIGHT); + assertTrue(same(y4, 54.1666667, 1.0)); + double x3 = axis.java2DToValue(75.0, dataArea, RectangleEdge.TOP); + assertTrue(same(x3, 91.875, 1.0)); + double x4 = axis.java2DToValue(75.0, dataArea, RectangleEdge.BOTTOM); + assertTrue(same(x4, 91.875, 1.0)); } - + /** * Serialize an instance, restore it, and check for equality. */ @@ -328,16 +328,16 @@ MyDateAxis axis = new MyDateAxis("Year"); Year y2006 = new Year(2006); Year y2007 = new Year(2007); - + // five dates to check... Date d0 = new Date(y2006.getFirstMillisecond()); Date d1 = new Date(y2006.getFirstMillisecond() + 500L); Date d2 = new Date(y2006.getMiddleMillisecond()); Date d3 = new Date(y2006.getMiddleMillisecond() + 500L); Date d4 = new Date(y2006.getLastMillisecond()); - + Date end = new Date(y2007.getLastMillisecond()); - + DateTickUnit unit = new DateTickUnit(DateTickUnit.YEAR, 1); axis.setTickUnit(unit); @@ -358,13 +358,13 @@ // MIDDLE: check d1, d2 and d3 axis.setTickMarkPosition(DateTickMarkPosition.MIDDLE); - + axis.setRange(d1, end); psd = axis.previousStandardDate(d1, unit); nsd = unit.addToDate(psd); assertTrue(psd.getTime() < d1.getTime()); assertTrue(nsd.getTime() >= d1.getTime()); - + axis.setRange(d2, end); psd = axis.previousStandardDate(d2, unit); nsd = unit.addToDate(psd); @@ -379,20 +379,20 @@ // END: check d3 and d4 axis.setTickMarkPosition(DateTickMarkPosition.END); - + axis.setRange(d3, end); psd = axis.previousStandardDate(d3, unit); nsd = unit.addToDate(psd); assertTrue(psd.getTime() < d3.getTime()); assertTrue(nsd.getTime() >= d3.getTime()); - + axis.setRange(d4, end); psd = axis.previousStandardDate(d4, unit); nsd = unit.addToDate(psd); assertTrue(psd.getTime() < d4.getTime()); assertTrue(nsd.getTime() >= d4.getTime()); } - + /** * A basic check for the testPreviousStandardDate() method when the * tick unit is 10 years (just for the sake of having a multiple). @@ -401,16 +401,16 @@ MyDateAxis axis = new MyDateAxis("Year"); Year y2006 = new Year(2006); Year y2007 = new Year(2007); - + // five dates to check... Date d0 = new Date(y2006.getFirstMillisecond()); Date d1 = new Date(y2006.getFirstMillisecond() + 500L); Date d2 = new Date(y2006.getMiddleMillisecond()); Date d3 = new Date(y2006.getMiddleMillisecond() + 500L); Date d4 = new Date(y2006.getLastMillisecond()); - + Date end = new Date(y2007.getLastMillisecond()); - + DateTickUnit unit = new DateTickUnit(DateTickUnit.YEAR, 10); axis.setTickUnit(unit); @@ -431,13 +431,13 @@ // MIDDLE: check d1, d2 and d3 axis.setTickMarkPosition(DateTickMarkPosition.MIDDLE); - + axis.setRange(d1, end); psd = axis.previousStandardDate(d1, unit); nsd = unit.addToDate(psd); assertTrue(psd.getTime() < d1.getTime()); assertTrue(nsd.getTime() >= d1.getTime()); - + axis.setRange(d2, end); psd = axis.previousStandardDate(d2, unit); nsd = unit.addToDate(psd); @@ -452,13 +452,13 @@ // END: check d3 and d4 axis.setTickMarkPosition(DateTickMarkPosition.END); - + axis.setRange(d3, end); psd = axis.previousStandardDate(d3, unit); nsd = unit.addToDate(psd); assertTrue(psd.getTime() < d3.getTime()); assertTrue(nsd.getTime() >= d3.getTime()); - + axis.setRange(d4, end); psd = axis.previousStandardDate(d4, unit); nsd = unit.addToDate(psd); @@ -474,16 +474,16 @@ MyDateAxis axis = new MyDateAxis("Month"); Month nov2006 = new Month(11, 2006); Month dec2006 = new Month(12, 2006); - + // five dates to check... Date d0 = new Date(nov2006.getFirstMillisecond()); Date d1 = new Date(nov2006.getFirstMillisecond() + 500L); Date d2 = new Date(nov2006.getMiddleMillisecond()); Date d3 = new Date(nov2006.getMiddleMillisecond() + 500L); Date d4 = new Date(nov2006.getLastMillisecond()); - + Date end = new Date(dec2006.getLastMillisecond()); - + DateTickUnit unit = new DateTickUnit(DateTickUnit.MONTH, 1); axis.setTickUnit(unit); @@ -504,13 +504,13 @@ // MIDDLE: check d1, d2 and d3 axis.setTickMarkPosition(DateTickMarkPosition.MIDDLE); - + axis.setRange(d1, end); psd = axis.previousStandardDate(d1, unit); nsd = unit.addToDate(psd); assertTrue(psd.getTime() < d1.getTime()); assertTrue(nsd.getTime() >= d1.getTime()); - + axis.setRange(d2, end); psd = axis.previousStandardDate(d2, unit); nsd = unit.addToDate(psd); @@ -525,20 +525,20 @@ // END: check d3 and d4 axis.setTickMarkPosition(DateTickMarkPosition.END); - + axis.setRange(d3, end); psd = axis.previousStandardDate(d3, unit); nsd = unit.addToDate(psd); assertTrue(psd.getTime() < d3.getTime()); assertTrue(nsd.getTime() >= d3.getTime()); - + axis.setRange(d4, end); psd = axis.previousStandardDate(d4, unit); nsd = unit.addToDate(psd); assertTrue(psd.getTime() < d4.getTime()); assertTrue(nsd.getTime() >= d4.getTime()); } - + /** * A basic check for the testPreviousStandardDate() method when the * tick unit is 3 months (just for the sake of having a multiple). @@ -547,16 +547,16 @@ MyDateAxis axis = new MyDateAxis("Month"); Month nov2006 = new Month(11, 2006); Month dec2006 = new Month(12, 2006); - + // five dates to check... Date d0 = new Date(nov2006.getFirstMillisecond()); Date d1 = new Date(nov2006.getFirstMillisecond() + 500L); Date d2 = new Date(nov2006.getMiddleMillisecond()); Date d3 = new Date(nov2006.getMiddleMillisecond() + 500L); Date d4 = new Date(nov2006.getLastMillisecond()); - + Date end = new Date(dec2006.getLastMillisecond()); - + DateTickUnit unit = new DateTickUnit(DateTickUnit.MONTH, 3); axis.setTickUnit(unit); @@ -577,13 +577,13 @@ // MIDDLE: check d1, d2 and d3 axis.setTickMarkPosition(DateTickMarkPosition.MIDDLE); - + axis.setRange(d1, end); psd = axis.previousStandardDate(d1, unit); nsd = unit.addToDate(psd); assertTrue(psd.getTime() < d1.getTime()); assertTrue(nsd.getTime() >= d1.getTime()); - + axis.setRange(d2, end); psd = axis.previousStandardDate(d2, unit); nsd = unit.addToDate(psd); @@ -598,13 +598,13 @@ // END: check d3 and d4 axis.setTickMarkPosition(DateTickMarkPosition.END); - + axis.setRange(d3, end); psd = axis.previousStandardDate(d3, unit); nsd = unit.addToDate(psd); assertTrue(psd.getTime() < d3.getTime()); assertTrue(nsd.getTime() >= d3.getTime()); - + axis.setRange(d4, end); psd = axis.previousStandardDate(d4, unit); nsd = unit.addToDate(psd); @@ -620,16 +620,16 @@ MyDateAxis axis = new MyDateAxis("Day"); Day apr12007 = new Day(1, 4, 2007); Day apr22007 = new Day(2, 4, 2007); - + // five dates to check... Date d0 = new Date(apr12007.getFirstMillisecond()); Date d1 = new Date(apr12007.getFirstMillisecond() + 500L); Date d2 = new Date(apr12007.getMiddleMillisecond()); Date d3 = new Date(apr12007.getMiddleMillisecond() + 500L); Date d4 = new Date(apr12007.getLastMillisecond()); - + Date end = new Date(apr22007.getLastMillisecond()); - + DateTickUnit unit = new DateTickUnit(DateTickUnit.DAY, 1); axis.setTickUnit(unit); @@ -650,13 +650,13 @@ // MIDDLE: check d1, d2 and d3 axis.setTickMarkPosition(DateTickMarkPosition.MIDDLE); - + axis.setRange(d1, end); psd = axis.previousStandardDate(d1, unit); nsd = unit.addToDate(psd); assertTrue(psd.getTime() < d1.getTime()); assertTrue(nsd.getTime() >= d1.getTime()); - ... [truncated message content] |
From: <mu...@us...> - 2008-06-10 13:06:43
|
Revision: 1123 http://jfreechart.svn.sourceforge.net/jfreechart/?rev=1123&view=rev Author: mungady Date: 2008-06-10 06:06:42 -0700 (Tue, 10 Jun 2008) Log Message: ----------- Clean up tests. Modified Paths: -------------- trunk/tests/org/jfree/chart/axis/junit/LogarithmicAxisTests.java trunk/tests/org/jfree/chart/axis/junit/MarkerAxisBandTests.java trunk/tests/org/jfree/chart/axis/junit/MonthDateFormatTests.java trunk/tests/org/jfree/chart/axis/junit/NumberAxis3DTests.java trunk/tests/org/jfree/chart/axis/junit/NumberAxisTests.java trunk/tests/org/jfree/chart/axis/junit/NumberTickUnitTests.java trunk/tests/org/jfree/chart/axis/junit/PeriodAxisLabelInfoTests.java trunk/tests/org/jfree/chart/axis/junit/PeriodAxisTests.java Modified: trunk/tests/org/jfree/chart/axis/junit/LogarithmicAxisTests.java =================================================================== --- trunk/tests/org/jfree/chart/axis/junit/LogarithmicAxisTests.java 2008-06-10 13:06:17 UTC (rev 1122) +++ trunk/tests/org/jfree/chart/axis/junit/LogarithmicAxisTests.java 2008-06-10 13:06:42 UTC (rev 1123) @@ -2,32 +2,32 @@ * JFreeChart : a free chart library for the Java(tm) platform * =========================================================== * - * (C) Copyright 2000-2007, by Object Refinery Limited and Contributors. + * (C) Copyright 2000-2008, by Object Refinery Limited and Contributors. * * Project Info: http://www.jfree.org/jfreechart/index.html * - * This library is free software; you can redistribute it and/or modify it - * under the terms of the GNU Lesser General Public License as published by - * the Free Software Foundation; either version 2.1 of the License, or + * This library is free software; you can redistribute it and/or modify it + * under the terms of the GNU Lesser General Public License as published by + * the Free Software Foundation; either version 2.1 of the License, or * (at your option) any later version. * - * This library is distributed in the hope that it will be useful, but - * WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY - * or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public + * This library is distributed in the hope that it will be useful, but + * WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY + * or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public * License for more details. * * You should have received a copy of the GNU Lesser General Public * License along with this library; if not, write to the Free Software - * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, - * USA. + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, + * USA. * - * [Java is a trademark or registered trademark of Sun Microsystems, Inc. + * [Java is a trademark or registered trademark of Sun Microsystems, Inc. * in the United States and other countries.] * * ------------------------- * LogarithmicAxisTests.java * ------------------------- - * (C) Copyright 2003-2007, by Object Refinery Limited and Contributors. + * (C) Copyright 2003-2008, by Object Refinery Limited and Contributors. * * Original Author: David Gilbert (for Object Refinery Limited); * Contributor(s): -; @@ -66,25 +66,25 @@ /** * Creates an instance. - * + * * @param label the label. */ public MyLogarithmicAxis(String label) { super(label); } - + /* (non-Javadoc) * @see org.jfree.chart.axis.LogarithmicAxis#switchedLog10(double) */ protected double switchedLog10(double val) { return super.switchedLog10(val); } - + } - + /** Tolerance for floating point comparisons */ public static double EPSILON = 0.000001; - + MyLogarithmicAxis axis = null; /** @@ -107,7 +107,7 @@ /** * Sets up a new axis. - * + * * @throws Exception */ protected void setUp() throws Exception { @@ -146,9 +146,9 @@ assertEquals(a1, a2); } - - /** - * Test if adjustedLog10 and adjustedPow10 are inverses of each other + + /** + * Test if adjustedLog10 and adjustedPow10 are inverses of each other */ public void testAdjustedLog10() { checkLogPowRoundTrip(20); @@ -168,13 +168,13 @@ this.axis.adjustedLog10(value)), EPSILON); } - /** - * Test if switchedLog10 and switchedPow10 are inverses of each other + /** + * Test if switchedLog10 and switchedPow10 are inverses of each other */ public void testSwitchedLog10() { assertFalse("Axis should not allow negative values", this.axis.getAllowNegativesFlag()); - + assertEquals(Math.log(0.5) / LogarithmicAxis.LOG10_VALUE, this.axis.switchedLog10(0.5), EPSILON); @@ -243,45 +243,45 @@ checkPointsToJava2D(edge, plotArea); } - private void checkPointsToJava2D(RectangleEdge edge, + private void checkPointsToJava2D(RectangleEdge edge, Rectangle2D plotArea) { assertEquals("Left most point on the axis should be beginning of " + "range.", plotArea.getX(), this.axis.valueToJava2D( this.axis.getLowerBound(), plotArea, edge), EPSILON); - assertEquals("Right most point on the axis should be end of range.", - plotArea.getX() + plotArea.getWidth(), - this.axis.valueToJava2D(this.axis.getUpperBound(), + assertEquals("Right most point on the axis should be end of range.", + plotArea.getX() + plotArea.getWidth(), + this.axis.valueToJava2D(this.axis.getUpperBound(), plotArea, edge), EPSILON); - assertEquals("Center point on the axis should geometric mean of the bounds.", - plotArea.getX() + (plotArea.getWidth() / 2), - this.axis.valueToJava2D(Math.sqrt(this.axis.getLowerBound() + assertEquals("Center point on the axis should geometric mean of the bounds.", + plotArea.getX() + (plotArea.getWidth() / 2), + this.axis.valueToJava2D(Math.sqrt(this.axis.getLowerBound() * this.axis.getUpperBound()), plotArea, edge), EPSILON); } - /** + /** * Check the translation java2D to value for left, right, and center point. */ private void checkPointsToValue(RectangleEdge edge, Rectangle2D plotArea) { assertEquals("Right most point on the axis should be end of range.", this.axis.getUpperBound(), this.axis.java2DToValue( - plotArea.getX() + plotArea.getWidth(), plotArea, edge), + plotArea.getX() + plotArea.getWidth(), plotArea, edge), EPSILON); assertEquals("Left most point on the axis should be beginning of " - + "range.", this.axis.getLowerBound(), - this.axis.java2DToValue(plotArea.getX(), plotArea, edge), + + "range.", this.axis.getLowerBound(), + this.axis.java2DToValue(plotArea.getX(), plotArea, edge), EPSILON); assertEquals("Center point on the axis should geometric mean of the " - + "bounds.", Math.sqrt(this.axis.getUpperBound() + + "bounds.", Math.sqrt(this.axis.getUpperBound() * this.axis.getLowerBound()), this.axis.java2DToValue( - plotArea.getX() + (plotArea.getWidth() / 2), plotArea, edge), + plotArea.getX() + (plotArea.getWidth() / 2), plotArea, edge), EPSILON); } /** * Runs all tests in this class. - * + * * @param args ignored. */ public static void main(String[] args) { Modified: trunk/tests/org/jfree/chart/axis/junit/MarkerAxisBandTests.java =================================================================== --- trunk/tests/org/jfree/chart/axis/junit/MarkerAxisBandTests.java 2008-06-10 13:06:17 UTC (rev 1122) +++ trunk/tests/org/jfree/chart/axis/junit/MarkerAxisBandTests.java 2008-06-10 13:06:42 UTC (rev 1123) @@ -2,32 +2,32 @@ * JFreeChart : a free chart library for the Java(tm) platform * =========================================================== * - * (C) Copyright 2000-2007, by Object Refinery Limited and Contributors. + * (C) Copyright 2000-2008, by Object Refinery Limited and Contributors. * * Project Info: http://www.jfree.org/jfreechart/index.html * - * This library is free software; you can redistribute it and/or modify it - * under the terms of the GNU Lesser General Public License as published by - * the Free Software Foundation; either version 2.1 of the License, or + * This library is free software; you can redistribute it and/or modify it + * under the terms of the GNU Lesser General Public License as published by + * the Free Software Foundation; either version 2.1 of the License, or * (at your option) any later version. * - * This library is distributed in the hope that it will be useful, but - * WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY - * or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public + * This library is distributed in the hope that it will be useful, but + * WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY + * or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public * License for more details. * * You should have received a copy of the GNU Lesser General Public * License along with this library; if not, write to the Free Software - * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, - * USA. + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, + * USA. * - * [Java is a trademark or registered trademark of Sun Microsystems, Inc. + * [Java is a trademark or registered trademark of Sun Microsystems, Inc. * in the United States and other countries.] * * ------------------------ * MarkerAxisBandTests.java * ------------------------ - * (C) Copyright 2003-2007, by Object Refinery Limited and Contributors. + * (C) Copyright 2003-2008, by Object Refinery Limited and Contributors. * * Original Author: David Gilbert (for Object Refinery Limited); * Contributor(s): -; @@ -81,24 +81,24 @@ /** * Test that the equals() method can distinguish all fields. */ - public void testEquals() { + public void testEquals() { Font font1 = new Font("SansSerif", Font.PLAIN, 12); Font font2 = new Font("SansSerif", Font.PLAIN, 14); - + MarkerAxisBand a1 = new MarkerAxisBand(null, 1.0, 1.0, 1.0, 1.0, font1); MarkerAxisBand a2 = new MarkerAxisBand(null, 1.0, 1.0, 1.0, 1.0, font1); assertEquals(a1, a2); - + a1 = new MarkerAxisBand(null, 2.0, 1.0, 1.0, 1.0, font1); assertFalse(a1.equals(a2)); a2 = new MarkerAxisBand(null, 2.0, 1.0, 1.0, 1.0, font1); assertTrue(a1.equals(a2)); - + a1 = new MarkerAxisBand(null, 2.0, 3.0, 1.0, 1.0, font1); assertFalse(a1.equals(a2)); a2 = new MarkerAxisBand(null, 2.0, 3.0, 1.0, 1.0, font1); assertTrue(a1.equals(a2)); - + a1 = new MarkerAxisBand(null, 2.0, 3.0, 4.0, 1.0, font1); assertFalse(a1.equals(a2)); a2 = new MarkerAxisBand(null, 2.0, 3.0, 4.0, 1.0, font1); @@ -114,13 +114,13 @@ a2 = new MarkerAxisBand(null, 2.0, 3.0, 4.0, 5.0, font2); assertTrue(a1.equals(a2)); } - + /** - * Two objects that are equal are required to return the same hashCode. + * Two objects that are equal are required to return the same hashCode. */ public void testHashCode() { Font font1 = new Font("SansSerif", Font.PLAIN, 12); - + MarkerAxisBand a1 = new MarkerAxisBand(null, 1.0, 1.0, 1.0, 1.0, font1); MarkerAxisBand a2 = new MarkerAxisBand(null, 1.0, 1.0, 1.0, 1.0, font1); assertTrue(a1.equals(a2)); @@ -144,13 +144,12 @@ out.close(); ObjectInput in = new ObjectInputStream( - new ByteArrayInputStream(buffer.toByteArray()) - ); + new ByteArrayInputStream(buffer.toByteArray())); a2 = (MarkerAxisBand) in.readObject(); in.close(); } catch (Exception e) { - System.out.println(e.toString()); + e.printStackTrace(); } assertEquals(a1, a2); Modified: trunk/tests/org/jfree/chart/axis/junit/MonthDateFormatTests.java =================================================================== --- trunk/tests/org/jfree/chart/axis/junit/MonthDateFormatTests.java 2008-06-10 13:06:17 UTC (rev 1122) +++ trunk/tests/org/jfree/chart/axis/junit/MonthDateFormatTests.java 2008-06-10 13:06:42 UTC (rev 1123) @@ -2,32 +2,32 @@ * JFreeChart : a free chart library for the Java(tm) platform * =========================================================== * - * (C) Copyright 2000-2007, by Object Refinery Limited and Contributors. + * (C) Copyright 2000-2008, by Object Refinery Limited and Contributors. * * Project Info: http://www.jfree.org/jfreechart/index.html * - * This library is free software; you can redistribute it and/or modify it - * under the terms of the GNU Lesser General Public License as published by - * the Free Software Foundation; either version 2.1 of the License, or + * This library is free software; you can redistribute it and/or modify it + * under the terms of the GNU Lesser General Public License as published by + * the Free Software Foundation; either version 2.1 of the License, or * (at your option) any later version. * - * This library is distributed in the hope that it will be useful, but - * WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY - * or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public + * This library is distributed in the hope that it will be useful, but + * WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY + * or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public * License for more details. * * You should have received a copy of the GNU Lesser General Public * License along with this library; if not, write to the Free Software - * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, - * USA. + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, + * USA. * - * [Java is a trademark or registered trademark of Sun Microsystems, Inc. + * [Java is a trademark or registered trademark of Sun Microsystems, Inc. * in the United States and other countries.] * * ------------------------- * MonthDateFormatTests.java * ------------------------- - * (C) Copyright 2005, 2007, by Object Refinery Limited and Contributors. + * (C) Copyright 2005-2008, by Object Refinery Limited and Contributors. * * Original Author: David Gilbert (for Object Refinery Limited); * Contributor(s): -; @@ -87,56 +87,56 @@ MonthDateFormat mf2 = new MonthDateFormat(); assertTrue(mf1.equals(mf2)); assertTrue(mf2.equals(mf1)); - + boolean[] showYear1 = new boolean [12]; showYear1[0] = true; boolean[] showYear2 = new boolean [12]; showYear1[1] = true; - + // time zone - mf1 = new MonthDateFormat(TimeZone.getTimeZone("PST"), Locale.US, 1, + mf1 = new MonthDateFormat(TimeZone.getTimeZone("PST"), Locale.US, 1, showYear1, new SimpleDateFormat("yy")); assertFalse(mf1.equals(mf2)); - mf2 = new MonthDateFormat(TimeZone.getTimeZone("PST"), Locale.US, 1, + mf2 = new MonthDateFormat(TimeZone.getTimeZone("PST"), Locale.US, 1, showYear1, new SimpleDateFormat("yy")); assertTrue(mf1.equals(mf2)); - + // locale - mf1 = new MonthDateFormat(TimeZone.getTimeZone("PST"), Locale.FRANCE, 1, + mf1 = new MonthDateFormat(TimeZone.getTimeZone("PST"), Locale.FRANCE, 1, showYear1, new SimpleDateFormat("yy")); assertFalse(mf1.equals(mf2)); - mf2 = new MonthDateFormat(TimeZone.getTimeZone("PST"), Locale.FRANCE, 1, + mf2 = new MonthDateFormat(TimeZone.getTimeZone("PST"), Locale.FRANCE, 1, showYear1, new SimpleDateFormat("yy")); assertTrue(mf1.equals(mf2)); - + // chars - mf1 = new MonthDateFormat(TimeZone.getTimeZone("PST"), Locale.FRANCE, 2, + mf1 = new MonthDateFormat(TimeZone.getTimeZone("PST"), Locale.FRANCE, 2, showYear1, new SimpleDateFormat("yy")); assertFalse(mf1.equals(mf2)); - mf2 = new MonthDateFormat(TimeZone.getTimeZone("PST"), Locale.FRANCE, 2, + mf2 = new MonthDateFormat(TimeZone.getTimeZone("PST"), Locale.FRANCE, 2, showYear1, new SimpleDateFormat("yy")); assertTrue(mf1.equals(mf2)); - + // showYear[] - mf1 = new MonthDateFormat(TimeZone.getTimeZone("PST"), Locale.FRANCE, 2, + mf1 = new MonthDateFormat(TimeZone.getTimeZone("PST"), Locale.FRANCE, 2, showYear2, new SimpleDateFormat("yy")); assertFalse(mf1.equals(mf2)); - mf2 = new MonthDateFormat(TimeZone.getTimeZone("PST"), Locale.FRANCE, 2, + mf2 = new MonthDateFormat(TimeZone.getTimeZone("PST"), Locale.FRANCE, 2, showYear2, new SimpleDateFormat("yy")); assertTrue(mf1.equals(mf2)); - + // yearFormatter - mf1 = new MonthDateFormat(TimeZone.getTimeZone("PST"), Locale.FRANCE, 2, + mf1 = new MonthDateFormat(TimeZone.getTimeZone("PST"), Locale.FRANCE, 2, showYear2, new SimpleDateFormat("yyyy")); assertFalse(mf1.equals(mf2)); - mf2 = new MonthDateFormat(TimeZone.getTimeZone("PST"), Locale.FRANCE, 2, + mf2 = new MonthDateFormat(TimeZone.getTimeZone("PST"), Locale.FRANCE, 2, showYear2, new SimpleDateFormat("yyyy")); assertTrue(mf1.equals(mf2)); } - + /** - * Two objects that are equal are required to return the same hashCode. + * Two objects that are equal are required to return the same hashCode. */ public void testHashCode() { MonthDateFormat mf1 = new MonthDateFormat(); @@ -145,8 +145,8 @@ int h1 = mf1.hashCode(); int h2 = mf2.hashCode(); assertEquals(h1, h2); - } - + } + /** * Confirm that cloning works. */ @@ -172,13 +172,12 @@ out.close(); ObjectInput in = new ObjectInputStream( - new ByteArrayInputStream(buffer.toByteArray()) - ); + new ByteArrayInputStream(buffer.toByteArray())); mf2 = (MonthDateFormat) in.readObject(); in.close(); } catch (Exception e) { - fail(e.toString()); + e.printStackTrace(); } assertTrue(mf1.equals(mf2)); } Modified: trunk/tests/org/jfree/chart/axis/junit/NumberAxis3DTests.java =================================================================== --- trunk/tests/org/jfree/chart/axis/junit/NumberAxis3DTests.java 2008-06-10 13:06:17 UTC (rev 1122) +++ trunk/tests/org/jfree/chart/axis/junit/NumberAxis3DTests.java 2008-06-10 13:06:42 UTC (rev 1123) @@ -2,32 +2,32 @@ * JFreeChart : a free chart library for the Java(tm) platform * =========================================================== * - * (C) Copyright 2000-2007, by Object Refinery Limited and Contributors. + * (C) Copyright 2000-2008, by Object Refinery Limited and Contributors. * * Project Info: http://www.jfree.org/jfreechart/index.html * - * This library is free software; you can redistribute it and/or modify it - * under the terms of the GNU Lesser General Public License as published by - * the Free Software Foundation; either version 2.1 of the License, or + * This library is free software; you can redistribute it and/or modify it + * under the terms of the GNU Lesser General Public License as published by + * the Free Software Foundation; either version 2.1 of the License, or * (at your option) any later version. * - * This library is distributed in the hope that it will be useful, but - * WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY - * or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public + * This library is distributed in the hope that it will be useful, but + * WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY + * or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public * License for more details. * * You should have received a copy of the GNU Lesser General Public * License along with this library; if not, write to the Free Software - * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, - * USA. + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, + * USA. * - * [Java is a trademark or registered trademark of Sun Microsystems, Inc. + * [Java is a trademark or registered trademark of Sun Microsystems, Inc. * in the United States and other countries.] * * ---------------------- * NumberAxis3DTests.java * ---------------------- - * (C) Copyright 2003-2007, by Object Refinery Limited and Contributors. + * (C) Copyright 2003-2008, by Object Refinery Limited and Contributors. * * Original Author: David Gilbert (for Object Refinery Limited); * Contributor(s): -; @@ -91,13 +91,12 @@ out.close(); ObjectInput in = new ObjectInputStream( - new ByteArrayInputStream(buffer.toByteArray()) - ); + new ByteArrayInputStream(buffer.toByteArray())); a2 = (NumberAxis3D) in.readObject(); in.close(); } catch (Exception e) { - System.out.println(e.toString()); + e.printStackTrace(); } assertEquals(a1, a2); Modified: trunk/tests/org/jfree/chart/axis/junit/NumberAxisTests.java =================================================================== --- trunk/tests/org/jfree/chart/axis/junit/NumberAxisTests.java 2008-06-10 13:06:17 UTC (rev 1122) +++ trunk/tests/org/jfree/chart/axis/junit/NumberAxisTests.java 2008-06-10 13:06:42 UTC (rev 1123) @@ -2,32 +2,32 @@ * JFreeChart : a free chart library for the Java(tm) platform * =========================================================== * - * (C) Copyright 2000-2007, by Object Refinery Limited and Contributors. + * (C) Copyright 2000-2008, by Object Refinery Limited and Contributors. * * Project Info: http://www.jfree.org/jfreechart/index.html * - * This library is free software; you can redistribute it and/or modify it - * under the terms of the GNU Lesser General Public License as published by - * the Free Software Foundation; either version 2.1 of the License, or + * This library is free software; you can redistribute it and/or modify it + * under the terms of the GNU Lesser General Public License as published by + * the Free Software Foundation; either version 2.1 of the License, or * (at your option) any later version. * - * This library is distributed in the hope that it will be useful, but - * WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY - * or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public + * This library is distributed in the hope that it will be useful, but + * WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY + * or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public * License for more details. * * You should have received a copy of the GNU Lesser General Public * License along with this library; if not, write to the Free Software - * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, - * USA. + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, + * USA. * - * [Java is a trademark or registered trademark of Sun Microsystems, Inc. + * [Java is a trademark or registered trademark of Sun Microsystems, Inc. * in the United States and other countries.] * * -------------------- * NumberAxisTests.java * -------------------- - * (C) Copyright 2003-2007, by Object Refinery Limited and Contributors. + * (C) Copyright 2003-2008, by Object Refinery Limited and Contributors. * * Original Author: David Gilbert (for Object Refinery Limited); * Contributor(s): -; @@ -39,7 +39,7 @@ * 05-Oct-2004 : Added tests to pick up a bug in the auto-range calculation for * a domain axis on an XYPlot using an XYSeriesCollection (DG); * 07-Jan-2005 : Added test for hashCode() (DG); - * 11-Jan-2006 : Fixed testAutoRange2() and testAutoRange3() following changes + * 11-Jan-2006 : Fixed testAutoRange2() and testAutoRange3() following changes * to BarRenderer (DG); * 20-Feb-2006 : Added rangeType field to equals() test (DG); * 20-Jun-2007 : Removed JCommon dependencies (DG); @@ -97,7 +97,7 @@ public NumberAxisTests(String name) { super(name); } - + /** * Confirm that cloning works. */ @@ -119,11 +119,11 @@ * Confirm that the equals method can distinguish all the required fields. */ public void testEquals() { - + NumberAxis a1 = new NumberAxis("Test"); NumberAxis a2 = new NumberAxis("Test"); assertTrue(a1.equals(a2)); - + //private boolean autoRangeIncludesZero; a1.setAutoRangeIncludesZero(false); assertFalse(a1.equals(a2)); @@ -147,16 +147,16 @@ assertFalse(a1.equals(a2)); a2.setNumberFormatOverride(new DecimalFormat("0.00")); assertTrue(a1.equals(a2)); - + a1.setRangeType(RangeType.POSITIVE); assertFalse(a1.equals(a2)); a2.setRangeType(RangeType.POSITIVE); assertTrue(a1.equals(a2)); - + } /** - * Two objects that are equal are required to return the same hashCode. + * Two objects that are equal are required to return the same hashCode. */ public void testHashCode() { NumberAxis a1 = new NumberAxis("Test"); @@ -168,33 +168,33 @@ } private static final double EPSILON = 0.0000001; - + /** * Test the translation of Java2D values to data values. */ public void testTranslateJava2DToValue() { NumberAxis axis = new NumberAxis(); - axis.setRange(50.0, 100.0); + axis.setRange(50.0, 100.0); Rectangle2D dataArea = new Rectangle2D.Double(10.0, 50.0, 400.0, 300.0); - double y1 = axis.java2DToValue(75.0, dataArea, RectangleEdge.LEFT); - assertEquals(y1, 95.8333333, EPSILON); - double y2 = axis.java2DToValue(75.0, dataArea, RectangleEdge.RIGHT); - assertEquals(y2, 95.8333333, EPSILON); - double x1 = axis.java2DToValue(75.0, dataArea, RectangleEdge.TOP); - assertEquals(x1, 58.125, EPSILON); - double x2 = axis.java2DToValue(75.0, dataArea, RectangleEdge.BOTTOM); - assertEquals(x2, 58.125, EPSILON); + double y1 = axis.java2DToValue(75.0, dataArea, RectangleEdge.LEFT); + assertEquals(y1, 95.8333333, EPSILON); + double y2 = axis.java2DToValue(75.0, dataArea, RectangleEdge.RIGHT); + assertEquals(y2, 95.8333333, EPSILON); + double x1 = axis.java2DToValue(75.0, dataArea, RectangleEdge.TOP); + assertEquals(x1, 58.125, EPSILON); + double x2 = axis.java2DToValue(75.0, dataArea, RectangleEdge.BOTTOM); + assertEquals(x2, 58.125, EPSILON); axis.setInverted(true); - double y3 = axis.java2DToValue(75.0, dataArea, RectangleEdge.LEFT); - assertEquals(y3, 54.1666667, EPSILON); - double y4 = axis.java2DToValue(75.0, dataArea, RectangleEdge.RIGHT); - assertEquals(y4, 54.1666667, EPSILON); - double x3 = axis.java2DToValue(75.0, dataArea, RectangleEdge.TOP); - assertEquals(x3, 91.875, EPSILON); - double x4 = axis.java2DToValue(75.0, dataArea, RectangleEdge.BOTTOM); - assertEquals(x4, 91.875, EPSILON); + double y3 = axis.java2DToValue(75.0, dataArea, RectangleEdge.LEFT); + assertEquals(y3, 54.1666667, EPSILON); + double y4 = axis.java2DToValue(75.0, dataArea, RectangleEdge.RIGHT); + assertEquals(y4, 54.1666667, EPSILON); + double x3 = axis.java2DToValue(75.0, dataArea, RectangleEdge.TOP); + assertEquals(x3, 91.875, EPSILON); + double x4 = axis.java2DToValue(75.0, dataArea, RectangleEdge.BOTTOM); + assertEquals(x4, 91.875, EPSILON); } - + /** * Serialize an instance, restore it, and check for equality. */ @@ -230,21 +230,21 @@ dataset.setValue(100.0, "Row 1", "Column 1"); dataset.setValue(200.0, "Row 1", "Column 2"); JFreeChart chart = ChartFactory.createBarChart( - "Test", + "Test", "Categories", "Value", dataset, PlotOrientation.VERTICAL, - false, false, + false, false ); CategoryPlot plot = (CategoryPlot) chart.getPlot(); NumberAxis axis = (NumberAxis) plot.getRangeAxis(); - assertEquals(axis.getLowerBound(), 0.0, EPSILON); - assertEquals(axis.getUpperBound(), 210.0, EPSILON); + assertEquals(axis.getLowerBound(), 0.0, EPSILON); + assertEquals(axis.getUpperBound(), 210.0, EPSILON); } - + /** * A simple test for the auto-range calculation looking at a * NumberAxis used as the range axis for a CategoryPlot. In this @@ -260,10 +260,10 @@ CategoryPlot plot = (CategoryPlot) chart.getPlot(); NumberAxis axis = (NumberAxis) plot.getRangeAxis(); axis.setAutoRangeIncludesZero(false); - assertEquals(axis.getLowerBound(), 95.0, EPSILON); - assertEquals(axis.getUpperBound(), 205.0, EPSILON); + assertEquals(axis.getLowerBound(), 95.0, EPSILON); + assertEquals(axis.getUpperBound(), 205.0, EPSILON); } - + /** * A simple test for the auto-range calculation looking at a * NumberAxis used as the range axis for a CategoryPlot. In this @@ -280,18 +280,18 @@ CategoryPlot plot = (CategoryPlot) chart.getPlot(); NumberAxis axis = (NumberAxis) plot.getRangeAxis(); axis.setAutoRangeIncludesZero(false); - assertEquals(axis.getLowerBound(), 95.0, EPSILON); - assertEquals(axis.getUpperBound(), 205.0, EPSILON); - + assertEquals(axis.getLowerBound(), 95.0, EPSILON); + assertEquals(axis.getUpperBound(), 205.0, EPSILON); + // now replacing the dataset should update the axis range... DefaultCategoryDataset dataset2 = new DefaultCategoryDataset(); dataset2.setValue(900.0, "Row 1", "Column 1"); dataset2.setValue(1000.0, "Row 1", "Column 2"); plot.setDataset(dataset2); - assertEquals(axis.getLowerBound(), 895.0, EPSILON); - assertEquals(axis.getUpperBound(), 1005.0, EPSILON); + assertEquals(axis.getLowerBound(), 895.0, EPSILON); + assertEquals(axis.getUpperBound(), 1005.0, EPSILON); } - + /** * A check for the interaction between the 'autoRangeIncludesZero' flag * and the base setting in the BarRenderer. @@ -308,38 +308,38 @@ axis.setAutoRangeIncludesZero(false); BarRenderer br = (BarRenderer) plot.getRenderer(); br.setIncludeBaseInRange(false); - assertEquals(95.0, axis.getLowerBound(), EPSILON); - assertEquals(205.0, axis.getUpperBound(), EPSILON); - + assertEquals(95.0, axis.getLowerBound(), EPSILON); + assertEquals(205.0, axis.getUpperBound(), EPSILON); + br.setIncludeBaseInRange(true); - assertEquals(0.0, axis.getLowerBound(), EPSILON); - assertEquals(210.0, axis.getUpperBound(), EPSILON); - + assertEquals(0.0, axis.getLowerBound(), EPSILON); + assertEquals(210.0, axis.getUpperBound(), EPSILON); + axis.setAutoRangeIncludesZero(true); - assertEquals(0.0, axis.getLowerBound(), EPSILON); - assertEquals(210.0, axis.getUpperBound(), EPSILON); - + assertEquals(0.0, axis.getLowerBound(), EPSILON); + assertEquals(210.0, axis.getUpperBound(), EPSILON); + br.setIncludeBaseInRange(true); - assertEquals(0.0, axis.getLowerBound(), EPSILON); - assertEquals(210.0, axis.getUpperBound(), EPSILON); + assertEquals(0.0, axis.getLowerBound(), EPSILON); + assertEquals(210.0, axis.getUpperBound(), EPSILON); // now replacing the dataset should update the axis range... DefaultCategoryDataset dataset2 = new DefaultCategoryDataset(); dataset2.setValue(900.0, "Row 1", "Column 1"); dataset2.setValue(1000.0, "Row 1", "Column 2"); plot.setDataset(dataset2); - assertEquals(0.0, axis.getLowerBound(), EPSILON); + assertEquals(0.0, axis.getLowerBound(), EPSILON); assertEquals(1050.0, axis.getUpperBound(), EPSILON); - + br.setIncludeBaseInRange(false); - assertEquals(0.0, axis.getLowerBound(), EPSILON); + assertEquals(0.0, axis.getLowerBound(), EPSILON); assertEquals(1050.0, axis.getUpperBound(), EPSILON); - + axis.setAutoRangeIncludesZero(false); - assertEquals(895.0, axis.getLowerBound(), EPSILON); - assertEquals(1005.0, axis.getUpperBound(), EPSILON); + assertEquals(895.0, axis.getLowerBound(), EPSILON); + assertEquals(1005.0, axis.getUpperBound(), EPSILON); } - + /** * Checks that the auto-range for the domain axis on an XYPlot is * working as expected. @@ -352,22 +352,22 @@ XYSeriesCollection dataset = new XYSeriesCollection(); dataset.addSeries(series); JFreeChart chart = ChartFactory.createScatterPlot( - "Test", + "Test", "X", "Y", dataset, PlotOrientation.VERTICAL, - false, false, + false, false ); XYPlot plot = (XYPlot) chart.getPlot(); NumberAxis axis = (NumberAxis) plot.getDomainAxis(); axis.setAutoRangeIncludesZero(false); - assertEquals(0.9, axis.getLowerBound(), EPSILON); - assertEquals(3.1, axis.getUpperBound(), EPSILON); + assertEquals(0.9, axis.getLowerBound(), EPSILON); + assertEquals(3.1, axis.getUpperBound(), EPSILON); } - + /** * Checks that the auto-range for the range axis on an XYPlot is * working as expected. @@ -380,66 +380,66 @@ XYSeriesCollection dataset = new XYSeriesCollection(); dataset.addSeries(series); JFreeChart chart = ChartFactory.createScatterPlot( - "Test", + "Test", "X", "Y", dataset, PlotOrientation.VERTICAL, - false, false, + false, false ); XYPlot plot = (XYPlot) chart.getPlot(); NumberAxis axis = (NumberAxis) plot.getRangeAxis(); axis.setAutoRangeIncludesZero(false); - assertEquals(0.9, axis.getLowerBound(), EPSILON); - assertEquals(3.1, axis.getUpperBound(), EPSILON); + assertEquals(0.9, axis.getLowerBound(), EPSILON); + assertEquals(3.1, axis.getUpperBound(), EPSILON); } - + // /** // * Some checks for the setRangeType() method. // */ // public void testSetRangeType() { -// +// // NumberAxis axis = new NumberAxis("X"); // axis.setRangeType(RangeType.POSITIVE); // assertEquals(RangeType.POSITIVE, axis.getRangeType()); -// +// // // test a change to RangeType.POSITIVE // axis.setRangeType(RangeType.FULL); // axis.setRange(-5.0, 5.0); // axis.setRangeType(RangeType.POSITIVE); // assertEquals(new Range(0.0, 5.0), axis.getRange()); -// +// // axis.setRangeType(RangeType.FULL); // axis.setRange(-10.0, -5.0); // axis.setRangeType(RangeType.POSITIVE); -// assertEquals(new Range(0.0, axis.getAutoRangeMinimumSize()), +// assertEquals(new Range(0.0, axis.getAutoRangeMinimumSize()), // axis.getRange()); // // // test a change to RangeType.NEGATIVE // axis.setRangeType(RangeType.FULL); // axis.setRange(-5.0, 5.0); // axis.setRangeType(RangeType.NEGATIVE); -// assertEquals(new Range(-5.0, 0.0), axis.getRange()); -// +// assertEquals(new Range(-5.0, 0.0), axis.getRange()); +// // axis.setRangeType(RangeType.FULL); // axis.setRange(5.0, 10.0); // axis.setRangeType(RangeType.NEGATIVE); -// assertEquals(new Range(-axis.getAutoRangeMinimumSize(), 0.0), +// assertEquals(new Range(-axis.getAutoRangeMinimumSize(), 0.0), // axis.getRange()); // // // try null // boolean pass = false; // try { -// axis.setRangeType(null); +// axis.setRangeType(null); // } // catch (IllegalArgumentException e) { // pass = true; // } // assertTrue(pass); // } - + /** * Some checks for the setLowerBound() method. */ @@ -451,7 +451,7 @@ axis.setLowerBound(10.0); assertEquals(10.0, axis.getLowerBound(), EPSILON); assertEquals(11.0, axis.getUpperBound(), EPSILON); - + //axis.setRangeType(RangeType.POSITIVE); //axis.setLowerBound(-5.0); //assertEquals(0.0, axis.getLowerBound(), EPSILON); Modified: trunk/tests/org/jfree/chart/axis/junit/NumberTickUnitTests.java =================================================================== --- trunk/tests/org/jfree/chart/axis/junit/NumberTickUnitTests.java 2008-06-10 13:06:17 UTC (rev 1122) +++ trunk/tests/org/jfree/chart/axis/junit/NumberTickUnitTests.java 2008-06-10 13:06:42 UTC (rev 1123) @@ -2,32 +2,32 @@ * JFreeChart : a free chart library for the Java(tm) platform * =========================================================== * - * (C) Copyright 2000-2007, by Object Refinery Limited and Contributors. + * (C) Copyright 2000-2008, by Object Refinery Limited and Contributors. * * Project Info: http://www.jfree.org/jfreechart/index.html * - * This library is free software; you can redistribute it and/or modify it - * under the terms of the GNU Lesser General Public License as published by - * the Free Software Foundation; either version 2.1 of the License, or + * This library is free software; you can redistribute it and/or modify it + * under the terms of the GNU Lesser General Public License as published by + * the Free Software Foundation; either version 2.1 of the License, or * (at your option) any later version. * - * This library is distributed in the hope that it will be useful, but - * WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY - * or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public + * This library is distributed in the hope that it will be useful, but + * WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY + * or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public * License for more details. * * You should have received a copy of the GNU Lesser General Public * License along with this library; if not, write to the Free Software - * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, - * USA. + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, + * USA. * - * [Java is a trademark or registered trademark of Sun Microsystems, Inc. + * [Java is a trademark or registered trademark of Sun Microsystems, Inc. * in the United States and other countries.] * * ------------------------ * NumberTickUnitTests.java * ------------------------ - * (C) Copyright 2005, 2007, by Object Refinery Limited and Contributors. + * (C) Copyright 2005-2008, by Object Refinery Limited and Contributors. * * Original Author: David Gilbert (for Object Refinery Limited); * Contributor(s): -; @@ -85,12 +85,12 @@ NumberTickUnit t2 = new NumberTickUnit(1.23, new DecimalFormat("0.00")); assertTrue(t1.equals(t2)); assertTrue(t2.equals(t1)); - + t1 = new NumberTickUnit(3.21, new DecimalFormat("0.00")); assertFalse(t1.equals(t2)); t2 = new NumberTickUnit(3.21, new DecimalFormat("0.00")); assertTrue(t1.equals(t2)); - + t1 = new NumberTickUnit(3.21, new DecimalFormat("0.000")); assertFalse(t1.equals(t2)); t2 = new NumberTickUnit(3.21, new DecimalFormat("0.000")); @@ -98,7 +98,7 @@ } /** - * Two objects that are equal are required to return the same hashCode. + * Two objects that are equal are required to return the same hashCode. */ public void testHashCode() { NumberTickUnit t1 = new NumberTickUnit(1.23, new DecimalFormat("0.00")); @@ -129,8 +129,7 @@ out.close(); ObjectInput in = new ObjectInputStream( - new ByteArrayInputStream(buffer.toByteArray()) - ); + new ByteArrayInputStream(buffer.toByteArray())); t2 = (NumberTickUnit) in.readObject(); in.close(); } Modified: trunk/tests/org/jfree/chart/axis/junit/PeriodAxisLabelInfoTests.java =================================================================== --- trunk/tests/org/jfree/chart/axis/junit/PeriodAxisLabelInfoTests.java 2008-06-10 13:06:17 UTC (rev 1122) +++ trunk/tests/org/jfree/chart/axis/junit/PeriodAxisLabelInfoTests.java 2008-06-10 13:06:42 UTC (rev 1123) @@ -2,32 +2,32 @@ * JFreeChart : a free chart library for the Java(tm) platform * =========================================================== * - * (C) Copyright 2000-2007, by Object Refinery Limited and Contributors. + * (C) Copyright 2000-2008, by Object Refinery Limited and Contributors. * * Project Info: http://www.jfree.org/jfreechart/index.html * - * This library is free software; you can redistribute it and/or modify it - * under the terms of the GNU Lesser General Public License as published by - * the Free Software Foundation; either version 2.1 of the License, or + * This library is free software; you can redistribute it and/or modify it + * under the terms of the GNU Lesser General Public License as published by + * the Free Software Foundation; either version 2.1 of the License, or * (at your option) any later version. * - * This library is distributed in the hope that it will be useful, but - * WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY - * or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public + * This library is distributed in the hope that it will be useful, but + * WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY + * or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public * License for more details. * * You should have received a copy of the GNU Lesser General Public * License along with this library; if not, write to the Free Software - * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, - * USA. + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, + * USA. * - * [Java is a trademark or registered trademark of Sun Microsystems, Inc. + * [Java is a trademark or registered trademark of Sun Microsystems, Inc. * in the United States and other countries.] * * ----------------------------- * PeriodAxisLabelInfoTests.java * ----------------------------- - * (C) Copyright 2004-2007, by Object Refinery Limited and Contributors. + * (C) Copyright 2004-2008, by Object Refinery Limited and Contributors. * * Original Author: David Gilbert (for Object Refinery Limited); * Contributor(s): -; @@ -37,7 +37,7 @@ * 10-Jun-2003 : Version 1 (DG); * 07-Jan-2005 : Added test for hashCode() (DG); * 21-Jun-2007 : Removed JCommon dependencies (DG); - * + * */ package org.jfree.chart.axis.junit; @@ -92,13 +92,13 @@ * Confirm that the equals method can distinguish all the required fields. */ public void testEquals() { - PeriodAxisLabelInfo info1 = new PeriodAxisLabelInfo(Day.class, + PeriodAxisLabelInfo info1 = new PeriodAxisLabelInfo(Day.class, new SimpleDateFormat("d")); - PeriodAxisLabelInfo info2 = new PeriodAxisLabelInfo(Day.class, + PeriodAxisLabelInfo info2 = new PeriodAxisLabelInfo(Day.class, new SimpleDateFormat("d")); assertTrue(info1.equals(info2)); assertTrue(info2.equals(info1)); - + Class c1 = Day.class; Class c2 = Month.class; DateFormat df1 = new SimpleDateFormat("d"); @@ -115,13 +115,13 @@ Stroke s2 = new BasicStroke(0.25f); Paint dp1 = Color.red; Paint dp2 = Color.green; - + info1 = new PeriodAxisLabelInfo(c2, df1, sp1, lf1, lp1, b1, s1, dp1); info2 = new PeriodAxisLabelInfo(c1, df1, sp1, lf1, lp1, b1, s1, dp1); assertFalse(info1.equals(info2)); info2 = new PeriodAxisLabelInfo(c2, df1, sp1, lf1, lp1, b1, s1, dp1); assertTrue(info1.equals(info2)); - + info1 = new PeriodAxisLabelInfo(c2, df2, sp1, lf1, lp1, b1, s1, dp1); assertFalse(info1.equals(info2)); info2 = new PeriodAxisLabelInfo(c2, df2, sp1, lf1, lp1, b1, s1, dp1); @@ -158,26 +158,26 @@ assertTrue(info1.equals(info2)); } - + /** - * Two objects that are equal are required to return the same hashCode. + * Two objects that are equal are required to return the same hashCode. */ public void testHashCode() { - PeriodAxisLabelInfo info1 = new PeriodAxisLabelInfo(Day.class, + PeriodAxisLabelInfo info1 = new PeriodAxisLabelInfo(Day.class, new SimpleDateFormat("d")); - PeriodAxisLabelInfo info2 = new PeriodAxisLabelInfo(Day.class, + PeriodAxisLabelInfo info2 = new PeriodAxisLabelInfo(Day.class, new SimpleDateFormat("d")); assertTrue(info1.equals(info2)); int h1 = info1.hashCode(); int h2 = info2.hashCode(); assertEquals(h1, h2); - } - + } + /** * Confirm that cloning works. */ public void testCloning() { - PeriodAxisLabelInfo info1 = new PeriodAxisLabelInfo(Day.class, + PeriodAxisLabelInfo info1 = new PeriodAxisLabelInfo(Day.class, new SimpleDateFormat("d")); PeriodAxisLabelInfo info2 = null; try { @@ -195,7 +195,7 @@ * Serialize an instance, restore it, and check for equality. */ public void testSerialization() { - PeriodAxisLabelInfo info1 = new PeriodAxisLabelInfo(Day.class, + PeriodAxisLabelInfo info1 = new PeriodAxisLabelInfo(Day.class, new SimpleDateFormat("d")); PeriodAxisLabelInfo info2 = null; try { Modified: trunk/tests/org/jfree/chart/axis/junit/PeriodAxisTests.java =================================================================== --- trunk/tests/org/jfree/chart/axis/junit/PeriodAxisTests.java 2008-06-10 13:06:17 UTC (rev 1122) +++ trunk/tests/org/jfree/chart/axis/junit/PeriodAxisTests.java 2008-06-10 13:06:42 UTC (rev 1123) @@ -2,32 +2,32 @@ * JFreeChart : a free chart library for the Java(tm) platform * =========================================================== * - * (C) Copyright 2000-2007, by Object Refinery Limited and Contributors. + * (C) Copyright 2000-2008, by Object Refinery Limited and Contributors. * * Project Info: http://www.jfree.org/jfreechart/index.html * - * This library is free software; you can redistribute it and/or modify it - * under the terms of the GNU Lesser General Public License as published by - * the Free Software Foundation; either version 2.1 of the License, or + * This library is free software; you can redistribute it and/or modify it + * under the terms of the GNU Lesser General Public License as published by + * the Free Software Foundation; either version 2.1 of the License, or * (at your option) any later version. * - * This library is distributed in the hope that it will be useful, but - * WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY - * or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public + * This library is distributed in the hope that it will be useful, but + * WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY + * or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public * License for more details. * * You should have received a copy of the GNU Lesser General Public * License along with this library; if not, write to the Free Software - * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, - * USA. + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, + * USA. * - * [Java is a trademark or registered trademark of Sun Microsystems, Inc. + * [Java is a trademark or registered trademark of Sun Microsystems, Inc. * in the United States and other countries.] * * -------------------- * PeriodAxisTests.java * -------------------- - * (C) Copyright 2004-2007, by Object Refinery Limited and Contributors. + * (C) Copyright 2004-2008, by Object Refinery Limited and Contributors. * * Original Author: David Gilbert (for Object Refinery Limited); * Contributor(s): -; @@ -94,17 +94,17 @@ * Confirm that the equals() method can distinguish all the required fields. */ public void testEquals() { - + PeriodAxis a1 = new PeriodAxis("Test"); PeriodAxis a2 = new PeriodAxis("Test"); assertTrue(a1.equals(a2)); assertTrue(a2.equals(a1)); - + a1.setFirst(new Year(2000)); assertFalse(a1.equals(a2)); a2.setFirst(new Year(2000)); assertTrue(a1.equals(a2)); - + a1.setLast(new Year(2004)); assertFalse(a1.equals(a2)); a2.setLast(new Year(2004)); @@ -114,32 +114,32 @@ assertFalse(a1.equals(a2)); a2.setTimeZone(TimeZone.getTimeZone("Pacific/Auckland")); assertTrue(a1.equals(a2)); - + a1.setAutoRangeTimePeriodClass(Quarter.class); assertFalse(a1.equals(a2)); a2.setAutoRangeTimePeriodClass(Quarter.class); assertTrue(a1.equals(a2)); - + PeriodAxisLabelInfo info[] = new PeriodAxisLabelInfo[1]; info[0] = new PeriodAxisLabelInfo( Month.class, new SimpleDateFormat("MMM") ); - + a1.setLabelInfo(info); assertFalse(a1.equals(a2)); a2.setLabelInfo(info); assertTrue(a1.equals(a2)); - + a1.setMajorTickTimePeriodClass(Minute.class); assertFalse(a1.equals(a2)); a2.setMajorTickTimePeriodClass(Minute.class); assertTrue(a1.equals(a2)); - + a1.setMinorTickMarksVisible(!a1.isMinorTickMarksVisible()); assertFalse(a1.equals(a2)); a2.setMinorTickMarksVisible(a1.isMinorTickMarksVisible()); assertTrue(a1.equals(a2)); - + a1.setMinorTickTimePeriodClass(Minute.class); assertFalse(a1.equals(a2)); a2.setMinorTickTimePeriodClass(Minute.class); @@ -150,16 +150,16 @@ assertFalse(a1.equals(a2)); a2.setMinorTickMarkStroke(s); assertTrue(a1.equals(a2)); - + a1.setMinorTickMarkPaint(Color.blue); assertFalse(a1.equals(a2)); a2.setMinorTickMarkPaint(Color.blue); assertTrue(a1.equals(a2)); - + } - + /** - * Two objects that are equal are required to return the same hashCode. + * Two objects that are equal are required to return the same hashCode. */ public void testHashCode() { PeriodAxis a1 = new PeriodAxis("Test"); @@ -168,8 +168,8 @@ int h1 = a1.hashCode(); int h2 = a2.hashCode(); assertEquals(h1, h2); - } - + } + /** * Confirm that cloning works. */ @@ -185,13 +185,13 @@ assertTrue(a1 != a2); assertTrue(a1.getClass() == a2.getClass()); assertTrue(a1.equals(a2)); - + // some checks that the clone is independent of the original a1.setLabel("New Label"); assertFalse(a1.equals(a2)); a2.setLabel("New Label"); assertTrue(a1.equals(a2)); - + a1.setFirst(new Year(1920)); assertFalse(a1.equals(a2)); a2.setFirst(new Year(1920)); @@ -204,9 +204,8 @@ PeriodAxisLabelInfo[] info = new PeriodAxisLabelInfo[2]; info[0] = new PeriodAxisLabelInfo(Day.class, new SimpleDateFormat("d")); - info[1] = new PeriodAxisLabelInfo( - Year.class, new SimpleDateFormat("yyyy") - ); + info[1] = new PeriodAxisLabelInfo(Year.class, + new SimpleDateFormat("yyyy")); a1.setLabelInfo(info); assertFalse(a1.equals(a2)); a2.setLabelInfo(info); @@ -237,13 +236,12 @@ out.close(); ObjectInput in = new ObjectInputStream( - new ByteArrayInputStream(buffer.toByteArray()) - ); + new ByteArrayInputStream(buffer.toByteArray())); a2 = (PeriodAxis) in.readObject(); in.close(); } catch (Exception e) { - System.out.println(e.toString()); + e.printStackTrace(); } boolean b = a1.equals(a2); assertTrue(b); This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <mu...@us...> - 2008-06-18 09:11:40
|
Revision: 1187 http://jfreechart.svn.sourceforge.net/jfreechart/?rev=1187&view=rev Author: mungady Date: 2008-06-18 02:11:38 -0700 (Wed, 18 Jun 2008) Log Message: ----------- Source formatting. Modified Paths: -------------- trunk/tests/org/jfree/chart/axis/junit/CategoryLabelWidthTypeTests.java trunk/tests/org/jfree/chart/axis/junit/DateTickTests.java Modified: trunk/tests/org/jfree/chart/axis/junit/CategoryLabelWidthTypeTests.java =================================================================== --- trunk/tests/org/jfree/chart/axis/junit/CategoryLabelWidthTypeTests.java 2008-06-18 09:08:46 UTC (rev 1186) +++ trunk/tests/org/jfree/chart/axis/junit/CategoryLabelWidthTypeTests.java 2008-06-18 09:11:38 UTC (rev 1187) @@ -27,7 +27,7 @@ * -------------------------------- * CategoryLabelWidthTypeTests.java * -------------------------------- - * (C) Copyright 2004-2007, by Object Refinery Limited and Contributors. + * (C) Copyright 2004-2008, by Object Refinery Limited and Contributors. * * Original Author: David Gilbert (for Object Refinery Limited); * Contributor(s): -; Modified: trunk/tests/org/jfree/chart/axis/junit/DateTickTests.java =================================================================== --- trunk/tests/org/jfree/chart/axis/junit/DateTickTests.java 2008-06-18 09:08:46 UTC (rev 1186) +++ trunk/tests/org/jfree/chart/axis/junit/DateTickTests.java 2008-06-18 09:11:38 UTC (rev 1187) @@ -142,15 +142,14 @@ * Confirm that cloning works. */ public void testCloning() { - DateTick t1 = new DateTick( - new Date(0L), "Label", TextAnchor.CENTER, TextAnchor.CENTER, 10.0 - ); + DateTick t1 = new DateTick(new Date(0L), "Label", TextAnchor.CENTER, + TextAnchor.CENTER, 10.0); DateTick t2 = null; try { t2 = (DateTick) t1.clone(); } catch (CloneNotSupportedException e) { - System.err.println("Failed to clone."); + e.printStackTrace(); } assertTrue(t1 != t2); assertTrue(t1.getClass() == t2.getClass()); @@ -162,9 +161,8 @@ */ public void testSerialization() { - DateTick t1 = new DateTick( - new Date(0L), "Label", TextAnchor.CENTER, TextAnchor.CENTER, 10.0 - ); + DateTick t1 = new DateTick(new Date(0L), "Label", TextAnchor.CENTER, + TextAnchor.CENTER, 10.0); DateTick t2 = null; try { This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <mu...@us...> - 2007-10-25 11:11:37
|
Revision: 430 http://jfreechart.svn.sourceforge.net/jfreechart/?rev=430&view=rev Author: mungady Date: 2007-10-25 04:11:30 -0700 (Thu, 25 Oct 2007) Log Message: ----------- New tests. Modified Paths: -------------- trunk/tests/org/jfree/chart/axis/junit/AxisPackageTests.java Added Paths: ----------- trunk/tests/org/jfree/chart/axis/junit/StandardTickUnitSourceTests.java Modified: trunk/tests/org/jfree/chart/axis/junit/AxisPackageTests.java =================================================================== --- trunk/tests/org/jfree/chart/axis/junit/AxisPackageTests.java 2007-10-25 11:09:12 UTC (rev 429) +++ trunk/tests/org/jfree/chart/axis/junit/AxisPackageTests.java 2007-10-25 11:11:30 UTC (rev 430) @@ -41,6 +41,7 @@ * 21-Mar-2007 : Added ExtendedCategoryAxisTests (DG); * 19-Jun-2007 : Removed ColorBarTests (DG); * 02-Aug-2007 : Added LogAxisTests and TickUnitsTests (DG); + * 25-Oct-2007 : Added StandardTickUnitSourceTests (DG); * */ @@ -92,6 +93,7 @@ suite.addTestSuite(QuarterDateFormatTests.class); suite.addTestSuite(SegmentedTimelineTests.class); suite.addTestSuite(SegmentedTimelineTests2.class); + suite.addTestSuite(StandardTickUnitSourceTests.class); suite.addTestSuite(SubCategoryAxisTests.class); suite.addTestSuite(SymbolAxisTests.class); suite.addTestSuite(TickUnitsTests.class); Added: trunk/tests/org/jfree/chart/axis/junit/StandardTickUnitSourceTests.java =================================================================== --- trunk/tests/org/jfree/chart/axis/junit/StandardTickUnitSourceTests.java (rev 0) +++ trunk/tests/org/jfree/chart/axis/junit/StandardTickUnitSourceTests.java 2007-10-25 11:11:30 UTC (rev 430) @@ -0,0 +1,114 @@ +/* =========================================================== + * JFreeChart : a free chart library for the Java(tm) platform + * =========================================================== + * + * (C) Copyright 2000-2007, by Object Refinery Limited and Contributors. + * + * Project Info: http://www.jfree.org/jfreechart/index.html + * + * This library is free software; you can redistribute it and/or modify it + * under the terms of the GNU Lesser General Public License as published by + * the Free Software Foundation; either version 2.1 of the License, or + * (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, but + * WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY + * or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public + * License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, + * USA. + * + * [Java is a trademark or registered trademark of Sun Microsystems, Inc. + * in the United States and other countries.] + * + * -------------------------------- + * StandardTickUnitSourceTests.java + * -------------------------------- + * (C) Copyright 2007, by Object Refinery Limited and Contributors. + * + * Original Author: David Gilbert (for Object Refinery Limited); + * Contributor(s): -; + * + * Changes + * ------- + * 25-Oct-2007 : Version 1 (DG); + * + */ + +package org.jfree.chart.axis.junit; + +import java.io.ByteArrayInputStream; +import java.io.ByteArrayOutputStream; +import java.io.ObjectInput; +import java.io.ObjectInputStream; +import java.io.ObjectOutput; +import java.io.ObjectOutputStream; + +import junit.framework.Test; +import junit.framework.TestCase; +import junit.framework.TestSuite; + +import org.jfree.chart.axis.StandardTickUnitSource; + +/** + * Tests for the {@link StandardTickUnitSource} class. + */ +public class StandardTickUnitSourceTests extends TestCase { + + /** + * Returns the tests as a test suite. + * + * @return The test suite. + */ + public static Test suite() { + return new TestSuite(StandardTickUnitSourceTests.class); + } + + /** + * Constructs a new set of tests. + * + * @param name the name of the tests. + */ + public StandardTickUnitSourceTests(String name) { + super(name); + } + + /** + * Confirm that the equals method can distinguish all the required fields. + */ + public void testEquals() { + StandardTickUnitSource t1 = new StandardTickUnitSource(); + StandardTickUnitSource t2 = new StandardTickUnitSource(); + assertTrue(t1.equals(t2)); + } + + /** + * Serialize an instance, restore it, and check for equality. + */ + public void testSerialization() { + + StandardTickUnitSource t1 = new StandardTickUnitSource(); + StandardTickUnitSource t2 = null; + + try { + ByteArrayOutputStream buffer = new ByteArrayOutputStream(); + ObjectOutput out = new ObjectOutputStream(buffer); + out.writeObject(t1); + out.close(); + + ObjectInput in = new ObjectInputStream(new ByteArrayInputStream( + buffer.toByteArray())); + t2 = (StandardTickUnitSource) in.readObject(); + in.close(); + } + catch (Exception e) { + e.printStackTrace(); + } + assertEquals(t1, t2); + + } + +} This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <mu...@us...> - 2008-06-10 12:50:00
|
Revision: 1116 http://jfreechart.svn.sourceforge.net/jfreechart/?rev=1116&view=rev Author: mungady Date: 2008-06-10 05:49:57 -0700 (Tue, 10 Jun 2008) Log Message: ----------- Added ModuloAxisTests.java from the 1.0.x branch. Modified Paths: -------------- trunk/tests/org/jfree/chart/axis/junit/AxisPackageTests.java Added Paths: ----------- trunk/tests/org/jfree/chart/axis/junit/ModuloAxisTests.java Modified: trunk/tests/org/jfree/chart/axis/junit/AxisPackageTests.java =================================================================== --- trunk/tests/org/jfree/chart/axis/junit/AxisPackageTests.java 2008-06-10 12:42:45 UTC (rev 1115) +++ trunk/tests/org/jfree/chart/axis/junit/AxisPackageTests.java 2008-06-10 12:49:57 UTC (rev 1116) @@ -2,32 +2,32 @@ * JFreeChart : a free chart library for the Java(tm) platform * =========================================================== * - * (C) Copyright 2000-2007, by Object Refinery Limited and Contributors. + * (C) Copyright 2000-2008, by Object Refinery Limited and Contributors. * * Project Info: http://www.jfree.org/jfreechart/index.html * - * This library is free software; you can redistribute it and/or modify it - * under the terms of the GNU Lesser General Public License as published by - * the Free Software Foundation; either version 2.1 of the License, or + * This library is free software; you can redistribute it and/or modify it + * under the terms of the GNU Lesser General Public License as published by + * the Free Software Foundation; either version 2.1 of the License, or * (at your option) any later version. * - * This library is distributed in the hope that it will be useful, but - * WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY - * or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public + * This library is distributed in the hope that it will be useful, but + * WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY + * or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public * License for more details. * * You should have received a copy of the GNU Lesser General Public * License along with this library; if not, write to the Free Software - * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, - * USA. + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, + * USA. * - * [Java is a trademark or registered trademark of Sun Microsystems, Inc. + * [Java is a trademark or registered trademark of Sun Microsystems, Inc. * in the United States and other countries.] * * --------------------- * AxisPackageTests.java * --------------------- - * (C) Copyright 2003-2007, by Object Refinery Limited. + * (C) Copyright 2003-2008, by Object Refinery Limited. * * Original Author: David Gilbert (for Object Refinery Limited); * Contributor(s): Bill Kelemen; @@ -42,7 +42,8 @@ * 19-Jun-2007 : Removed ColorBarTests (DG); * 02-Aug-2007 : Added LogAxisTests and TickUnitsTests (DG); * 25-Oct-2007 : Added StandardTickUnitSourceTests (DG); - * + * 13-Nov-2007 : Added ModuloAxisTests (DG); + * */ package org.jfree.chart.axis.junit; @@ -84,6 +85,7 @@ suite.addTestSuite(LogAxisTests.class); suite.addTestSuite(LogarithmicAxisTests.class); suite.addTestSuite(MarkerAxisBandTests.class); + suite.addTestSuite(ModuloAxisTests.class); suite.addTestSuite(MonthDateFormatTests.class); suite.addTestSuite(NumberAxisTests.class); suite.addTestSuite(NumberAxis3DTests.class); @@ -109,10 +111,10 @@ public AxisPackageTests(String name) { super(name); } - + /** * Runs the test suite using JUnit's text-based runner. - * + * * @param args ignored. */ public static void main(String[] args) { Added: trunk/tests/org/jfree/chart/axis/junit/ModuloAxisTests.java =================================================================== --- trunk/tests/org/jfree/chart/axis/junit/ModuloAxisTests.java (rev 0) +++ trunk/tests/org/jfree/chart/axis/junit/ModuloAxisTests.java 2008-06-10 12:49:57 UTC (rev 1116) @@ -0,0 +1,149 @@ +/* =========================================================== + * JFreeChart : a free chart library for the Java(tm) platform + * =========================================================== + * + * (C) Copyright 2000-2008, by Object Refinery Limited and Contributors. + * + * Project Info: http://www.jfree.org/jfreechart/index.html + * + * This library is free software; you can redistribute it and/or modify it + * under the terms of the GNU Lesser General Public License as published by + * the Free Software Foundation; either version 2.1 of the License, or + * (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, but + * WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY + * or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public + * License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, + * USA. + * + * [Java is a trademark or registered trademark of Sun Microsystems, Inc. + * in the United States and other countries.] + * + * -------------------- + * ModuloAxisTests.java + * -------------------- + * (C) Copyright 2007, 2008, by Object Refinery Limited and Contributors. + * + * Original Author: David Gilbert (for Object Refinery Limited); + * Contributor(s): -; + * + * Changes + * ------- + * 13-Nov-2007 : Version 1 (DG); + * + */ + +package org.jfree.chart.axis.junit; + +import java.io.ByteArrayInputStream; +import java.io.ByteArrayOutputStream; +import java.io.ObjectInput; +import java.io.ObjectInputStream; +import java.io.ObjectOutput; +import java.io.ObjectOutputStream; + +import junit.framework.Test; +import junit.framework.TestCase; +import junit.framework.TestSuite; + +import org.jfree.chart.axis.ModuloAxis; +import org.jfree.data.Range; + +/** + * Tests for the {@link ModuloAxis} class. + */ +public class ModuloAxisTests extends TestCase { + + /** + * Returns the tests as a test suite. + * + * @return The test suite. + */ + public static Test suite() { + return new TestSuite(ModuloAxisTests.class); + } + + /** + * Constructs a new set of tests. + * + * @param name the name of the tests. + */ + public ModuloAxisTests(String name) { + super(name); + } + + /** + * Confirm that cloning works. + */ + public void testCloning() { + ModuloAxis a1 = new ModuloAxis("Test", new Range(0.0, 1.0)); + ModuloAxis a2 = null; + try { + a2 = (ModuloAxis) a1.clone(); + } + catch (CloneNotSupportedException e) { + e.printStackTrace(); + } + assertTrue(a1 != a2); + assertTrue(a1.getClass() == a2.getClass()); + assertTrue(a1.equals(a2)); + } + + /** + * Confirm that the equals method can distinguish all the required fields. + */ + public void testEquals() { + ModuloAxis a1 = new ModuloAxis("Test", new Range(0.0, 1.0)); + ModuloAxis a2 = new ModuloAxis("Test", new Range(0.0, 1.0)); + assertTrue(a1.equals(a2)); + + a1.setDisplayRange(0.1, 1.1); + assertFalse(a1.equals(a2)); + a2.setDisplayRange(0.1, 1.1); + assertTrue(a1.equals(a2)); + } + + /** + * Two objects that are equal are required to return the same hashCode. + */ + public void testHashCode() { + ModuloAxis a1 = new ModuloAxis("Test", new Range(0.0, 1.0)); + ModuloAxis a2 = new ModuloAxis("Test", new Range(0.0, 1.0)); + assertTrue(a1.equals(a2)); + int h1 = a1.hashCode(); + int h2 = a2.hashCode(); + assertEquals(h1, h2); + } + + /** + * Serialize an instance, restore it, and check for equality. + */ + public void testSerialization() { + + ModuloAxis a1 = new ModuloAxis("Test", new Range(0.0, 1.0)); + ModuloAxis a2 = null; + + try { + ByteArrayOutputStream buffer = new ByteArrayOutputStream(); + ObjectOutput out = new ObjectOutputStream(buffer); + out.writeObject(a1); + out.close(); + + ObjectInput in = new ObjectInputStream( + new ByteArrayInputStream(buffer.toByteArray())); + a2 = (ModuloAxis) in.readObject(); + in.close(); + } + catch (Exception e) { + e.printStackTrace(); + } + assertEquals(a1, a2); + + } + +} \ No newline at end of file This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <mu...@us...> - 2008-06-10 13:07:10
|
Revision: 1124 http://jfreechart.svn.sourceforge.net/jfreechart/?rev=1124&view=rev Author: mungady Date: 2008-06-10 06:07:06 -0700 (Tue, 10 Jun 2008) Log Message: ----------- Clean up tests. Modified Paths: -------------- trunk/tests/org/jfree/chart/axis/junit/QuarterDateFormatTests.java trunk/tests/org/jfree/chart/axis/junit/SegmentedTimelineTests.java trunk/tests/org/jfree/chart/axis/junit/SegmentedTimelineTests2.java trunk/tests/org/jfree/chart/axis/junit/StandardTickUnitSourceTests.java trunk/tests/org/jfree/chart/axis/junit/SubCategoryAxisTests.java trunk/tests/org/jfree/chart/axis/junit/SymbolAxisTests.java trunk/tests/org/jfree/chart/axis/junit/TickUnitsTests.java trunk/tests/org/jfree/chart/axis/junit/ValueAxisTests.java Modified: trunk/tests/org/jfree/chart/axis/junit/QuarterDateFormatTests.java =================================================================== --- trunk/tests/org/jfree/chart/axis/junit/QuarterDateFormatTests.java 2008-06-10 13:06:42 UTC (rev 1123) +++ trunk/tests/org/jfree/chart/axis/junit/QuarterDateFormatTests.java 2008-06-10 13:07:06 UTC (rev 1124) @@ -2,32 +2,32 @@ * JFreeChart : a free chart library for the Java(tm) platform * =========================================================== * - * (C) Copyright 2000-2007, by Object Refinery Limited and Contributors. + * (C) Copyright 2000-2008, by Object Refinery Limited and Contributors. * * Project Info: http://www.jfree.org/jfreechart/index.html * - * This library is free software; you can redistribute it and/or modify it - * under the terms of the GNU Lesser General Public License as published by - * the Free Software Foundation; either version 2.1 of the License, or + * This library is free software; you can redistribute it and/or modify it + * under the terms of the GNU Lesser General Public License as published by + * the Free Software Foundation; either version 2.1 of the License, or * (at your option) any later version. * - * This library is distributed in the hope that it will be useful, but - * WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY - * or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public + * This library is distributed in the hope that it will be useful, but + * WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY + * or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public * License for more details. * * You should have received a copy of the GNU Lesser General Public * License along with this library; if not, write to the Free Software - * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, - * USA. + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, + * USA. * - * [Java is a trademark or registered trademark of Sun Microsystems, Inc. + * [Java is a trademark or registered trademark of Sun Microsystems, Inc. * in the United States and other countries.] * * --------------------------- * QuarterDateFormatTests.java * --------------------------- - * (C) Copyright 2005, 2007, by Object Refinery Limited and Contributors. + * (C) Copyright 2005-2008, by Object Refinery Limited and Contributors. * * Original Author: David Gilbert (for Object Refinery Limited); * Contributor(s): -; @@ -88,31 +88,31 @@ "GMT"), new String[] {"1", "2", "3", "4"}); assertTrue(qf1.equals(qf2)); assertTrue(qf2.equals(qf1)); - - qf1 = new QuarterDateFormat(TimeZone.getTimeZone("PST"), + + qf1 = new QuarterDateFormat(TimeZone.getTimeZone("PST"), new String[] {"1", "2", "3", "4"}); assertFalse(qf1.equals(qf2)); - qf2 = new QuarterDateFormat(TimeZone.getTimeZone("PST"), + qf2 = new QuarterDateFormat(TimeZone.getTimeZone("PST"), new String[] {"1", "2", "3", "4"}); assertTrue(qf1.equals(qf2)); - - qf1 = new QuarterDateFormat(TimeZone.getTimeZone("PST"), + + qf1 = new QuarterDateFormat(TimeZone.getTimeZone("PST"), new String[] {"A", "2", "3", "4"}); assertFalse(qf1.equals(qf2)); - qf2 = new QuarterDateFormat(TimeZone.getTimeZone("PST"), + qf2 = new QuarterDateFormat(TimeZone.getTimeZone("PST"), new String[] {"A", "2", "3", "4"}); assertTrue(qf1.equals(qf2)); - qf1 = new QuarterDateFormat(TimeZone.getTimeZone("PST"), + qf1 = new QuarterDateFormat(TimeZone.getTimeZone("PST"), new String[] {"A", "2", "3", "4"}, true); assertFalse(qf1.equals(qf2)); - qf2 = new QuarterDateFormat(TimeZone.getTimeZone("PST"), + qf2 = new QuarterDateFormat(TimeZone.getTimeZone("PST"), new String[] {"A", "2", "3", "4"}, true); assertTrue(qf1.equals(qf2)); } - + /** - * Two objects that are equal are required to return the same hashCode. + * Two objects that are equal are required to return the same hashCode. */ public void testHashCode() { QuarterDateFormat qf1 = new QuarterDateFormat(TimeZone.getTimeZone( @@ -123,8 +123,8 @@ int h1 = qf1.hashCode(); int h2 = qf2.hashCode(); assertEquals(h1, h2); - } - + } + /** * Confirm that cloning works. */ Modified: trunk/tests/org/jfree/chart/axis/junit/SegmentedTimelineTests.java =================================================================== --- trunk/tests/org/jfree/chart/axis/junit/SegmentedTimelineTests.java 2008-06-10 13:06:42 UTC (rev 1123) +++ trunk/tests/org/jfree/chart/axis/junit/SegmentedTimelineTests.java 2008-06-10 13:07:06 UTC (rev 1124) @@ -2,32 +2,32 @@ * JFreeChart : a free chart library for the Java(tm) platform * =========================================================== * - * (C) Copyright 2000-2007, by Object Refinery Limited and Contributors. + * (C) Copyright 2000-2008, by Object Refinery Limited and Contributors. * * Project Info: http://www.jfree.org/jfreechart/index.html * - * This library is free software; you can redistribute it and/or modify it - * under the terms of the GNU Lesser General Public License as published by - * the Free Software Foundation; either version 2.1 of the License, or + * This library is free software; you can redistribute it and/or modify it + * under the terms of the GNU Lesser General Public License as published by + * the Free Software Foundation; either version 2.1 of the License, or * (at your option) any later version. * - * This library is distributed in the hope that it will be useful, but - * WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY - * or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public + * This library is distributed in the hope that it will be useful, but + * WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY + * or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public * License for more details. * * You should have received a copy of the GNU Lesser General Public * License along with this library; if not, write to the Free Software - * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, - * USA. + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, + * USA. * - * [Java is a trademark or registered trademark of Sun Microsystems, Inc. + * [Java is a trademark or registered trademark of Sun Microsystems, Inc. * in the United States and other countries.] * * ---------------------------- * SegmentedTimelineTests.java * ---------------------------- - * (C) Copyright 2003-2007, by Bill Kelemen and Contributors. + * (C) Copyright 2003-2008, by Bill Kelemen and Contributors. * * Original Author: Bill Kelemen; * Contributor(s): David Gilbert (for Object Refinery Limited); @@ -78,11 +78,11 @@ private static final int TEST_CYCLE_INC = 55; /** Number of ms in five years */ - private static final long FIVE_YEARS = 5 * 365 + private static final long FIVE_YEARS = 5 * 365 * SegmentedTimeline.DAY_SEGMENT_SIZE; /** Number format object for ms tests. */ - private static final NumberFormat NUMBER_FORMAT + private static final NumberFormat NUMBER_FORMAT = NumberFormat.getNumberInstance(); /** Date format object for Monday through Friday tests. */ @@ -92,22 +92,22 @@ private static final SimpleDateFormat DATE_TIME_FORMAT; /** Some ms exceptions for ms testing. */ - private static final String[] MS_EXCEPTIONS = {"0", "2", "4", "10", "15", - "16", "17", "18", "19", "20", "21", "22", "23", "24", "47", "58", + private static final String[] MS_EXCEPTIONS = {"0", "2", "4", "10", "15", + "16", "17", "18", "19", "20", "21", "22", "23", "24", "47", "58", "100", "101"}; /** Some ms4 exceptions for ms testing. */ - private static final String[] MS2_BASE_TIMELINE_EXCEPTIONS = {"0", "8", - "16", "24", "32", "40", "48", "56", "64", "72", "80", "88", "96", + private static final String[] MS2_BASE_TIMELINE_EXCEPTIONS = {"0", "8", + "16", "24", "32", "40", "48", "56", "64", "72", "80", "88", "96", "104", "112", "120", "128", "136"}; /** US non-trading dates in 2000 through 2002 to test exceptions. */ - private static final String[] US_HOLIDAYS = {"2000-01-17", "2000-02-21", - "2000-04-21", "2000-05-29", "2000-07-04", "2000-09-04", "2000-11-23", - "2000-12-25", "2001-01-01", "2001-01-15", "2001-02-19", "2001-04-13", - "2001-05-28", "2001-07-04", "2001-09-03", "2001-09-11", "2001-09-12", - "2001-09-13", "2001-09-14", "2001-11-22", "2001-12-25", "2002-01-01", - "2002-01-21", "2002-02-18", "2002-03-29", "2002-05-27", "2002-07-04", + private static final String[] US_HOLIDAYS = {"2000-01-17", "2000-02-21", + "2000-04-21", "2000-05-29", "2000-07-04", "2000-09-04", "2000-11-23", + "2000-12-25", "2001-01-01", "2001-01-15", "2001-02-19", "2001-04-13", + "2001-05-28", "2001-07-04", "2001-09-03", "2001-09-11", "2001-09-12", + "2001-09-13", "2001-09-14", "2001-11-22", "2001-12-25", "2002-01-01", + "2002-01-21", "2002-02-18", "2002-03-29", "2002-05-27", "2002-07-04", "2002-09-02", "2002-11-28", "2002-12-25"}; /** Some test exceptions for the fifteen min timeline. */ @@ -130,15 +130,15 @@ /** Our 1-ms test timeline using 5 included and 2 excluded segments. */ private SegmentedTimeline msTimeline; - /** - * Our 1-ms test timeline (with baseTimeline) using 2 included and 2 - * excluded segments. + /** + * Our 1-ms test timeline (with baseTimeline) using 2 included and 2 + * excluded segments. */ private SegmentedTimeline ms2Timeline; - /** - * Our 4-ms test base timeline for ms2Timeline using 1 included and 1 - * excluded segments + /** + * Our 4-ms test base timeline for ms2Timeline using 1 included and 1 + * excluded segments */ private SegmentedTimeline ms2BaseTimeline; @@ -184,7 +184,7 @@ /** * Sets up the fixture, for example, open a network connection. * This method is called before a test is executed. - * + * * @throws Exception if there is a problem. */ protected void setUp() throws Exception { @@ -228,7 +228,7 @@ this.ms2BaseTimeline = new SegmentedTimeline(4, 1, 1); this.ms2BaseTimeline.setStartTime(0); - // 1-ms test timeline (with a baseTimeline) using 2 included and 2 + // 1-ms test timeline (with a baseTimeline) using 2 included and 2 // excluded segments centered inside each base segment // // The ms2Timeline without a base would look like this: @@ -244,7 +244,7 @@ // \/ | // segment group segment size = 1 ms // - // With the base timeline some originally included segments are now + // With the base timeline some originally included segments are now // removed (see "xx" below): // // 0 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 ... @@ -259,11 +259,11 @@ this.ms2Timeline.setBaseTimeline(this.ms2BaseTimeline); // test monday though friday timeline - this.mondayFridayTimeline + this.mondayFridayTimeline = SegmentedTimeline.newMondayThroughFridayTimeline(); // test 9am-4pm Monday through Friday timeline - this.fifteenMinTimeline + this.fifteenMinTimeline = SegmentedTimeline.newFifteenMinuteTimeline(); // find first Monday after 2001-01-01 @@ -284,7 +284,7 @@ /** * Tears down the fixture, for example, close a network connection. * This method is called after a test is executed. - * + * * @throws Exception if there is a problem. */ protected void tearDown() throws Exception { @@ -321,14 +321,14 @@ } /** - * Tests that the factory method that creates Monday through Friday + * Tests that the factory method that creates Monday through Friday * segmented timeline does so correctly. */ public void testMondayThroughFridaySegmentedTimeline() { // verify attributes set during object construction - assertEquals(SegmentedTimeline.DAY_SEGMENT_SIZE, + assertEquals(SegmentedTimeline.DAY_SEGMENT_SIZE, this.mondayFridayTimeline.getSegmentSize()); - assertEquals(SegmentedTimeline.FIRST_MONDAY_AFTER_1900, + assertEquals(SegmentedTimeline.FIRST_MONDAY_AFTER_1900, this.mondayFridayTimeline.getStartTime()); assertEquals(5, this.mondayFridayTimeline.getSegmentsIncluded()); assertEquals(2, this.mondayFridayTimeline.getSegmentsExcluded()); @@ -341,7 +341,7 @@ public void testFifteenMinSegmentedTimeline() { assertEquals(SegmentedTimeline.FIFTEEN_MINUTE_SEGMENT_SIZE, this.fifteenMinTimeline.getSegmentSize()); - assertEquals(SegmentedTimeline.FIRST_MONDAY_AFTER_1900 + 36 + assertEquals(SegmentedTimeline.FIRST_MONDAY_AFTER_1900 + 36 * this.fifteenMinTimeline.getSegmentSize(), this.fifteenMinTimeline.getStartTime()); assertEquals(28, this.fifteenMinTimeline.getSegmentsIncluded()); @@ -390,7 +390,7 @@ * @param timeline the timeline to use for verifications. */ public void verifyOneSegment(SegmentedTimeline timeline) { - + for (long testCycle = TEST_CYCLE_START; testCycle < TEST_CYCLE_END; testCycle += TEST_CYCLE_INC) { @@ -401,11 +401,11 @@ segment1.getSegmentEnd() + 1); // verify segments are consecutive and correct - assertEquals(segment1.getSegmentNumber() + 1, + assertEquals(segment1.getSegmentNumber() + 1, segment2.getSegmentNumber()); - assertEquals(segment1.getSegmentEnd() + 1, + assertEquals(segment1.getSegmentEnd() + 1, segment2.getSegmentStart()); - assertEquals(segment1.getSegmentStart() + assertEquals(segment1.getSegmentStart() + timeline.getSegmentSize() - 1, segment1.getSegmentEnd()); assertEquals(segment1.getSegmentStart() + timeline.getSegmentSize(), segment2.getSegmentStart()); @@ -416,10 +416,10 @@ long delta; if (timeline.getSegmentSize() > 1000000) { delta = timeline.getSegmentSize() / 10000; - } + } else if (timeline.getSegmentSize() > 100000) { delta = timeline.getSegmentSize() / 1000; - } + } else if (timeline.getSegmentSize() > 10000) { delta = timeline.getSegmentSize() / 100; } @@ -434,14 +434,14 @@ } long start = segment1.getSegmentStart() + delta; - long end = segment1.getSegmentStart() + long end = segment1.getSegmentStart() + timeline.getSegmentSize() - 1; SegmentedTimeline.Segment lastSeg = timeline.getSegment( segment1.getSegmentStart()); SegmentedTimeline.Segment seg; for (long i = start; i < end; i += delta) { seg = timeline.getSegment(i); - assertEquals(lastSeg.getSegmentNumber(), + assertEquals(lastSeg.getSegmentNumber(), seg.getSegmentNumber()); assertEquals(lastSeg.getSegmentStart(), seg.getSegmentStart()); assertEquals(lastSeg.getSegmentEnd(), seg.getSegmentEnd()); @@ -510,22 +510,22 @@ // logically consecutive segments non-physically consecutive // (with non-contained time in between) assertTrue(!timeline.containsDomainRange( - seg1.getSegmentEnd() + 1, + seg1.getSegmentEnd() + 1, seg2.getSegmentStart() - 1)); - assertEquals(0, (seg2.getSegmentStart() + assertEquals(0, (seg2.getSegmentStart() - seg1.getSegmentStart()) % m); - assertEquals(0, (seg2.getSegmentEnd() + assertEquals(0, (seg2.getSegmentEnd() - seg1.getSegmentEnd()) % m); - assertEquals(0, (seg2.getMillisecond() + assertEquals(0, (seg2.getMillisecond() - seg1.getMillisecond()) % m); - } + } else { // physically consecutive - assertEquals(seg1.getSegmentStart() + m, + assertEquals(seg1.getSegmentStart() + m, seg2.getSegmentStart()); - assertEquals(seg1.getSegmentEnd() + m, + assertEquals(seg1.getSegmentEnd() + m, seg2.getSegmentEnd()); - assertEquals(seg1.getMillisecond() + m, + assertEquals(seg1.getMillisecond() + m, seg2.getMillisecond()); } @@ -574,7 +574,7 @@ * on the first monday after 1/1/2000 and for five years. */ public void testMondayThroughFridayIncludedAndExcludedSegments() { - verifyIncludedAndExcludedSegments(this.mondayFridayTimeline, + verifyIncludedAndExcludedSegments(this.mondayFridayTimeline, this.monday.getTime().getTime()); } @@ -584,18 +584,18 @@ * on the first monday after 1/1/2000 and for five years. */ public void testFifteenMinIncludedAndExcludedSegments() { - verifyIncludedAndExcludedSegments(this.fifteenMinTimeline, + verifyIncludedAndExcludedSegments(this.fifteenMinTimeline, this.monday9am.getTime().getTime()); } /** - * Tests that a timeline's included and excluded segments are being + * Tests that a timeline's included and excluded segments are being * calculated correctly. - * + * * @param timeline the timeline to verify * @param n the first segment number to start verifying */ - public void verifyIncludedAndExcludedSegments(SegmentedTimeline timeline, + public void verifyIncludedAndExcludedSegments(SegmentedTimeline timeline, long n) { // clear any exceptions in this timeline timeline.setExceptionSegments(new java.util.ArrayList()); @@ -609,7 +609,7 @@ assertTrue(segment.inIncludeSegments()); assertTrue(!segment.inExcludeSegments()); assertTrue(!segment.inExceptionSegments()); - } + } else { // should be an excluded segment assertTrue(!segment.inIncludeSegments()); @@ -626,7 +626,7 @@ /** * Tests methods related to exceptions methods in the msTimeline. - * + * * @throws ParseException if there is a parsing error. */ public void testMsExceptionSegments() throws ParseException { @@ -635,42 +635,42 @@ /** * Tests methods related to exceptions methods in the ms2BaseTimeline. - * + * * @throws ParseException if there is a parsing error. */ public void testMs2BaseTimelineExceptionSegments() throws ParseException { - verifyExceptionSegments(this.ms2BaseTimeline, + verifyExceptionSegments(this.ms2BaseTimeline, MS2_BASE_TIMELINE_EXCEPTIONS, NUMBER_FORMAT); } /** * Tests methods related to exceptions methods in the mondayFridayTimeline. - * + * * @throws ParseException if there is a parsing error. */ - public void testMondayThoughFridayExceptionSegments() + public void testMondayThoughFridayExceptionSegments() throws ParseException { - verifyExceptionSegments(this.mondayFridayTimeline, + verifyExceptionSegments(this.mondayFridayTimeline, US_HOLIDAYS, DATE_FORMAT); } /** * Tests methods related to exceptions methods in the fifteenMinTimeline. - * + * * @throws ParseException if there is a parsing error. */ public void testFifteenMinExceptionSegments() throws ParseException { - verifyExceptionSegments(this.fifteenMinTimeline, + verifyExceptionSegments(this.fifteenMinTimeline, FIFTEEN_MIN_EXCEPTIONS, DATE_TIME_FORMAT); } /** * Tests methods related to adding exceptions. - * + * * @param timeline the timeline to verify * @param exceptionString array of Strings that represent the exceptions * @param fmt Format object that can parse the exceptionString strings - * + * * @throws ParseException if there is a parsing error. */ public void verifyExceptionSegments(SegmentedTimeline timeline, @@ -679,7 +679,7 @@ throws ParseException { // fill in the exceptions - long[] exception = verifyFillInExceptions(timeline, exceptionString, + long[] exception = verifyFillInExceptions(timeline, exceptionString, fmt); int m = exception.length; @@ -696,8 +696,8 @@ assertEquals(m - i, timeline.getExceptionSegmentCount( segment.getSegmentStart(), lastSegment.getSegmentEnd())); // exclude current exception and last one - assertEquals(Math.max(0, m - i - 2), - timeline.getExceptionSegmentCount(exception[i] + 1, + assertEquals(Math.max(0, m - i - 2), + timeline.getExceptionSegmentCount(exception[i] + 1, exception[m - 1] - 1)); } @@ -709,7 +709,7 @@ /** * Tests translations for 1-ms timeline - * + * * @throws ParseException if there is a parsing error. */ public void testMsTranslations() throws ParseException { @@ -719,22 +719,22 @@ /** * Tests translations for the base timeline used for the ms2Timeline - * + * * @throws ParseException if there is a parsing error. */ public void testMs2BaseTimelineTranslations() throws ParseException { - verifyFillInExceptions(this.ms2BaseTimeline, + verifyFillInExceptions(this.ms2BaseTimeline, MS2_BASE_TIMELINE_EXCEPTIONS, NUMBER_FORMAT); verifyTranslations(this.ms2BaseTimeline, 0); } /** * Tests translations for the Monday through Friday timeline - * + * * @throws ParseException if there is a parsing error. */ public void testMs2Translations() throws ParseException { - fillInBaseTimelineExceptions(this.ms2Timeline, + fillInBaseTimelineExceptions(this.ms2Timeline, MS2_BASE_TIMELINE_EXCEPTIONS, NUMBER_FORMAT); fillInBaseTimelineExclusionsAsExceptions(this.ms2Timeline, 0, 5000); verifyTranslations(this.ms2Timeline, 1); @@ -742,36 +742,36 @@ /** * Tests translations for the Monday through Friday timeline - * + * * @throws ParseException if there is a parsing error. */ public void textMondayThroughFridayTranslations() throws ParseException { - verifyFillInExceptions(this.mondayFridayTimeline, US_HOLIDAYS, + verifyFillInExceptions(this.mondayFridayTimeline, US_HOLIDAYS, DATE_FORMAT); - verifyTranslations(this.mondayFridayTimeline, + verifyTranslations(this.mondayFridayTimeline, this.monday.getTime().getTime()); } /** * Tests translations for the Fifteen Min timeline - * + * * @throws ParseException if there is a parsing error. */ public void testFifteenMinTranslations() throws ParseException { - verifyFillInExceptions(this.fifteenMinTimeline, + verifyFillInExceptions(this.fifteenMinTimeline, FIFTEEN_MIN_EXCEPTIONS, DATE_TIME_FORMAT); - fillInBaseTimelineExceptions(this.fifteenMinTimeline, + fillInBaseTimelineExceptions(this.fifteenMinTimeline, US_HOLIDAYS, DATE_FORMAT); fillInBaseTimelineExclusionsAsExceptions(this.fifteenMinTimeline, - this.monday9am.getTime().getTime(), + this.monday9am.getTime().getTime(), this.monday9am.getTime().getTime() + FIVE_YEARS); - verifyTranslations(this.fifteenMinTimeline, + verifyTranslations(this.fifteenMinTimeline, this.monday9am.getTime().getTime()); } /** * Tests translations between timelines. - * + * * @param timeline the timeline to use for verifications. * @param startTest ??. */ @@ -779,17 +779,17 @@ for (long testCycle = TEST_CYCLE_START; testCycle < TEST_CYCLE_END; testCycle += TEST_CYCLE_INC) { - long millisecond = startTest + testCycle + long millisecond = startTest + testCycle * timeline.getSegmentSize(); SegmentedTimeline.Segment segment = timeline.getSegment( millisecond); - + for (int i = 0; i < 1000; i++) { long translatedValue = timeline.toTimelineValue( segment.getMillisecond()); long newValue = timeline.toMillisecond(translatedValue); - if (segment.inExcludeSegments() + if (segment.inExcludeSegments() || segment.inExceptionSegments()) { // the reverse transformed value will be in the start of the // next non-excluded and non-exception segment @@ -855,7 +855,7 @@ * @param timeline The timeline where the exceptions will be stored * @param exceptionString The exceptions to load * @param fmt The date formatter to use to parse each exceptions[i] value - * @throws ParseException If there is any exception parsing each + * @throws ParseException If there is any exception parsing each * exceptions[i] value. * @return An array of Dates[] containing each exception date. */ @@ -882,7 +882,7 @@ if (segment.inIncludeSegments()) { timeline.addException(e); exceptionList.add(new Long(e)); - assertEquals(exceptionList.size(), + assertEquals(exceptionList.size(), timeline.getExceptionSegments().size()); assertTrue(segment.inExceptionSegments()); } @@ -906,7 +906,7 @@ * @param timeline The timeline where the exceptions will be stored * @param exceptionString The exceptions to load * @param fmt The date formatter to use to parse each exceptions[i] value - * @throws ParseException If there is any exception parsing each + * @throws ParseException If there is any exception parsing each * exceptions[i] value. */ private void fillInBaseTimelineExceptions(SegmentedTimeline timeline, @@ -924,10 +924,10 @@ } timeline.addBaseTimelineException(e); - // verify all timeline segments included in the + // verify all timeline segments included in the // baseTimeline.segment are now exceptions SegmentedTimeline.Segment segment1 = baseTimeline.getSegment(e); - for (SegmentedTimeline.Segment segment2 + for (SegmentedTimeline.Segment segment2 = timeline.getSegment(segment1.getSegmentStart()); segment2.getSegmentStart() <= segment1.getSegmentEnd(); segment2.inc()) { @@ -940,7 +940,7 @@ } /** - * Adds new exceptions to a timeline. The exceptions are the excluded + * Adds new exceptions to a timeline. The exceptions are the excluded * segments from its base timeline. * * @param timeline the timeline. @@ -961,10 +961,10 @@ if (segment1.inExcludeSegments()) { - // verify all timeline segments included in the + // verify all timeline segments included in the // baseTimeline.segment are now exceptions for (SegmentedTimeline.Segment segment2 = timeline.getSegment( - segment1.getSegmentStart()); + segment1.getSegmentStart()); segment2.getSegmentStart() <= segment1.getSegmentEnd(); segment2.inc()) { if (!segment2.inExcludeSegments()) { @@ -996,26 +996,26 @@ * Confirm that the equals method can distinguish all the required fields. */ public void testEquals() { - + SegmentedTimeline l1 = new SegmentedTimeline(1000, 5, 2); SegmentedTimeline l2 = new SegmentedTimeline(1000, 5, 2); assertTrue(l1.equals(l2)); - + l1 = new SegmentedTimeline(1000, 5, 2); l2 = new SegmentedTimeline(1001, 5, 2); assertFalse(l1.equals(l2)); - + l1 = new SegmentedTimeline(1000, 5, 2); l2 = new SegmentedTimeline(1000, 4, 2); assertFalse(l1.equals(l2)); - + l1 = new SegmentedTimeline(1000, 5, 2); l2 = new SegmentedTimeline(1000, 5, 1); assertFalse(l1.equals(l2)); - + l1 = new SegmentedTimeline(1000, 5, 2); l2 = new SegmentedTimeline(1000, 5, 2); - + // start time... l1.setStartTime(1234L); assertFalse(l1.equals(l2)); @@ -1023,9 +1023,9 @@ assertTrue(l1.equals(l2)); } - + /** - * Two objects that are equal are required to return the same hashCode. + * Two objects that are equal are required to return the same hashCode. */ public void testHashCode() { SegmentedTimeline l1 = new SegmentedTimeline(1000, 5, 2); @@ -1034,8 +1034,8 @@ int h1 = l1.hashCode(); int h2 = l2.hashCode(); assertEquals(h1, h2); - } - + } + /** * Serialize an instance, restore it, and check for equality. */ @@ -1083,7 +1083,7 @@ assertFalse(stl.containsDomainValue(946684800070L)); assertFalse(stl.containsDomainValue(946684800099L)); assertTrue(stl.containsDomainValue(946684800100L)); - + assertEquals(0, stl.toTimelineValue(946684800000L)); assertEquals(19, stl.toTimelineValue(946684800019L)); assertEquals(20, stl.toTimelineValue(946684800020L)); @@ -1093,22 +1093,22 @@ assertEquals(40, stl.toTimelineValue(946684800070L)); assertEquals(40, stl.toTimelineValue(946684800099L)); assertEquals(40, stl.toTimelineValue(946684800100L)); - + assertEquals(946684800000L, stl.toMillisecond(0)); assertEquals(946684800019L, stl.toMillisecond(19)); assertEquals(946684800050L, stl.toMillisecond(20)); assertEquals(946684800069L, stl.toMillisecond(39)); assertEquals(946684800100L, stl.toMillisecond(40)); - + } - + /** * Tests a basic time line with one exception. */ public void testSegmentedTimelineWithException1() { SegmentedTimeline stl = new SegmentedTimeline(10, 2, 3); stl.setStartTime(946684800000L); // 1-Jan-2000 - stl.addException(946684800050L); + stl.addException(946684800050L); assertFalse(stl.containsDomainValue(946684799999L)); assertTrue(stl.containsDomainValue(946684800000L)); assertTrue(stl.containsDomainValue(946684800019L)); @@ -1139,7 +1139,7 @@ assertEquals(946684800069L, stl.toMillisecond(29)); assertEquals(946684800100L, stl.toMillisecond(30)); - } + } ////////////////////////////////////////////////////////////////////////// // main method only for debug @@ -1147,9 +1147,9 @@ /** * Only use to debug JUnit suite. - * + * * @param args ignored. - * + * * @throws Exception if there is some problem. */ public static void main(String[] args) throws Exception { Modified: trunk/tests/org/jfree/chart/axis/junit/SegmentedTimelineTests2.java =================================================================== --- trunk/tests/org/jfree/chart/axis/junit/SegmentedTimelineTests2.java 2008-06-10 13:06:42 UTC (rev 1123) +++ trunk/tests/org/jfree/chart/axis/junit/SegmentedTimelineTests2.java 2008-06-10 13:07:06 UTC (rev 1124) @@ -2,32 +2,32 @@ * JFreeChart : a free chart library for the Java(tm) platform * =========================================================== * - * (C) Copyright 2000-2007, by Object Refinery Limited and Contributors. + * (C) Copyright 2000-2008, by Object Refinery Limited and Contributors. * * Project Info: http://www.jfree.org/jfreechart/index.html * - * This library is free software; you can redistribute it and/or modify it - * under the terms of the GNU Lesser General Public License as published by - * the Free Software Foundation; either version 2.1 of the License, or + * This library is free software; you can redistribute it and/or modify it + * under the terms of the GNU Lesser General Public License as published by + * the Free Software Foundation; either version 2.1 of the License, or * (at your option) any later version. * - * This library is distributed in the hope that it will be useful, but - * WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY - * or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public + * This library is distributed in the hope that it will be useful, but + * WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY + * or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public * License for more details. * * You should have received a copy of the GNU Lesser General Public * License along with this library; if not, write to the Free Software - * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, - * USA. + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, + * USA. * - * [Java is a trademark or registered trademark of Sun Microsystems, Inc. + * [Java is a trademark or registered trademark of Sun Microsystems, Inc. * in the United States and other countries.] * * ---------------------------- * SegmentedTimelineTests2.java * ---------------------------- - * (C) Copyright 2004-2007, by Object Refinery Limited and Contributors. + * (C) Copyright 2004-2008, by Object Refinery Limited and Contributors. * * Original Author: David Gilbert (for Object Refinery Limited); * Contributor(s): -; @@ -63,7 +63,7 @@ } /** - * Test 1 checks 9am Friday 26 March 2004 converts to a timeline value and + * Test 1 checks 9am Friday 26 March 2004 converts to a timeline value and * back again correctly. This is prior to Daylight Saving. */ public void test1() { @@ -80,21 +80,21 @@ cal.set(Calendar.SECOND, 0); cal.set(Calendar.MILLISECOND, 0); Date date = cal.getTime(); - - SegmentedTimeline timeline = getTimeline(); - long value = timeline.toTimelineValue(date); + + SegmentedTimeline timeline = getTimeline(); + long value = timeline.toTimelineValue(date); long ms = timeline.toMillisecond(value); Calendar cal2 = Calendar.getInstance(Locale.UK); cal2.setTime(new Date(ms)); Date reverted = cal2.getTime(); - assertTrue("test1", value == (900000 * 34) + assertTrue("test1", value == (900000 * 34) && date.getTime() == reverted.getTime()); TimeZone.setDefault(savedZone); Locale.setDefault(savedLocale); } /** - * Test 2 checks 9.15am Friday 26 March 2004 converts to a timeline value + * Test 2 checks 9.15am Friday 26 March 2004 converts to a timeline value * and back again correctly. This is prior to Daylight Saving. */ public void test2() { @@ -109,23 +109,23 @@ cal.set(Calendar.SECOND, 0); cal.set(Calendar.MILLISECOND, 0); Date date = cal.getTime(); - - SegmentedTimeline timeline = getTimeline(); - long value = timeline.toTimelineValue(date); + SegmentedTimeline timeline = getTimeline(); + + long value = timeline.toTimelineValue(date); long ms = timeline.toMillisecond(value); Calendar cal2 = Calendar.getInstance(Locale.UK); cal2.setTime(new Date(ms)); Date reverted = cal2.getTime(); assertTrue( - "test2", value == (900000 * 34 + 900000) + "test2", value == (900000 * 34 + 900000) && date.getTime() == reverted.getTime() ); TimeZone.setDefault(savedZone); } /** - * Test 3 checks 9.30am Friday 26 March 2004 converts to a timeline value + * Test 3 checks 9.30am Friday 26 March 2004 converts to a timeline value * and back again correctly. This is prior to Daylight Saving. */ public void test3() { @@ -139,25 +139,25 @@ cal.set(Calendar.MINUTE, 30); cal.set(Calendar.SECOND, 0); cal.set(Calendar.MILLISECOND, 0); - Date date = cal.getTime(); - SegmentedTimeline timeline = getTimeline(); + Date date = cal.getTime(); + SegmentedTimeline timeline = getTimeline(); - long value = timeline.toTimelineValue(date); + long value = timeline.toTimelineValue(date); long ms = timeline.toMillisecond(value); - + Calendar cal2 = Calendar.getInstance(Locale.UK); cal2.setTime(new Date(ms)); Date reverted = cal2.getTime(); assertTrue( - "test2", value == (900000 * 34 + 900000 * 2) + "test2", value == (900000 * 34 + 900000 * 2) && date.getTime() == reverted.getTime() ); TimeZone.setDefault(savedZone); } /** - * Test 4 checks 9.30am Friday 26 March 2004 (+ 1 millisecond) converts to - * a timeline value and back again correctly. This is prior to Daylight + * Test 4 checks 9.30am Friday 26 March 2004 (+ 1 millisecond) converts to + * a timeline value and back again correctly. This is prior to Daylight * Saving. */ public void test4() { @@ -172,24 +172,24 @@ cal.set(Calendar.SECOND, 0); cal.set(Calendar.MILLISECOND, 1); Date date = cal.getTime(); - SegmentedTimeline timeline = getTimeline(); + SegmentedTimeline timeline = getTimeline(); - long value = timeline.toTimelineValue(date); + long value = timeline.toTimelineValue(date); long ms = timeline.toMillisecond(value); Calendar cal2 = Calendar.getInstance(Locale.UK); cal2.setTime(new Date(ms)); Date reverted = cal2.getTime(); assertTrue( - "test4", value == (900000 * 34 + 900000 * 2 + 1) + "test4", value == (900000 * 34 + 900000 * 2 + 1) && date.getTime() == reverted.getTime() ); TimeZone.setDefault(savedZone); } /** - * Test 5 checks 5.30pm Thursday 25 March 2004 converts to a timeline - * value and back again correctly. As it is in the excluded segment, we - * expect it to map to 9am, Friday 26 March 2004. This is prior to + * Test 5 checks 5.30pm Thursday 25 March 2004 converts to a timeline + * value and back again correctly. As it is in the excluded segment, we + * expect it to map to 9am, Friday 26 March 2004. This is prior to * Daylight Saving. */ public void test5() { @@ -204,9 +204,9 @@ cal.set(Calendar.SECOND, 0); cal.set(Calendar.MILLISECOND, 0); Date date = cal.getTime(); - SegmentedTimeline timeline = getTimeline(); + SegmentedTimeline timeline = getTimeline(); - long value = timeline.toTimelineValue(date); + long value = timeline.toTimelineValue(date); long ms = timeline.toMillisecond(value); Calendar cal2 = Calendar.getInstance(Locale.UK); cal2.setTime(new Date(ms)); @@ -219,18 +219,18 @@ expectedReverted.set(Calendar.MINUTE, 0); expectedReverted.set(Calendar.SECOND, 0); expectedReverted.set(Calendar.MILLISECOND, 0); - + assertTrue( - "test5", value == (900000 * 34) + "test5", value == (900000 * 34) && expectedReverted.getTime().getTime() == reverted.getTime() ); TimeZone.setDefault(savedZone); } /** - * Test 6 checks that 9am on Sunday 28 March 2004 converts to the timeline - * value and back again correctly. Note that Saturday and Sunday are - * excluded from the timeline, so we expect the value to map to 9am on + * Test 6 checks that 9am on Sunday 28 March 2004 converts to the timeline + * value and back again correctly. Note that Saturday and Sunday are + * excluded from the timeline, so we expect the value to map to 9am on * Monday 29 March 2004. This is during daylight saving. */ public void test6() { @@ -245,14 +245,14 @@ cal.set(Calendar.SECOND, 0); cal.set(Calendar.MILLISECOND, 0); Date date = cal.getTime(); - SegmentedTimeline timeline = getTimeline(); + SegmentedTimeline timeline = getTimeline(); - long value = timeline.toTimelineValue(date); + long value = timeline.toTimelineValue(date); long ms = timeline.toMillisecond(value); Calendar cal2 = Calendar.getInstance(Locale.UK); cal2.setTime(new Date(ms)); Date reverted = cal2.getTime(); - + Calendar expectedReverted = Calendar.getInstance(Locale.UK); expectedReverted.set(Calendar.YEAR, 2004); expectedReverted.set(Calendar.MONTH, Calendar.MARCH); @@ -261,16 +261,16 @@ expectedReverted.set(Calendar.MINUTE, 0); expectedReverted.set(Calendar.SECOND, 0); expectedReverted.set(Calendar.MILLISECOND, 0); - + assertTrue( - "test6", value == (900000 * 34 * 2) + "test6", value == (900000 * 34 * 2) && expectedReverted.getTime().getTime() == reverted.getTime() ); TimeZone.setDefault(savedZone); } - + /** - * Test 7 checks 9am Monday 29 March 2004 converts to a timeline value and + * Test 7 checks 9am Monday 29 March 2004 converts to a timeline value and * back again correctly. This is during Daylight Saving. */ public void test7() { @@ -285,15 +285,15 @@ cal.set(Calendar.SECOND, 0); cal.set(Calendar.MILLISECOND, 0); Date date = cal.getTime(); - + SegmentedTimeline timeline = getTimeline(); - long value = timeline.toTimelineValue(date); + long value = timeline.toTimelineValue(date); long ms = timeline.toMillisecond(value); - + Calendar cal2 = Calendar.getInstance(Locale.UK); cal2.setTime(new Date(ms)); Date reverted = cal2.getTime(); - + Calendar expectedReverted = Calendar.getInstance(); expectedReverted.set(Calendar.YEAR, 2004); expectedReverted.set(Calendar.MONTH, Calendar.MARCH); @@ -302,9 +302,9 @@ expectedReverted.set(Calendar.MINUTE, 0); expectedReverted.set(Calendar.SECOND, 0); expectedReverted.set(Calendar.MILLISECOND, 0); - + assertTrue( - "test7", value == (900000 * 34 * 2) + "test7", value == (900000 * 34 * 2) && expectedReverted.getTime().getTime() == reverted.getTime() ); TimeZone.setDefault(savedZone); @@ -325,9 +325,9 @@ cal.set(Calendar.SECOND, 0); cal.set(Calendar.MILLISECOND, 0); Date date = cal.getTime(); - - SegmentedTimeline timeline = getTimeline(); - + + SegmentedTimeline timeline = getTimeline(); + // Add exception in included segments cal.set(Calendar.YEAR, 2004); cal.set(Calendar.MONTH, Calendar.MARCH); @@ -337,14 +337,14 @@ cal.set(Calendar.SECOND, 0); cal.set(Calendar.MILLISECOND, 0); timeline.addException(cal.getTime()); - - long value = timeline.toTimelineValue(date); + + long value = timeline.toTimelineValue(date); long ms = timeline.toMillisecond(value); - + Calendar cal2 = Calendar.getInstance(Locale.UK); cal2.setTime(new Date(ms)); Date reverted = cal2.getTime(); - + Calendar expectedReverted = Calendar.getInstance(); expectedReverted.set(Calendar.YEAR, 2004); expectedReverted.set(Calendar.MONTH, Calendar.MARCH); @@ -353,18 +353,18 @@ expectedReverted.set(Calendar.MINUTE, 0); expectedReverted.set(Calendar.SECOND, 0); expectedReverted.set(Calendar.MILLISECOND, 0); - + assertTrue( - "test8", value == (900000 * 34 * 2 + 900000 * (4 - 1)) + "test8", value == (900000 * 34 * 2 + 900000 * (4 - 1)) && expectedReverted.getTime().getTime() == reverted.getTime() ); TimeZone.setDefault(savedZone); } - + /** - * Creates a timeline from 9am on Thursday 25 March 2004 to 5pm on + * Creates a timeline from 9am on Thursday 25 March 2004 to 5pm on * Tuesday 30 March 2004, for the UK locale. - * + * * @return A timeline. */ private SegmentedTimeline getTimeline() { @@ -390,18 +390,18 @@ return getTimeline(from, to); } - + /** - * Returns a segmented timeline for 15 minute segments, Monday to Friday + * Returns a segmented timeline for 15 minute segments, Monday to Friday * only, between 9am and 5pm. The UK locale is used. - * + * * @param start the start date. * @param end the end date. - * + * * @return The timeline. */ private SegmentedTimeline getTimeline(Date start, Date end) { - + Calendar cal = Calendar.getInstance(Locale.UK); cal.set(Calendar.YEAR, 1970); cal.set(Calendar.MONTH, Calendar.JANUARY); @@ -421,17 +421,17 @@ cal.set(Calendar.SECOND, 0); cal.set(Calendar.MILLISECOND, 0); Date close = cal.getTime(); - - SegmentedTimeline result = null; + + SegmentedTimeline result = null; // Create a segmented time line (segment size : 15 minutes) long quarterHourCount = (close.getTime() - open.getTime()) / SegmentedTimeline.FIFTEEN_MINUTE_SEGMENT_SIZE; - long totalQuarterHourCount = SegmentedTimeline.DAY_SEGMENT_SIZE + long totalQuarterHourCount = SegmentedTimeline.DAY_SEGMENT_SIZE / SegmentedTimeline.FIFTEEN_MINUTE_SEGMENT_SIZE; result = new SegmentedTimeline( SegmentedTimeline.FIFTEEN_MINUTE_SEGMENT_SIZE, - (int) quarterHourCount, - (int) (totalQuarterHourCount - quarterHourCount) + (int) quarterHourCount, + (int) (totalQuarterHourCount - quarterHourCount) ); result.setAdjustForDaylightSaving(true); // Set start time @@ -444,9 +444,9 @@ if (start != null && end != null) { result.addBaseTimelineExclusions(start.getTime(), end.getTime()); } - - return result; + + return result; } - - + + } Modified: trunk/tests/org/jfree/chart/axis/junit/StandardTickUnitSourceTests.java =================================================================== --- trunk/tests/org/jfree/chart/axis/junit/StandardTickUnitSourceTests.java 2008-06-10 13:06:42 UTC (rev 1123) +++ trunk/tests/org/jfree/chart/axis/junit/StandardTickUnitSourceTests.java 2008-06-10 13:07:06 UTC (rev 1124) @@ -2,32 +2,32 @@ * JFreeChart : a free chart library for the Java(tm) platform * =========================================================== * - * (C) Copyright 2000-2007, by Object Refinery Limited and Contributors. + * (C) Copyright 2000-2008, by Object Refinery Limited and Contributors. * * Project Info: http://www.jfree.org/jfreechart/index.html * - * This library is free software; you can redistribute it and/or modify it - * under the terms of the GNU Lesser General Public License as published by - * the Free Software Foundation; either version 2.1 of the License, or + * This library is free software; you can redistribute it and/or modify it + * under the terms of the GNU Lesser General Public License as published by + * the Free Software Foundation; either version 2.1 of the License, or * (at your option) any later version. * - * This library is distributed in the hope that it will be useful, but - * WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY - * or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public + * This library is distributed in the hope that it will be useful, but + * WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY + * or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public * License for more details. * * You should have received a copy of the GNU Lesser General Public * License along with this library; if not, write to the Free Software - * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, - * USA. + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, + * USA. * - * [Java is a trademark or registered trademark of Sun Microsystems, Inc. + * [Java is a trademark or registered trademark of Sun Microsystems, Inc. * in the United States and other countries.] * * -------------------------------- * StandardTickUnitSourceTests.java * -------------------------------- - * (C) Copyright 2007, by Object Refinery Limited and Contributors. + * (C) Copyright 2007, 2008, by Object Refinery Limited and Contributors. * * Original Author: David Gilbert (for Object Refinery Limited); * Contributor(s): -; Modified: trunk/tests/org/jfree/chart/axis/junit/SubCategoryAxisTests.java =================================================================== --- trunk/tests/org/jfree/chart/axis/junit/SubCategoryAxisTests.java 2008-06-10 13:06:42 UTC (rev 1123) +++ trunk/tests/org/jfree/chart/axis/junit/SubCategoryAxisTests.java 2008-06-10 13:07:06 UTC (rev 1124) @@ -2,32 +2,32 @@ * JFreeChart : a free chart library for the Java(tm) platform * =========================================================== * - * (C) Copyright 2000-2007, by Object Refinery Limited and Contributors. + * (C) Copyright 2000-2008, by Object Refinery Limited and Contributors. * * Project Info: http://www.jfree.org/jfreechart/index.html * - * This library is free software; you can redistribute it and/or modify it - * under the terms of the GNU Lesser General Public License as published by - * the Free Software Foundation; either version 2.1 of the License, or + * This library is free software; you can redistribute it and/or modify it + * under the terms of the GNU Lesser General Public License as published by + * the Free Software Foundation; either version 2.1 of the License, or * (at your option) any later version. * - * This library is distributed in the hope that it will be useful, but - * WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY - * or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public + * This library is distributed in the hope that it will be useful, but + * WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY + * or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public * License for more details. * * You should have received a copy of the GNU Lesser General Public * License along with this library; if not, write to the Free Software - * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, - * USA. + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, + * USA. * - * [Java is a trademark or registered trademark of Sun Microsystems, Inc. + * [Java is a trademark or registered trademark of Sun Microsystems, Inc. * in the United States and other countries.] * * ------------------------- * SubCategoryAxisTests.java * ------------------------- - * (C) Copyright 2004-2007, by Object Refinery Limited and Contributors. + * (C) Copyright 2004-2008, by Object Refinery Limited and Contributors. * * Original Author: David Gilbert (for Object Refinery Limited); * Contributor(s): -; @@ -83,34 +83,34 @@ * Confirm that the equals method can distinguish all the required fields. */ public void testEquals() { - + SubCategoryAxis a1 = new SubCategoryAxis("Test"); SubCategoryAxis a2 = new SubCategoryAxis("Test"); assertTrue(a1.equals(a2)); assertTrue(a2.equals(a1)); - + // subcategories a1.addSubCategory("Sub 1"); assertFalse(a1.equals(a2)); a2.addSubCategory("Sub 1"); assertTrue(a1.equals(a2)); - // subLabelFont + // subLabelFont a1.setSubLabelFont(new Font("Serif", Font.BOLD, 15)); assertFalse(a1.equals(a2)); a2.setSubLabelFont(new Font("Serif", Font.BOLD, 15)); assertTrue(a1.equals(a2)); - - // subLabelPaint + + // subLabelPaint a1.setSubLabelPaint(Color.red); assertFalse(a1.equals(a2)); a2.setSubLabelPaint(Color.red); assertTrue(a1.equals(a2)); - + } /** - * Two objects that are equal are required to return the same hashCode. + * Two objects that are equal are required to return the same hashCode. */ public void testHashCode() { SubCategoryAxis a1 = new SubCategoryAxis("Test"); @@ -119,8 +119,8 @@ int h1 = a1.hashCode(); int h2 = a2.hashCode(); assertEquals(h1, h2); - } - + } + /** * Confirm that cloning works. */ @@ -153,13 +153,12 @@ out.close(); ObjectInput in = new ObjectInputStream( - new ByteArrayInputStream(buffer.toByteArray()) - ); + new ByteArrayInputStream(buffer.toByteArray())); a2 = (SubCategoryAxis) in.readObject(); in.close(); } catch (Exception e) { - System.out.println(e.toString()); + e.printStackTrace(); } assertEquals(a1, a2); Modified: trunk/tests/org/jfree/chart/axis/junit/SymbolAxisTests.java =================================================================== --- trunk/tests/org/jfree/chart/axis/junit/SymbolAxisTests.java 2008-06-10 13:06:42 UTC (rev 1123) +++ trunk/tests/org/jfree/chart/axis/junit/SymbolAxisTests.java 2008-06-10 13:07:06 UTC (rev 1124) @@ -2,32 +2,32 @@ * JFreeChart : a free chart library for the Java(tm) platform * =========================================================== * - * (C) Copyright 2000-2007, by Object Refinery Limited and Contributors. + * (C) Copyright 2000-2008, by Object Refinery Limited and Contributors. * * Project Info: http://www.jfree.org/jfreechart/index.html * - * This library is free software; you can redistribute it and/or modify it - * under the terms of the GNU Lesser General Public License as published by - * the Free Software Foundation; either version 2.1 of the License, or + * This library is free software; you can redistribute it and/or modify it + * under the terms of the GNU Lesser General Public License as published by + * the Free Software Foundation; either version 2.1 of the License, or * (at your option) any later version. * - * This library is distributed in the hope that it will be useful, but - * WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY - * or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public + * This library is distributed in the hope that it will be useful, but + * WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY + * or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public * License for more details. * * You should have received a copy of the GNU Lesser General Public * License along with this library; if not, write to the Free Software - * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, - * USA. + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, + * USA. * - * [Java is a trademark or registered trademark of Sun Microsystems, Inc. + * [Java is a trademark or registered trademark of Sun Microsystems, Inc. * in the United States and other countries.] * * ---------------------- * SymbolicAxisTests.java * ---------------------- - * (C) Copyright 2003-2007, by Object Refinery Limited and Contributors. + * (C) Copyright 2003-2008, by Object Refinery Limited and Contributors. * * Original Author: David Gilbert (for Object Refinery Limited); * Contributor(s): -; @@ -36,7 +36,7 @@ * ------- * 26-Mar-2003 : Version 1 (DG); * 25-Jul-2007 : Added new field in testEquals() (DG); - * + * */ package org.jfree.chart.axis.junit; @@ -104,7 +104,7 @@ assertEquals(a1, a2); } - + /** * Confirm that cloning works. */ @@ -130,17 +130,17 @@ SymbolAxis a2 = new SymbolAxis("Axis", new String[] {"A", "B"}); assertTrue(a1.equals(a2)); assertTrue(a2.equals(a1)); - + a1 = new SymbolAxis("Axis 2", new String[] {"A", "B"}); assertFalse(a1.equals(a2)); a2 = new SymbolAxis("Axis 2", new String[] {"A", "B"}); - assertTrue(a1.equals(a2)); + assertTrue(a1.equals(a2)); a1 = new SymbolAxis("Axis 2", new String[] {"C", "B"}); assertFalse(a1.equals(a2)); a2 = new SymbolAxis("Axis 2", new String[] {"C", "B"}); - assertTrue(a1.equals(a2)); - + assertTrue(a1.equals(a2)); + a1.setGridBandsVisible(false); assertFalse(a1.equals(a2)); a2.setGridBandsVisible(false); @@ -150,7 +150,7 @@ assertFalse(a1.equals(a2)); a2.setGridBandPaint(Color.black); assertTrue(a1.equals(a2)); - + a1.setGridBandAlternatePaint(Color.red); assertFalse(a1.equals(a2)); a2.setGridBandAlternatePaint(Color.red); Modified: trunk/tests/org/jfree/chart/axis/junit/TickUnitsTests.java =================================================================== --- trunk/tests/org/jfree/chart/axis/junit/TickUnitsTe... [truncated message content] |