From: David G. <mu...@us...> - 2005-12-02 10:40:26
|
Update of /cvsroot/jfreechart/jfreechart/source/org/jfree/chart/renderer/category/junit In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv13998/source/org/jfree/chart/renderer/category/junit Modified Files: Tag: STABLE_1-0-0 StatisticalBarRendererTests.java StatisticalLineAndShapeRendererTests.java Log Message: 2005-12-02 David Gilbert <dav...@ob...> * source/org/jfree/chart/renderer/category/StatisticalBarRenderer.java: Reformatting, * source/org/jfree/chart/renderer/category/StatisticalLineAndShaperenderer.java (drawItem): Fixed null pointer exception, * source/org/jfree/chart/renderer/category/junit/StatisticalBarRendererTests.java (testDrawWithNullInfo): New test, * source/org/jfree/chart/renderer/category/junit/StatisticalLineAndShapeRenderer.java (testDrawWithNullInfo): New test. Index: StatisticalBarRendererTests.java =================================================================== RCS file: /cvsroot/jfreechart/jfreechart/source/org/jfree/chart/renderer/category/junit/StatisticalBarRendererTests.java,v retrieving revision 1.3.2.2 retrieving revision 1.3.2.3 diff -C2 -d -r1.3.2.2 -r1.3.2.3 *** StatisticalBarRendererTests.java 25 Oct 2005 20:55:24 -0000 1.3.2.2 --- StatisticalBarRendererTests.java 2 Dec 2005 10:40:17 -0000 1.3.2.3 *************** *** 55,59 **** --- 55,64 ---- import junit.framework.TestSuite; + import org.jfree.chart.JFreeChart; + import org.jfree.chart.axis.CategoryAxis; + import org.jfree.chart.axis.NumberAxis; + import org.jfree.chart.plot.CategoryPlot; import org.jfree.chart.renderer.category.StatisticalBarRenderer; + import org.jfree.data.statistics.DefaultStatisticalCategoryDataset; /** *************** *** 150,152 **** --- 155,183 ---- } + /** + * 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 { + DefaultStatisticalCategoryDataset dataset + = new DefaultStatisticalCategoryDataset(); + dataset.add(1.0, 2.0, "S1", "C1"); + dataset.add(3.0, 4.0, "S1", "C2"); + CategoryPlot plot = new CategoryPlot(dataset, + new CategoryAxis("Category"), new NumberAxis("Value"), + new StatisticalBarRenderer()); + JFreeChart chart = new JFreeChart(plot); + /* BufferedImage image = */ chart.createBufferedImage(300, 200, + null); + success = true; + } + catch (NullPointerException e) { + e.printStackTrace(); + success = false; + } + assertTrue(success); + } + } Index: StatisticalLineAndShapeRendererTests.java =================================================================== RCS file: /cvsroot/jfreechart/jfreechart/source/org/jfree/chart/renderer/category/junit/StatisticalLineAndShapeRendererTests.java,v retrieving revision 1.1.2.4 retrieving revision 1.1.2.5 diff -C2 -d -r1.1.2.4 -r1.1.2.5 *** StatisticalLineAndShapeRendererTests.java 25 Oct 2005 20:55:24 -0000 1.1.2.4 --- StatisticalLineAndShapeRendererTests.java 2 Dec 2005 10:40:17 -0000 1.1.2.5 *************** *** 55,59 **** --- 55,64 ---- import junit.framework.TestSuite; + import org.jfree.chart.JFreeChart; + import org.jfree.chart.axis.CategoryAxis; + import org.jfree.chart.axis.NumberAxis; + import org.jfree.chart.plot.CategoryPlot; import org.jfree.chart.renderer.category.StatisticalLineAndShapeRenderer; + import org.jfree.data.statistics.DefaultStatisticalCategoryDataset; /** *************** *** 157,159 **** --- 162,190 ---- } + /** + * 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 { + DefaultStatisticalCategoryDataset dataset + = new DefaultStatisticalCategoryDataset(); + dataset.add(1.0, 2.0, "S1", "C1"); + dataset.add(3.0, 4.0, "S1", "C2"); + CategoryPlot plot = new CategoryPlot(dataset, + new CategoryAxis("Category"), new NumberAxis("Value"), + new StatisticalLineAndShapeRenderer()); + JFreeChart chart = new JFreeChart(plot); + /* BufferedImage image = */ chart.createBufferedImage(300, 200, + null); + success = true; + } + catch (NullPointerException e) { + e.printStackTrace(); + success = false; + } + assertTrue(success); + } + } |