Menu
▾
▴
[Jfreechart-commit] SF.net SVN: jfreechart:[2828] branches/jfreechart-1.0.x-branch/tests/org/ jfree/chart
|
From: <mu...@us...> - 2013-08-04 05:18:14
|
Revision: 2828
http://sourceforge.net/p/jfreechart/code/2828
Author: mungady
Date: 2013-08-04 05:18:11 +0000 (Sun, 04 Aug 2013)
Log Message:
-----------
Update tests to JUnit 4.
Modified Paths:
--------------
branches/jfreechart-1.0.x-branch/tests/org/jfree/chart/AreaChartTest.java
branches/jfreechart-1.0.x-branch/tests/org/jfree/chart/BarChart3DTest.java
branches/jfreechart-1.0.x-branch/tests/org/jfree/chart/BarChartTest.java
branches/jfreechart-1.0.x-branch/tests/org/jfree/chart/ChartPackageTests.java
branches/jfreechart-1.0.x-branch/tests/org/jfree/chart/ChartPanelTest.java
branches/jfreechart-1.0.x-branch/tests/org/jfree/chart/ChartRenderingInfoTest.java
branches/jfreechart-1.0.x-branch/tests/org/jfree/chart/GanttChartTest.java
branches/jfreechart-1.0.x-branch/tests/org/jfree/chart/HashUtilitiesTest.java
branches/jfreechart-1.0.x-branch/tests/org/jfree/chart/JFreeChartTest.java
branches/jfreechart-1.0.x-branch/tests/org/jfree/chart/LegendItemCollectionTest.java
branches/jfreechart-1.0.x-branch/tests/org/jfree/chart/LegendItemTest.java
Modified: branches/jfreechart-1.0.x-branch/tests/org/jfree/chart/AreaChartTest.java
===================================================================
--- branches/jfreechart-1.0.x-branch/tests/org/jfree/chart/AreaChartTest.java 2013-08-04 05:17:20 UTC (rev 2827)
+++ branches/jfreechart-1.0.x-branch/tests/org/jfree/chart/AreaChartTest.java 2013-08-04 05:18:11 UTC (rev 2828)
@@ -42,6 +42,7 @@
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertTrue;
+import static org.junit.Assert.assertSame;
import static org.junit.Assert.fail;
import java.awt.Graphics2D;
@@ -92,7 +93,7 @@
= new StandardCategoryToolTipGenerator();
renderer.setSeriesToolTipGenerator(0, tt);
CategoryToolTipGenerator tt2 = renderer.getToolTipGenerator(0, 0);
- assertTrue(tt2 == tt);
+ assertSame(tt2, tt);
}
/**
@@ -107,7 +108,7 @@
= new StandardCategoryURLGenerator();
renderer.setSeriesItemURLGenerator(0, url1);
CategoryURLGenerator url2 = renderer.getItemURLGenerator(0, 0);
- assertTrue(url2 == url1);
+ assertSame(url2, url1);
}
/**
@@ -178,7 +179,7 @@
static class LocalListener implements ChartChangeListener {
/** A flag. */
- private boolean flag = false;
+ private boolean flag;
/**
* Event handler.
Modified: branches/jfreechart-1.0.x-branch/tests/org/jfree/chart/BarChart3DTest.java
===================================================================
--- branches/jfreechart-1.0.x-branch/tests/org/jfree/chart/BarChart3DTest.java 2013-08-04 05:17:20 UTC (rev 2827)
+++ branches/jfreechart-1.0.x-branch/tests/org/jfree/chart/BarChart3DTest.java 2013-08-04 05:18:11 UTC (rev 2828)
@@ -24,9 +24,9 @@
* [Oracle and Java are registered trademarks of Oracle and/or its affiliates.
* Other names may be trademarks of their respective owners.]
*
- * --------------------
- * BarChart3DTests.java
- * --------------------
+ * -------------------
+ * BarChart3DTest.java
+ * -------------------
* (C) Copyright 2002-2013, by Object Refinery Limited.
*
* Original Author: David Gilbert (for Object Refinery Limited);
@@ -44,6 +44,7 @@
package org.jfree.chart;
import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertSame;
import static org.junit.Assert.assertTrue;
import static org.junit.Assert.fail;
@@ -143,7 +144,7 @@
= new StandardCategoryToolTipGenerator();
renderer.setSeriesToolTipGenerator(0, tt);
CategoryToolTipGenerator tt2 = renderer.getToolTipGenerator(0, 0);
- assertTrue(tt2 == tt);
+ assertSame(tt2, tt);
}
/**
@@ -158,16 +159,15 @@
= new StandardCategoryURLGenerator();
renderer.setSeriesItemURLGenerator(0, url1);
CategoryURLGenerator url2 = renderer.getItemURLGenerator(0, 0);
- assertTrue(url2 == url1);
+ assertSame(url2, url1);
}
/**
- * Create a horizontal bar chart with sample data in the range -3 to +3.
+ * Create a bar chart with sample data in the range -3 to +3.
*
* @return The chart.
*/
private static JFreeChart createBarChart3D() {
-
Number[][] data = new Integer[][]
{{new Integer(-3), new Integer(-2)},
{new Integer(-1), new Integer(1)},
@@ -175,7 +175,6 @@
CategoryDataset dataset = DatasetUtilities.createCategoryDataset("S",
"C", data);
-
return ChartFactory.createBarChart3D("Bar Chart 3D", "Domain", "Range",
dataset, PlotOrientation.HORIZONTAL, true, true, true);
@@ -188,7 +187,7 @@
static class LocalListener implements ChartChangeListener {
/** A flag. */
- private boolean flag = false;
+ private boolean flag;
/**
* Event handler.
Modified: branches/jfreechart-1.0.x-branch/tests/org/jfree/chart/BarChartTest.java
===================================================================
--- branches/jfreechart-1.0.x-branch/tests/org/jfree/chart/BarChartTest.java 2013-08-04 05:17:20 UTC (rev 2827)
+++ branches/jfreechart-1.0.x-branch/tests/org/jfree/chart/BarChartTest.java 2013-08-04 05:18:11 UTC (rev 2828)
@@ -43,16 +43,14 @@
package org.jfree.chart;
+import static org.junit.Assert.fail;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertTrue;
+
import java.awt.Graphics2D;
import java.awt.geom.Rectangle2D;
import java.awt.image.BufferedImage;
-import junit.framework.Test;
-import junit.framework.TestCase;
-import junit.framework.TestSuite;
-
-import org.jfree.chart.ChartFactory;
-import org.jfree.chart.JFreeChart;
import org.jfree.chart.axis.ValueAxis;
import org.jfree.chart.event.ChartChangeEvent;
import org.jfree.chart.event.ChartChangeListener;
@@ -66,37 +64,22 @@
import org.jfree.data.Range;
import org.jfree.data.category.CategoryDataset;
import org.jfree.data.general.DatasetUtilities;
+import org.junit.Before;
+import org.junit.Test;
/**
* Tests for a bar chart.
*/
-public class BarChartTest extends TestCase {
+public class BarChartTest {
/** A chart. */
private JFreeChart chart;
/**
- * Returns the tests as a test suite.
- *
- * @return The test suite.
- */
- public static Test suite() {
- return new TestSuite(BarChartTest.class);
- }
-
- /**
- * Constructs a new set of tests.
- *
- * @param name the name of the tests.
- */
- public BarChartTest(String name) {
- super(name);
- }
-
- /**
* Common test setup.
*/
- protected void setUp() {
+ @Before
+ public void setUp() {
this.chart = createBarChart();
}
@@ -104,10 +87,8 @@
* Draws the chart with a null info object to make sure that no exceptions
* are thrown (a problem that was occurring at one point).
*/
+ @Test
public void testDrawWithNullInfo() {
-
- boolean success = false;
-
try {
BufferedImage image = new BufferedImage(200 , 100,
BufferedImage.TYPE_INT_RGB);
@@ -115,19 +96,16 @@
this.chart.draw(g2, new Rectangle2D.Double(0, 0, 200, 100), null,
null);
g2.dispose();
- success = true;
}
catch (Exception e) {
- success = false;
+ fail("There should be no exception.");
}
-
- assertTrue(success);
-
}
/**
* Replaces the chart's dataset and then checks that the new dataset is OK.
*/
+ @Test
public void testReplaceDataset() {
// create a dataset...
@@ -157,6 +135,7 @@
* Check that setting a tool tip generator for a series does override the
* default generator.
*/
+ @Test
public void testSetSeriesToolTipGenerator() {
CategoryPlot plot = (CategoryPlot) this.chart.getPlot();
CategoryItemRenderer renderer = plot.getRenderer();
@@ -171,6 +150,7 @@
* Check that setting a URL generator for a series does override the
* default generator.
*/
+ @Test
public void testSetSeriesURLGenerator() {
CategoryPlot plot = (CategoryPlot) this.chart.getPlot();
CategoryItemRenderer renderer = plot.getRenderer();
Modified: branches/jfreechart-1.0.x-branch/tests/org/jfree/chart/ChartPackageTests.java
===================================================================
--- branches/jfreechart-1.0.x-branch/tests/org/jfree/chart/ChartPackageTests.java 2013-08-04 05:17:20 UTC (rev 2827)
+++ branches/jfreechart-1.0.x-branch/tests/org/jfree/chart/ChartPackageTests.java 2013-08-04 05:18:11 UTC (rev 2828)
@@ -63,14 +63,6 @@
*/
public static Test suite() {
TestSuite suite = new TestSuite("org.jfree.chart");
- suite.addTestSuite(BarChartTest.class);
- suite.addTestSuite(ChartPanelTest.class);
- suite.addTestSuite(ChartRenderingInfoTest.class);
- suite.addTestSuite(GanttChartTest.class);
- suite.addTestSuite(HashUtilitiesTest.class);
- suite.addTestSuite(JFreeChartTest.class);
- suite.addTestSuite(LegendItemTest.class);
- suite.addTestSuite(LegendItemCollectionTest.class);
suite.addTestSuite(LineChartTest.class);
suite.addTestSuite(LineChart3DTest.class);
suite.addTestSuite(MeterChartTest.class);
Modified: branches/jfreechart-1.0.x-branch/tests/org/jfree/chart/ChartPanelTest.java
===================================================================
--- branches/jfreechart-1.0.x-branch/tests/org/jfree/chart/ChartPanelTest.java 2013-08-04 05:17:20 UTC (rev 2827)
+++ branches/jfreechart-1.0.x-branch/tests/org/jfree/chart/ChartPanelTest.java 2013-08-04 05:18:11 UTC (rev 2828)
@@ -27,7 +27,7 @@
* --------------------
* ChartPanelTests.java
* --------------------
- * (C) Copyright 2004-2009, by Object Refinery Limited and Contributors.
+ * (C) Copyright 2004-2013, by Object Refinery Limited and Contributors.
*
* Original Author: David Gilbert (for Object Refinery Limited);
* Contributor(s): -;
@@ -41,33 +41,27 @@
package org.jfree.chart;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertTrue;
+import static org.junit.Assert.assertFalse;
import java.awt.geom.Rectangle2D;
import java.util.EventListener;
import java.util.List;
import javax.swing.event.CaretListener;
-import junit.framework.Test;
-import junit.framework.TestCase;
-import junit.framework.TestSuite;
-
-import org.jfree.chart.ChartFactory;
-import org.jfree.chart.ChartMouseEvent;
-import org.jfree.chart.ChartMouseListener;
-import org.jfree.chart.ChartPanel;
-import org.jfree.chart.JFreeChart;
import org.jfree.chart.axis.NumberAxis;
import org.jfree.chart.event.ChartChangeEvent;
import org.jfree.chart.event.ChartChangeListener;
import org.jfree.chart.plot.PlotOrientation;
import org.jfree.chart.plot.XYPlot;
import org.jfree.data.xy.DefaultXYDataset;
+import org.junit.Test;
/**
* Tests for the {@link ChartPanel} class.
*/
-public class ChartPanelTest extends TestCase
- implements ChartChangeListener, ChartMouseListener {
+public class ChartPanelTest implements ChartChangeListener, ChartMouseListener {
private List chartChangeEvents = new java.util.ArrayList();
@@ -82,26 +76,9 @@
}
/**
- * Returns the tests as a test suite.
- *
- * @return The test suite.
- */
- public static Test suite() {
- return new TestSuite(ChartPanelTest.class);
- }
-
- /**
- * Constructs a new set of tests.
- *
- * @param name the name of the tests.
- */
- public ChartPanelTest(String name) {
- super(name);
- }
-
- /**
* Test that the constructor will accept a null chart.
*/
+ @Test
public void testConstructor1() {
ChartPanel panel = new ChartPanel(null);
assertEquals(null, panel.getChart());
@@ -110,6 +87,7 @@
/**
* Test that it is possible to set the panel's chart to null.
*/
+ @Test
public void testSetChart() {
JFreeChart chart = new JFreeChart(new XYPlot());
ChartPanel panel = new ChartPanel(chart);
@@ -120,6 +98,7 @@
/**
* Check the behaviour of the getListeners() method.
*/
+ @Test
public void testGetListeners() {
ChartPanel p = new ChartPanel(null);
p.addChartMouseListener(this);
@@ -176,6 +155,7 @@
* Checks that a call to the zoom() method generates just one
* ChartChangeEvent.
*/
+ @Test
public void test2502355_zoom() {
DefaultXYDataset dataset = new DefaultXYDataset();
JFreeChart chart = ChartFactory.createXYLineChart("TestChart", "X",
@@ -191,6 +171,7 @@
* Checks that a call to the zoomInBoth() method generates just one
* ChartChangeEvent.
*/
+ @Test
public void test2502355_zoomInBoth() {
DefaultXYDataset dataset = new DefaultXYDataset();
JFreeChart chart = ChartFactory.createXYLineChart("TestChart", "X",
@@ -206,6 +187,7 @@
* Checks that a call to the zoomOutBoth() method generates just one
* ChartChangeEvent.
*/
+ @Test
public void test2502355_zoomOutBoth() {
DefaultXYDataset dataset = new DefaultXYDataset();
JFreeChart chart = ChartFactory.createXYLineChart("TestChart", "X",
@@ -221,6 +203,7 @@
* Checks that a call to the restoreAutoBounds() method generates just one
* ChartChangeEvent.
*/
+ @Test
public void test2502355_restoreAutoBounds() {
DefaultXYDataset dataset = new DefaultXYDataset();
JFreeChart chart = ChartFactory.createXYLineChart("TestChart", "X",
@@ -236,6 +219,7 @@
* Checks that a call to the zoomInDomain() method, for a plot with more
* than one domain axis, generates just one ChartChangeEvent.
*/
+ @Test
public void test2502355_zoomInDomain() {
DefaultXYDataset dataset = new DefaultXYDataset();
JFreeChart chart = ChartFactory.createXYLineChart("TestChart", "X",
@@ -253,6 +237,7 @@
* Checks that a call to the zoomInRange() method, for a plot with more
* than one range axis, generates just one ChartChangeEvent.
*/
+ @Test
public void test2502355_zoomInRange() {
DefaultXYDataset dataset = new DefaultXYDataset();
JFreeChart chart = ChartFactory.createXYLineChart("TestChart", "X",
@@ -270,6 +255,7 @@
* Checks that a call to the zoomOutDomain() method, for a plot with more
* than one domain axis, generates just one ChartChangeEvent.
*/
+ @Test
public void test2502355_zoomOutDomain() {
DefaultXYDataset dataset = new DefaultXYDataset();
JFreeChart chart = ChartFactory.createXYLineChart("TestChart", "X",
@@ -287,6 +273,7 @@
* Checks that a call to the zoomOutRange() method, for a plot with more
* than one range axis, generates just one ChartChangeEvent.
*/
+ @Test
public void test2502355_zoomOutRange() {
DefaultXYDataset dataset = new DefaultXYDataset();
JFreeChart chart = ChartFactory.createXYLineChart("TestChart", "X",
@@ -304,6 +291,7 @@
* Checks that a call to the restoreAutoDomainBounds() method, for a plot
* with more than one range axis, generates just one ChartChangeEvent.
*/
+ @Test
public void test2502355_restoreAutoDomainBounds() {
DefaultXYDataset dataset = new DefaultXYDataset();
JFreeChart chart = ChartFactory.createXYLineChart("TestChart", "X",
@@ -321,6 +309,7 @@
* Checks that a call to the restoreAutoRangeBounds() method, for a plot
* with more than one range axis, generates just one ChartChangeEvent.
*/
+ @Test
public void test2502355_restoreAutoRangeBounds() {
DefaultXYDataset dataset = new DefaultXYDataset();
JFreeChart chart = ChartFactory.createXYLineChart("TestChart", "X",
@@ -338,6 +327,7 @@
* In version 1.0.13 there is a bug where enabling the mouse wheel handler
* twice would in fact disable it.
*/
+ @Test
public void testSetMouseWheelEnabled() {
DefaultXYDataset dataset = new DefaultXYDataset();
JFreeChart chart = ChartFactory.createXYLineChart("TestChart", "X",
Modified: branches/jfreechart-1.0.x-branch/tests/org/jfree/chart/ChartRenderingInfoTest.java
===================================================================
--- branches/jfreechart-1.0.x-branch/tests/org/jfree/chart/ChartRenderingInfoTest.java 2013-08-04 05:17:20 UTC (rev 2827)
+++ branches/jfreechart-1.0.x-branch/tests/org/jfree/chart/ChartRenderingInfoTest.java 2013-08-04 05:18:11 UTC (rev 2828)
@@ -43,62 +43,40 @@
import java.awt.Rectangle;
import java.awt.geom.Rectangle2D;
-import java.io.ByteArrayInputStream;
-import java.io.ByteArrayOutputStream;
import java.io.IOException;
-import java.io.ObjectInput;
-import java.io.ObjectInputStream;
-import java.io.ObjectOutput;
-import java.io.ObjectOutputStream;
-import junit.framework.Test;
-import junit.framework.TestCase;
-import junit.framework.TestSuite;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertNotSame;
+import static org.junit.Assert.assertSame;
-import org.jfree.chart.ChartRenderingInfo;
import org.jfree.chart.entity.ChartEntity;
import org.jfree.chart.entity.StandardEntityCollection;
+import org.junit.Test;
/**
* Tests for the {@link ChartRenderingInfo} class.
*/
-public class ChartRenderingInfoTest extends TestCase {
+public class ChartRenderingInfoTest {
/**
- * Returns the tests as a test suite.
- *
- * @return The test suite.
- */
- public static Test suite() {
- return new TestSuite(ChartRenderingInfoTest.class);
- }
-
- /**
- * Constructs a new set of tests.
- *
- * @param name the name of the tests.
- */
- public ChartRenderingInfoTest(String name) {
- super(name);
- }
-
- /**
* Confirm that the equals method can distinguish all the required fields.
*/
+ @Test
public void testEquals() {
ChartRenderingInfo i1 = new ChartRenderingInfo();
ChartRenderingInfo i2 = new ChartRenderingInfo();
- assertTrue(i1.equals(i2));
+ assertEquals(i1, i2);
i1.setChartArea(new Rectangle2D.Double(1.0, 2.0, 3.0, 4.0));
assertFalse(i1.equals(i2));
i2.setChartArea(new Rectangle2D.Double(1.0, 2.0, 3.0, 4.0));
- assertTrue(i1.equals(i2));
+ assertEquals(i1, i2);
i1.getPlotInfo().setDataArea(new Rectangle(1, 2, 3, 4));
assertFalse(i1.equals(i2));
i2.getPlotInfo().setDataArea(new Rectangle(1, 2, 3, 4));
- assertTrue(i1.equals(i2));
+ assertEquals(i1, i2);
StandardEntityCollection e1 = new StandardEntityCollection();
e1.add(new ChartEntity(new Rectangle(1, 2, 3, 4)));
@@ -112,62 +90,50 @@
/**
* Confirm that cloning works.
*/
+ @Test
public void testCloning() throws CloneNotSupportedException {
ChartRenderingInfo i1 = new ChartRenderingInfo();
ChartRenderingInfo i2 = (ChartRenderingInfo) i1.clone();
- assertTrue(i1 != i2);
- assertTrue(i1.getClass() == i2.getClass());
- assertTrue(i1.equals(i2));
+ assertNotSame(i1, i2);
+ assertSame(i1.getClass(), i2.getClass());
+ assertEquals(i1, i2);
+
// check independence
i1.getChartArea().setRect(4.0, 3.0, 2.0, 1.0);
assertFalse(i1.equals(i2));
i2.getChartArea().setRect(4.0, 3.0, 2.0, 1.0);
- assertTrue(i1.equals(i2));
+ assertEquals(i1, i2);
i1.getEntityCollection().add(new ChartEntity(new Rectangle(1, 2, 2,
1)));
assertFalse(i1.equals(i2));
i2.getEntityCollection().add(new ChartEntity(new Rectangle(1, 2, 2,
1)));
- assertTrue(i1.equals(i2));
+ assertEquals(i1, i2);
}
/**
* Serialize an instance, restore it, and check for equality.
*/
+ @Test
public void testSerialization() throws IOException, ClassNotFoundException {
ChartRenderingInfo i1 = new ChartRenderingInfo();
i1.setChartArea(new Rectangle2D.Double(1.0, 2.0, 3.0, 4.0));
- ChartRenderingInfo i2;
- ByteArrayOutputStream buffer = new ByteArrayOutputStream();
- ObjectOutput out = new ObjectOutputStream(buffer);
- out.writeObject(i1);
- out.close();
- ObjectInput in = new ObjectInputStream(new ByteArrayInputStream(
- buffer.toByteArray()));
- i2 = (ChartRenderingInfo) in.readObject();
- in.close();
+ ChartRenderingInfo i2 = (ChartRenderingInfo) TestUtilities.serialised(i1);
assertEquals(i1, i2);
}
/**
* Serialize an instance, restore it, and check for equality.
*/
+ @Test
public void testSerialization2() throws IOException, ClassNotFoundException {
ChartRenderingInfo i1 = new ChartRenderingInfo();
i1.getPlotInfo().setDataArea(new Rectangle2D.Double(1.0, 2.0, 3.0,
4.0));
- ChartRenderingInfo i2;
- ByteArrayOutputStream buffer = new ByteArrayOutputStream();
- ObjectOutput out = new ObjectOutputStream(buffer);
- out.writeObject(i1);
- out.close();
- ObjectInput in = new ObjectInputStream(new ByteArrayInputStream(
- buffer.toByteArray()));
- i2 = (ChartRenderingInfo) in.readObject();
- in.close();
+ ChartRenderingInfo i2 = (ChartRenderingInfo) TestUtilities.serialised(i1);
assertEquals(i1, i2);
assertEquals(i2, i2.getPlotInfo().getOwner());
}
Modified: branches/jfreechart-1.0.x-branch/tests/org/jfree/chart/GanttChartTest.java
===================================================================
--- branches/jfreechart-1.0.x-branch/tests/org/jfree/chart/GanttChartTest.java 2013-08-04 05:17:20 UTC (rev 2827)
+++ branches/jfreechart-1.0.x-branch/tests/org/jfree/chart/GanttChartTest.java 2013-08-04 05:18:11 UTC (rev 2828)
@@ -46,12 +46,6 @@
import java.util.Calendar;
import java.util.Date;
-import junit.framework.Test;
-import junit.framework.TestCase;
-import junit.framework.TestSuite;
-
-import org.jfree.chart.ChartFactory;
-import org.jfree.chart.JFreeChart;
import org.jfree.chart.event.ChartChangeEvent;
import org.jfree.chart.event.ChartChangeListener;
import org.jfree.chart.labels.CategoryToolTipGenerator;
@@ -65,37 +59,25 @@
import org.jfree.data.gantt.TaskSeries;
import org.jfree.data.gantt.TaskSeriesCollection;
import org.jfree.data.time.SimpleTimePeriod;
+import org.junit.Before;
+import org.junit.Test;
+import static org.junit.Assert.fail;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertSame;
/**
* Some tests for a Gantt chart.
*/
-public class GanttChartTest extends TestCase {
+public class GanttChartTest {
/** A chart. */
private JFreeChart chart;
/**
- * Returns the tests as a test suite.
- *
- * @return The test suite.
- */
- public static Test suite() {
- return new TestSuite(GanttChartTest.class);
- }
-
- /**
- * Constructs a new set of tests.
- *
- * @param name the name of the tests.
- */
- public GanttChartTest(String name) {
- super(name);
- }
-
- /**
* Common test setup.
*/
- protected void setUp() {
+ @Before
+ public void setUp() {
this.chart = createGanttChart();
}
@@ -103,6 +85,7 @@
* Draws the chart with a <code>null</code> info object to make sure that
* no exceptions are thrown (a problem that was occurring at one point).
*/
+ @Test
public void testDrawWithNullInfo() {
try {
BufferedImage image = new BufferedImage(200 , 100,
@@ -121,24 +104,19 @@
* Draws the chart with a <code>null</code> info object to make sure that
* no exceptions are thrown (a problem that was occurring at one point).
*/
+ @Test
public void testDrawWithNullInfo2() {
- boolean success = false;
- try {
- JFreeChart chart = createGanttChart();
- CategoryPlot plot = (CategoryPlot) chart.getPlot();
- plot.setDataset(createDataset());
- /* BufferedImage img =*/ chart.createBufferedImage(300, 200, null);
- success = true;
- }
- catch (NullPointerException e) {
- success = false;
- }
- assertTrue(success);
+ JFreeChart chart = createGanttChart();
+ CategoryPlot plot = (CategoryPlot) chart.getPlot();
+ plot.setDataset(createDataset());
+ /* BufferedImage img =*/ chart.createBufferedImage(300, 200, null);
+ //FIXME we should really assert a value
}
/**
* Replaces the chart's dataset and then checks that the new dataset is OK.
*/
+ @Test
public void testReplaceDataset() {
LocalListener l = new LocalListener();
this.chart.addChangeListener(l);
@@ -151,6 +129,7 @@
* Check that setting a tool tip generator for a series does override the
* default generator.
*/
+ @Test
public void testSetSeriesToolTipGenerator() {
CategoryPlot plot = (CategoryPlot) this.chart.getPlot();
CategoryItemRenderer renderer = plot.getRenderer();
@@ -158,13 +137,14 @@
= new StandardCategoryToolTipGenerator();
renderer.setSeriesToolTipGenerator(0, tt);
CategoryToolTipGenerator tt2 = renderer.getToolTipGenerator(0, 0);
- assertTrue(tt2 == tt);
+ assertSame(tt2, tt);
}
/**
* Check that setting a URL generator for a series does override the
* default generator.
*/
+ @Test
public void testSetSeriesURLGenerator() {
CategoryPlot plot = (CategoryPlot) this.chart.getPlot();
CategoryItemRenderer renderer = plot.getRenderer();
@@ -172,7 +152,7 @@
= new StandardCategoryURLGenerator();
renderer.setSeriesItemURLGenerator(0, url1);
CategoryURLGenerator url2 = renderer.getItemURLGenerator(0, 0);
- assertTrue(url2 == url1);
+ assertSame(url2, url1);
}
/**
@@ -182,7 +162,6 @@
*/
private static JFreeChart createGanttChart() {
- // create the chart...
return ChartFactory.createGanttChart(
"Gantt Chart",
"Domain", "Range",
@@ -191,7 +170,6 @@
true,
true
);
-
}
/**
@@ -307,7 +285,7 @@
static class LocalListener implements ChartChangeListener {
/** A flag. */
- private boolean flag = false;
+ private boolean flag;
/**
* Event handler.
Modified: branches/jfreechart-1.0.x-branch/tests/org/jfree/chart/HashUtilitiesTest.java
===================================================================
--- branches/jfreechart-1.0.x-branch/tests/org/jfree/chart/HashUtilitiesTest.java 2013-08-04 05:17:20 UTC (rev 2827)
+++ branches/jfreechart-1.0.x-branch/tests/org/jfree/chart/HashUtilitiesTest.java 2013-08-04 05:18:11 UTC (rev 2828)
@@ -40,44 +40,26 @@
package org.jfree.chart;
-import junit.framework.Test;
-import junit.framework.TestCase;
-import junit.framework.TestSuite;
+import org.junit.Test;
-import org.jfree.chart.HashUtilities;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertFalse;
/**
* Tests for the {@link HashUtilities} class.
*/
-public class HashUtilitiesTest extends TestCase {
+public class HashUtilitiesTest {
/**
- * Returns the tests as a test suite.
- *
- * @return The test suite.
- */
- public static Test suite() {
- return new TestSuite(HashUtilitiesTest.class);
- }
-
- /**
- * Constructs a new set of tests.
- *
- * @param name the name of the tests.
- */
- public HashUtilitiesTest(String name) {
- super(name);
- }
-
- /**
* Some sanity checks for the hashCodeForDoubleArray() method.
*/
+ @Test
public void testHashCodeForDoubleArray() {
double[] a1 = new double[] {1.0};
double[] a2 = new double[] {1.0};
int h1 = HashUtilities.hashCodeForDoubleArray(a1);
int h2 = HashUtilities.hashCodeForDoubleArray(a2);
- assertTrue(h1 == h2);
+ assertEquals(h1, h2);
double[] a3 = new double[] {0.5, 1.0};
int h3 = HashUtilities.hashCodeForDoubleArray(a3);
Modified: branches/jfreechart-1.0.x-branch/tests/org/jfree/chart/JFreeChartTest.java
===================================================================
--- branches/jfreechart-1.0.x-branch/tests/org/jfree/chart/JFreeChartTest.java 2013-08-04 05:17:20 UTC (rev 2827)
+++ branches/jfreechart-1.0.x-branch/tests/org/jfree/chart/JFreeChartTest.java 2013-08-04 05:18:11 UTC (rev 2828)
@@ -24,10 +24,10 @@
* [Oracle and Java are registered trademarks of Oracle and/or its affiliates.
* Other names may be trademarks of their respective owners.]
*
- * --------------------
- * JFreeChartTests.java
- * --------------------
- * (C) Copyright 2002-2008, by Object Refinery Limited.
+ * -------------------
+ * JFreeChartTest.java
+ * -------------------
+ * (C) Copyright 2002-2013, by Object Refinery Limited.
*
* Original Author: David Gilbert (for Object Refinery Limited);
* Contributor(s): -;
@@ -50,25 +50,12 @@
import java.awt.Font;
import java.awt.GradientPaint;
import java.awt.RenderingHints;
-import java.io.ByteArrayInputStream;
-import java.io.ByteArrayOutputStream;
import java.io.IOException;
-import java.io.ObjectInput;
-import java.io.ObjectInputStream;
-import java.io.ObjectOutput;
-import java.io.ObjectOutputStream;
import java.util.List;
-import junit.framework.Test;
-import junit.framework.TestCase;
-import junit.framework.TestSuite;
-
-import org.jfree.chart.ChartFactory;
-import org.jfree.chart.JFreeChart;
import org.jfree.chart.event.ChartChangeEvent;
import org.jfree.chart.event.ChartChangeListener;
import org.jfree.chart.plot.PiePlot;
-import org.jfree.chart.plot.PlotOrientation;
import org.jfree.chart.plot.RingPlot;
import org.jfree.chart.title.LegendTitle;
import org.jfree.chart.title.TextTitle;
@@ -82,65 +69,48 @@
import org.jfree.ui.Align;
import org.jfree.ui.RectangleEdge;
import org.jfree.ui.RectangleInsets;
+import org.junit.Before;
+import org.junit.Test;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertTrue;
+import static org.junit.Assert.assertNull;
+import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.assertSame;
+import static org.junit.Assert.fail;
+
/**
* Tests for the {@link JFreeChart} class.
*/
-public class JFreeChartTest extends TestCase implements ChartChangeListener {
+public class JFreeChartTest implements ChartChangeListener {
/** A pie chart. */
private JFreeChart pieChart;
/**
- * Returns the tests as a test suite.
- *
- * @return The test suite.
- */
- public static Test suite() {
- return new TestSuite(JFreeChartTest.class);
- }
-
- /**
- * Constructs a new set of tests.
- *
- * @param name the name of the tests.
- */
- public JFreeChartTest(String name) {
- super(name);
- }
-
- /**
* Common test setup.
*/
- protected void setUp() {
-
- // create a dataset...
+ @Before
+ public void setUp() {
DefaultPieDataset data = new DefaultPieDataset();
data.setValue("Java", new Double(43.2));
data.setValue("Visual Basic", new Double(0.0));
data.setValue("C/C++", new Double(17.5));
-
- // create the chart...
- this.pieChart = ChartFactory.createPieChart(
- "Pie Chart", // chart title
- data, // data
- true, // include legend
- true,
- false
- );
-
+ this.pieChart = ChartFactory.createPieChart("Pie Chart", data);
}
/**
* Check that the equals() method can distinguish all fields.
*/
+ @Test
public void testEquals() {
JFreeChart chart1 = new JFreeChart("Title",
new Font("SansSerif", Font.PLAIN, 12), new PiePlot(), true);
JFreeChart chart2 = new JFreeChart("Title",
new Font("SansSerif", Font.PLAIN, 12), new PiePlot(), true);
- assertTrue(chart1.equals(chart2));
- assertTrue(chart2.equals(chart1));
+ assertEquals(chart1, chart2);
+ assertEquals(chart2, chart1);
// renderingHints
chart1.setRenderingHints(new RenderingHints(
@@ -150,44 +120,44 @@
chart2.setRenderingHints(new RenderingHints(
RenderingHints.KEY_TEXT_ANTIALIASING,
RenderingHints.VALUE_TEXT_ANTIALIAS_ON));
- assertTrue(chart1.equals(chart2));
+ assertEquals(chart1, chart2);
// borderVisible
chart1.setBorderVisible(true);
assertFalse(chart1.equals(chart2));
chart2.setBorderVisible(true);
- assertTrue(chart1.equals(chart2));
+ assertEquals(chart1, chart2);
// borderStroke
BasicStroke s = new BasicStroke(2.0f);
chart1.setBorderStroke(s);
assertFalse(chart1.equals(chart2));
chart2.setBorderStroke(s);
- assertTrue(chart1.equals(chart2));
+ assertEquals(chart1, chart2);
// borderPaint
chart1.setBorderPaint(Color.red);
assertFalse(chart1.equals(chart2));
chart2.setBorderPaint(Color.red);
- assertTrue(chart1.equals(chart2));
+ assertEquals(chart1, chart2);
// padding
chart1.setPadding(new RectangleInsets(1, 2, 3, 4));
assertFalse(chart1.equals(chart2));
chart2.setPadding(new RectangleInsets(1, 2, 3, 4));
- assertTrue(chart1.equals(chart2));
+ assertEquals(chart1, chart2);
// title
chart1.setTitle("XYZ");
assertFalse(chart1.equals(chart2));
chart2.setTitle("XYZ");
- assertTrue(chart1.equals(chart2));
+ assertEquals(chart1, chart2);
// subtitles
chart1.addSubtitle(new TextTitle("Subtitle"));
assertFalse(chart1.equals(chart2));
chart2.addSubtitle(new TextTitle("Subtitle"));
- assertTrue(chart1.equals(chart2));
+ assertEquals(chart1, chart2);
// plot
chart1 = new JFreeChart("Title",
@@ -197,7 +167,7 @@
assertFalse(chart1.equals(chart2));
chart2 = new JFreeChart("Title",
new Font("SansSerif", Font.PLAIN, 12), new RingPlot(), false);
- assertTrue(chart1.equals(chart2));
+ assertEquals(chart1, chart2);
// backgroundPaint
chart1.setBackgroundPaint(new GradientPaint(1.0f, 2.0f, Color.red,
@@ -205,31 +175,32 @@
assertFalse(chart1.equals(chart2));
chart2.setBackgroundPaint(new GradientPaint(1.0f, 2.0f, Color.red,
3.0f, 4.0f, Color.blue));
- assertTrue(chart1.equals(chart2));
+ assertEquals(chart1, chart2);
// backgroundImage
chart1.setBackgroundImage(JFreeChart.INFO.getLogo());
assertFalse(chart1.equals(chart2));
chart2.setBackgroundImage(JFreeChart.INFO.getLogo());
- assertTrue(chart1.equals(chart2));
+ assertEquals(chart1, chart2);
// backgroundImageAlignment
chart1.setBackgroundImageAlignment(Align.BOTTOM_LEFT);
assertFalse(chart1.equals(chart2));
chart2.setBackgroundImageAlignment(Align.BOTTOM_LEFT);
- assertTrue(chart1.equals(chart2));
+ assertEquals(chart1, chart2);
// backgroundImageAlpha
chart1.setBackgroundImageAlpha(0.1f);
assertFalse(chart1.equals(chart2));
chart2.setBackgroundImageAlpha(0.1f);
- assertTrue(chart1.equals(chart2));
+ assertEquals(chart1, chart2);
}
/**
* A test to make sure that the legend is being picked up in the
* equals() testing.
*/
+ @Test
public void testEquals2() {
JFreeChart chart1 = new JFreeChart("Title",
new Font("SansSerif", Font.PLAIN, 12), new PiePlot(), true);
@@ -242,6 +213,7 @@
/**
* Checks the subtitle count - should be 1 (the legend).
*/
+ @Test
public void testSubtitleCount() {
int count = this.pieChart.getSubtitleCount();
assertEquals(1, count);
@@ -250,94 +222,74 @@
/**
* Some checks for the getSubtitle() method.
*/
+ @Test
public void testGetSubtitle() {
DefaultPieDataset dataset = new DefaultPieDataset();
- JFreeChart chart = ChartFactory.createPieChart("title", dataset, true,
- false, false);
+ JFreeChart chart = ChartFactory.createPieChart("title", dataset);
Title t = chart.getSubtitle(0);
assertTrue(t instanceof LegendTitle);
- boolean pass = false;
try {
- t = chart.getSubtitle(-1);
+ chart.getSubtitle(-1);
+ fail("Should have thrown an IllegalArgumentException on negative number");
}
catch (IllegalArgumentException e) {
- pass = true;
+ assertEquals("Index out of range.", e.getMessage());
}
- assertTrue(pass);
- pass = false;
try {
- t = chart.getSubtitle(1);
+ chart.getSubtitle(1);
+ fail("Should have thrown an IllegalArgumentException on excesive number");
}
catch (IllegalArgumentException e) {
- pass = true;
+ assertEquals("Index out of range.", e.getMessage());
}
- assertTrue(pass);
- pass = false;
try {
- t = chart.getSubtitle(2);
+ chart.getSubtitle(2);
+ fail("Should have thrown an IllegalArgumentException on number being out of range");
}
catch (IllegalArgumentException e) {
- pass = true;
+ assertEquals("Index out of range.", e.getMessage());
}
- assertTrue(pass);
+
}
/**
* Serialize a pie chart, restore it, and check for equality.
*/
+ @Test
public void testSerialization1() throws IOException, ClassNotFoundException {
DefaultPieDataset data = new DefaultPieDataset();
data.setValue("Type 1", 54.5);
data.setValue("Type 2", 23.9);
data.setValue("Type 3", 45.8);
- JFreeChart c1 = ChartFactory.createPieChart("Test", data, true, true,
- true);
- JFreeChart c2;
-
- ByteArrayOutputStream buffer = new ByteArrayOutputStream();
- ObjectOutput out = new ObjectOutputStream(buffer);
- out.writeObject(c1);
- out.close();
- ObjectInput in = new ObjectInputStream(new ByteArrayInputStream(
- buffer.toByteArray()));
- c2 = (JFreeChart) in.readObject();
- in.close();
+ JFreeChart c1 = ChartFactory.createPieChart("Test", data);
+ JFreeChart c2 = (JFreeChart) TestUtilities.serialised(c1);
assertEquals(c1, c2);
LegendTitle lt2 = c2.getLegend();
- assertTrue(lt2.getSources()[0] == c2.getPlot());
+ assertSame(lt2.getSources()[0], c2.getPlot());
}
/**
* Serialize a 3D pie chart, restore it, and check for equality.
*/
+ @Test
public void testSerialization2() throws IOException, ClassNotFoundException {
DefaultPieDataset data = new DefaultPieDataset();
data.setValue("Type 1", 54.5);
data.setValue("Type 2", 23.9);
data.setValue("Type 3", 45.8);
-
- JFreeChart c1 = ChartFactory.createPieChart3D("Test", data, true, true,
- true);
- JFreeChart c2;
-
- ByteArrayOutputStream buffer = new ByteArrayOutputStream();
- ObjectOutput out = new ObjectOutputStream(buffer);
- out.writeObject(c1);
- out.close();
- ObjectInput in = new ObjectInputStream(new ByteArrayInputStream(
- buffer.toByteArray()));
- c2 = (JFreeChart) in.readObject();
- in.close();
+ JFreeChart c1 = ChartFactory.createPieChart3D("Test", data);
+ JFreeChart c2 = (JFreeChart) TestUtilities.serialised(c1);
assertEquals(c1, c2);
}
/**
* Serialize a bar chart, restore it, and check for equality.
*/
+ @Test
public void testSerialization3() throws IOException, ClassNotFoundException {
// row keys...
@@ -386,32 +338,16 @@
dataset.addValue(3.0, series3, category8);
// create the chart...
- JFreeChart c1 = ChartFactory.createBarChart(
- "Vertical Bar Chart", // chart title
- "Category", // domain axis label
- "Value", // range axis label
- dataset, // data
- PlotOrientation.VERTICAL, // orientation
- true, // include legend
- true,
- false
- );
-
- JFreeChart c2;
- ByteArrayOutputStream buffer = new ByteArrayOutputStream();
- ObjectOutput out = new ObjectOutputStream(buffer);
- out.writeObject(c1);
- out.close();
- ObjectInput in = new ObjectInputStream(new ByteArrayInputStream(
- buffer.toByteArray()));
- c2 = (JFreeChart) in.readObject();
- in.close();
+ JFreeChart c1 = ChartFactory.createBarChart("Vertical Bar Chart",
+ "Category", "Value", dataset);
+ JFreeChart c2 = (JFreeChart) TestUtilities.serialised(c1);
assertEquals(c1, c2);
}
/**
* Serialize a time seroes chart, restore it, and check for equality.
*/
+ @Test
public void testSerialization4() throws IOException, ClassNotFoundException {
RegularTimePeriod t = new Day();
@@ -423,28 +359,18 @@
dataset.addSeries(series);
JFreeChart c1 = ChartFactory.createTimeSeriesChart("Test", "Date",
- "Value", dataset, true, true, true);
- JFreeChart c2;
-
- ByteArrayOutputStream buffer = new ByteArrayOutputStream();
- ObjectOutput out = new ObjectOutputStream(buffer);
- out.writeObject(c1);
- out.close();
-
- ObjectInput in = new ObjectInputStream(new ByteArrayInputStream(
- buffer.toByteArray()));
- c2 = (JFreeChart) in.readObject();
- in.close();
+ "Value", dataset);
+ JFreeChart c2 = (JFreeChart) TestUtilities.serialised(c1);
assertEquals(c1, c2);
}
/**
* Some checks for the addSubtitle() methods.
*/
+ @Test
public void testAddSubtitle() {
DefaultPieDataset dataset = new DefaultPieDataset();
- JFreeChart chart = ChartFactory.createPieChart("title", dataset, true,
- false, false);
+ JFreeChart chart = ChartFactory.createPieChart("title", dataset);
TextTitle t0 = new TextTitle("T0");
chart.addSubtitle(0, t0);
@@ -454,41 +380,39 @@
chart.addSubtitle(t1);
assertEquals(t1, chart.getSubtitle(2)); // subtitle 1 is the legend
- boolean pass = false;
try {
chart.addSubtitle(null);
+ fail("Should have thrown an IllegalArgumentException on index out of range");
}
catch (IllegalArgumentException e) {
- pass = true;
+ assertEquals("Null 'subtitle' argument.", e.getMessage());
}
- assertTrue(pass);
- pass = false;
try {
chart.addSubtitle(-1, t0);
+ fail("Should have thrown an IllegalArgumentException on index out of range");
}
catch (IllegalArgumentException e) {
- pass = true;
+ assertEquals("The 'index' argument is out of range.", e.getMessage());
}
- assertTrue(pass);
- pass = false;
try {
chart.addSubtitle(4, t0);
+ fail("Should have thrown an IllegalArgumentException on index out of range");
}
catch (IllegalArgumentException e) {
- pass = true;
+ assertEquals("The 'index' argument is out of range.", e.getMessage());
}
- assertTrue(pass);
+
}
/**
* Some checks for the getSubtitles() method.
*/
+ @Test
public void testGetSubtitles() {
DefaultPieDataset dataset = new DefaultPieDataset();
- JFreeChart chart = ChartFactory.createPieChart("title", dataset, true,
- false, false);
+ JFreeChart chart = ChartFactory.createPieChart("title", dataset);
List subtitles = chart.getSubtitles();
assertEquals(1, chart.getSubtitleCount());
@@ -501,10 +425,10 @@
/**
* Some checks for the default legend firing change events.
*/
+ @Test
public void testLegendEvents() {
DefaultPieDataset dataset = new DefaultPieDataset();
- JFreeChart chart = ChartFactory.createPieChart("title", dataset, true,
- false, false);
+ JFreeChart chart = ChartFactory.createPieChart("title", dataset);
chart.addChangeListener(this);
this.lastChartChangeEvent = null;
LegendTitle legend = chart.getLegend();
@@ -515,10 +439,10 @@
/**
* Some checks for title changes and event notification.
*/
+ @Test
public void testTitleChangeEvent() {
DefaultPieDataset dataset = new DefaultPieDataset();
- JFreeChart chart = ChartFactory.createPieChart("title", dataset, true,
- false, false);
+ JFreeChart chart = ChartFactory.createPieChart("title", dataset);
chart.addChangeListener(this);
this.lastChartChangeEvent = null;
TextTitle t = chart.getTitle();
Modified: branches/jfreechart-1.0.x-branch/tests/org/jfree/chart/LegendItemCollectionTest.java
===================================================================
--- branches/jfreechart-1.0.x-branch/tests/org/jfree/chart/LegendItemCollectionTest.java 2013-08-04 05:17:20 UTC (rev 2827)
+++ branches/jfreechart-1.0.x-branch/tests/org/jfree/chart/LegendItemCollectionTest.java 2013-08-04 05:18:11 UTC (rev 2828)
@@ -2,7 +2,7 @@
* JFreeChart : a free chart library for the Java(tm) platform
* ===========================================================
*
- * (C) Copyright 2000-2013, by Object Refinery Limited and Contributors.
+ * (C) Copyright 2000-2012, by Object Refinery Limited and Contributors.
*
* Project Info: http://www.jfree.org/jfreechart/index.html
*
@@ -24,10 +24,10 @@
* [Oracle and Java are registered trademarks of Oracle and/or its affiliates.
* Other names may be trademarks of their respective owners.]
*
- * ------------------------------
- * LegendItemCollectionTests.java
- * ------------------------------
- * (C) Copyright 2005-2008, by Object Refinery Limited and Contributors.
+ * -----------------------------
+ * LegendItemCollectionTest.java
+ * -----------------------------
+ * (C) Copyright 2005-2013, by Object Refinery Limited and Contributors.
*
* Original Author: David Gilbert (for Object Refinery Limited);
* Contributor(s): -;
@@ -53,45 +53,27 @@
import java.io.ObjectOutput;
import java.io.ObjectOutputStream;
-import junit.framework.Test;
-import junit.framework.TestCase;
-import junit.framework.TestSuite;
+import org.junit.Test;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertSame;
+import static org.junit.Assert.assertNotSame;
-import org.jfree.chart.LegendItem;
-import org.jfree.chart.LegendItemCollection;
-
/**
* Tests for the {@link LegendItemCollection} class.
*/
-public class LegendItemCollectionTest extends TestCase {
+public class LegendItemCollectionTest {
/**
- * Returns the tests as a test suite.
- *
- * @return The test suite.
- */
- public static Test suite() {
- return new TestSuite(LegendItemCollectionTest.class);
- }
-
- /**
- * Constructs a new set of tests.
- *
- * @param name the name of the tests.
- */
- public LegendItemCollectionTest(String name) {
- super(name);
- }
-
- /**
* Confirm that the equals method can distinguish all the required fields.
*/
+ @Test
public void testEquals() {
LegendItemCollection c1 = new LegendItemCollection();
LegendItemCollection c2 = new LegendItemCollection();
- assertTrue(c1.equals(c2));
- assertTrue(c2.equals(c1));
+ assertEquals(c1, c2);
+ assertEquals(c2, c1);
LegendItem item1 = new LegendItem("Label", "Description",
"ToolTip", "URL", true,
@@ -108,43 +90,36 @@
c1.add(item1);
assertFalse(c1.equals(c2));
c2.add(item2);
- assertTrue(c1.equals(c2));
+ assertEquals(c1, c2);
}
-
/**
* Serialize an instance, restore it, and check for equality.
*/
+ @Test
public void testSerialization() throws IOException, ClassNotFoundException {
LegendItemCollection c1 = new LegendItemCollection();
c1.add(new LegendItem("Item", "Description", "ToolTip", "URL",
new Rectangle2D.Double(1.0, 2.0, 3.0, 4.0), Color.red));
- LegendItemCollection c2;
- ByteArrayOutputStream buffer = new ByteArrayOutputStream();
- ObjectOutput out = new ObjectOutputStream(buffer);
- out.writeObject(c1);
- out.close();
-
- ObjectInput in = new ObjectInputStream(new ByteArrayInputStream(
- buffer.toByteArray()));
- c2 = (LegendItemCollection) in.readObject();
- in.close();
+ LegendItemCollection c2 = (LegendItemCollection) TestUtilities.serialised(c1);
assertEquals(c1, c2);
}
/**
* Confirm that cloning works.
*/
+ @Test
public void testCloning() throws CloneNotSupportedException {
LegendItemCollection c1 = new LegendItemCollection();
LegendItem item1 = new LegendItem("Item 1");
c1.add(item1);
LegendItemCollection c2 = (LegendItemCollection) c1.clone();
- assertTrue(c1 != c2);
- assertTrue(c1.getClass() == c2.getClass());
- assertTrue(c1.equals(c2));
+ assertNotSame(c1, c2);
+ assertSame(c1.getClass(), c2.getClass());
+ assertEquals(c1, c2);
+
Rectangle2D item1Shape = (Rectangle2D) item1.getShape();
item1Shape.setRect(1.0, 2.0, 3.0, 4.0);
assertFalse(c1.equals(c2));
Modified: branches/jfreechart-1.0.x-branch/tests/org/jfree/chart/LegendItemTest.java
===================================================================
--- branches/jfreechart-1.0.x-branch/tests/org/jfree/chart/LegendItemTest.java 2013-08-04 05:17:20 UTC (rev 2827)
+++ branches/jfreechart-1.0.x-branch/tests/org/jfree/chart/LegendItemTest.java 2013-08-04 05:18:11 UTC (rev 2828)
@@ -61,40 +61,25 @@
import java.io.ObjectOutputStream;
import java.text.AttributedString;
-import junit.framework.Test;
-import junit.framework.TestCase;
-import junit.framework.TestSuite;
-
-import org.jfree.chart.LegendItem;
import org.jfree.ui.GradientPaintTransformType;
import org.jfree.ui.StandardGradientPaintTransformer;
+import org.junit.Test;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertSame;
+import static org.junit.Assert.assertNotSame;
+
+
/**
* Tests for the {@link LegendItem} class.
*/
-public class LegendItemTest extends TestCase {
+public class LegendItemTest {
/**
- * Returns the tests as a test suite.
- *
- * @return The test suite.
- */
- public static Test suite() {
- return new TestSuite(LegendItemTest.class);
- }
-
- /**
- * Constructs a new set of tests.
- *
- * @param name the name of the tests.
- */
- public LegendItemTest(String name) {
- super(name);
- }
-
- /**
* Confirm that the equals method can distinguish all the required fields.
*/
+ @Test
public void testEquals() {
LegendItem item1 = new LegendItem("Label", "Description",
@@ -109,8 +94,8 @@
true, Color.red, true, Color.blue, new BasicStroke(1.2f), true,
new Line2D.Double(1.0, 2.0, 3.0, 4.0), new BasicStroke(2.1f),
Color.green);
- assertTrue(item1.equals(item2));
- assertTrue(item2.equals(item1));
+ assertEquals(item1, item2);
+ assertEquals(item2, item1);
item1 = new LegendItem("Label2", "Description", "ToolTip", "URL",
true, new Rectangle2D.Double(1.0, 2.0, 3.0, 4.0), true,
@@ -123,7 +108,7 @@
true, Color.red, true, Color.blue, new BasicStroke(1.2f), true,
new Line2D.Double(1.0, 2.0, 3.0, 4.0), new BasicStroke(2.1f),
Color.green);
- assertTrue(item1.equals(item2));
+ assertEquals(item1, item2);
item1 = new LegendItem("Label2", "Description2", "ToolTip",
"URL", true, new Rectangle2D.Double(1.0, 2.0, 3.0, 4.0),
@@ -136,7 +121,7 @@
true, Color.red, true, Color.blue, new BasicStroke(1.2f), true,
new Line2D.Double(1.0, 2.0, 3.0, 4.0), new BasicStroke(2.1f),
Color.green);
- assertTrue(item1.equals(item2));
+ assertEquals(item1, item2);
item1 = new LegendItem("Label2", "Description2", "ToolTip",
"URL", false, new Rectangle2D.Double(1.0, 2.0, 3.0, 4.0),
@@ -149,7 +134,7 @@
true, Color.red, true, Color.blue, new BasicStroke(1.2f), true,
new Line2D.Double(1.0, 2.0, 3.0, 4.0), new BasicStroke(2.1f),
Color.green);
- assertTrue(item1.equals(item2));
+ assertEquals(item1, item2);
item1 = new LegendItem("Label2", "Description2", "ToolTip",
"URL", false, new Rectangle2D.Double(4.0, 3.0, 2.0, 1.0),
@@ -162,7 +147,7 @@
true, Color.red, true, Color.blue, new BasicStroke(1.2f), true,
new Line2D.Double(1.0, 2.0, 3.0, 4.0), new BasicStroke(2.1f),
Color.green);
- assertTrue(item1.equals(item2));
+ assertEquals(item1, item2);
item1 = new LegendItem("Label2", "Description2", "ToolTip",
"URL", false, new Rectangle2D.Double(4.0, 3.0, 2.0, 1.0),
@@ -175,7 +160,7 @@
false, Color.red, true, Color.blue, new BasicStroke(1.2f), true,
new Line2D.Double(1.0, 2.0, 3.0, 4.0), new BasicStroke(2.1f),
Color.green);
- assertTrue(item1.equals(item2));
+ assertEquals(item1, item2);
item1 = new LegendItem("Label2", "Description2", "ToolTip", "URL",
false, new Rectangle2D.Double(4.0, 3.0, 2.0, 1.0), false,
@@ -188,7 +173,7 @@
Color.black, true, Color.blue, new BasicStroke(1.2f), true,
new Line2D.Double(1.0, 2.0, 3.0, 4.0), new BasicStroke(2.1f),
Color.green);
- assertTrue(item1.equals(item2));
+ assertEquals(item1, item2);
item1 = new LegendItem("Label2", "Description2", "ToolTip",
"URL", false, new Rectangle2D.Double(4.0, 3.0, 2.0, 1.0),
@@ -201,7 +186,7 @@
Color.black, false, Color.blue, new BasicStroke(1.2f), true,
new Line2D.Double(1.0, 2.0, 3.0, 4.0), new BasicStroke(2.1f),
Color.green);
- assertTrue(item1.equals(item2));
+ assertEquals(item1, item2);
item1 = new LegendItem("Label2", "Description2", "ToolTip", "URL",
false, new Rectangle2D.Double(4.0, 3.0, 2.0, 1.0), false,
@@ -214,7 +199,7 @@
Color.black, false, Color.yellow, new BasicStroke(1.2f), true,
new Line2D.Double(1.0, 2.0, 3.0, 4.0), new BasicStroke(2.1f),
Color.green);
- assertTrue(item1.equals(item2));
+ assertEquals(item1, item2);
item1 = new LegendItem("Label2", "Description2", "ToolTip", "URL",
false, new Rectangle2D.Double(4.0, 3.0, 2.0, 1.0), false,
@@ -227,7 +212,7 @@
Color.black, false, Color.yellow, new BasicStroke(2.1f), true,
new Line2D.Double(1.0, 2.0, 3.0, 4.0), new BasicStroke(2.1f),
Color.green);
- assertTrue(item1.equals(item2));
+ assertEquals(item1, item2);
item1 = new LegendItem("Label2", "Description2", "ToolTip",
"URL", false, new Rectangle2D.Double(4.0, 3.0, 2.0, 1.0),
@@ -240,7 +225,7 @@
false, Color.black, false, Color.yellow, new BasicStroke(2.1f),
false, new Line2D.Double(1.0, 2.0, 3.0, 4.0),
new BasicStroke(2.1f), Color.green);
- assertTrue(item1.equals(item2));
+ assertEquals(item1, item2);
item1 = new LegendItem("Label2", "Description2", "ToolTip",
"URL", false, new Rectangle2D.Double(4.0, 3.0, 2.0, 1.0),
@@ -253,7 +238,7 @@
false, Color.black, false, Color.yellow, new BasicStroke(2.1f),
false, new Line2D.Double(4.0, 3.0, 2.0, 1.0),
new BasicStroke(2.1f), Color.green);
- assertTrue(item1.equals(item2));
+ assertEquals(item1, item2);
item1 = new LegendItem("Label2", "Description2", "ToolTip",
"URL", false, new Rectangle2D.Double(4.0, 3.0, 2.0, 1.0),
@@ -266,7 +251,7 @@
false, Color.black, false, Color.yellow, new BasicStroke(2.1f),
false, new Line2D.Double(4.0, 3.0, 2.0, 1.0),
new BasicStroke(3.3f), Color.green);
- assertTrue(item1.equals(item2));
+ assertEquals(item1, item2);
item1 = new LegendItem("Label2", "Description2", "ToolTip", "URL",
false, new Rectangle2D.Double(4.0, 3.0, 2.0, 1.0), false,
@@ -281,7 +266,7 @@
false, new Line2D.Double(4.0, 3.0, 2.0, 1.0),
new BasicStroke(3.3f),
Color.white);
- assertTrue(item1.equals(item2));
+ assertEquals(item1, item2);
// fillPaintTransformer
item1.setFillPaintTransformer(new StandardGradientPaintTransformer(
@@ -289,19 +274,19 @@
assertFalse(item1.equals(item2));
item2.setFillPaintTransformer(new StandardGradientPaintTransformer(
GradientPaintTransformType.CENTER_VERTICAL));
- assertTrue(item1.equals(item2));
+ assertEquals(item1, item2);
// labelFont
item1.setLabelFont(new Font("Dialog", Font.PLAIN, 13));
assertFalse(item1.equals(item2));
item2.setLabelFont(new Font("Dialog", Font.PLAIN, 13));
- assertTrue(item1.equals(item2));
+ assertEquals(item1, item2);
// labelPaint
item1.setLabelPaint(Color.red);
assertFalse(item1.equals(item2));
item2.setLabelPaint(Color.red);
- assertTrue(item1.equals(item2));
+ assertEquals(item1, item2);
// fillPaint
item1.setFillPaint(new GradientPaint(1.0f, 2.0f, Color.green, 3.0f,
@@ -309,7 +294,7 @@
assertFalse(item1.equals(item2));
item2.setFillPaint(new GradientPaint(1.0f, 2.0f, Color.green, 3.0f,
4.0f, Color.blue));
- assertTrue(item1.equals(item2));
+ assertEquals(item1, item2);
// outlinePaint
item1.setOutlinePaint(new GradientPaint(1.1f, 2.2f, Color.green, 3.3f,
@@ -317,7 +302,7 @@
assertFalse(item1.equals(item2));
item2.setOutlinePaint(new GradientPaint(1.1f, 2.2f, Color.green, 3.3f,
4.4f, Color.blue));
- assertTrue(item1.equals(item2));
+ assertEquals(item1, item2);
// linePaint
item1.setLinePaint(new GradientPaint(0.1f, 0.2f, Color.green, 0.3f,
@@ -325,13 +310,14 @@
assertFalse(item1.equals(item2));
item2.setLinePaint...
[truncated message content] |