From: <mu...@us...> - 2008-09-01 19:53:00
|
Revision: 1431 http://jfreechart.svn.sourceforge.net/jfreechart/?rev=1431&view=rev Author: mungady Date: 2008-09-01 19:52:57 +0000 (Mon, 01 Sep 2008) Log Message: ----------- Kill some tabs. Modified Paths: -------------- trunk/tests/org/jfree/chart/annotations/junit/XYDrawableAnnotationTests.java trunk/tests/org/jfree/chart/axis/junit/CategoryLabelPositionsTests.java trunk/tests/org/jfree/chart/axis/junit/CategoryLabelWidthTypeTests.java trunk/tests/org/jfree/chart/axis/junit/CategoryTickTests.java trunk/tests/org/jfree/chart/axis/junit/DateTickMarkPositionTests.java trunk/tests/org/jfree/chart/axis/junit/DateTickTests.java trunk/tests/org/jfree/chart/axis/junit/PeriodAxisTests.java Modified: trunk/tests/org/jfree/chart/annotations/junit/XYDrawableAnnotationTests.java =================================================================== --- trunk/tests/org/jfree/chart/annotations/junit/XYDrawableAnnotationTests.java 2008-09-01 19:47:41 UTC (rev 1430) +++ trunk/tests/org/jfree/chart/annotations/junit/XYDrawableAnnotationTests.java 2008-09-01 19:52:57 UTC (rev 1431) @@ -164,10 +164,10 @@ assertTrue(a1.equals(a2)); a1 = new XYDrawableAnnotation(11.0, 22.0, 101.0, 202.0, 2.0, - new TestDrawable()); + new TestDrawable()); assertFalse(a1.equals(a2)); a2 = new XYDrawableAnnotation(11.0, 22.0, 101.0, 202.0, 2.0, - new TestDrawable()); + new TestDrawable()); assertTrue(a1.equals(a2)); } Modified: trunk/tests/org/jfree/chart/axis/junit/CategoryLabelPositionsTests.java =================================================================== --- trunk/tests/org/jfree/chart/axis/junit/CategoryLabelPositionsTests.java 2008-09-01 19:47:41 UTC (rev 1430) +++ trunk/tests/org/jfree/chart/axis/junit/CategoryLabelPositionsTests.java 2008-09-01 19:52:57 UTC (rev 1431) @@ -102,14 +102,14 @@ p1 = new CategoryLabelPositions( new CategoryLabelPosition(RA_BOTTOM, - TextBlockAnchor.TOP_CENTER), + TextBlockAnchor.TOP_CENTER), new CategoryLabelPosition(RA_TOP, TextBlockAnchor.CENTER), new CategoryLabelPosition(RA_TOP, TextBlockAnchor.CENTER), new CategoryLabelPosition(RA_TOP, TextBlockAnchor.CENTER)); assertTrue(!p1.equals(p2)); p2 = new CategoryLabelPositions( new CategoryLabelPosition(RA_BOTTOM, - TextBlockAnchor.TOP_CENTER), + TextBlockAnchor.TOP_CENTER), new CategoryLabelPosition(RA_TOP, TextBlockAnchor.CENTER), new CategoryLabelPosition(RA_TOP, TextBlockAnchor.CENTER), new CategoryLabelPosition(RA_TOP, TextBlockAnchor.CENTER)); @@ -117,58 +117,58 @@ p1 = new CategoryLabelPositions( new CategoryLabelPosition(RA_BOTTOM, - TextBlockAnchor.TOP_CENTER), + TextBlockAnchor.TOP_CENTER), new CategoryLabelPosition(RA_BOTTOM, TextBlockAnchor.TOP_CENTER), new CategoryLabelPosition(RA_TOP, TextBlockAnchor.CENTER), new CategoryLabelPosition(RA_TOP, TextBlockAnchor.CENTER)); assertTrue(!p1.equals(p2)); p2 = new CategoryLabelPositions( new CategoryLabelPosition(RA_BOTTOM, - TextBlockAnchor.TOP_CENTER), + TextBlockAnchor.TOP_CENTER), new CategoryLabelPosition(RA_BOTTOM, - TextBlockAnchor.TOP_CENTER), + TextBlockAnchor.TOP_CENTER), new CategoryLabelPosition(RA_TOP, TextBlockAnchor.CENTER), new CategoryLabelPosition(RA_TOP, TextBlockAnchor.CENTER)); assertTrue(p1.equals(p2)); p1 = new CategoryLabelPositions( new CategoryLabelPosition(RA_BOTTOM, - TextBlockAnchor.TOP_CENTER), + TextBlockAnchor.TOP_CENTER), new CategoryLabelPosition(RA_BOTTOM, - TextBlockAnchor.TOP_CENTER), + TextBlockAnchor.TOP_CENTER), new CategoryLabelPosition(RA_BOTTOM, - TextBlockAnchor.TOP_CENTER), + TextBlockAnchor.TOP_CENTER), new CategoryLabelPosition(RA_TOP, TextBlockAnchor.CENTER)); assertTrue(!p1.equals(p2)); p2 = new CategoryLabelPositions( new CategoryLabelPosition(RA_BOTTOM, - TextBlockAnchor.TOP_CENTER), + TextBlockAnchor.TOP_CENTER), new CategoryLabelPosition(RA_BOTTOM, - TextBlockAnchor.TOP_CENTER), + TextBlockAnchor.TOP_CENTER), new CategoryLabelPosition(RA_BOTTOM, - TextBlockAnchor.TOP_CENTER), + TextBlockAnchor.TOP_CENTER), new CategoryLabelPosition(RA_TOP, TextBlockAnchor.CENTER)); assertTrue(p1.equals(p2)); p1 = new CategoryLabelPositions( new CategoryLabelPosition(RA_BOTTOM, - TextBlockAnchor.TOP_CENTER), + TextBlockAnchor.TOP_CENTER), new CategoryLabelPosition(RA_BOTTOM, - TextBlockAnchor.TOP_CENTER), + TextBlockAnchor.TOP_CENTER), new CategoryLabelPosition(RA_BOTTOM, - TextBlockAnchor.TOP_CENTER), + TextBlockAnchor.TOP_CENTER), new CategoryLabelPosition(RA_BOTTOM, - TextBlockAnchor.TOP_CENTER)); + TextBlockAnchor.TOP_CENTER)); assertTrue(!p1.equals(p2)); p2 = new CategoryLabelPositions( new CategoryLabelPosition(RA_BOTTOM, - TextBlockAnchor.TOP_CENTER), + TextBlockAnchor.TOP_CENTER), new CategoryLabelPosition(RA_BOTTOM, - TextBlockAnchor.TOP_CENTER), + TextBlockAnchor.TOP_CENTER), new CategoryLabelPosition(RA_BOTTOM, - TextBlockAnchor.TOP_CENTER), + TextBlockAnchor.TOP_CENTER), new CategoryLabelPosition(RA_BOTTOM, - TextBlockAnchor.TOP_CENTER)); + TextBlockAnchor.TOP_CENTER)); assertTrue(p1.equals(p2)); } Modified: trunk/tests/org/jfree/chart/axis/junit/CategoryLabelWidthTypeTests.java =================================================================== --- trunk/tests/org/jfree/chart/axis/junit/CategoryLabelWidthTypeTests.java 2008-09-01 19:47:41 UTC (rev 1430) +++ trunk/tests/org/jfree/chart/axis/junit/CategoryLabelWidthTypeTests.java 2008-09-01 19:52:57 UTC (rev 1431) @@ -81,9 +81,9 @@ */ public void testEquals() { assertEquals(CategoryLabelWidthType.CATEGORY, - CategoryLabelWidthType.CATEGORY); + CategoryLabelWidthType.CATEGORY); assertEquals(CategoryLabelWidthType.RANGE, - CategoryLabelWidthType.RANGE); + CategoryLabelWidthType.RANGE); } /** Modified: trunk/tests/org/jfree/chart/axis/junit/CategoryTickTests.java =================================================================== --- trunk/tests/org/jfree/chart/axis/junit/CategoryTickTests.java 2008-09-01 19:47:41 UTC (rev 1430) +++ trunk/tests/org/jfree/chart/axis/junit/CategoryTickTests.java 2008-09-01 19:52:57 UTC (rev 1431) @@ -174,7 +174,7 @@ public void testSerialization() { CategoryTick t1 = new CategoryTick("C1", new TextBlock(), - TextBlockAnchor.CENTER, TextAnchor.CENTER, 1.5f); + TextBlockAnchor.CENTER, TextAnchor.CENTER, 1.5f); CategoryTick t2 = null; try { Modified: trunk/tests/org/jfree/chart/axis/junit/DateTickMarkPositionTests.java =================================================================== --- trunk/tests/org/jfree/chart/axis/junit/DateTickMarkPositionTests.java 2008-09-01 19:47:41 UTC (rev 1430) +++ trunk/tests/org/jfree/chart/axis/junit/DateTickMarkPositionTests.java 2008-09-01 19:52:57 UTC (rev 1431) @@ -85,9 +85,9 @@ assertEquals(DateTickMarkPosition.END, DateTickMarkPosition.END); assertFalse(DateTickMarkPosition.START.equals(null)); assertFalse(DateTickMarkPosition.START.equals( - DateTickMarkPosition.END)); + DateTickMarkPosition.END)); assertFalse(DateTickMarkPosition.MIDDLE.equals( - DateTickMarkPosition.END)); + DateTickMarkPosition.END)); } /** Modified: trunk/tests/org/jfree/chart/axis/junit/DateTickTests.java =================================================================== --- trunk/tests/org/jfree/chart/axis/junit/DateTickTests.java 2008-09-01 19:47:41 UTC (rev 1430) +++ trunk/tests/org/jfree/chart/axis/junit/DateTickTests.java 2008-09-01 19:52:57 UTC (rev 1431) @@ -143,7 +143,7 @@ */ public void testCloning() { DateTick t1 = new DateTick(new Date(0L), "Label", TextAnchor.CENTER, - TextAnchor.CENTER, 10.0); + TextAnchor.CENTER, 10.0); DateTick t2 = null; try { t2 = (DateTick) t1.clone(); @@ -162,7 +162,7 @@ public void testSerialization() { DateTick t1 = new DateTick(new Date(0L), "Label", TextAnchor.CENTER, - TextAnchor.CENTER, 10.0); + TextAnchor.CENTER, 10.0); DateTick t2 = null; try { Modified: trunk/tests/org/jfree/chart/axis/junit/PeriodAxisTests.java =================================================================== --- trunk/tests/org/jfree/chart/axis/junit/PeriodAxisTests.java 2008-09-01 19:47:41 UTC (rev 1430) +++ trunk/tests/org/jfree/chart/axis/junit/PeriodAxisTests.java 2008-09-01 19:52:57 UTC (rev 1431) @@ -205,7 +205,7 @@ PeriodAxisLabelInfo[] info = new PeriodAxisLabelInfo[2]; info[0] = new PeriodAxisLabelInfo(Day.class, new SimpleDateFormat("d")); info[1] = new PeriodAxisLabelInfo(Year.class, - new SimpleDateFormat("yyyy")); + new SimpleDateFormat("yyyy")); a1.setLabelInfo(info); assertFalse(a1.equals(a2)); a2.setLabelInfo(info); This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <mu...@us...> - 2008-09-01 20:25:35
|
Revision: 1438 http://jfreechart.svn.sourceforge.net/jfreechart/?rev=1438&view=rev Author: mungady Date: 2008-09-01 20:25:31 +0000 (Mon, 01 Sep 2008) Log Message: ----------- Kill some tabs. Modified Paths: -------------- trunk/tests/org/jfree/chart/plot/junit/CategoryPlotTests.java trunk/tests/org/jfree/chart/plot/junit/MultiplePiePlotTests.java trunk/tests/org/jfree/chart/plot/junit/ThermometerPlotTests.java trunk/tests/org/jfree/chart/plot/junit/XYPlotTests.java trunk/tests/org/jfree/chart/renderer/category/junit/StandardBarPainterTests.java trunk/tests/org/jfree/chart/renderer/xy/junit/GradientXYBarPainterTests.java trunk/tests/org/jfree/chart/renderer/xy/junit/StandardXYBarPainterTests.java trunk/tests/org/jfree/chart/title/junit/CompositeTitleTests.java trunk/tests/org/jfree/chart/util/junit/SerialUtilitiesTests.java trunk/tests/org/jfree/chart/util/junit/ShapeListTests.java Modified: trunk/tests/org/jfree/chart/plot/junit/CategoryPlotTests.java =================================================================== --- trunk/tests/org/jfree/chart/plot/junit/CategoryPlotTests.java 2008-09-01 20:10:06 UTC (rev 1437) +++ trunk/tests/org/jfree/chart/plot/junit/CategoryPlotTests.java 2008-09-01 20:25:31 UTC (rev 1438) @@ -129,7 +129,7 @@ public void testConstructor() { CategoryPlot plot = new CategoryPlot(); assertEquals(new RectangleInsets(4.0, 4.0, 4.0, 4.0), - plot.getAxisOffset()); + plot.getAxisOffset()); } /** @@ -444,10 +444,10 @@ // domainCrosshairPaint plot1.setDomainCrosshairPaint(new GradientPaint(1.0f, 2.0f, Color.red, - 3.0f, 4.0f, Color.blue)); + 3.0f, 4.0f, Color.blue)); assertFalse(plot1.equals(plot2)); plot2.setDomainCrosshairPaint(new GradientPaint(1.0f, 2.0f, Color.red, - 3.0f, 4.0f, Color.blue)); + 3.0f, 4.0f, Color.blue)); assertTrue(plot1.equals(plot2)); // domainCrosshairStroke Modified: trunk/tests/org/jfree/chart/plot/junit/MultiplePiePlotTests.java =================================================================== --- trunk/tests/org/jfree/chart/plot/junit/MultiplePiePlotTests.java 2008-09-01 20:10:06 UTC (rev 1437) +++ trunk/tests/org/jfree/chart/plot/junit/MultiplePiePlotTests.java 2008-09-01 20:25:31 UTC (rev 1438) @@ -69,8 +69,8 @@ public class MultiplePiePlotTests extends TestCase implements PlotChangeListener { - /** The last event received. */ - PlotChangeEvent lastEvent; + /** The last event received. */ + PlotChangeEvent lastEvent; /** * Returns the tests as a test suite. @@ -85,9 +85,9 @@ * Receives a plot change event and records it. Some tests will use this * to check that events have been generated (or not) when required. */ - public void plotChanged(PlotChangeEvent event) { - this.lastEvent = event; - } + public void plotChanged(PlotChangeEvent event) { + this.lastEvent = event; + } /** * Constructs a new set of tests. @@ -102,14 +102,14 @@ * Some checks for the constructors. */ public void testConstructor() { - MultiplePiePlot plot = new MultiplePiePlot(); - assertNull(plot.getDataset()); + MultiplePiePlot plot = new MultiplePiePlot(); + assertNull(plot.getDataset()); - // the following checks that the plot registers itself as a listener - // with the dataset passed to the constructor - see patch 1943021 - DefaultCategoryDataset dataset = new DefaultCategoryDataset(); - plot = new MultiplePiePlot(dataset); - assertTrue(dataset.hasListener(plot)); + // the following checks that the plot registers itself as a listener + // with the dataset passed to the constructor - see patch 1943021 + DefaultCategoryDataset dataset = new DefaultCategoryDataset(); + plot = new MultiplePiePlot(dataset); + assertTrue(dataset.hasListener(plot)); } /** Modified: trunk/tests/org/jfree/chart/plot/junit/ThermometerPlotTests.java =================================================================== --- trunk/tests/org/jfree/chart/plot/junit/ThermometerPlotTests.java 2008-09-01 20:10:06 UTC (rev 1437) +++ trunk/tests/org/jfree/chart/plot/junit/ThermometerPlotTests.java 2008-09-01 20:25:31 UTC (rev 1438) @@ -91,10 +91,10 @@ * Some checks for the equals() method. */ public void testEquals() { - ThermometerPlot p1 = new ThermometerPlot(); - ThermometerPlot p2 = new ThermometerPlot(); - assertTrue(p1.equals(p2)); - assertTrue(p2.equals(p1)); + ThermometerPlot p1 = new ThermometerPlot(); + ThermometerPlot p2 = new ThermometerPlot(); + assertTrue(p1.equals(p2)); + assertTrue(p2.equals(p1)); // padding p1.setPadding(new RectangleInsets(1.0, 2.0, 3.0, 4.0)); Modified: trunk/tests/org/jfree/chart/plot/junit/XYPlotTests.java =================================================================== --- trunk/tests/org/jfree/chart/plot/junit/XYPlotTests.java 2008-09-01 20:10:06 UTC (rev 1437) +++ trunk/tests/org/jfree/chart/plot/junit/XYPlotTests.java 2008-09-01 20:25:31 UTC (rev 1438) @@ -1024,8 +1024,8 @@ * false. */ public void testRemoveDomainMarker() { - XYPlot plot = new XYPlot(); - assertFalse(plot.removeDomainMarker(new ValueMarker(0.5))); + XYPlot plot = new XYPlot(); + assertFalse(plot.removeDomainMarker(new ValueMarker(0.5))); } /** @@ -1033,8 +1033,8 @@ * false. */ public void testRemoveRangeMarker() { - XYPlot plot = new XYPlot(); - assertFalse(plot.removeRangeMarker(new ValueMarker(0.5))); + XYPlot plot = new XYPlot(); + assertFalse(plot.removeRangeMarker(new ValueMarker(0.5))); } } Modified: trunk/tests/org/jfree/chart/renderer/category/junit/StandardBarPainterTests.java =================================================================== --- trunk/tests/org/jfree/chart/renderer/category/junit/StandardBarPainterTests.java 2008-09-01 20:10:06 UTC (rev 1437) +++ trunk/tests/org/jfree/chart/renderer/category/junit/StandardBarPainterTests.java 2008-09-01 20:25:31 UTC (rev 1438) @@ -90,8 +90,8 @@ * Two objects that are equal are required to return the same hashCode. */ public void testHashcode() { - StandardBarPainter p1 = new StandardBarPainter(); - StandardBarPainter p2 = new StandardBarPainter(); + StandardBarPainter p1 = new StandardBarPainter(); + StandardBarPainter p2 = new StandardBarPainter(); assertTrue(p1.equals(p2)); int h1 = p1.hashCode(); int h2 = p2.hashCode(); @@ -103,7 +103,7 @@ * instances of the class are immutable). */ public void testCloning() { - StandardBarPainter p1 = new StandardBarPainter(); + StandardBarPainter p1 = new StandardBarPainter(); assertFalse(p1 instanceof Cloneable); assertFalse(p1 instanceof PublicCloneable); } @@ -112,8 +112,8 @@ * Serialize an instance, restore it, and check for equality. */ public void testSerialization() { - StandardBarPainter p1 = new StandardBarPainter(); - StandardBarPainter p2 = null; + StandardBarPainter p1 = new StandardBarPainter(); + StandardBarPainter p2 = null; try { ByteArrayOutputStream buffer = new ByteArrayOutputStream(); ObjectOutput out = new ObjectOutputStream(buffer); Modified: trunk/tests/org/jfree/chart/renderer/xy/junit/GradientXYBarPainterTests.java =================================================================== --- trunk/tests/org/jfree/chart/renderer/xy/junit/GradientXYBarPainterTests.java 2008-09-01 20:10:06 UTC (rev 1437) +++ trunk/tests/org/jfree/chart/renderer/xy/junit/GradientXYBarPainterTests.java 2008-09-01 20:25:31 UTC (rev 1438) @@ -105,8 +105,8 @@ * Two objects that are equal are required to return the same hashCode. */ public void testHashcode() { - GradientXYBarPainter p1 = new GradientXYBarPainter(0.1, 0.2, 0.3); - GradientXYBarPainter p2 = new GradientXYBarPainter(0.1, 0.2, 0.3); + GradientXYBarPainter p1 = new GradientXYBarPainter(0.1, 0.2, 0.3); + GradientXYBarPainter p2 = new GradientXYBarPainter(0.1, 0.2, 0.3); assertTrue(p1.equals(p2)); int h1 = p1.hashCode(); int h2 = p2.hashCode(); @@ -118,7 +118,7 @@ * instances of the class are immutable). */ public void testCloning() { - GradientXYBarPainter p1 = new GradientXYBarPainter(0.1, 0.2, 0.3); + GradientXYBarPainter p1 = new GradientXYBarPainter(0.1, 0.2, 0.3); assertFalse(p1 instanceof Cloneable); assertFalse(p1 instanceof PublicCloneable); } @@ -127,8 +127,8 @@ * Serialize an instance, restore it, and check for equality. */ public void testSerialization() { - GradientXYBarPainter p1 = new GradientXYBarPainter(0.1, 0.2, 0.3); - GradientXYBarPainter p2 = null; + GradientXYBarPainter p1 = new GradientXYBarPainter(0.1, 0.2, 0.3); + GradientXYBarPainter p2 = null; try { ByteArrayOutputStream buffer = new ByteArrayOutputStream(); ObjectOutput out = new ObjectOutputStream(buffer); Modified: trunk/tests/org/jfree/chart/renderer/xy/junit/StandardXYBarPainterTests.java =================================================================== --- trunk/tests/org/jfree/chart/renderer/xy/junit/StandardXYBarPainterTests.java 2008-09-01 20:10:06 UTC (rev 1437) +++ trunk/tests/org/jfree/chart/renderer/xy/junit/StandardXYBarPainterTests.java 2008-09-01 20:25:31 UTC (rev 1438) @@ -90,8 +90,8 @@ * Two objects that are equal are required to return the same hashCode. */ public void testHashcode() { - StandardXYBarPainter p1 = new StandardXYBarPainter(); - StandardXYBarPainter p2 = new StandardXYBarPainter(); + StandardXYBarPainter p1 = new StandardXYBarPainter(); + StandardXYBarPainter p2 = new StandardXYBarPainter(); assertTrue(p1.equals(p2)); int h1 = p1.hashCode(); int h2 = p2.hashCode(); @@ -103,7 +103,7 @@ * instances of the class are immutable). */ public void testCloning() { - StandardXYBarPainter p1 = new StandardXYBarPainter(); + StandardXYBarPainter p1 = new StandardXYBarPainter(); assertFalse(p1 instanceof Cloneable); assertFalse(p1 instanceof PublicCloneable); } @@ -112,8 +112,8 @@ * Serialize an instance, restore it, and check for equality. */ public void testSerialization() { - StandardXYBarPainter p1 = new StandardXYBarPainter(); - StandardXYBarPainter p2 = null; + StandardXYBarPainter p1 = new StandardXYBarPainter(); + StandardXYBarPainter p2 = null; try { ByteArrayOutputStream buffer = new ByteArrayOutputStream(); ObjectOutput out = new ObjectOutputStream(buffer); Modified: trunk/tests/org/jfree/chart/title/junit/CompositeTitleTests.java =================================================================== --- trunk/tests/org/jfree/chart/title/junit/CompositeTitleTests.java 2008-09-01 20:10:06 UTC (rev 1437) +++ trunk/tests/org/jfree/chart/title/junit/CompositeTitleTests.java 2008-09-01 20:25:31 UTC (rev 1438) @@ -89,8 +89,8 @@ * Some checks for the constructor. */ public void testConstructor() { - CompositeTitle t = new CompositeTitle(); - assertNull(t.getBackgroundPaint()); + CompositeTitle t = new CompositeTitle(); + assertNull(t.getBackgroundPaint()); } /** @@ -127,10 +127,10 @@ assertTrue(t1.equals(t2)); t1.setBackgroundPaint(new GradientPaint(1.0f, 2.0f, Color.red, - 3.0f, 4.0f, Color.yellow)); + 3.0f, 4.0f, Color.yellow)); assertFalse(t1.equals(t2)); t2.setBackgroundPaint(new GradientPaint(1.0f, 2.0f, Color.red, - 3.0f, 4.0f, Color.yellow)); + 3.0f, 4.0f, Color.yellow)); assertTrue(t1.equals(t2)); } @@ -156,7 +156,7 @@ CompositeTitle t1 = new CompositeTitle(new BlockContainer()); t1.getContainer().add(new TextTitle("T1")); t1.setBackgroundPaint(new GradientPaint(1.0f, 2.0f, Color.red, - 3.0f, 4.0f, Color.yellow)); + 3.0f, 4.0f, Color.yellow)); CompositeTitle t2 = null; try { t2 = (CompositeTitle) t1.clone(); @@ -176,7 +176,7 @@ CompositeTitle t1 = new CompositeTitle(new BlockContainer()); t1.getContainer().add(new TextTitle("T1")); t1.setBackgroundPaint(new GradientPaint(1.0f, 2.0f, Color.red, - 3.0f, 4.0f, Color.blue)); + 3.0f, 4.0f, Color.blue)); CompositeTitle t2 = null; try { ByteArrayOutputStream buffer = new ByteArrayOutputStream(); Modified: trunk/tests/org/jfree/chart/util/junit/SerialUtilitiesTests.java =================================================================== --- trunk/tests/org/jfree/chart/util/junit/SerialUtilitiesTests.java 2008-09-01 20:10:06 UTC (rev 1437) +++ trunk/tests/org/jfree/chart/util/junit/SerialUtilitiesTests.java 2008-09-01 20:25:31 UTC (rev 1438) @@ -160,7 +160,7 @@ public void testGradientPaintSerialization() { Paint p1 = new GradientPaint(0.0f, 0.0f, Color.blue, - 100.0f, 200.0f, Color.red); + 100.0f, 200.0f, Color.red); Paint p2 = null; try { @@ -200,7 +200,7 @@ public void testTexturePaintSerialization() { Paint p1 = new TexturePaint( - new BufferedImage(5, 5, BufferedImage.TYPE_INT_RGB), + new BufferedImage(5, 5, BufferedImage.TYPE_INT_RGB), new Rectangle2D.Double(0, 0, 5, 5)); Paint p2 = null; @@ -330,7 +330,7 @@ */ public void testArc2DFloatSerialization() { Arc2D a1 = new Arc2D.Float(1.0f, 2.0f, 3.0f, 4.0f, 5.0f, 6.0f, - Arc2D.PIE); + Arc2D.PIE); Arc2D a2 = null; try { ByteArrayOutputStream buffer = new ByteArrayOutputStream(); Modified: trunk/tests/org/jfree/chart/util/junit/ShapeListTests.java =================================================================== --- trunk/tests/org/jfree/chart/util/junit/ShapeListTests.java 2008-09-01 20:10:06 UTC (rev 1437) +++ trunk/tests/org/jfree/chart/util/junit/ShapeListTests.java 2008-09-01 20:25:31 UTC (rev 1438) @@ -141,7 +141,7 @@ out.close(); ObjectInput in = new ObjectInputStream(new ByteArrayInputStream( - buffer.toByteArray())); + buffer.toByteArray())); l2 = (ShapeList) in.readObject(); in.close(); } This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <mu...@us...> - 2008-09-02 12:36:23
|
Revision: 1469 http://jfreechart.svn.sourceforge.net/jfreechart/?rev=1469&view=rev Author: mungady Date: 2008-09-02 12:36:03 +0000 (Tue, 02 Sep 2008) Log Message: ----------- Fixed Eclipse warnings. Modified Paths: -------------- trunk/tests/org/jfree/chart/axis/junit/LogarithmicAxisTests.java trunk/tests/org/jfree/chart/junit/ChartPanelTests.java trunk/tests/org/jfree/chart/plot/junit/ValueMarkerTests.java Modified: trunk/tests/org/jfree/chart/axis/junit/LogarithmicAxisTests.java =================================================================== --- trunk/tests/org/jfree/chart/axis/junit/LogarithmicAxisTests.java 2008-09-02 12:34:03 UTC (rev 1468) +++ trunk/tests/org/jfree/chart/axis/junit/LogarithmicAxisTests.java 2008-09-02 12:36:03 UTC (rev 1469) @@ -260,6 +260,9 @@ /** * Check the translation java2D to value for left, right, and center point. + * + * @param edge the edge. + * @param plotArea the plot area. */ private void checkPointsToValue(RectangleEdge edge, Rectangle2D plotArea) { assertEquals("Right most point on the axis should be end of range.", Modified: trunk/tests/org/jfree/chart/junit/ChartPanelTests.java =================================================================== --- trunk/tests/org/jfree/chart/junit/ChartPanelTests.java 2008-09-02 12:34:03 UTC (rev 1468) +++ trunk/tests/org/jfree/chart/junit/ChartPanelTests.java 2008-09-02 12:36:03 UTC (rev 1469) @@ -132,10 +132,20 @@ assertTrue(pass); } + /** + * Ignores a mouse click event. + * + * @param event the event. + */ public void chartMouseClicked(ChartMouseEvent event) { // ignore } + /** + * Ignores a mouse move event. + * + * @param event the event. + */ public void chartMouseMoved(ChartMouseEvent event) { // ignore } Modified: trunk/tests/org/jfree/chart/plot/junit/ValueMarkerTests.java =================================================================== --- trunk/tests/org/jfree/chart/plot/junit/ValueMarkerTests.java 2008-09-02 12:34:03 UTC (rev 1468) +++ trunk/tests/org/jfree/chart/plot/junit/ValueMarkerTests.java 2008-09-02 12:36:03 UTC (rev 1469) @@ -243,6 +243,11 @@ assertEquals(m, this.lastEvent.getMarker()); } + /** + * Records the last event. + * + * @param event the event. + */ public void markerChanged(MarkerChangeEvent event) { this.lastEvent = event; } This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <mu...@us...> - 2008-11-25 10:12:19
|
Revision: 1722 http://jfreechart.svn.sourceforge.net/jfreechart/?rev=1722&view=rev Author: mungady Date: 2008-11-25 10:12:17 +0000 (Tue, 25 Nov 2008) Log Message: ----------- Synchronised with 1.0.x branch. Modified Paths: -------------- trunk/tests/org/jfree/chart/axis/junit/SubCategoryAxisTests.java trunk/tests/org/jfree/chart/junit/GanttChartTests.java trunk/tests/org/jfree/chart/plot/junit/MarkerTests.java trunk/tests/org/jfree/chart/renderer/category/junit/AbstractCategoryItemRendererTests.java trunk/tests/org/jfree/chart/renderer/category/junit/BarRendererTests.java trunk/tests/org/jfree/chart/renderer/category/junit/GroupedStackedBarRendererTests.java trunk/tests/org/jfree/chart/renderer/category/junit/StackedBarRendererTests.java Modified: trunk/tests/org/jfree/chart/axis/junit/SubCategoryAxisTests.java =================================================================== --- trunk/tests/org/jfree/chart/axis/junit/SubCategoryAxisTests.java 2008-11-25 10:12:00 UTC (rev 1721) +++ trunk/tests/org/jfree/chart/axis/junit/SubCategoryAxisTests.java 2008-11-25 10:12:17 UTC (rev 1722) @@ -36,6 +36,7 @@ * ------- * 12-May-2004 : Version 1 (DG); * 07-Jan-2005 : Added test for hashCode() (DG); + * 13-Nov-2008 : Added test2275695() (DG); * */ @@ -43,6 +44,9 @@ import java.awt.Color; import java.awt.Font; +import java.awt.Graphics2D; +import java.awt.geom.Rectangle2D; +import java.awt.image.BufferedImage; import java.io.ByteArrayInputStream; import java.io.ByteArrayOutputStream; import java.io.ObjectInput; @@ -54,7 +58,11 @@ import junit.framework.TestCase; import junit.framework.TestSuite; +import org.jfree.chart.ChartFactory; +import org.jfree.chart.JFreeChart; import org.jfree.chart.axis.SubCategoryAxis; +import org.jfree.chart.plot.CategoryPlot; +import org.jfree.chart.plot.PlotOrientation; /** * Tests for the {@link SubCategoryAxis} class. @@ -67,7 +75,7 @@ * @return The test suite. */ public static Test suite() { - return new TestSuite(CategoryAxisTests.class); + return new TestSuite(SubCategoryAxisTests.class); } /** @@ -126,12 +134,13 @@ */ public void testCloning() { SubCategoryAxis a1 = new SubCategoryAxis("Test"); + a1.addSubCategory("SubCategoryA"); SubCategoryAxis a2 = null; try { a2 = (SubCategoryAxis) a1.clone(); } catch (CloneNotSupportedException e) { - System.err.println("Failed to clone."); + e.printStackTrace(); } assertTrue(a1 != a2); assertTrue(a1.getClass() == a2.getClass()); @@ -142,10 +151,9 @@ * Serialize an instance, restore it, and check for equality. */ public void testSerialization() { - SubCategoryAxis a1 = new SubCategoryAxis("Test Axis"); + a1.addSubCategory("SubCategoryA"); SubCategoryAxis a2 = null; - try { ByteArrayOutputStream buffer = new ByteArrayOutputStream(); ObjectOutput out = new ObjectOutputStream(buffer); @@ -161,7 +169,31 @@ e.printStackTrace(); } assertEquals(a1, a2); + } + /** + * A check for the NullPointerException in bug 2275695. + */ + public void test2275695() { + JFreeChart chart = ChartFactory.createStackedBarChart("Test", + "Category", "Value", null, PlotOrientation.VERTICAL, + true, false, false); + CategoryPlot plot = (CategoryPlot) chart.getPlot(); + plot.setDomainAxis(new SubCategoryAxis("SubCategoryAxis")); + boolean success = false; + try { + 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, null); + g2.dispose(); + success = true; + } + catch (Exception e) { + e.printStackTrace(); + success = false; + } + assertTrue(success); } } Modified: trunk/tests/org/jfree/chart/junit/GanttChartTests.java =================================================================== --- trunk/tests/org/jfree/chart/junit/GanttChartTests.java 2008-11-25 10:12:00 UTC (rev 1721) +++ trunk/tests/org/jfree/chart/junit/GanttChartTests.java 2008-11-25 10:12:17 UTC (rev 1722) @@ -117,6 +117,7 @@ success = true; } catch (Exception e) { + e.printStackTrace(); success = false; } assertTrue(success); Modified: trunk/tests/org/jfree/chart/plot/junit/MarkerTests.java =================================================================== --- trunk/tests/org/jfree/chart/plot/junit/MarkerTests.java 2008-11-25 10:12:00 UTC (rev 1721) +++ trunk/tests/org/jfree/chart/plot/junit/MarkerTests.java 2008-11-25 10:12:17 UTC (rev 1722) @@ -219,7 +219,7 @@ ValueMarker m = new ValueMarker(1.1); m.addChangeListener(this); this.lastEvent = null; - assertEquals(new Font("SansSerif", Font.PLAIN, 9), m.getLabelFont()); + assertEquals(new Font("Tahoma", Font.PLAIN, 9), m.getLabelFont()); m.setLabelFont(new Font("SansSerif", Font.BOLD, 10)); assertEquals(new Font("SansSerif", Font.BOLD, 10), m.getLabelFont()); assertEquals(m, this.lastEvent.getMarker()); Modified: trunk/tests/org/jfree/chart/renderer/category/junit/AbstractCategoryItemRendererTests.java =================================================================== --- trunk/tests/org/jfree/chart/renderer/category/junit/AbstractCategoryItemRendererTests.java 2008-11-25 10:12:00 UTC (rev 1721) +++ trunk/tests/org/jfree/chart/renderer/category/junit/AbstractCategoryItemRendererTests.java 2008-11-25 10:12:17 UTC (rev 1722) @@ -39,6 +39,8 @@ * 07-Dec-2006 : Added testEquals() method (DG); * 26-Jun-2007 : Added testGetSeriesItemLabelGenerator() and * testGetSeriesURLGenerator() (DG); + * 25-Nov-2008 : Added testFindRangeBounds() (DG); + * */ package org.jfree.chart.renderer.category.junit; @@ -57,8 +59,11 @@ import org.jfree.chart.renderer.category.AbstractCategoryItemRenderer; import org.jfree.chart.renderer.category.BarRenderer; import org.jfree.chart.renderer.category.CategoryItemRenderer; +import org.jfree.chart.renderer.category.LineAndShapeRenderer; import org.jfree.chart.urls.StandardCategoryURLGenerator; import org.jfree.chart.util.Layer; +import org.jfree.data.Range; +import org.jfree.data.category.DefaultCategoryDataset; /** * Tests for the {@link AbstractCategoryItemRenderer} class. @@ -360,5 +365,27 @@ r.setBaseURLGenerator(new StandardCategoryURLGenerator()); assertNull(r.getSeriesURLGenerator(2)); } + + /** + * Some checks for the findRangeBounds() method. + */ + public void testFindRangeBounds() { + AbstractCategoryItemRenderer r = new LineAndShapeRenderer(); + assertNull(r.findRangeBounds(null)); + + // an empty dataset should return a null range + DefaultCategoryDataset dataset = new DefaultCategoryDataset(); + assertNull(r.findRangeBounds(dataset)); + + dataset.addValue(1.0, "R1", "C1"); + assertEquals(new Range(1.0, 1.0), r.findRangeBounds(dataset)); + + dataset.addValue(-2.0, "R1", "C2"); + assertEquals(new Range(-2.0, 1.0), r.findRangeBounds(dataset)); + + dataset.addValue(null, "R1", "C3"); + assertEquals(new Range(-2.0, 1.0), r.findRangeBounds(dataset)); + } + } Modified: trunk/tests/org/jfree/chart/renderer/category/junit/BarRendererTests.java =================================================================== --- trunk/tests/org/jfree/chart/renderer/category/junit/BarRendererTests.java 2008-11-25 10:12:00 UTC (rev 1721) +++ trunk/tests/org/jfree/chart/renderer/category/junit/BarRendererTests.java 2008-11-25 10:12:17 UTC (rev 1722) @@ -42,6 +42,7 @@ * 11-May-2007 : Added testGetLegendItem() (DG); * 20-Jun-2007 : Removed JCommon dependencies (DG); * 23-Apr-2008 : Added testPublicCloneable() (DG); + * 25-Nov-2008 : Added testFindRangeBounds (DG); * */ @@ -74,6 +75,7 @@ import org.jfree.chart.util.GradientPaintTransformType; import org.jfree.chart.util.PublicCloneable; import org.jfree.chart.util.StandardGradientPaintTransformer; +import org.jfree.data.Range; import org.jfree.data.category.DefaultCategoryDataset; /** @@ -313,4 +315,28 @@ assertEquals(2, li.getSeriesIndex()); } + /** + * Some checks for the findRangeBounds() method. + */ + public void testFindRangeBounds() { + BarRenderer r = new BarRenderer(); + assertNull(r.findRangeBounds(null)); + + // an empty dataset should return a null range + DefaultCategoryDataset dataset = new DefaultCategoryDataset(); + assertNull(r.findRangeBounds(dataset)); + + dataset.addValue(1.0, "R1", "C1"); + assertEquals(new Range(0.0, 1.0), r.findRangeBounds(dataset)); + r.setIncludeBaseInRange(false); + assertEquals(new Range(1.0, 1.0), r.findRangeBounds(dataset)); + r.setIncludeBaseInRange(true); + + dataset.addValue(-2.0, "R1", "C2"); + assertEquals(new Range(-2.0, 1.0), r.findRangeBounds(dataset)); + + dataset.addValue(null, "R1", "C3"); + assertEquals(new Range(-2.0, 1.0), r.findRangeBounds(dataset)); + } + } Modified: trunk/tests/org/jfree/chart/renderer/category/junit/GroupedStackedBarRendererTests.java =================================================================== --- trunk/tests/org/jfree/chart/renderer/category/junit/GroupedStackedBarRendererTests.java 2008-11-25 10:12:00 UTC (rev 1721) +++ trunk/tests/org/jfree/chart/renderer/category/junit/GroupedStackedBarRendererTests.java 2008-11-25 10:12:17 UTC (rev 1722) @@ -59,6 +59,7 @@ import org.jfree.chart.renderer.category.GroupedStackedBarRenderer; import org.jfree.chart.util.PublicCloneable; import org.jfree.data.KeyToGroupMap; +import org.jfree.data.Range; import org.jfree.data.category.DefaultCategoryDataset; /** @@ -183,4 +184,37 @@ assertTrue(success); } + /** + * Some checks for the findRangeBounds() method. + */ + public void testFindRangeBounds() { + GroupedStackedBarRenderer r = new GroupedStackedBarRenderer(); + assertNull(r.findRangeBounds(null)); + + // an empty dataset should return a null range + DefaultCategoryDataset dataset = new DefaultCategoryDataset(); + assertNull(r.findRangeBounds(dataset)); + + dataset.addValue(1.0, "R1", "C1"); + assertEquals(new Range(0.0, 1.0), r.findRangeBounds(dataset)); + + dataset.addValue(-2.0, "R1", "C2"); + assertEquals(new Range(-2.0, 1.0), r.findRangeBounds(dataset)); + + dataset.addValue(null, "R1", "C3"); + assertEquals(new Range(-2.0, 1.0), r.findRangeBounds(dataset)); + + KeyToGroupMap m = new KeyToGroupMap("G1"); + m.mapKeyToGroup("R1", "G1"); + m.mapKeyToGroup("R2", "G1"); + m.mapKeyToGroup("R3", "G2"); + r.setSeriesToGroupMap(m); + + dataset.addValue(0.5, "R3", "C1"); + assertEquals(new Range(-2.0, 1.0), r.findRangeBounds(dataset)); + + dataset.addValue(5.0, "R3", "C2"); + assertEquals(new Range(-2.0, 5.0), r.findRangeBounds(dataset)); + } + } Modified: trunk/tests/org/jfree/chart/renderer/category/junit/StackedBarRendererTests.java =================================================================== --- trunk/tests/org/jfree/chart/renderer/category/junit/StackedBarRendererTests.java 2008-11-25 10:12:00 UTC (rev 1721) +++ trunk/tests/org/jfree/chart/renderer/category/junit/StackedBarRendererTests.java 2008-11-25 10:12:17 UTC (rev 1722) @@ -54,6 +54,8 @@ import org.jfree.chart.renderer.category.StackedBarRenderer; import org.jfree.chart.util.PublicCloneable; +import org.jfree.data.Range; +import org.jfree.data.category.DefaultCategoryDataset; /** * Tests for the {@link StackedBarRenderer} class. @@ -145,8 +147,7 @@ out.close(); ObjectInput in = new ObjectInputStream( - new ByteArrayInputStream(buffer.toByteArray()) - ); + new ByteArrayInputStream(buffer.toByteArray())); r2 = (StackedBarRenderer) in.readObject(); in.close(); } @@ -157,4 +158,31 @@ } + /** + * Some checks for the findRangeBounds() method. + */ + public void testFindRangeBounds() { + StackedBarRenderer r = new StackedBarRenderer(); + assertNull(r.findRangeBounds(null)); + + // an empty dataset should return a null range + DefaultCategoryDataset dataset = new DefaultCategoryDataset(); + assertNull(r.findRangeBounds(dataset)); + + dataset.addValue(1.0, "R1", "C1"); + assertEquals(new Range(0.0, 1.0), r.findRangeBounds(dataset)); + + dataset.addValue(-2.0, "R1", "C2"); + assertEquals(new Range(-2.0, 1.0), r.findRangeBounds(dataset)); + + dataset.addValue(null, "R1", "C3"); + assertEquals(new Range(-2.0, 1.0), r.findRangeBounds(dataset)); + + dataset.addValue(2.0, "R2", "C1"); + assertEquals(new Range(-2.0, 3.0), r.findRangeBounds(dataset)); + + dataset.addValue(null, "R2", "C2"); + assertEquals(new Range(-2.0, 3.0), r.findRangeBounds(dataset)); + } + } This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |