Menu
▾
▴
[Jfreechart-commit] SF.net SVN: jfreechart: [865] branches/jfreechart-1.0.x-branch/tests/org/ jfree/chart/renderer/category/junit
|
From: <mu...@us...> - 2008-04-23 09:04:22
|
Revision: 865
http://jfreechart.svn.sourceforge.net/jfreechart/?rev=865&view=rev
Author: mungady
Date: 2008-04-23 02:04:21 -0700 (Wed, 23 Apr 2008)
Log Message:
-----------
New tests.
Modified Paths:
--------------
branches/jfreechart-1.0.x-branch/tests/org/jfree/chart/renderer/category/junit/AreaRendererTests.java
branches/jfreechart-1.0.x-branch/tests/org/jfree/chart/renderer/category/junit/BarRenderer3DTests.java
branches/jfreechart-1.0.x-branch/tests/org/jfree/chart/renderer/category/junit/BarRendererTests.java
branches/jfreechart-1.0.x-branch/tests/org/jfree/chart/renderer/category/junit/BoxAndWhiskerRendererTests.java
branches/jfreechart-1.0.x-branch/tests/org/jfree/chart/renderer/category/junit/CategoryStepRendererTests.java
branches/jfreechart-1.0.x-branch/tests/org/jfree/chart/renderer/category/junit/DefaultCategoryItemRendererTests.java
branches/jfreechart-1.0.x-branch/tests/org/jfree/chart/renderer/category/junit/GanttRendererTests.java
branches/jfreechart-1.0.x-branch/tests/org/jfree/chart/renderer/category/junit/GroupedStackedBarRendererTests.java
branches/jfreechart-1.0.x-branch/tests/org/jfree/chart/renderer/category/junit/IntervalBarRendererTests.java
Modified: branches/jfreechart-1.0.x-branch/tests/org/jfree/chart/renderer/category/junit/AreaRendererTests.java
===================================================================
--- branches/jfreechart-1.0.x-branch/tests/org/jfree/chart/renderer/category/junit/AreaRendererTests.java 2008-04-23 08:51:11 UTC (rev 864)
+++ branches/jfreechart-1.0.x-branch/tests/org/jfree/chart/renderer/category/junit/AreaRendererTests.java 2008-04-23 09:04:21 UTC (rev 865)
@@ -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.]
*
* ----------------------
* AreaRendererTests.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): -;
@@ -38,6 +38,7 @@
* 22-Oct-2003 : Added hashCode() test (DG);
* 11-Oct-2006 : Strengthened the testEquals() method (DG);
* 17-May-2007 : Added testGetLegendItemSeriesIndex() (DG);
+ * 23-Apr-2008 : Added testPublicCloneable() (DG);
*
*/
@@ -62,6 +63,7 @@
import org.jfree.chart.renderer.AreaRendererEndType;
import org.jfree.chart.renderer.category.AreaRenderer;
import org.jfree.data.category.DefaultCategoryDataset;
+import org.jfree.util.PublicCloneable;
/**
* Tests for the {@link AreaRenderer} class.
@@ -93,7 +95,7 @@
AreaRenderer r1 = new AreaRenderer();
AreaRenderer r2 = new AreaRenderer();
assertEquals(r1, r2);
-
+
r1.setEndType(AreaRendererEndType.LEVEL);
assertFalse(r1.equals(r2));
r2.setEndType(AreaRendererEndType.LEVEL);
@@ -101,7 +103,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() {
AreaRenderer r1 = new AreaRenderer();
@@ -111,7 +113,7 @@
int h2 = r2.hashCode();
assertEquals(h1, h2);
}
-
+
/**
* Confirm that cloning works.
*/
@@ -130,6 +132,14 @@
}
/**
+ * Check that this class implements PublicCloneable.
+ */
+ public void testPublicCloneable() {
+ AreaRenderer r1 = new AreaRenderer();
+ assertTrue(r1 instanceof PublicCloneable);
+ }
+
+ /**
* Serialize an instance, restore it, and check for equality.
*/
public void testSerialization() {
@@ -151,7 +161,7 @@
}
assertEquals(r1, r2);
}
-
+
/**
* A check for the datasetIndex and seriesIndex fields in the LegendItem
* returned by the getLegendItem() method.
@@ -159,11 +169,11 @@
public void testGetLegendItemSeriesIndex() {
DefaultCategoryDataset dataset0 = new DefaultCategoryDataset();
dataset0.addValue(21.0, "R1", "C1");
- dataset0.addValue(22.0, "R2", "C1");
+ dataset0.addValue(22.0, "R2", "C1");
DefaultCategoryDataset dataset1 = new DefaultCategoryDataset();
dataset1.addValue(23.0, "R3", "C1");
- dataset1.addValue(24.0, "R4", "C1");
- dataset1.addValue(25.0, "R5", "C1");
+ dataset1.addValue(24.0, "R4", "C1");
+ dataset1.addValue(25.0, "R5", "C1");
AreaRenderer r = new AreaRenderer();
CategoryPlot plot = new CategoryPlot(dataset0, new CategoryAxis("x"),
new NumberAxis("y"), r);
Modified: branches/jfreechart-1.0.x-branch/tests/org/jfree/chart/renderer/category/junit/BarRenderer3DTests.java
===================================================================
--- branches/jfreechart-1.0.x-branch/tests/org/jfree/chart/renderer/category/junit/BarRenderer3DTests.java 2008-04-23 08:51:11 UTC (rev 864)
+++ branches/jfreechart-1.0.x-branch/tests/org/jfree/chart/renderer/category/junit/BarRenderer3DTests.java 2008-04-23 09:04:21 UTC (rev 865)
@@ -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.]
*
* -----------------------
* BarRenderer3DTests.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,6 +37,7 @@
* 25-Mar-2003 : Version 1 (DG);
* 22-Oct-2003 : Added hashCode test (DG);
* 07-Dec-2006 : Improved testEquals() (DG);
+ * 23-Apr-2008 : Added testPublicCloneable (DG);
*
*/
@@ -56,6 +57,7 @@
import junit.framework.TestSuite;
import org.jfree.chart.renderer.category.BarRenderer3D;
+import org.jfree.util.PublicCloneable;
/**
* Tests for the {@link BarRenderer3D} class.
@@ -87,27 +89,27 @@
BarRenderer3D r1 = new BarRenderer3D(1.0, 2.0);
BarRenderer3D r2 = new BarRenderer3D(1.0, 2.0);
assertEquals(r1, r2);
-
+
r1 = new BarRenderer3D(1.1, 2.0);
assertFalse(r1.equals(r2));
r2 = new BarRenderer3D(1.1, 2.0);
assertTrue(r1.equals(r2));
-
+
r1 = new BarRenderer3D(1.1, 2.2);
assertFalse(r1.equals(r2));
r2 = new BarRenderer3D(1.1, 2.2);
assertTrue(r1.equals(r2));
- r1.setWallPaint(new GradientPaint(1.0f, 2.0f, Color.red, 4.0f, 3.0f,
+ r1.setWallPaint(new GradientPaint(1.0f, 2.0f, Color.red, 4.0f, 3.0f,
Color.blue));
assertFalse(r1.equals(r2));
- r2.setWallPaint(new GradientPaint(1.0f, 2.0f, Color.red, 4.0f, 3.0f,
+ r2.setWallPaint(new GradientPaint(1.0f, 2.0f, Color.red, 4.0f, 3.0f,
Color.blue));
assertTrue(r1.equals(r2));
}
/**
- * 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() {
BarRenderer3D r1 = new BarRenderer3D();
@@ -117,7 +119,7 @@
int h2 = r2.hashCode();
assertEquals(h1, h2);
}
-
+
/**
* Confirm that cloning works.
*/
@@ -136,11 +138,19 @@
}
/**
+ * Check that this class implements PublicCloneable.
+ */
+ public void testPublicCloneable() {
+ BarRenderer3D r1 = new BarRenderer3D();
+ assertTrue(r1 instanceof PublicCloneable);
+ }
+
+ /**
* Serialize an instance, restore it, and check for equality.
*/
public void testSerialization() {
BarRenderer3D r1 = new BarRenderer3D();
- r1.setWallPaint(new GradientPaint(1.0f, 2.0f, Color.red, 4.0f, 3.0f,
+ r1.setWallPaint(new GradientPaint(1.0f, 2.0f, Color.red, 4.0f, 3.0f,
Color.blue));
BarRenderer3D r2 = null;
try {
Modified: branches/jfreechart-1.0.x-branch/tests/org/jfree/chart/renderer/category/junit/BarRendererTests.java
===================================================================
--- branches/jfreechart-1.0.x-branch/tests/org/jfree/chart/renderer/category/junit/BarRendererTests.java 2008-04-23 08:51:11 UTC (rev 864)
+++ branches/jfreechart-1.0.x-branch/tests/org/jfree/chart/renderer/category/junit/BarRendererTests.java 2008-04-23 09:04:21 UTC (rev 865)
@@ -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.]
*
* ---------------------
* BarRendererTests.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): -;
@@ -40,6 +40,7 @@
* 18-May-2005 : Added field to equals() test (DG);
* 22-Sep-2005 : Renamed getMaxBarWidth() --> getMaximumBarWidth() (DG);
* 11-May-2007 : Added testGetLegendItem() (DG);
+ * 23-Apr-2008 : Added testPublicCloneable() (DG);
*
*/
@@ -71,6 +72,7 @@
import org.jfree.ui.GradientPaintTransformType;
import org.jfree.ui.StandardGradientPaintTransformer;
import org.jfree.ui.TextAnchor;
+import org.jfree.util.PublicCloneable;
/**
* Tests for the {@link BarRenderer} class.
@@ -103,37 +105,37 @@
BarRenderer r2 = new BarRenderer();
assertTrue(r1.equals(r2));
assertTrue(r2.equals(r1));
-
+
// base value
r1.setBase(0.123);
assertFalse(r1.equals(r2));
r2.setBase(0.123);
assertTrue(r1.equals(r2));
-
+
// itemMargin
r1.setItemMargin(0.22);
assertFalse(r1.equals(r2));
r2.setItemMargin(0.22);
assertTrue(r1.equals(r2));
-
+
// drawBarOutline
r1.setDrawBarOutline(!r1.isDrawBarOutline());
assertFalse(r1.equals(r2));
r2.setDrawBarOutline(!r2.isDrawBarOutline());
assertTrue(r1.equals(r2));
-
+
// maximumBarWidth
r1.setMaximumBarWidth(0.11);
assertFalse(r1.equals(r2));
r2.setMaximumBarWidth(0.11);
assertTrue(r1.equals(r2));
-
+
// minimumBarLength
r1.setMinimumBarLength(0.04);
assertFalse(r1.equals(r2));
r2.setMinimumBarLength(0.04);
assertTrue(r1.equals(r2));
-
+
// gradientPaintTransformer
r1.setGradientPaintTransformer(new StandardGradientPaintTransformer(
GradientPaintTransformType.CENTER_VERTICAL));
@@ -141,7 +143,7 @@
r2.setGradientPaintTransformer(new StandardGradientPaintTransformer(
GradientPaintTransformType.CENTER_VERTICAL));
assertTrue(r1.equals(r2));
-
+
// positiveItemLabelPositionFallback
r1.setPositiveItemLabelPositionFallback(new ItemLabelPosition(
ItemLabelAnchor.INSIDE1, TextAnchor.CENTER));
@@ -161,7 +163,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() {
BarRenderer r1 = new BarRenderer();
@@ -171,7 +173,7 @@
int h2 = r2.hashCode();
assertEquals(h1, h2);
}
-
+
/**
* Confirm that cloning works.
*/
@@ -191,6 +193,14 @@
}
/**
+ * Check that this class implements PublicCloneable.
+ */
+ public void testPublicCloneable() {
+ BarRenderer r1 = new BarRenderer();
+ assertTrue(r1 instanceof PublicCloneable);
+ }
+
+ /**
* Serialize an instance, restore it, and check for equality.
*/
public void testSerialization() {
@@ -215,16 +225,16 @@
assertEquals(r1, r2);
}
-
+
/**
* Tests each setter method to ensure that it sends an event notification.
*/
public void testEventNotification() {
-
+
RendererChangeDetector detector = new RendererChangeDetector();
BarRenderer r1 = new BarRenderer();
r1.addChangeListener(detector);
-
+
detector.setNotified(false);
r1.setBasePaint(Color.red);
assertTrue(detector.getNotified());
@@ -247,7 +257,7 @@
li = r.getLegendItem(0, 0);
assertNull(li);
}
-
+
/**
* A check for the datasetIndex and seriesIndex fields in the LegendItem
* returned by the getLegendItem() method.
@@ -255,11 +265,11 @@
public void testGetLegendItemSeriesIndex() {
DefaultCategoryDataset dataset0 = new DefaultCategoryDataset();
dataset0.addValue(21.0, "R1", "C1");
- dataset0.addValue(22.0, "R2", "C1");
+ dataset0.addValue(22.0, "R2", "C1");
DefaultCategoryDataset dataset1 = new DefaultCategoryDataset();
dataset1.addValue(23.0, "R3", "C1");
- dataset1.addValue(24.0, "R4", "C1");
- dataset1.addValue(25.0, "R5", "C1");
+ dataset1.addValue(24.0, "R4", "C1");
+ dataset1.addValue(25.0, "R5", "C1");
BarRenderer r = new BarRenderer();
CategoryPlot plot = new CategoryPlot(dataset0, new CategoryAxis("x"),
new NumberAxis("y"), r);
Modified: branches/jfreechart-1.0.x-branch/tests/org/jfree/chart/renderer/category/junit/BoxAndWhiskerRendererTests.java
===================================================================
--- branches/jfreechart-1.0.x-branch/tests/org/jfree/chart/renderer/category/junit/BoxAndWhiskerRendererTests.java 2008-04-23 08:51:11 UTC (rev 864)
+++ branches/jfreechart-1.0.x-branch/tests/org/jfree/chart/renderer/category/junit/BoxAndWhiskerRendererTests.java 2008-04-23 09:04:21 UTC (rev 865)
@@ -6,22 +6,22 @@
*
* 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.]
*
* -------------------------------
@@ -41,6 +41,7 @@
* 17-May-2007 : Added testGetLegendItemSeriesIndex() (DG);
* 08-Oct-2007 : Added tests for null items in dataset (DG);
* 15-Jan-2008 : Updated testEquals() (DG);
+ * 23-Apr-2008 : Added testPublicCloneable() (DG);
*
*/
@@ -75,6 +76,7 @@
import org.jfree.data.category.DefaultCategoryDataset;
import org.jfree.data.statistics.BoxAndWhiskerItem;
import org.jfree.data.statistics.DefaultBoxAndWhiskerCategoryDataset;
+import org.jfree.util.PublicCloneable;
/**
* Tests for the {@link BoxAndWhiskerRenderer} class.
@@ -106,24 +108,24 @@
BoxAndWhiskerRenderer r1 = new BoxAndWhiskerRenderer();
BoxAndWhiskerRenderer r2 = new BoxAndWhiskerRenderer();
assertEquals(r1, r2);
-
- r1.setArtifactPaint(new GradientPaint(1.0f, 2.0f, Color.yellow,
+
+ r1.setArtifactPaint(new GradientPaint(1.0f, 2.0f, Color.yellow,
3.0f, 4.0f, Color.blue));
assertFalse(r1.equals(r2));
- r2.setArtifactPaint(new GradientPaint(1.0f, 2.0f, Color.yellow,
+ r2.setArtifactPaint(new GradientPaint(1.0f, 2.0f, Color.yellow,
3.0f, 4.0f, Color.blue));
assertEquals(r1, r2);
-
+
r1.setFillBox(!r1.getFillBox());
assertFalse(r1.equals(r2));
r2.setFillBox(!r2.getFillBox());
assertEquals(r1, r2);
-
+
r1.setItemMargin(0.11);
assertFalse(r1.equals(r2));
r2.setItemMargin(0.11);
assertEquals(r1, r2);
-
+
r1.setMaximumBarWidth(0.99);
assertFalse(r1.equals(r2));
r2.setMaximumBarWidth(0.99);
@@ -131,7 +133,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() {
BoxAndWhiskerRenderer r1 = new BoxAndWhiskerRenderer();
@@ -141,7 +143,7 @@
int h2 = r2.hashCode();
assertEquals(h1, h2);
}
-
+
/**
* Confirm that cloning works.
*/
@@ -160,6 +162,14 @@
}
/**
+ * Check that this class implements PublicCloneable.
+ */
+ public void testPublicCloneable() {
+ BoxAndWhiskerRenderer r1 = new BoxAndWhiskerRenderer();
+ assertTrue(r1 instanceof PublicCloneable);
+ }
+
+ /**
* Serialize an instance, restore it, and check for equality.
*/
public void testSerialization() {
@@ -184,25 +194,25 @@
assertEquals(r1, r2);
}
-
+
/**
- * Draws the chart with a <code>null</code> info object to make sure that
+ * Draws the chart with a <code>null</code> info object to make sure that
* no exceptions are thrown (particularly by code in the renderer).
*/
public void testDrawWithNullInfo() {
boolean success = false;
try {
- DefaultBoxAndWhiskerCategoryDataset dataset
+ DefaultBoxAndWhiskerCategoryDataset dataset
= new DefaultBoxAndWhiskerCategoryDataset();
dataset.add(new BoxAndWhiskerItem(new Double(1.0), new Double(2.0),
- new Double(0.0), new Double(4.0), new Double(0.5),
- new Double(4.5), new Double(-0.5), new Double(5.5),
+ new Double(0.0), new Double(4.0), new Double(0.5),
+ new Double(4.5), new Double(-0.5), new Double(5.5),
null), "S1", "C1");
- CategoryPlot plot = new CategoryPlot(dataset,
- new CategoryAxis("Category"), new NumberAxis("Value"),
+ CategoryPlot plot = new CategoryPlot(dataset,
+ new CategoryAxis("Category"), new NumberAxis("Value"),
new BoxAndWhiskerRenderer());
JFreeChart chart = new JFreeChart(plot);
- /* BufferedImage image = */ chart.createBufferedImage(300, 200,
+ /* BufferedImage image = */ chart.createBufferedImage(300, 200,
null);
success = true;
}
@@ -211,14 +221,14 @@
}
assertTrue(success);
}
-
+
/**
* A check for bug 1572478 (for the vertical orientation).
*/
public void testBug1572478Vertical() {
- DefaultBoxAndWhiskerCategoryDataset dataset
+ DefaultBoxAndWhiskerCategoryDataset dataset
= new DefaultBoxAndWhiskerCategoryDataset() {
-
+
public Number getQ1Value(int row, int column) {
return null;
}
@@ -238,10 +248,10 @@
boolean success = false;
try {
- BufferedImage image = new BufferedImage(200 , 100,
+ BufferedImage image = new BufferedImage(200 , 100,
BufferedImage.TYPE_INT_RGB);
Graphics2D g2 = image.createGraphics();
- chart.draw(g2, new Rectangle2D.Double(0, 0, 200, 100), null,
+ chart.draw(g2, new Rectangle2D.Double(0, 0, 200, 100), null,
new ChartRenderingInfo());
g2.dispose();
success = true;
@@ -258,9 +268,9 @@
* A check for bug 1572478 (for the horizontal orientation).
*/
public void testBug1572478Horizontal() {
- DefaultBoxAndWhiskerCategoryDataset dataset
+ DefaultBoxAndWhiskerCategoryDataset dataset
= new DefaultBoxAndWhiskerCategoryDataset() {
-
+
public Number getQ1Value(int row, int column) {
return null;
}
@@ -281,10 +291,10 @@
boolean success = false;
try {
- BufferedImage image = new BufferedImage(200 , 100,
+ BufferedImage image = new BufferedImage(200 , 100,
BufferedImage.TYPE_INT_RGB);
Graphics2D g2 = image.createGraphics();
- chart.draw(g2, new Rectangle2D.Double(0, 0, 200, 100), null,
+ chart.draw(g2, new Rectangle2D.Double(0, 0, 200, 100), null,
new ChartRenderingInfo());
g2.dispose();
success = true;
@@ -296,12 +306,12 @@
assertTrue(success);
}
-
+
/**
* Some checks for the getLegendItem() method.
*/
public void testGetLegendItem() {
- DefaultBoxAndWhiskerCategoryDataset dataset
+ DefaultBoxAndWhiskerCategoryDataset dataset
= new DefaultBoxAndWhiskerCategoryDataset();
List values = new ArrayList();
values.add(new Double(1.10));
@@ -319,7 +329,7 @@
li = r.getLegendItem(0, 0);
assertNull(li);
}
-
+
/**
* A check for the datasetIndex and seriesIndex fields in the LegendItem
* returned by the getLegendItem() method.
@@ -327,11 +337,11 @@
public void testGetLegendItemSeriesIndex() {
DefaultCategoryDataset dataset0 = new DefaultCategoryDataset();
dataset0.addValue(21.0, "R1", "C1");
- dataset0.addValue(22.0, "R2", "C1");
+ dataset0.addValue(22.0, "R2", "C1");
DefaultCategoryDataset dataset1 = new DefaultCategoryDataset();
dataset1.addValue(23.0, "R3", "C1");
- dataset1.addValue(24.0, "R4", "C1");
- dataset1.addValue(25.0, "R5", "C1");
+ dataset1.addValue(24.0, "R4", "C1");
+ dataset1.addValue(25.0, "R5", "C1");
BoxAndWhiskerRenderer r = new BoxAndWhiskerRenderer();
CategoryPlot plot = new CategoryPlot(dataset0, new CategoryAxis("x"),
new NumberAxis("y"), r);
@@ -342,25 +352,25 @@
assertEquals(1, li.getDatasetIndex());
assertEquals(2, li.getSeriesIndex());
}
-
+
/**
* Draws a chart where the dataset contains a null mean value.
*/
public void testDrawWithNullMean() {
boolean success = false;
try {
- DefaultBoxAndWhiskerCategoryDataset dataset
+ DefaultBoxAndWhiskerCategoryDataset dataset
= new DefaultBoxAndWhiskerCategoryDataset();
dataset.add(new BoxAndWhiskerItem(null, new Double(2.0),
- new Double(0.0), new Double(4.0), new Double(0.5),
- new Double(4.5), new Double(-0.5), new Double(5.5),
+ new Double(0.0), new Double(4.0), new Double(0.5),
+ new Double(4.5), new Double(-0.5), new Double(5.5),
null), "S1", "C1");
- CategoryPlot plot = new CategoryPlot(dataset,
- new CategoryAxis("Category"), new NumberAxis("Value"),
+ CategoryPlot plot = new CategoryPlot(dataset,
+ new CategoryAxis("Category"), new NumberAxis("Value"),
new BoxAndWhiskerRenderer());
ChartRenderingInfo info = new ChartRenderingInfo();
JFreeChart chart = new JFreeChart(plot);
- /* BufferedImage image = */ chart.createBufferedImage(300, 200,
+ /* BufferedImage image = */ chart.createBufferedImage(300, 200,
info);
success = true;
}
@@ -376,18 +386,18 @@
public void testDrawWithNullMedian() {
boolean success = false;
try {
- DefaultBoxAndWhiskerCategoryDataset dataset
+ DefaultBoxAndWhiskerCategoryDataset dataset
= new DefaultBoxAndWhiskerCategoryDataset();
dataset.add(new BoxAndWhiskerItem(new Double(1.0), null,
- new Double(0.0), new Double(4.0), new Double(0.5),
- new Double(4.5), new Double(-0.5), new Double(5.5),
+ new Double(0.0), new Double(4.0), new Double(0.5),
+ new Double(4.5), new Double(-0.5), new Double(5.5),
null), "S1", "C1");
- CategoryPlot plot = new CategoryPlot(dataset,
- new CategoryAxis("Category"), new NumberAxis("Value"),
+ CategoryPlot plot = new CategoryPlot(dataset,
+ new CategoryAxis("Category"), new NumberAxis("Value"),
new BoxAndWhiskerRenderer());
ChartRenderingInfo info = new ChartRenderingInfo();
JFreeChart chart = new JFreeChart(plot);
- /* BufferedImage image = */ chart.createBufferedImage(300, 200,
+ /* BufferedImage image = */ chart.createBufferedImage(300, 200,
info);
success = true;
}
@@ -403,18 +413,18 @@
public void testDrawWithNullQ1() {
boolean success = false;
try {
- DefaultBoxAndWhiskerCategoryDataset dataset
+ DefaultBoxAndWhiskerCategoryDataset dataset
= new DefaultBoxAndWhiskerCategoryDataset();
dataset.add(new BoxAndWhiskerItem(new Double(1.0), new Double(2.0),
- null, new Double(4.0), new Double(0.5),
- new Double(4.5), new Double(-0.5), new Double(5.5),
+ null, new Double(4.0), new Double(0.5),
+ new Double(4.5), new Double(-0.5), new Double(5.5),
null), "S1", "C1");
- CategoryPlot plot = new CategoryPlot(dataset,
- new CategoryAxis("Category"), new NumberAxis("Value"),
+ CategoryPlot plot = new CategoryPlot(dataset,
+ new CategoryAxis("Category"), new NumberAxis("Value"),
new BoxAndWhiskerRenderer());
ChartRenderingInfo info = new ChartRenderingInfo();
JFreeChart chart = new JFreeChart(plot);
- /* BufferedImage image = */ chart.createBufferedImage(300, 200,
+ /* BufferedImage image = */ chart.createBufferedImage(300, 200,
info);
success = true;
}
@@ -430,18 +440,18 @@
public void testDrawWithNullQ3() {
boolean success = false;
try {
- DefaultBoxAndWhiskerCategoryDataset dataset
+ DefaultBoxAndWhiskerCategoryDataset dataset
= new DefaultBoxAndWhiskerCategoryDataset();
dataset.add(new BoxAndWhiskerItem(new Double(1.0), new Double(2.0),
- new Double(3.0), null, new Double(0.5),
- new Double(4.5), new Double(-0.5), new Double(5.5),
+ new Double(3.0), null, new Double(0.5),
+ new Double(4.5), new Double(-0.5), new Double(5.5),
null), "S1", "C1");
- CategoryPlot plot = new CategoryPlot(dataset,
- new CategoryAxis("Category"), new NumberAxis("Value"),
+ CategoryPlot plot = new CategoryPlot(dataset,
+ new CategoryAxis("Category"), new NumberAxis("Value"),
new BoxAndWhiskerRenderer());
ChartRenderingInfo info = new ChartRenderingInfo();
JFreeChart chart = new JFreeChart(plot);
- /* BufferedImage image = */ chart.createBufferedImage(300, 200,
+ /* BufferedImage image = */ chart.createBufferedImage(300, 200,
info);
success = true;
}
@@ -457,18 +467,18 @@
public void testDrawWithNullMinRegular() {
boolean success = false;
try {
- DefaultBoxAndWhiskerCategoryDataset dataset
+ DefaultBoxAndWhiskerCategoryDataset dataset
= new DefaultBoxAndWhiskerCategoryDataset();
dataset.add(new BoxAndWhiskerItem(new Double(1.0), new Double(2.0),
- new Double(3.0), new Double(4.0), null,
- new Double(4.5), new Double(-0.5), new Double(5.5),
+ new Double(3.0), new Double(4.0), null,
+ new Double(4.5), new Double(-0.5), new Double(5.5),
null), "S1", "C1");
- CategoryPlot plot = new CategoryPlot(dataset,
- new CategoryAxis("Category"), new NumberAxis("Value"),
+ CategoryPlot plot = new CategoryPlot(dataset,
+ new CategoryAxis("Category"), new NumberAxis("Value"),
new BoxAndWhiskerRenderer());
ChartRenderingInfo info = new ChartRenderingInfo();
JFreeChart chart = new JFreeChart(plot);
- /* BufferedImage image = */ chart.createBufferedImage(300, 200,
+ /* BufferedImage image = */ chart.createBufferedImage(300, 200,
info);
success = true;
}
@@ -484,18 +494,18 @@
public void testDrawWithNullMaxRegular() {
boolean success = false;
try {
- DefaultBoxAndWhiskerCategoryDataset dataset
+ DefaultBoxAndWhiskerCategoryDataset dataset
= new DefaultBoxAndWhiskerCategoryDataset();
dataset.add(new BoxAndWhiskerItem(new Double(1.0), new Double(2.0),
- new Double(3.0), new Double(4.0), new Double(0.5),
- null, new Double(-0.5), new Double(5.5),
+ new Double(3.0), new Double(4.0), new Double(0.5),
+ null, new Double(-0.5), new Double(5.5),
null), "S1", "C1");
- CategoryPlot plot = new CategoryPlot(dataset,
- new CategoryAxis("Category"), new NumberAxis("Value"),
+ CategoryPlot plot = new CategoryPlot(dataset,
+ new CategoryAxis("Category"), new NumberAxis("Value"),
new BoxAndWhiskerRenderer());
ChartRenderingInfo info = new ChartRenderingInfo();
JFreeChart chart = new JFreeChart(plot);
- /* BufferedImage image = */ chart.createBufferedImage(300, 200,
+ /* BufferedImage image = */ chart.createBufferedImage(300, 200,
info);
success = true;
}
@@ -511,18 +521,18 @@
public void testDrawWithNullMinOutlier() {
boolean success = false;
try {
- DefaultBoxAndWhiskerCategoryDataset dataset
+ DefaultBoxAndWhiskerCategoryDataset dataset
= new DefaultBoxAndWhiskerCategoryDataset();
dataset.add(new BoxAndWhiskerItem(new Double(1.0), new Double(2.0),
- new Double(3.0), new Double(4.0), new Double(0.5),
- new Double(4.5), null, new Double(5.5),
+ new Double(3.0), new Double(4.0), new Double(0.5),
+ new Double(4.5), null, new Double(5.5),
null), "S1", "C1");
- CategoryPlot plot = new CategoryPlot(dataset,
- new CategoryAxis("Category"), new NumberAxis("Value"),
+ CategoryPlot plot = new CategoryPlot(dataset,
+ new CategoryAxis("Category"), new NumberAxis("Value"),
new BoxAndWhiskerRenderer());
ChartRenderingInfo info = new ChartRenderingInfo();
JFreeChart chart = new JFreeChart(plot);
- /* BufferedImage image = */ chart.createBufferedImage(300, 200,
+ /* BufferedImage image = */ chart.createBufferedImage(300, 200,
info);
success = true;
}
@@ -538,18 +548,18 @@
public void testDrawWithNullMaxOutlier() {
boolean success = false;
try {
- DefaultBoxAndWhiskerCategoryDataset dataset
+ DefaultBoxAndWhiskerCategoryDataset dataset
= new DefaultBoxAndWhiskerCategoryDataset();
dataset.add(new BoxAndWhiskerItem(new Double(1.0), new Double(2.0),
- new Double(3.0), new Double(4.0), new Double(0.5),
- new Double(4.5), new Double(-0.5), null,
+ new Double(3.0), new Double(4.0), new Double(0.5),
+ new Double(4.5), new Double(-0.5), null,
new java.util.ArrayList()), "S1", "C1");
- CategoryPlot plot = new CategoryPlot(dataset,
- new CategoryAxis("Category"), new NumberAxis("Value"),
+ CategoryPlot plot = new CategoryPlot(dataset,
+ new CategoryAxis("Category"), new NumberAxis("Value"),
new BoxAndWhiskerRenderer());
ChartRenderingInfo info = new ChartRenderingInfo();
JFreeChart chart = new JFreeChart(plot);
- /* BufferedImage image = */ chart.createBufferedImage(300, 200,
+ /* BufferedImage image = */ chart.createBufferedImage(300, 200,
info);
success = true;
}
@@ -558,5 +568,5 @@
}
assertTrue(success);
}
-
+
}
Modified: branches/jfreechart-1.0.x-branch/tests/org/jfree/chart/renderer/category/junit/CategoryStepRendererTests.java
===================================================================
--- branches/jfreechart-1.0.x-branch/tests/org/jfree/chart/renderer/category/junit/CategoryStepRendererTests.java 2008-04-23 08:51:11 UTC (rev 864)
+++ branches/jfreechart-1.0.x-branch/tests/org/jfree/chart/renderer/category/junit/CategoryStepRendererTests.java 2008-04-23 09:04:21 UTC (rev 865)
@@ -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.]
*
* ------------------------------
* CategoryStepRendererTests.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): -;
@@ -37,6 +37,7 @@
* 08-Mar-2005 : Version 1 (DG);
* 22-Feb-2007 : Minor updates (DG);
* 17-May-2007 : Added testGetLegendItemSeriesIndex() (DG);
+ * 23-Apr-2008 : Added testPublicCloneable (DG);
*
*/
@@ -60,6 +61,7 @@
import org.jfree.chart.plot.CategoryPlot;
import org.jfree.chart.renderer.category.CategoryStepRenderer;
import org.jfree.data.category.DefaultCategoryDataset;
+import org.jfree.util.PublicCloneable;
/**
* Tests for the {@link CategoryStepRenderer} class.
@@ -91,13 +93,13 @@
CategoryStepRenderer r1 = new CategoryStepRenderer(false);
CategoryStepRenderer r2 = new CategoryStepRenderer(false);
assertEquals(r1, r2);
-
+
r1 = new CategoryStepRenderer(true);
assertFalse(r1.equals(r2));
r2 = new CategoryStepRenderer(true);
assertTrue(r1.equals(r2));
}
-
+
/**
* Confirm that cloning works.
*/
@@ -116,6 +118,14 @@
}
/**
+ * Check that this class implements PublicCloneable.
+ */
+ public void testPublicCloneable() {
+ CategoryStepRenderer r1 = new CategoryStepRenderer(false);
+ assertTrue(r1 instanceof PublicCloneable);
+ }
+
+ /**
* Serialize an instance, restore it, and check for equality.
*/
public void testSerialization() {
@@ -140,7 +150,7 @@
assertEquals(r1, r2);
}
-
+
/**
* A check for the datasetIndex and seriesIndex fields in the LegendItem
* returned by the getLegendItem() method.
@@ -148,11 +158,11 @@
public void testGetLegendItemSeriesIndex() {
DefaultCategoryDataset dataset0 = new DefaultCategoryDataset();
dataset0.addValue(21.0, "R1", "C1");
- dataset0.addValue(22.0, "R2", "C1");
+ dataset0.addValue(22.0, "R2", "C1");
DefaultCategoryDataset dataset1 = new DefaultCategoryDataset();
dataset1.addValue(23.0, "R3", "C1");
- dataset1.addValue(24.0, "R4", "C1");
- dataset1.addValue(25.0, "R5", "C1");
+ dataset1.addValue(24.0, "R4", "C1");
+ dataset1.addValue(25.0, "R5", "C1");
CategoryStepRenderer r = new CategoryStepRenderer();
CategoryPlot plot = new CategoryPlot(dataset0, new CategoryAxis("x"),
new NumberAxis("y"), r);
@@ -163,5 +173,5 @@
assertEquals(1, li.getDatasetIndex());
assertEquals(2, li.getSeriesIndex());
}
-
+
}
Modified: branches/jfreechart-1.0.x-branch/tests/org/jfree/chart/renderer/category/junit/DefaultCategoryItemRendererTests.java
===================================================================
--- branches/jfreechart-1.0.x-branch/tests/org/jfree/chart/renderer/category/junit/DefaultCategoryItemRendererTests.java 2008-04-23 08:51:11 UTC (rev 864)
+++ branches/jfreechart-1.0.x-branch/tests/org/jfree/chart/renderer/category/junit/DefaultCategoryItemRendererTests.java 2008-04-23 09:04:21 UTC (rev 865)
@@ -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.]
*
* -------------------------------------
* DefaultCategoryItemRendererTests.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,6 +36,7 @@
* -------
* 29-Apr-2003 : Version 1 (DG);
* 22-Oct-2003 : Added hashCode test (DG);
+ * 23-Apr-2008 : Added testPublicCloneable() (DG);
*
*/
@@ -53,6 +54,7 @@
import junit.framework.TestSuite;
import org.jfree.chart.renderer.category.DefaultCategoryItemRenderer;
+import org.jfree.util.PublicCloneable;
/**
* Tests for the {@link DefaultCategoryItemRenderer} class.
@@ -87,7 +89,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() {
DefaultCategoryItemRenderer r1 = new DefaultCategoryItemRenderer();
@@ -97,7 +99,7 @@
int h2 = r2.hashCode();
assertEquals(h1, h2);
}
-
+
/**
* Confirm that cloning works.
*/
@@ -114,8 +116,16 @@
assertTrue(r1.getClass() == r2.getClass());
assertTrue(r1.equals(r2));
}
-
+
/**
+ * Check that this class implements PublicCloneable.
+ */
+ public void testPublicCloneable() {
+ DefaultCategoryItemRenderer r1 = new DefaultCategoryItemRenderer();
+ assertTrue(r1 instanceof PublicCloneable);
+ }
+
+ /**
* Serialize an instance, restore it, and check for equality.
*/
public void testSerialization() {
Modified: branches/jfreechart-1.0.x-branch/tests/org/jfree/chart/renderer/category/junit/GanttRendererTests.java
===================================================================
--- branches/jfreechart-1.0.x-branch/tests/org/jfree/chart/renderer/category/junit/GanttRendererTests.java 2008-04-23 08:51:11 UTC (rev 864)
+++ branches/jfreechart-1.0.x-branch/tests/org/jfree/chart/renderer/category/junit/GanttRendererTests.java 2008-04-23 09:04:21 UTC (rev 865)
@@ -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.]
*
* -----------------------
* GanttRendererTests.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,6 +36,7 @@
* -------
* 22-Oct-2003 : Version 1 (DG);
* 20-Mar-2007 : Extended testEquals() (DG);
+ * 23-Apr-2008 : Added testPublicCloneable() (DG);
*
*/
@@ -55,6 +56,7 @@
import junit.framework.TestSuite;
import org.jfree.chart.renderer.category.GanttRenderer;
+import org.jfree.util.PublicCloneable;
/**
* Tests for the {@link GanttRenderer} class.
@@ -86,12 +88,12 @@
GanttRenderer r1 = new GanttRenderer();
GanttRenderer r2 = new GanttRenderer();
assertEquals(r1, r2);
-
+
r1.setCompletePaint(Color.yellow);
assertFalse(r1.equals(r2));
r2.setCompletePaint(Color.yellow);
assertTrue(r1.equals(r2));
-
+
r1.setIncompletePaint(Color.green);
assertFalse(r1.equals(r2));
r2.setIncompletePaint(Color.green);
@@ -109,7 +111,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() {
GanttRenderer r1 = new GanttRenderer();
@@ -119,7 +121,7 @@
int h2 = r2.hashCode();
assertEquals(h1, h2);
}
-
+
/**
* Confirm that cloning works.
*/
@@ -136,16 +138,24 @@
assertTrue(r1.getClass() == r2.getClass());
assertTrue(r1.equals(r2));
}
-
+
/**
+ * Check that this class implements PublicCloneable.
+ */
+ public void testPublicCloneable() {
+ GanttRenderer r1 = new GanttRenderer();
+ assertTrue(r1 instanceof PublicCloneable);
+ }
+
+ /**
* Serialize an instance, restore it, and check for equality.
*/
public void testSerialization() {
GanttRenderer r1 = new GanttRenderer();
- r1.setCompletePaint(new GradientPaint(1.0f, 2.0f, Color.red, 3.0f,
+ r1.setCompletePaint(new GradientPaint(1.0f, 2.0f, Color.red, 3.0f,
4.0f, Color.blue));
- r1.setIncompletePaint(new GradientPaint(4.0f, 3.0f, Color.red, 2.0f,
+ r1.setIncompletePaint(new GradientPaint(4.0f, 3.0f, Color.red, 2.0f,
1.0f, Color.blue));
GanttRenderer r2 = null;
Modified: branches/jfreechart-1.0.x-branch/tests/org/jfree/chart/renderer/category/junit/GroupedStackedBarRendererTests.java
===================================================================
--- branches/jfreechart-1.0.x-branch/tests/org/jfree/chart/renderer/category/junit/GroupedStackedBarRendererTests.java 2008-04-23 08:51:11 UTC (rev 864)
+++ branches/jfreechart-1.0.x-branch/tests/org/jfree/chart/renderer/category/junit/GroupedStackedBarRendererTests.java 2008-04-23 09:04:21 UTC (rev 865)
@@ -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.]
*
* -----------------------------------
* GroupedStackedBarRendererTests.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): -;
@@ -35,7 +35,8 @@
* Changes
* -------
* 08-Jul-2004 : Version 1 (DG);
- *
+ * 23-Apr-2008 : Added testPublicCloneable() (DG);
+ *
*/
package org.jfree.chart.renderer.category.junit;
@@ -58,6 +59,7 @@
import org.jfree.chart.renderer.category.GroupedStackedBarRenderer;
import org.jfree.data.KeyToGroupMap;
import org.jfree.data.category.DefaultCategoryDataset;
+import org.jfree.util.PublicCloneable;
/**
* Tests for the {@link GroupedStackedBarRenderer} class.
@@ -90,7 +92,7 @@
GroupedStackedBarRenderer r2 = new GroupedStackedBarRenderer();
assertTrue(r1.equals(r2));
assertTrue(r2.equals(r1));
-
+
// map
KeyToGroupMap m1 = new KeyToGroupMap("G1");
m1.mapKeyToGroup("S1", "G2");
@@ -101,7 +103,7 @@
r2.setSeriesToGroupMap(m2);
assertTrue(r1.equals(r2));
}
-
+
/**
* Confirm that cloning works.
*/
@@ -120,6 +122,14 @@
}
/**
+ * Check that this class implements PublicCloneable.
+ */
+ public void testPublicCloneable() {
+ GroupedStackedBarRenderer r1 = new GroupedStackedBarRenderer();
+ assertTrue(r1 instanceof PublicCloneable);
+ }
+
+ /**
* Serialize an instance, restore it, and check for equality.
*/
public void testSerialization() {
@@ -143,9 +153,9 @@
assertEquals(r1, r2);
}
-
+
/**
- * Draws the chart with a <code>null</code> info object to make sure that
+ * Draws the chart with a <code>null</code> info object to make sure that
* no exceptions are thrown (particularly by code in the renderer).
*/
public void testDrawWithNullInfo() {
@@ -156,13 +166,13 @@
dataset.addValue(2.0, "S1", "C2");
dataset.addValue(3.0, "S2", "C1");
dataset.addValue(4.0, "S2", "C2");
- GroupedStackedBarRenderer renderer
+ GroupedStackedBarRenderer renderer
= new GroupedStackedBarRenderer();
- CategoryPlot plot = new CategoryPlot(dataset,
- new CategoryAxis("Category"), new NumberAxis("Value"),
+ CategoryPlot plot = new CategoryPlot(dataset,
+ new CategoryAxis("Category"), new NumberAxis("Value"),
renderer);
JFreeChart chart = new JFreeChart(plot);
- /* BufferedImage image = */ chart.createBufferedImage(300, 200,
+ /* BufferedImage image = */ chart.createBufferedImage(300, 200,
null);
success = true;
}
Modified: branches/jfreechart-1.0.x-branch/tests/org/jfree/chart/renderer/category/junit/IntervalBarRendererTests.java
===================================================================
--- branches/jfreechart-1.0.x-branch/tests/org/jfree/chart/renderer/category/junit/IntervalBarRendererTests.java 2008-04-23 08:51:11 UTC (rev 864)
+++ branches/jfreechart-1.0.x-branch/tests/org/jfree/chart/renderer/category/junit/IntervalBarRendererTests.java 2008-04-23 09:04:21 UTC (rev 865)
@@ -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 PART...
[truncated message content] |