Menu
▾
▴
[Jfreechart-commit] jfreechart/experimental/org/jfree/experimental/data/xy/junit VectorSeriesCollectionTests.java, 1.1.2.1, 1.1.2.2 VectorSeriesTests.java, 1.1.2.1, 1.1.2.2
|
From: David G. <mu...@us...> - 2007-05-24 16:15:40
|
Update of /cvsroot/jfreechart/jfreechart/experimental/org/jfree/experimental/data/xy/junit In directory sc8-pr-cvs6.sourceforge.net:/tmp/cvs-serv12864/experimental/org/jfree/experimental/data/xy/junit Modified Files: Tag: STABLE_1-0-0 VectorSeriesCollectionTests.java VectorSeriesTests.java Log Message: 2007-05-24 David Gilbert <dav...@ob...> * experimental/org/jfree/experimental/chart/renderer/xy/VectorRenderer.java (findDomainBounds): Updated for method name changes, (findRangeBounds): Likewise, (drawItem): Likewise, * experimental/org/jfree/experimental/data/xy/Vector.java (getLength): New method, (getAngle): Likewise, * experimental/org/jfree/experimental/data/xy/VectorDataItem.java (getVector): New method, (getDeltaX): Renamed getVectorX(), (getDeltaY): Renamed getVectorY(), * experimental/org/jfree/experimental/data/xy/VectorSeries.java (getDeltaXValue): Renamed getVectorXValue(), (getDeltaYValue): Renamed getVectorYValue(), * experimental/org/jfree/experimental/data/xy/VectorSeriesCollection.java (removeSeries): New method, (removeAllSeries): Likewise, (indexOf): Likewise, (getVector): Likewise, (getDeltaXValue): Renamed getVectorXValue(), (getDeltaYValue): Renamed getVectorYValue(), * experimental/org/jfree/experimental/data/xy/VectorXYDataset.java (getDeltaXValue): Renamed getVectorXValue(), (getDeltaYValue): Renamed getVectorYValue(), (getDeltaX): Removed, (getDeltaY): Removed, (getVector): New method. Index: VectorSeriesCollectionTests.java =================================================================== RCS file: /cvsroot/jfreechart/jfreechart/experimental/org/jfree/experimental/data/xy/junit/Attic/VectorSeriesCollectionTests.java,v retrieving revision 1.1.2.1 retrieving revision 1.1.2.2 diff -C2 -d -r1.1.2.1 -r1.1.2.2 *** VectorSeriesCollectionTests.java 30 Jan 2007 16:29:11 -0000 1.1.2.1 --- VectorSeriesCollectionTests.java 24 May 2007 16:15:36 -0000 1.1.2.2 *************** *** 28,32 **** * VectorSeriesCollectionTests.java * -------------------------------- ! * (C) Copyright 2003-2007, by Object Refinery Limited and Contributors. * * Original Author: David Gilbert (for Object Refinery Limited); --- 28,32 ---- * VectorSeriesCollectionTests.java * -------------------------------- ! * (C) Copyright 2007, by Object Refinery Limited and Contributors. * * Original Author: David Gilbert (for Object Refinery Limited); *************** *** 38,41 **** --- 38,42 ---- * ------- * 30-Jan-2007 : Version 1 (DG); + * 24-May-2007 : Added testRemoveSeries() (DG); * */ *************** *** 153,155 **** --- 154,177 ---- } + /** + * Some checks for the removeSeries() method. + */ + public void testRemoveSeries() { + VectorSeries s1 = new VectorSeries("S1"); + VectorSeries s2 = new VectorSeries("S2"); + VectorSeriesCollection vsc = new VectorSeriesCollection(); + vsc.addSeries(s1); + vsc.addSeries(s2); + assertEquals(2, vsc.getSeriesCount()); + boolean b = vsc.removeSeries(s1); + assertTrue(b); + assertEquals(1, vsc.getSeriesCount()); + assertEquals("S2", vsc.getSeriesKey(0)); + b = vsc.removeSeries(new VectorSeries("NotInDataset")); + assertFalse(b); + assertEquals(1, vsc.getSeriesCount()); + b = vsc.removeSeries(s2); + assertEquals(0, vsc.getSeriesCount()); + } + } \ No newline at end of file Index: VectorSeriesTests.java =================================================================== RCS file: /cvsroot/jfreechart/jfreechart/experimental/org/jfree/experimental/data/xy/junit/Attic/VectorSeriesTests.java,v retrieving revision 1.1.2.1 retrieving revision 1.1.2.2 diff -C2 -d -r1.1.2.1 -r1.1.2.2 *** VectorSeriesTests.java 30 Jan 2007 16:29:11 -0000 1.1.2.1 --- VectorSeriesTests.java 24 May 2007 16:15:36 -0000 1.1.2.2 *************** *** 38,41 **** --- 38,42 ---- * ------- * 30-Jan-2007 : Version 1, based on XYSeriesTests (DG); + * 24-May-2007 : Updated for modified method names (DG); * */ *************** *** 224,232 **** s1.add(2.0, 3.0, 4.0, 4.0); s1.add(3.0, 5.0, 5.0, 5.0); ! assertEquals(1.0, s1.getDeltaXValue(0), EPSILON); ! assertEquals(2.0, s1.getDeltaXValue(1), EPSILON); ! assertEquals(3.0, s1.getDeltaXValue(2), EPSILON); ! assertEquals(4.0, s1.getDeltaXValue(3), EPSILON); ! assertEquals(5.0, s1.getDeltaXValue(4), EPSILON); } --- 225,233 ---- s1.add(2.0, 3.0, 4.0, 4.0); s1.add(3.0, 5.0, 5.0, 5.0); ! assertEquals(1.0, s1.getVectorXValue(0), EPSILON); ! assertEquals(2.0, s1.getVectorXValue(1), EPSILON); ! assertEquals(3.0, s1.getVectorXValue(2), EPSILON); ! assertEquals(4.0, s1.getVectorXValue(3), EPSILON); ! assertEquals(5.0, s1.getVectorXValue(4), EPSILON); } *************** *** 243,253 **** series.add(2.0, 2.2, 2.2, 2.2); series.add(1.0, 1.1, 1.1, 1.1); ! assertEquals(5.5, series.getDeltaXValue(0), EPSILON); ! assertEquals(5.51, series.getDeltaXValue(1), EPSILON); ! assertEquals(6.6, series.getDeltaXValue(2), EPSILON); ! assertEquals(3.3, series.getDeltaXValue(3), EPSILON); ! assertEquals(4.4, series.getDeltaXValue(4), EPSILON); ! assertEquals(2.2, series.getDeltaXValue(5), EPSILON); ! assertEquals(1.1, series.getDeltaXValue(6), EPSILON); } --- 244,254 ---- series.add(2.0, 2.2, 2.2, 2.2); series.add(1.0, 1.1, 1.1, 1.1); ! assertEquals(5.5, series.getVectorXValue(0), EPSILON); ! assertEquals(5.51, series.getVectorXValue(1), EPSILON); ! assertEquals(6.6, series.getVectorXValue(2), EPSILON); ! assertEquals(3.3, series.getVectorXValue(3), EPSILON); ! assertEquals(4.4, series.getVectorXValue(4), EPSILON); ! assertEquals(2.2, series.getVectorXValue(5), EPSILON); ! assertEquals(1.1, series.getVectorXValue(6), EPSILON); } |