Menu
▾
▴
[Jfreechart-commit] SF.net SVN: jfreechart: [1122] trunk/tests/org/jfree/chart/axis/junit
|
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] |