From: <mu...@us...> - 2008-09-04 19:49:24
|
Revision: 1498 http://jfreechart.svn.sourceforge.net/jfreechart/?rev=1498&view=rev Author: mungady Date: 2008-09-04 19:49:21 +0000 (Thu, 04 Sep 2008) Log Message: ----------- Whitespace. Modified Paths: -------------- branches/jfreechart-1.0.x-branch/tests/org/jfree/data/statistics/junit/BoxAndWhiskerCalculatorTests.java branches/jfreechart-1.0.x-branch/tests/org/jfree/data/statistics/junit/BoxAndWhiskerItemTests.java branches/jfreechart-1.0.x-branch/tests/org/jfree/data/statistics/junit/DataStatisticsPackageTests.java branches/jfreechart-1.0.x-branch/tests/org/jfree/data/statistics/junit/DefaultBoxAndWhiskerCategoryDatasetTests.java branches/jfreechart-1.0.x-branch/tests/org/jfree/data/statistics/junit/DefaultBoxAndWhiskerXYDatasetTests.java branches/jfreechart-1.0.x-branch/tests/org/jfree/data/statistics/junit/DefaultMultiValueCategoryDatasetTests.java branches/jfreechart-1.0.x-branch/tests/org/jfree/data/statistics/junit/DefaultStatisticalCategoryDatasetTests.java branches/jfreechart-1.0.x-branch/tests/org/jfree/data/statistics/junit/HistogramBinTests.java branches/jfreechart-1.0.x-branch/tests/org/jfree/data/statistics/junit/MeanAndStandardDeviationTests.java branches/jfreechart-1.0.x-branch/tests/org/jfree/data/statistics/junit/RegressionTests.java branches/jfreechart-1.0.x-branch/tests/org/jfree/data/statistics/junit/SimpleHistogramBinTests.java branches/jfreechart-1.0.x-branch/tests/org/jfree/data/statistics/junit/SimpleHistogramDatasetTests.java branches/jfreechart-1.0.x-branch/tests/org/jfree/data/statistics/junit/StatisticsTests.java Modified: branches/jfreechart-1.0.x-branch/tests/org/jfree/data/statistics/junit/BoxAndWhiskerCalculatorTests.java =================================================================== --- branches/jfreechart-1.0.x-branch/tests/org/jfree/data/statistics/junit/BoxAndWhiskerCalculatorTests.java 2008-09-04 19:48:17 UTC (rev 1497) +++ branches/jfreechart-1.0.x-branch/tests/org/jfree/data/statistics/junit/BoxAndWhiskerCalculatorTests.java 2008-09-04 19:49:21 UTC (rev 1498) @@ -2,32 +2,32 @@ * JFreeChart : a free chart library for the Java(tm) platform * =========================================================== * - * (C) Copyright 2000-2007, by Object Refinery Limited and Contributors. + * (C) Copyright 2000-2008, by Object Refinery Limited and Contributors. * * Project Info: http://www.jfree.org/jfreechart/index.html * - * This library is free software; you can redistribute it and/or modify it - * under the terms of the GNU Lesser General Public License as published by - * the Free Software Foundation; either version 2.1 of the License, or + * This library is free software; you can redistribute it and/or modify it + * under the terms of the GNU Lesser General Public License as published by + * the Free Software Foundation; either version 2.1 of the License, or * (at your option) any later version. * - * This library is distributed in the hope that it will be useful, but - * WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY - * or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public + * This library is distributed in the hope that it will be useful, but + * WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY + * or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public * License for more details. * * You should have received a copy of the GNU Lesser General Public * License along with this library; if not, write to the Free Software - * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, - * USA. + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, + * USA. * - * [Java is a trademark or registered trademark of Sun Microsystems, Inc. + * [Java is a trademark or registered trademark of Sun Microsystems, Inc. * in the United States and other countries.] * * --------------------------------- * BoxAndWhiskerCalculatorTests.java * --------------------------------- - * (C) Copyright 2003-2007, by Object Refinery Limited and Contributors. + * (C) Copyright 2003-2008, by Object Refinery Limited and Contributors. * * Original Author: David Gilbert (for Object Refinery Limited); * Contributor(s): -; @@ -72,12 +72,12 @@ public BoxAndWhiskerCalculatorTests(String name) { super(name); } - + /** * Some checks for the calculateBoxAndWhiskerStatistics() method. */ public void testCalculateBoxAndWhiskerStatistics() { - + // try null list boolean pass = false; try { @@ -87,25 +87,25 @@ pass = true; } assertTrue(pass); - + // try a list containing a single value List values = new ArrayList(); values.add(new Double(1.1)); - BoxAndWhiskerItem item + BoxAndWhiskerItem item = BoxAndWhiskerCalculator.calculateBoxAndWhiskerStatistics(values); assertEquals(1.1, item.getMean().doubleValue(), EPSILON); assertEquals(1.1, item.getMedian().doubleValue(), EPSILON); assertEquals(1.1, item.getQ1().doubleValue(), EPSILON); - assertEquals(1.1, item.getQ3().doubleValue(), EPSILON); + assertEquals(1.1, item.getQ3().doubleValue(), EPSILON); } - + private static final double EPSILON = 0.000000001; - + /** * Tests the Q1 calculation. */ public void testCalculateQ1() { - + // try null argument boolean pass = false; try { @@ -115,7 +115,7 @@ pass = true; } assertTrue(pass); - + List values = new ArrayList(); double q1 = BoxAndWhiskerCalculator.calculateQ1(values); assertTrue(Double.isNaN(q1)); @@ -163,7 +163,7 @@ q3 = BoxAndWhiskerCalculator.calculateQ3(values); assertEquals(q3, 3.5, EPSILON); } - + /** * The test case included in bug report 1593149. */ Modified: branches/jfreechart-1.0.x-branch/tests/org/jfree/data/statistics/junit/BoxAndWhiskerItemTests.java =================================================================== --- branches/jfreechart-1.0.x-branch/tests/org/jfree/data/statistics/junit/BoxAndWhiskerItemTests.java 2008-09-04 19:48:17 UTC (rev 1497) +++ branches/jfreechart-1.0.x-branch/tests/org/jfree/data/statistics/junit/BoxAndWhiskerItemTests.java 2008-09-04 19:49:21 UTC (rev 1498) @@ -2,32 +2,32 @@ * JFreeChart : a free chart library for the Java(tm) platform * =========================================================== * - * (C) Copyright 2000-2007, by Object Refinery Limited and Contributors. + * (C) Copyright 2000-2008, by Object Refinery Limited and Contributors. * * Project Info: http://www.jfree.org/jfreechart/index.html * - * This library is free software; you can redistribute it and/or modify it - * under the terms of the GNU Lesser General Public License as published by - * the Free Software Foundation; either version 2.1 of the License, or + * This library is free software; you can redistribute it and/or modify it + * under the terms of the GNU Lesser General Public License as published by + * the Free Software Foundation; either version 2.1 of the License, or * (at your option) any later version. * - * This library is distributed in the hope that it will be useful, but - * WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY - * or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public + * This library is distributed in the hope that it will be useful, but + * WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY + * or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public * License for more details. * * You should have received a copy of the GNU Lesser General Public * License along with this library; if not, write to the Free Software - * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, - * USA. + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, + * USA. * - * [Java is a trademark or registered trademark of Sun Microsystems, Inc. + * [Java is a trademark or registered trademark of Sun Microsystems, Inc. * in the United States and other countries.] * * --------------------------- * BoxAndWhiskerItemTests.java * --------------------------- - * (C) Copyright 2004-2007, by Object Refinery Limited and Contributors. + * (C) Copyright 2004-2008, by Object Refinery Limited and Contributors. * * Original Author: David Gilbert (for Object Refinery Limited); * Contributor(s): -; @@ -81,15 +81,15 @@ * Confirm that the equals method can distinguish all the required fields. */ public void testEquals() { - + BoxAndWhiskerItem i1 = new BoxAndWhiskerItem( - new Double(1.0), new Double(2.0), new Double(3.0), new Double(4.0), - new Double(5.0), new Double(6.0), new Double(7.0), new Double(8.0), + new Double(1.0), new Double(2.0), new Double(3.0), new Double(4.0), + new Double(5.0), new Double(6.0), new Double(7.0), new Double(8.0), new ArrayList() ); BoxAndWhiskerItem i2 = new BoxAndWhiskerItem( - new Double(1.0), new Double(2.0), new Double(3.0), new Double(4.0), - new Double(5.0), new Double(6.0), new Double(7.0), new Double(8.0), + new Double(1.0), new Double(2.0), new Double(3.0), new Double(4.0), + new Double(5.0), new Double(6.0), new Double(7.0), new Double(8.0), new ArrayList() ); assertTrue(i1.equals(i2)); @@ -103,12 +103,12 @@ public void testSerialization() { BoxAndWhiskerItem i1 = new BoxAndWhiskerItem( - new Double(1.0), new Double(2.0), new Double(3.0), new Double(4.0), - new Double(5.0), new Double(6.0), new Double(7.0), new Double(8.0), + new Double(1.0), new Double(2.0), new Double(3.0), new Double(4.0), + new Double(5.0), new Double(6.0), new Double(7.0), new Double(8.0), new ArrayList() ); BoxAndWhiskerItem i2 = null; - + try { ByteArrayOutputStream buffer = new ByteArrayOutputStream(); ObjectOutput out = new ObjectOutputStream(buffer); Modified: branches/jfreechart-1.0.x-branch/tests/org/jfree/data/statistics/junit/DataStatisticsPackageTests.java =================================================================== --- branches/jfreechart-1.0.x-branch/tests/org/jfree/data/statistics/junit/DataStatisticsPackageTests.java 2008-09-04 19:48:17 UTC (rev 1497) +++ branches/jfreechart-1.0.x-branch/tests/org/jfree/data/statistics/junit/DataStatisticsPackageTests.java 2008-09-04 19:49:21 UTC (rev 1498) @@ -2,32 +2,32 @@ * JFreeChart : a free chart library for the Java(tm) platform * =========================================================== * - * (C) Copyright 2000-2007, by Object Refinery Limited and Contributors. + * (C) Copyright 2000-2008, by Object Refinery Limited and Contributors. * * Project Info: http://www.jfree.org/jfreechart/index.html * - * This library is free software; you can redistribute it and/or modify it - * under the terms of the GNU Lesser General Public License as published by - * the Free Software Foundation; either version 2.1 of the License, or + * This library is free software; you can redistribute it and/or modify it + * under the terms of the GNU Lesser General Public License as published by + * the Free Software Foundation; either version 2.1 of the License, or * (at your option) any later version. * - * This library is distributed in the hope that it will be useful, but - * WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY - * or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public + * This library is distributed in the hope that it will be useful, but + * WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY + * or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public * License for more details. * * You should have received a copy of the GNU Lesser General Public * License along with this library; if not, write to the Free Software - * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, - * USA. + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, + * USA. * - * [Java is a trademark or registered trademark of Sun Microsystems, Inc. + * [Java is a trademark or registered trademark of Sun Microsystems, Inc. * in the United States and other countries.] * * ------------------------------- * DataStatisticsPackageTests.java * ------------------------------- - * (C) Copyright 2003-2007, by Object Refinery Limited and Contributors. + * (C) Copyright 2003-2008, by Object Refinery Limited and Contributors. * * Original Author: David Gilbert (for Object Refinery Limited); * Contributor(s): -; @@ -37,7 +37,7 @@ * 28-Aug-2003 : Version 1 (DG); * 01-Mar-2004 : Added tests for BoxAndWhiskerItem class (DG); * 25-Mar-2004 : Added tests for Statistics class (DG); - * 10-Jan-2005 : Added tests for new SimpleHistogramDataset and + * 10-Jan-2005 : Added tests for new SimpleHistogramDataset and * SimpleHistogramBin classes (DG); * 18-Jan-2005 : Added main() method (DG); * 12-Nov-2007 : Added DefaultBoxAndWhiskerXYDatasetTests (DG); @@ -51,8 +51,8 @@ import junit.framework.TestSuite; /** - * Some tests for the <code>org.jfree.data.statistics</code> package that can - * be run using JUnit. You can find more information about JUnit at + * Some tests for the <code>org.jfree.data.statistics</code> package that can + * be run using JUnit. You can find more information about JUnit at * <a href="http://www.junit.org">http://www.junit.org</a>. */ public class DataStatisticsPackageTests extends TestCase { @@ -87,10 +87,10 @@ public DataStatisticsPackageTests(String name) { super(name); } - + /** * Runs the test suite using JUnit's text-based runner. - * + * * @param args ignored. */ public static void main(String[] args) { Modified: branches/jfreechart-1.0.x-branch/tests/org/jfree/data/statistics/junit/DefaultBoxAndWhiskerCategoryDatasetTests.java =================================================================== --- branches/jfreechart-1.0.x-branch/tests/org/jfree/data/statistics/junit/DefaultBoxAndWhiskerCategoryDatasetTests.java 2008-09-04 19:48:17 UTC (rev 1497) +++ branches/jfreechart-1.0.x-branch/tests/org/jfree/data/statistics/junit/DefaultBoxAndWhiskerCategoryDatasetTests.java 2008-09-04 19:49:21 UTC (rev 1498) @@ -2,32 +2,32 @@ * JFreeChart : a free chart library for the Java(tm) platform * =========================================================== * - * (C) Copyright 2000-2007, by Object Refinery Limited and Contributors. + * (C) Copyright 2000-2008, by Object Refinery Limited and Contributors. * * Project Info: http://www.jfree.org/jfreechart/index.html * - * This library is free software; you can redistribute it and/or modify it - * under the terms of the GNU Lesser General Public License as published by - * the Free Software Foundation; either version 2.1 of the License, or + * This library is free software; you can redistribute it and/or modify it + * under the terms of the GNU Lesser General Public License as published by + * the Free Software Foundation; either version 2.1 of the License, or * (at your option) any later version. * - * This library is distributed in the hope that it will be useful, but - * WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY - * or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public + * This library is distributed in the hope that it will be useful, but + * WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY + * or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public * License for more details. * * You should have received a copy of the GNU Lesser General Public * License along with this library; if not, write to the Free Software - * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, - * USA. + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, + * USA. * - * [Java is a trademark or registered trademark of Sun Microsystems, Inc. + * [Java is a trademark or registered trademark of Sun Microsystems, Inc. * in the United States and other countries.] * * --------------------------------------------- * DefaultBoxAndWhiskerCategoryDatasetTests.java * --------------------------------------------- - * (C) Copyright 2004-2007, by Object Refinery Limited and Contributors. + * (C) Copyright 2004-2008, by Object Refinery Limited and Contributors. * * Original Author: David Gilbert (for Object Refinery Limited); * Contributor(s): -; @@ -39,7 +39,7 @@ * 28-Sep-2007 : Enhanced testClone() (DG); * 02-Oct-2007 : Added new tests (DG); * 03-Oct-2007 : Added getTestRangeBounds() and testRemove() (DG); - * + * */ package org.jfree.data.statistics.junit; @@ -88,16 +88,16 @@ * Confirm that the equals method can distinguish all the required fields. */ public void testEquals() { - DefaultBoxAndWhiskerCategoryDataset d1 + DefaultBoxAndWhiskerCategoryDataset d1 = new DefaultBoxAndWhiskerCategoryDataset(); - d1.add(new BoxAndWhiskerItem(new Double(1.0), new Double(2.0), - new Double(3.0), new Double(4.0), new Double(5.0), - new Double(6.0), new Double(7.0), new Double(8.0), + d1.add(new BoxAndWhiskerItem(new Double(1.0), new Double(2.0), + new Double(3.0), new Double(4.0), new Double(5.0), + new Double(6.0), new Double(7.0), new Double(8.0), new ArrayList()), "ROW1", "COLUMN1"); - DefaultBoxAndWhiskerCategoryDataset d2 + DefaultBoxAndWhiskerCategoryDataset d2 = new DefaultBoxAndWhiskerCategoryDataset(); - d2.add(new BoxAndWhiskerItem(new Double(1.0), new Double(2.0), - new Double(3.0), new Double(4.0), new Double(5.0), + d2.add(new BoxAndWhiskerItem(new Double(1.0), new Double(2.0), + new Double(3.0), new Double(4.0), new Double(5.0), new Double(6.0), new Double(7.0), new Double(8.0), new ArrayList()), "ROW1", "COLUMN1"); assertTrue(d1.equals(d2)); @@ -109,14 +109,14 @@ */ public void testSerialization() { - DefaultBoxAndWhiskerCategoryDataset d1 + DefaultBoxAndWhiskerCategoryDataset d1 = new DefaultBoxAndWhiskerCategoryDataset(); - d1.add(new BoxAndWhiskerItem(new Double(1.0), new Double(2.0), - new Double(3.0), new Double(4.0), new Double(5.0), + d1.add(new BoxAndWhiskerItem(new Double(1.0), new Double(2.0), + new Double(3.0), new Double(4.0), new Double(5.0), new Double(6.0), new Double(7.0), new Double(8.0), new ArrayList()), "ROW1", "COLUMN1"); DefaultBoxAndWhiskerCategoryDataset d2 = null; - + try { ByteArrayOutputStream buffer = new ByteArrayOutputStream(); ObjectOutput out = new ObjectOutputStream(buffer); @@ -139,10 +139,10 @@ * Confirm that cloning works. */ public void testCloning() { - DefaultBoxAndWhiskerCategoryDataset d1 + DefaultBoxAndWhiskerCategoryDataset d1 = new DefaultBoxAndWhiskerCategoryDataset(); - d1.add(new BoxAndWhiskerItem(new Double(1.0), new Double(2.0), - new Double(3.0), new Double(4.0), new Double(5.0), + d1.add(new BoxAndWhiskerItem(new Double(1.0), new Double(2.0), + new Double(3.0), new Double(4.0), new Double(5.0), new Double(6.0), new Double(7.0), new Double(8.0), new ArrayList()), "ROW1", "COLUMN1"); DefaultBoxAndWhiskerCategoryDataset d2 = null; @@ -155,10 +155,10 @@ assertTrue(d1 != d2); assertTrue(d1.getClass() == d2.getClass()); assertTrue(d1.equals(d2)); - + // test independence - d1.add(new BoxAndWhiskerItem(new Double(1.0), new Double(2.0), - new Double(3.0), new Double(4.0), new Double(5.0), + d1.add(new BoxAndWhiskerItem(new Double(1.0), new Double(2.0), + new Double(3.0), new Double(4.0), new Double(5.0), new Double(6.0), new Double(7.0), new Double(8.0), new ArrayList()), "ROW2", "COLUMN1"); assertFalse(d1.equals(d2)); @@ -168,52 +168,52 @@ * A simple test for bug report 1701822. */ public void test1701822() { - DefaultBoxAndWhiskerCategoryDataset dataset + DefaultBoxAndWhiskerCategoryDataset dataset = new DefaultBoxAndWhiskerCategoryDataset(); try { - dataset.add(new BoxAndWhiskerItem(new Double(1.0), new Double(2.0), - new Double(3.0), new Double(4.0), new Double(5.0), + dataset.add(new BoxAndWhiskerItem(new Double(1.0), new Double(2.0), + new Double(3.0), new Double(4.0), new Double(5.0), new Double(6.0), null, new Double(8.0), new ArrayList()), "ROW1", "COLUMN1"); - dataset.add(new BoxAndWhiskerItem(new Double(1.0), new Double(2.0), - new Double(3.0), new Double(4.0), new Double(5.0), + dataset.add(new BoxAndWhiskerItem(new Double(1.0), new Double(2.0), + new Double(3.0), new Double(4.0), new Double(5.0), new Double(6.0), new Double(7.0), null, new ArrayList()), "ROW1", "COLUMN2"); } catch (NullPointerException e) { assertTrue(false); } - + } - + private static final double EPSILON = 0.0000000001; - + /** * Some checks for the add() method. */ public void testAdd() { - DefaultBoxAndWhiskerCategoryDataset dataset + DefaultBoxAndWhiskerCategoryDataset dataset = new DefaultBoxAndWhiskerCategoryDataset(); - BoxAndWhiskerItem item1 = new BoxAndWhiskerItem(1.0, 2.0, 3.0, 4.0, + BoxAndWhiskerItem item1 = new BoxAndWhiskerItem(1.0, 2.0, 3.0, 4.0, 5.0, 6.0, 7.0, 8.0, new ArrayList()); dataset.add(item1, "R1", "C1"); - + assertEquals(2.0, dataset.getValue("R1", "C1").doubleValue(), EPSILON); - assertEquals(1.0, dataset.getMeanValue("R1", "C1").doubleValue(), + assertEquals(1.0, dataset.getMeanValue("R1", "C1").doubleValue(), EPSILON); - assertEquals(2.0, dataset.getMedianValue("R1", "C1").doubleValue(), + assertEquals(2.0, dataset.getMedianValue("R1", "C1").doubleValue(), EPSILON); - assertEquals(3.0, dataset.getQ1Value("R1", "C1").doubleValue(), + assertEquals(3.0, dataset.getQ1Value("R1", "C1").doubleValue(), EPSILON); - assertEquals(4.0, dataset.getQ3Value("R1", "C1").doubleValue(), + assertEquals(4.0, dataset.getQ3Value("R1", "C1").doubleValue(), EPSILON); - assertEquals(5.0, dataset.getMinRegularValue("R1", "C1").doubleValue(), + assertEquals(5.0, dataset.getMinRegularValue("R1", "C1").doubleValue(), EPSILON); assertEquals(6.0, dataset.getMaxRegularValue("R1", "C1").doubleValue(), EPSILON); - assertEquals(7.0, dataset.getMinOutlier("R1", "C1").doubleValue(), + assertEquals(7.0, dataset.getMinOutlier("R1", "C1").doubleValue(), EPSILON); - assertEquals(8.0, dataset.getMaxOutlier("R1", "C1").doubleValue(), + assertEquals(8.0, dataset.getMaxOutlier("R1", "C1").doubleValue(), EPSILON); assertEquals(new Range(7.0, 8.0), dataset.getRangeBounds(false)); } @@ -222,85 +222,85 @@ * Some checks for the add() method. */ public void testAddUpdatesCachedRange() { - DefaultBoxAndWhiskerCategoryDataset dataset + DefaultBoxAndWhiskerCategoryDataset dataset = new DefaultBoxAndWhiskerCategoryDataset(); - BoxAndWhiskerItem item1 = new BoxAndWhiskerItem(1.0, 2.0, 3.0, 4.0, + BoxAndWhiskerItem item1 = new BoxAndWhiskerItem(1.0, 2.0, 3.0, 4.0, 5.0, 6.0, 7.0, 8.0, new ArrayList()); dataset.add(item1, "R1", "C1"); - + // now overwrite this item with another - BoxAndWhiskerItem item2 = new BoxAndWhiskerItem(1.5, 2.5, 3.5, 4.5, + BoxAndWhiskerItem item2 = new BoxAndWhiskerItem(1.5, 2.5, 3.5, 4.5, 5.5, 6.5, 7.5, 8.5, new ArrayList()); dataset.add(item2, "R1", "C1"); assertEquals(2.5, dataset.getValue("R1", "C1").doubleValue(), EPSILON); - assertEquals(1.5, dataset.getMeanValue("R1", "C1").doubleValue(), + assertEquals(1.5, dataset.getMeanValue("R1", "C1").doubleValue(), EPSILON); - assertEquals(2.5, dataset.getMedianValue("R1", "C1").doubleValue(), + assertEquals(2.5, dataset.getMedianValue("R1", "C1").doubleValue(), EPSILON); - assertEquals(3.5, dataset.getQ1Value("R1", "C1").doubleValue(), + assertEquals(3.5, dataset.getQ1Value("R1", "C1").doubleValue(), EPSILON); - assertEquals(4.5, dataset.getQ3Value("R1", "C1").doubleValue(), + assertEquals(4.5, dataset.getQ3Value("R1", "C1").doubleValue(), EPSILON); - assertEquals(5.5, dataset.getMinRegularValue("R1", "C1").doubleValue(), + assertEquals(5.5, dataset.getMinRegularValue("R1", "C1").doubleValue(), EPSILON); assertEquals(6.5, dataset.getMaxRegularValue("R1", "C1").doubleValue(), EPSILON); - assertEquals(7.5, dataset.getMinOutlier("R1", "C1").doubleValue(), + assertEquals(7.5, dataset.getMinOutlier("R1", "C1").doubleValue(), EPSILON); - assertEquals(8.5, dataset.getMaxOutlier("R1", "C1").doubleValue(), + assertEquals(8.5, dataset.getMaxOutlier("R1", "C1").doubleValue(), EPSILON); assertEquals(new Range(7.5, 8.5), dataset.getRangeBounds(false)); } - + /** * Some basic checks for the constructor. */ public void testConstructor() { - DefaultBoxAndWhiskerCategoryDataset dataset + DefaultBoxAndWhiskerCategoryDataset dataset = new DefaultBoxAndWhiskerCategoryDataset(); assertEquals(0, dataset.getColumnCount()); assertEquals(0, dataset.getRowCount()); assertTrue(Double.isNaN(dataset.getRangeLowerBound(false))); assertTrue(Double.isNaN(dataset.getRangeUpperBound(false))); } - + /** * Some checks for the getRangeBounds() method. */ public void testGetRangeBounds() { - DefaultBoxAndWhiskerCategoryDataset d1 + DefaultBoxAndWhiskerCategoryDataset d1 = new DefaultBoxAndWhiskerCategoryDataset(); - d1.add(new BoxAndWhiskerItem(1.0, 2.0, 3.0, 4.0, 5.0, 6.0, 7.0, 8.0, + d1.add(new BoxAndWhiskerItem(1.0, 2.0, 3.0, 4.0, 5.0, 6.0, 7.0, 8.0, new ArrayList()), "R1", "C1"); assertEquals(new Range(7.0, 8.0), d1.getRangeBounds(false)); assertEquals(new Range(7.0, 8.0), d1.getRangeBounds(true)); - - d1.add(new BoxAndWhiskerItem(1.5, 2.5, 3.5, 4.5, 5.5, 6.5, 7.5, 8.5, + + d1.add(new BoxAndWhiskerItem(1.5, 2.5, 3.5, 4.5, 5.5, 6.5, 7.5, 8.5, new ArrayList()), "R1", "C1"); assertEquals(new Range(7.5, 8.5), d1.getRangeBounds(false)); assertEquals(new Range(7.5, 8.5), d1.getRangeBounds(true)); - - d1.add(new BoxAndWhiskerItem(2.5, 3.5, 4.5, 5.5, 6.5, 7.5, 8.5, 9.5, + + d1.add(new BoxAndWhiskerItem(2.5, 3.5, 4.5, 5.5, 6.5, 7.5, 8.5, 9.5, new ArrayList()), "R2", "C1"); assertEquals(new Range(7.5, 9.5), d1.getRangeBounds(false)); assertEquals(new Range(7.5, 9.5), d1.getRangeBounds(true)); - + // this replaces the entry with the current minimum value, but the new // minimum value is now in a different item - d1.add(new BoxAndWhiskerItem(1.5, 2.5, 3.5, 4.5, 5.5, 6.5, 8.6, 9.6, + d1.add(new BoxAndWhiskerItem(1.5, 2.5, 3.5, 4.5, 5.5, 6.5, 8.6, 9.6, new ArrayList()), "R1", "C1"); assertEquals(new Range(8.5, 9.6), d1.getRangeBounds(false)); assertEquals(new Range(8.5, 9.6), d1.getRangeBounds(true)); } - + /** * Some checks for the remove method. */ public void testRemove() { DefaultBoxAndWhiskerCategoryDataset data = new DefaultBoxAndWhiskerCategoryDataset(); - + boolean pass = false; try { data.remove("R1", "R2"); @@ -309,16 +309,16 @@ pass = true; } assertTrue(pass); - data.add(new BoxAndWhiskerItem(1.0, 2.0, 3.0, 4.0, 5.0, 6.0, 7.0, 8.0, + data.add(new BoxAndWhiskerItem(1.0, 2.0, 3.0, 4.0, 5.0, 6.0, 7.0, 8.0, new ArrayList()), "R1", "C1"); assertEquals(new Range(7.0, 8.0), data.getRangeBounds(false)); assertEquals(new Range(7.0, 8.0), data.getRangeBounds(true)); - - data.add(new BoxAndWhiskerItem(2.5, 3.5, 4.5, 5.5, 6.5, 7.5, 8.5, 9.5, + + data.add(new BoxAndWhiskerItem(2.5, 3.5, 4.5, 5.5, 6.5, 7.5, 8.5, 9.5, new ArrayList()), "R2", "C1"); assertEquals(new Range(7.0, 9.5), data.getRangeBounds(false)); assertEquals(new Range(7.0, 9.5), data.getRangeBounds(true)); - + data.remove("R1", "C1"); assertEquals(new Range(8.5, 9.5), data.getRangeBounds(false)); assertEquals(new Range(8.5, 9.5), data.getRangeBounds(true)); Modified: branches/jfreechart-1.0.x-branch/tests/org/jfree/data/statistics/junit/DefaultBoxAndWhiskerXYDatasetTests.java =================================================================== --- branches/jfreechart-1.0.x-branch/tests/org/jfree/data/statistics/junit/DefaultBoxAndWhiskerXYDatasetTests.java 2008-09-04 19:48:17 UTC (rev 1497) +++ branches/jfreechart-1.0.x-branch/tests/org/jfree/data/statistics/junit/DefaultBoxAndWhiskerXYDatasetTests.java 2008-09-04 19:49:21 UTC (rev 1498) @@ -2,32 +2,32 @@ * JFreeChart : a free chart library for the Java(tm) platform * =========================================================== * - * (C) Copyright 2000-2007, by Object Refinery Limited and Contributors. + * (C) Copyright 2000-2008, by Object Refinery Limited and Contributors. * * Project Info: http://www.jfree.org/jfreechart/index.html * - * This library is free software; you can redistribute it and/or modify it - * under the terms of the GNU Lesser General Public License as published by - * the Free Software Foundation; either version 2.1 of the License, or + * This library is free software; you can redistribute it and/or modify it + * under the terms of the GNU Lesser General Public License as published by + * the Free Software Foundation; either version 2.1 of the License, or * (at your option) any later version. * - * This library is distributed in the hope that it will be useful, but - * WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY - * or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public + * This library is distributed in the hope that it will be useful, but + * WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY + * or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public * License for more details. * * You should have received a copy of the GNU Lesser General Public * License along with this library; if not, write to the Free Software - * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, - * USA. + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, + * USA. * - * [Java is a trademark or registered trademark of Sun Microsystems, Inc. + * [Java is a trademark or registered trademark of Sun Microsystems, Inc. * in the United States and other countries.] * * --------------------------------------- * DefaultBoxAndWhiskerXYDatasetTests.java * --------------------------------------- - * (C) Copyright 2007, by Object Refinery Limited and Contributors. + * (C) Copyright 2007, 2008, by Object Refinery Limited and Contributors. * * Original Author: David Gilbert (for Object Refinery Limited); * Contributor(s): -; @@ -35,7 +35,7 @@ * Changes * ------- * 12-Nov-2007 : Version 1 (DG); - * + * */ package org.jfree.data.statistics.junit; @@ -89,11 +89,11 @@ DefaultBoxAndWhiskerXYDataset d2 = new DefaultBoxAndWhiskerXYDataset( "Series"); assertTrue(d1.equals(d2)); - - d1.add(new Date(1L), new BoxAndWhiskerItem(1.0, 2.0, 3.0, 4.0, 5.0, + + d1.add(new Date(1L), new BoxAndWhiskerItem(1.0, 2.0, 3.0, 4.0, 5.0, 6.0, 7.0, 8.0, new ArrayList())); assertFalse(d1.equals(d2)); - d2.add(new Date(1L), new BoxAndWhiskerItem(1.0, 2.0, 3.0, 4.0, 5.0, + d2.add(new Date(1L), new BoxAndWhiskerItem(1.0, 2.0, 3.0, 4.0, 5.0, 6.0, 7.0, 8.0, new ArrayList())); assertTrue(d1.equals(d2)); } @@ -105,10 +105,10 @@ DefaultBoxAndWhiskerXYDataset d1 = new DefaultBoxAndWhiskerXYDataset( "Series"); - d1.add(new Date(1L), new BoxAndWhiskerItem(1.0, 2.0, 3.0, 4.0, 5.0, + d1.add(new Date(1L), new BoxAndWhiskerItem(1.0, 2.0, 3.0, 4.0, 5.0, 6.0, 7.0, 8.0, new ArrayList())); DefaultBoxAndWhiskerXYDataset d2 = null; - + try { ByteArrayOutputStream buffer = new ByteArrayOutputStream(); ObjectOutput out = new ObjectOutputStream(buffer); @@ -126,7 +126,7 @@ assertEquals(d1, d2); // test independence - d1.add(new Date(2L), new BoxAndWhiskerItem(1.0, 2.0, 3.0, 4.0, 5.0, + d1.add(new Date(2L), new BoxAndWhiskerItem(1.0, 2.0, 3.0, 4.0, 5.0, 6.0, 7.0, 8.0, new ArrayList())); assertFalse(d1.equals(d2)); } @@ -137,7 +137,7 @@ public void testCloning() { DefaultBoxAndWhiskerXYDataset d1 = new DefaultBoxAndWhiskerXYDataset( "Series"); - d1.add(new Date(1L), new BoxAndWhiskerItem(1.0, 2.0, 3.0, 4.0, 5.0, + d1.add(new Date(1L), new BoxAndWhiskerItem(1.0, 2.0, 3.0, 4.0, 5.0, 6.0, 7.0, 8.0, new ArrayList())); DefaultBoxAndWhiskerXYDataset d2 = null; try { @@ -149,31 +149,31 @@ assertTrue(d1 != d2); assertTrue(d1.getClass() == d2.getClass()); assertTrue(d1.equals(d2)); - + // test independence - d1.add(new Date(2L), new BoxAndWhiskerItem(1.0, 2.0, 3.0, 4.0, 5.0, + d1.add(new Date(2L), new BoxAndWhiskerItem(1.0, 2.0, 3.0, 4.0, 5.0, 6.0, 7.0, 8.0, new ArrayList())); assertFalse(d1.equals(d2)); } - + private static final double EPSILON = 0.0000000001; - + /** * Some checks for the add() method. */ public void testAdd() { - DefaultBoxAndWhiskerXYDataset dataset + DefaultBoxAndWhiskerXYDataset dataset = new DefaultBoxAndWhiskerXYDataset("S1"); - BoxAndWhiskerItem item1 = new BoxAndWhiskerItem(1.0, 2.0, 3.0, 4.0, + BoxAndWhiskerItem item1 = new BoxAndWhiskerItem(1.0, 2.0, 3.0, 4.0, 5.0, 6.0, 7.0, 8.0, new ArrayList()); dataset.add(new Date(33L), item1); - + assertEquals(1.0, dataset.getY(0, 0).doubleValue(), EPSILON); assertEquals(1.0, dataset.getMeanValue(0, 0).doubleValue(), EPSILON); assertEquals(2.0, dataset.getMedianValue(0, 0).doubleValue(), EPSILON); assertEquals(3.0, dataset.getQ1Value(0, 0).doubleValue(), EPSILON); assertEquals(4.0, dataset.getQ3Value(0, 0).doubleValue(), EPSILON); - assertEquals(5.0, dataset.getMinRegularValue(0, 0).doubleValue(), + assertEquals(5.0, dataset.getMinRegularValue(0, 0).doubleValue(), EPSILON); assertEquals(6.0, dataset.getMaxRegularValue(0, 0).doubleValue(), EPSILON); @@ -181,40 +181,40 @@ assertEquals(8.0, dataset.getMaxOutlier(0, 0).doubleValue(), EPSILON); assertEquals(new Range(5.0, 6.0), dataset.getRangeBounds(false)); } - + /** * Some basic checks for the constructor. */ public void testConstructor() { - DefaultBoxAndWhiskerXYDataset dataset + DefaultBoxAndWhiskerXYDataset dataset = new DefaultBoxAndWhiskerXYDataset("S1"); assertEquals(1, dataset.getSeriesCount()); assertEquals(0, dataset.getItemCount(0)); assertTrue(Double.isNaN(dataset.getRangeLowerBound(false))); assertTrue(Double.isNaN(dataset.getRangeUpperBound(false))); } - + /** * Some checks for the getRangeBounds() method. */ public void testGetRangeBounds() { - DefaultBoxAndWhiskerXYDataset d1 + DefaultBoxAndWhiskerXYDataset d1 = new DefaultBoxAndWhiskerXYDataset("S"); - d1.add(new Date(1L), new BoxAndWhiskerItem(1.0, 2.0, 3.0, 4.0, 5.0, + d1.add(new Date(1L), new BoxAndWhiskerItem(1.0, 2.0, 3.0, 4.0, 5.0, 6.0, 7.0, 8.0, new ArrayList())); assertEquals(new Range(5.0, 6.0), d1.getRangeBounds(false)); assertEquals(new Range(5.0, 6.0), d1.getRangeBounds(true)); - - d1.add(new Date(1L), new BoxAndWhiskerItem(1.5, 2.5, 3.5, 4.5, 5.5, + + d1.add(new Date(1L), new BoxAndWhiskerItem(1.5, 2.5, 3.5, 4.5, 5.5, 6.5, 7.5, 8.5, new ArrayList())); assertEquals(new Range(5.0, 6.5), d1.getRangeBounds(false)); assertEquals(new Range(5.0, 6.5), d1.getRangeBounds(true)); - - d1.add(new Date(2L), new BoxAndWhiskerItem(2.5, 3.5, 4.5, 5.5, 6.5, + + d1.add(new Date(2L), new BoxAndWhiskerItem(2.5, 3.5, 4.5, 5.5, 6.5, 7.5, 8.5, 9.5, new ArrayList())); assertEquals(new Range(5.0, 7.5), d1.getRangeBounds(false)); assertEquals(new Range(5.0, 7.5), d1.getRangeBounds(true)); } - + } Modified: branches/jfreechart-1.0.x-branch/tests/org/jfree/data/statistics/junit/DefaultMultiValueCategoryDatasetTests.java =================================================================== --- branches/jfreechart-1.0.x-branch/tests/org/jfree/data/statistics/junit/DefaultMultiValueCategoryDatasetTests.java 2008-09-04 19:48:17 UTC (rev 1497) +++ branches/jfreechart-1.0.x-branch/tests/org/jfree/data/statistics/junit/DefaultMultiValueCategoryDatasetTests.java 2008-09-04 19:49:21 UTC (rev 1498) @@ -2,32 +2,32 @@ * JFreeChart : a free chart library for the Java(tm) platform * =========================================================== * - * (C) Copyright 2000-2007, by Object Refinery Limited and Contributors. + * (C) Copyright 2000-2008, by Object Refinery Limited and Contributors. * * Project Info: http://www.jfree.org/jfreechart/index.html * - * This library is free software; you can redistribute it and/or modify it - * under the terms of the GNU Lesser General Public License as published by - * the Free Software Foundation; either version 2.1 of the License, or + * This library is free software; you can redistribute it and/or modify it + * under the terms of the GNU Lesser General Public License as published by + * the Free Software Foundation; either version 2.1 of the License, or * (at your option) any later version. * - * This library is distributed in the hope that it will be useful, but - * WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY - * or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public + * This library is distributed in the hope that it will be useful, but + * WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY + * or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public * License for more details. * * You should have received a copy of the GNU Lesser General Public * License along with this library; if not, write to the Free Software - * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, - * USA. + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, + * USA. * - * [Java is a trademark or registered trademark of Sun Microsystems, Inc. + * [Java is a trademark or registered trademark of Sun Microsystems, Inc. * in the United States and other countries.] * * ------------------------------------------ * DefaultMultiValueCategoryDatasetTests.java * ------------------------------------------ - * (C) Copyright 2007, by Object Refinery Limited and Contributors. + * (C) Copyright 2007, 2008, by Object Refinery Limited and Contributors. * * Original Author: David Gilbert (for Object Refinery Limited); * Contributor(s): -; @@ -60,7 +60,7 @@ * Tests for the {@link DefaultMultiValueCategoryDataset} class. */ public class DefaultMultiValueCategoryDatasetTests extends TestCase { - + /** * Returns the tests as a test suite. * @@ -78,12 +78,12 @@ public DefaultMultiValueCategoryDatasetTests(String name) { super(name); } - + /** * Some checks for the getValue() method. */ public void testGetValue() { - DefaultMultiValueCategoryDataset d + DefaultMultiValueCategoryDataset d = new DefaultMultiValueCategoryDataset(); List values = new ArrayList(); values.add(new Integer(1)); @@ -95,25 +95,25 @@ d.getValue("XX", "C1"); } catch (UnknownKeyException e) { - pass = true; + pass = true; } assertTrue(pass); - + pass = false; try { d.getValue("R1", "XX"); } catch (UnknownKeyException e) { - pass = true; + pass = true; } assertTrue(pass); } - + /** * A simple check for the getValue(int, int) method. */ public void testGetValue2() { - DefaultMultiValueCategoryDataset d + DefaultMultiValueCategoryDataset d = new DefaultMultiValueCategoryDataset(); boolean pass = false; try { @@ -124,21 +124,21 @@ } assertTrue(pass); } - + /** * Some tests for the getRowCount() method. */ public void testGetRowCount() { - DefaultMultiValueCategoryDataset d + DefaultMultiValueCategoryDataset d = new DefaultMultiValueCategoryDataset(); assertTrue(d.getRowCount() == 0); List values = new ArrayList(); d.add(values, "R1", "C1"); assertTrue(d.getRowCount() == 1); - + d.add(values, "R2", "C1"); assertTrue(d.getRowCount() == 2); - + d.add(values, "R2", "C1"); assertTrue(d.getRowCount() == 2); } @@ -147,17 +147,17 @@ * Some tests for the getColumnCount() method. */ public void testGetColumnCount() { - DefaultMultiValueCategoryDataset d + DefaultMultiValueCategoryDataset d = new DefaultMultiValueCategoryDataset(); assertTrue(d.getColumnCount() == 0); - + List values = new ArrayList(); d.add(values, "R1", "C1"); assertTrue(d.getColumnCount() == 1); - + d.add(values, "R1", "C2"); assertTrue(d.getColumnCount() == 2); - + d.add(values, "R1", "C2"); assertTrue(d.getColumnCount() == 2); @@ -167,30 +167,30 @@ * Confirm that the equals method can distinguish all the required fields. */ public void testEquals() { - DefaultMultiValueCategoryDataset d1 + DefaultMultiValueCategoryDataset d1 = new DefaultMultiValueCategoryDataset(); - DefaultMultiValueCategoryDataset d2 + DefaultMultiValueCategoryDataset d2 = new DefaultMultiValueCategoryDataset(); assertTrue(d1.equals(d2)); assertTrue(d2.equals(d1)); - + List values = new ArrayList(); d1.add(values, "R1", "C1"); assertFalse(d1.equals(d2)); d2.add(values, "R1", "C1"); assertTrue(d1.equals(d2)); - + values.add(new Integer(99)); d1.add(values, "R1", "C1"); assertFalse(d1.equals(d2)); d2.add(values, "R1", "C1"); assertTrue(d1.equals(d2)); - + values.add(new Integer(99)); d1.add(values, "R1", "C2"); assertFalse(d1.equals(d2)); d2.add(values, "R1", "C2"); - assertTrue(d1.equals(d2)); + assertTrue(d1.equals(d2)); } /** @@ -198,9 +198,9 @@ */ public void testSerialization() { - DefaultMultiValueCategoryDataset d1 + DefaultMultiValueCategoryDataset d1 = new DefaultMultiValueCategoryDataset(); - DefaultMultiValueCategoryDataset d2 + DefaultMultiValueCategoryDataset d2 = new DefaultMultiValueCategoryDataset(); try { @@ -220,14 +220,14 @@ assertEquals(d1, d2); } - + /** * Some checks for the add() method. */ public void testAddValue() { - DefaultMultiValueCategoryDataset d1 + DefaultMultiValueCategoryDataset d1 = new DefaultMultiValueCategoryDataset(); - + boolean pass = false; try { d1.add(null, "R1", "C1"); @@ -236,11 +236,11 @@ pass = true; } assertTrue(pass); - + List values = new ArrayList(); d1.add(values, "R2", "C1"); assertEquals(values, d1.getValues("R2", "C1")); - + pass = false; try { d1.add(values, null, "C2"); @@ -250,12 +250,12 @@ } assertTrue(pass); } - + /** * Confirm that cloning works. */ public void testCloning() { - DefaultMultiValueCategoryDataset d1 + DefaultMultiValueCategoryDataset d1 = new DefaultMultiValueCategoryDataset(); DefaultMultiValueCategoryDataset d2 = null; try { @@ -267,7 +267,7 @@ assertTrue(d1 != d2); assertTrue(d1.getClass() == d2.getClass()); assertTrue(d1.equals(d2)); - + // try a dataset with some content... List values = new ArrayList(); values.add(new Integer(99)); @@ -281,7 +281,7 @@ assertTrue(d1 != d2); assertTrue(d1.getClass() == d2.getClass()); assertTrue(d1.equals(d2)); - + // check that the clone doesn't share the same underlying arrays. List values2 = new ArrayList(); values2.add(new Integer(111)); Modified: branches/jfreechart-1.0.x-branch/tests/org/jfree/data/statistics/junit/DefaultStatisticalCategoryDatasetTests.java =================================================================== --- branches/jfreechart-1.0.x-branch/tests/org/jfree/data/statistics/junit/DefaultStatisticalCategoryDatasetTests.java 2008-09-04 19:48:17 UTC (rev 1497) +++ branches/jfreechart-1.0.x-branch/tests/org/jfree/data/statistics/junit/DefaultStatisticalCategoryDatasetTests.java 2008-09-04 19:49:21 UTC (rev 1498) @@ -2,32 +2,32 @@ * JFreeChart : a free chart library for the Java(tm) platform * =========================================================== * - * (C) Copyright 2000-2007, by Object Refinery Limited and Contributors. + * (C) Copyright 2000-2008, by Object Refinery Limited and Contributors. * * Project Info: http://www.jfree.org/jfreechart/index.html * - * This library is free software; you can redistribute it and/or modify it - * under the terms of the GNU Lesser General Public License as published by - * the Free Software Foundation; either version 2.1 of the License, or + * This library is free software; you can redistribute it and/or modify it + * under the terms of the GNU Lesser General Public License as published by + * the Free Software Foundation; either version 2.1 of the License, or * (at your option) any later version. * - * This library is distributed in the hope that it will be useful, but - * WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY - * or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public + * This library is distributed in the hope that it will be useful, but + * WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY + * or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public * License for more details. * * You should have received a copy of the GNU Lesser General Public * License along with this library; if not, write to the Free Software - * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, - * USA. + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, + * USA. * - * [Java is a trademark or registered trademark of Sun Microsystems, Inc. + * [Java is a trademark or registered trademark of Sun Microsystems, Inc. * in the United States and other countries.] * * ------------------------------------------- * DefaultStatisticalCategoryDatasetTests.java * ------------------------------------------- - * (C) Copyright 2005-2007, by Object Refinery Limited and Contributors. + * (C) Copyright 2005-2008, by Object Refinery Limited and Contributors. * * Original Author: David Gilbert (for Object Refinery Limited); * Contributor(s): -; @@ -86,22 +86,22 @@ * Some checks for the getRangeBounds() method. */ public void testGetRangeBounds() { - DefaultStatisticalCategoryDataset d + DefaultStatisticalCategoryDataset d = new DefaultStatisticalCategoryDataset(); - + // an empty dataset should return null for bounds assertNull(d.getRangeBounds(true)); - + // try a dataset with a single value d.add(4.5, 1.0, "R1", "C1"); assertEquals(new Range(4.5, 4.5), d.getRangeBounds(false)); assertEquals(new Range(3.5, 5.5), d.getRangeBounds(true)); - + // try a dataset with two values d.add(0.5, 2.0, "R1", "C2"); assertEquals(new Range(0.5, 4.5), d.getRangeBounds(false)); assertEquals(new Range(-1.5, 5.5), d.getRangeBounds(true)); - + // try a Double.NaN d.add(Double.NaN, 0.0, "R1", "C3"); assertEquals(new Range(0.5, 4.5), d.getRangeBounds(false)); @@ -109,26 +109,26 @@ // try a Double.NEGATIVE_INFINITY d.add(Double.NEGATIVE_INFINITY, 0.0, "R1", "C3"); - assertEquals(new Range(Double.NEGATIVE_INFINITY, 4.5), + assertEquals(new Range(Double.NEGATIVE_INFINITY, 4.5), d.getRangeBounds(false)); - assertEquals(new Range(Double.NEGATIVE_INFINITY, 5.5), + assertEquals(new Range(Double.NEGATIVE_INFINITY, 5.5), d.getRangeBounds(true)); // try a Double.POSITIVE_INFINITY d.add(Double.POSITIVE_INFINITY, 0.0, "R1", "C3"); - assertEquals(new Range(0.5, Double.POSITIVE_INFINITY), + assertEquals(new Range(0.5, Double.POSITIVE_INFINITY), d.getRangeBounds(false)); - assertEquals(new Range(-1.5, Double.POSITIVE_INFINITY), + assertEquals(new Range(-1.5, Double.POSITIVE_INFINITY), d.getRangeBounds(true)); } - + /** * Confirm that the equals method can distinguish all the required fields. */ public void testEquals() { - DefaultStatisticalCategoryDataset d1 + DefaultStatisticalCategoryDataset d1 = new DefaultStatisticalCategoryDataset(); - DefaultStatisticalCategoryDataset d2 + DefaultStatisticalCategoryDataset d2 = new DefaultStatisticalCategoryDataset(); assertTrue(d1.equals(d2)); assertTrue(d2.equals(d1)); @@ -139,7 +139,7 @@ * Some checks for cloning. */ public void testCloning() { - DefaultStatisticalCategoryDataset d1 + DefaultStatisticalCategoryDataset d1 = new DefaultStatisticalCategoryDataset(); d1.add(1.1, 2.2, "R1", "C1"); d1.add(3.3, 4.4, "R1", "C2"); @@ -155,7 +155,7 @@ assertTrue(d1 != d2); assertTrue(d1.getClass() == d2.getClass()); assertTrue(d1.equals(d2)); - + // check independence d1.add(1.1, 2.2, "R3", "C1"); assertFalse(d1.equals(d2)); @@ -165,7 +165,7 @@ * Check serialization of a default instance. */ public void testSerialization1() { - DefaultStatisticalCategoryDataset d1 + DefaultStatisticalCategoryDataset d1 = new DefaultStatisticalCategoryDataset(); d1.add(1.1, 2.2, "R1", "C1"); d1.add(3.3, 4.4, "R1", "C2"); @@ -188,12 +188,12 @@ } assertEquals(d1, d2); } - + /** * Check serialization of a more complex instance. */ public void testSerialization2() { - DefaultStatisticalCategoryDataset d1 + DefaultStatisticalCategoryDataset d1 = new DefaultStatisticalCategoryDataset(); d1.add(1.2, 3.4, "Row 1", "Column 1"); DefaultStatisticalCategoryDataset d2 = null; @@ -213,30 +213,30 @@ } assertEquals(d1, d2); } - + private static final double EPSILON = 0.0000000001; - + /** * Some checks for the add() method. */ public void testAdd() { - DefaultStatisticalCategoryDataset d1 + DefaultStatisticalCategoryDataset d1 = new DefaultStatisticalCategoryDataset(); d1.add(1.0, 2.0, "R1", "C1"); assertEquals(1.0, d1.getValue("R1", "C1").doubleValue(), EPSILON); assertEquals(2.0, d1.getStdDevValue("R1", "C1").doubleValue(), EPSILON); - + // overwrite the value d1.add(10.0, 20.0, "R1", "C1"); assertEquals(10.0, d1.getValue("R1", "C1").doubleValue(), EPSILON); assertEquals(20.0, d1.getStdDevValue("R1", "C1").doubleValue(), EPSILON); } - + /** * Some checks for the getRangeLowerBound() method. */ public void testGetRangeLowerBound() { - DefaultStatisticalCategoryDataset d1 + DefaultStatisticalCategoryDataset d1 = new DefaultStatisticalCategoryDataset(); d1.add(1.0, 2.0, "R1", "C1"); assertEquals(1.0, d1.getRangeLowerBound(false), EPSILON); @@ -247,35 +247,35 @@ * Some checks for the getRangeUpperBound() method. */ public void testGetRangeUpperBound() { - DefaultStatisticalCategoryDataset d1 + DefaultStatisticalCategoryDataset d1 = new DefaultStatisticalCategoryDataset(); d1.add(1.0, 2.0, "R1", "C1"); assertEquals(1.0, d1.getRangeUpperBound(false), EPSILON); assertEquals(3.0, d1.getRangeUpperBound(true), EPSILON); } - + /** * Some checks for the getRangeBounds() method. */ public void testGetRangeBounds2() { - DefaultStatisticalCategoryDataset d1 + DefaultStatisticalCategoryDataset d1 = new DefaultStatisticalCategoryDataset(); d1.add(1.0, 2.0, "R1", "C1"); assertEquals(new Range(1.0, 1.0), d1.getRangeBounds(false)); assertEquals(new Range(-1.0, 3.0), d1.getRangeBounds(true)); - + d1.add(10.0, 20.0, "R1", "C1"); assertEquals(new Range(10.0, 10.0), d1.getRangeBounds(false)); assertEquals(new Range(-10.0, 30.0), d1.getRangeBounds(true)); } - + /** * Some checks for the remove method. */ public void testRemove() { DefaultStatisticalCategoryDataset data = new DefaultStatisticalCategoryDataset(); - + boolean pass = false; try { data.remove("R1", "R2"); @@ -287,14 +287,14 @@ data.add(1.0, 0.5, "R1", "C1"); assertEquals(new Range(1.0, 1.0), data.getRangeBounds(false)); assertEquals(new Range(0.5, 1.5), data.getRangeBounds(true)); - + data.add(1.4, 0.2, "R2", "C1"); - + assertEquals(1.0, data.getRangeLowerBound(false), EPSILON); assertEquals(1.4, data.getRangeUpperBound(false), EPSILON); assertEquals(0.5, data.getRangeLowerBound(true), EPSILON); assertEquals(1.6, data.getRangeUpperBound(true), EPSILON); - + data.remove("R1", "C1"); assertEquals(1.4, data.getRangeLowerBound(false), EPSILON); Modified: branches/jfreechart-1.0.x-branch/tests/org/jfree/data/statistics/junit/HistogramBinTests.java =================================================================== --- branches/jfreechart-1.0.x-branch/tests/org/jfree/data/statistics/junit/HistogramBinTests.java 2008-09-04 19:48:17 UTC (rev 1497) +++ branches/jfreechart-1.0.x-branch/tests/org/jfree/data/statistics/junit/HistogramBinTests.java 2008-09-04 19:49:21 UTC (rev 1498) @@ -2,32 +2,32 @@ * JFreeChart : a free chart library for the Java(tm) platform * =========================================================== * - * (C) Copyright 2000-2007, by Object Refinery Limited and Contributors. + * (C) Copyright 2000-2008, by Object Refinery Limited and Contributors. * * Project Info: http://www.jfree.org/jfreechart/index.html * - * This library is free software; you can redistribute it and/or modify it - * under the terms of the GNU Lesser General Public License as published by - * the Free Software Foundation; either version 2.1 of the License, or + * This library is free software; you can redistribute it and/or modify it + * under the terms of the GNU Lesser General Public License as published by + * the Free Software Foundation; either version 2.1 of the License, or * (at your option) any later version. * - * This library is distributed in the hope that it will be useful, but - * WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY - * or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public + * This library is distributed in the hope that it will be useful, but + * WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY + * or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public * License for more details. * * You should have received a copy of the GNU Lesser General Public * License along with this library; if not, write to the Free Software - * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, - * USA. + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, + * USA. * - * [Java is a trademark or registered trademark of Sun Microsystems, Inc. + * [Java is a trademark or registered trademark of Sun Microsystems, Inc. * in the United States and other countries.] * * ---------------------- * HistogramBinTests.java * ---------------------- - * (C) Copyright 2004-2007, by Object Refinery Limited. + * (C) Copyright 2004-2008, by Object Refinery Limited. * * Original Author: David Gilbert (for Object Refinery Limited); * Contributor(s): -; @@ -80,12 +80,12 @@ * Confirm that the equals method can distinguish all the required fields. */ public void testEquals() { - + double start = 10.0; double end = 20.0; HistogramBin b1 = new HistogramBin(start, end); HistogramBin b2 = new HistogramBin(start, end); - + assertTrue(b1.equals(b2)); assertTrue(b2.equals(b... [truncated message content] |
From: <mu...@us...> - 2011-10-30 21:23:31
|
Revision: 2414 http://jfreechart.svn.sourceforge.net/jfreechart/?rev=2414&view=rev Author: mungady Date: 2011-10-30 21:23:25 +0000 (Sun, 30 Oct 2011) Log Message: ----------- Update headers for Oracle trademarks. Modified Paths: -------------- branches/jfreechart-1.0.x-branch/tests/org/jfree/data/statistics/junit/BoxAndWhiskerCalculatorTests.java branches/jfreechart-1.0.x-branch/tests/org/jfree/data/statistics/junit/BoxAndWhiskerItemTests.java branches/jfreechart-1.0.x-branch/tests/org/jfree/data/statistics/junit/DataStatisticsPackageTests.java branches/jfreechart-1.0.x-branch/tests/org/jfree/data/statistics/junit/DefaultBoxAndWhiskerCategoryDatasetTests.java branches/jfreechart-1.0.x-branch/tests/org/jfree/data/statistics/junit/DefaultBoxAndWhiskerXYDatasetTests.java branches/jfreechart-1.0.x-branch/tests/org/jfree/data/statistics/junit/DefaultMultiValueCategoryDatasetTests.java branches/jfreechart-1.0.x-branch/tests/org/jfree/data/statistics/junit/DefaultStatisticalCategoryDatasetTests.java branches/jfreechart-1.0.x-branch/tests/org/jfree/data/statistics/junit/HistogramBinTests.java branches/jfreechart-1.0.x-branch/tests/org/jfree/data/statistics/junit/HistogramDatasetTests.java branches/jfreechart-1.0.x-branch/tests/org/jfree/data/statistics/junit/MeanAndStandardDeviationTests.java branches/jfreechart-1.0.x-branch/tests/org/jfree/data/statistics/junit/RegressionTests.java branches/jfreechart-1.0.x-branch/tests/org/jfree/data/statistics/junit/SimpleHistogramBinTests.java branches/jfreechart-1.0.x-branch/tests/org/jfree/data/statistics/junit/SimpleHistogramDatasetTests.java branches/jfreechart-1.0.x-branch/tests/org/jfree/data/statistics/junit/StatisticsTests.java Modified: branches/jfreechart-1.0.x-branch/tests/org/jfree/data/statistics/junit/BoxAndWhiskerCalculatorTests.java =================================================================== --- branches/jfreechart-1.0.x-branch/tests/org/jfree/data/statistics/junit/BoxAndWhiskerCalculatorTests.java 2011-10-30 21:22:37 UTC (rev 2413) +++ branches/jfreechart-1.0.x-branch/tests/org/jfree/data/statistics/junit/BoxAndWhiskerCalculatorTests.java 2011-10-30 21:23:25 UTC (rev 2414) @@ -2,7 +2,7 @@ * JFreeChart : a free chart library for the Java(tm) platform * =========================================================== * - * (C) Copyright 2000-2008, by Object Refinery Limited and Contributors. + * (C) Copyright 2000-2011, by Object Refinery Limited and Contributors. * * Project Info: http://www.jfree.org/jfreechart/index.html * @@ -21,8 +21,8 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, * USA. * - * [Java is a trademark or registered trademark of Sun Microsystems, Inc. - * in the United States and other countries.] + * [Oracle and Java are registered trademarks of Oracle and/or its affiliates. + * Other names may be trademarks of their respective owners.] * * --------------------------------- * BoxAndWhiskerCalculatorTests.java Modified: branches/jfreechart-1.0.x-branch/tests/org/jfree/data/statistics/junit/BoxAndWhiskerItemTests.java =================================================================== --- branches/jfreechart-1.0.x-branch/tests/org/jfree/data/statistics/junit/BoxAndWhiskerItemTests.java 2011-10-30 21:22:37 UTC (rev 2413) +++ branches/jfreechart-1.0.x-branch/tests/org/jfree/data/statistics/junit/BoxAndWhiskerItemTests.java 2011-10-30 21:23:25 UTC (rev 2414) @@ -2,7 +2,7 @@ * JFreeChart : a free chart library for the Java(tm) platform * =========================================================== * - * (C) Copyright 2000-2008, by Object Refinery Limited and Contributors. + * (C) Copyright 2000-2011, by Object Refinery Limited and Contributors. * * Project Info: http://www.jfree.org/jfreechart/index.html * @@ -21,8 +21,8 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, * USA. * - * [Java is a trademark or registered trademark of Sun Microsystems, Inc. - * in the United States and other countries.] + * [Oracle and Java are registered trademarks of Oracle and/or its affiliates. + * Other names may be trademarks of their respective owners.] * * --------------------------- * BoxAndWhiskerItemTests.java Modified: branches/jfreechart-1.0.x-branch/tests/org/jfree/data/statistics/junit/DataStatisticsPackageTests.java =================================================================== --- branches/jfreechart-1.0.x-branch/tests/org/jfree/data/statistics/junit/DataStatisticsPackageTests.java 2011-10-30 21:22:37 UTC (rev 2413) +++ branches/jfreechart-1.0.x-branch/tests/org/jfree/data/statistics/junit/DataStatisticsPackageTests.java 2011-10-30 21:23:25 UTC (rev 2414) @@ -2,7 +2,7 @@ * JFreeChart : a free chart library for the Java(tm) platform * =========================================================== * - * (C) Copyright 2000-2008, by Object Refinery Limited and Contributors. + * (C) Copyright 2000-2011, by Object Refinery Limited and Contributors. * * Project Info: http://www.jfree.org/jfreechart/index.html * @@ -21,8 +21,8 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, * USA. * - * [Java is a trademark or registered trademark of Sun Microsystems, Inc. - * in the United States and other countries.] + * [Oracle and Java are registered trademarks of Oracle and/or its affiliates. + * Other names may be trademarks of their respective owners.] * * ------------------------------- * DataStatisticsPackageTests.java Modified: branches/jfreechart-1.0.x-branch/tests/org/jfree/data/statistics/junit/DefaultBoxAndWhiskerCategoryDatasetTests.java =================================================================== --- branches/jfreechart-1.0.x-branch/tests/org/jfree/data/statistics/junit/DefaultBoxAndWhiskerCategoryDatasetTests.java 2011-10-30 21:22:37 UTC (rev 2413) +++ branches/jfreechart-1.0.x-branch/tests/org/jfree/data/statistics/junit/DefaultBoxAndWhiskerCategoryDatasetTests.java 2011-10-30 21:23:25 UTC (rev 2414) @@ -2,7 +2,7 @@ * JFreeChart : a free chart library for the Java(tm) platform * =========================================================== * - * (C) Copyright 2000-2008, by Object Refinery Limited and Contributors. + * (C) Copyright 2000-2011, by Object Refinery Limited and Contributors. * * Project Info: http://www.jfree.org/jfreechart/index.html * @@ -21,8 +21,8 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, * USA. * - * [Java is a trademark or registered trademark of Sun Microsystems, Inc. - * in the United States and other countries.] + * [Oracle and Java are registered trademarks of Oracle and/or its affiliates. + * Other names may be trademarks of their respective owners.] * * --------------------------------------------- * DefaultBoxAndWhiskerCategoryDatasetTests.java Modified: branches/jfreechart-1.0.x-branch/tests/org/jfree/data/statistics/junit/DefaultBoxAndWhiskerXYDatasetTests.java =================================================================== --- branches/jfreechart-1.0.x-branch/tests/org/jfree/data/statistics/junit/DefaultBoxAndWhiskerXYDatasetTests.java 2011-10-30 21:22:37 UTC (rev 2413) +++ branches/jfreechart-1.0.x-branch/tests/org/jfree/data/statistics/junit/DefaultBoxAndWhiskerXYDatasetTests.java 2011-10-30 21:23:25 UTC (rev 2414) @@ -2,7 +2,7 @@ * JFreeChart : a free chart library for the Java(tm) platform * =========================================================== * - * (C) Copyright 2000-2008, by Object Refinery Limited and Contributors. + * (C) Copyright 2000-2011, by Object Refinery Limited and Contributors. * * Project Info: http://www.jfree.org/jfreechart/index.html * @@ -21,8 +21,8 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, * USA. * - * [Java is a trademark or registered trademark of Sun Microsystems, Inc. - * in the United States and other countries.] + * [Oracle and Java are registered trademarks of Oracle and/or its affiliates. + * Other names may be trademarks of their respective owners.] * * --------------------------------------- * DefaultBoxAndWhiskerXYDatasetTests.java Modified: branches/jfreechart-1.0.x-branch/tests/org/jfree/data/statistics/junit/DefaultMultiValueCategoryDatasetTests.java =================================================================== --- branches/jfreechart-1.0.x-branch/tests/org/jfree/data/statistics/junit/DefaultMultiValueCategoryDatasetTests.java 2011-10-30 21:22:37 UTC (rev 2413) +++ branches/jfreechart-1.0.x-branch/tests/org/jfree/data/statistics/junit/DefaultMultiValueCategoryDatasetTests.java 2011-10-30 21:23:25 UTC (rev 2414) @@ -2,7 +2,7 @@ * JFreeChart : a free chart library for the Java(tm) platform * =========================================================== * - * (C) Copyright 2000-2008, by Object Refinery Limited and Contributors. + * (C) Copyright 2000-2011, by Object Refinery Limited and Contributors. * * Project Info: http://www.jfree.org/jfreechart/index.html * @@ -21,8 +21,8 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, * USA. * - * [Java is a trademark or registered trademark of Sun Microsystems, Inc. - * in the United States and other countries.] + * [Oracle and Java are registered trademarks of Oracle and/or its affiliates. + * Other names may be trademarks of their respective owners.] * * ------------------------------------------ * DefaultMultiValueCategoryDatasetTests.java Modified: branches/jfreechart-1.0.x-branch/tests/org/jfree/data/statistics/junit/DefaultStatisticalCategoryDatasetTests.java =================================================================== --- branches/jfreechart-1.0.x-branch/tests/org/jfree/data/statistics/junit/DefaultStatisticalCategoryDatasetTests.java 2011-10-30 21:22:37 UTC (rev 2413) +++ branches/jfreechart-1.0.x-branch/tests/org/jfree/data/statistics/junit/DefaultStatisticalCategoryDatasetTests.java 2011-10-30 21:23:25 UTC (rev 2414) @@ -21,8 +21,8 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, * USA. * - * [Java is a trademark or registered trademark of Sun Microsystems, Inc. - * in the United States and other countries.] + * [Oracle and Java are registered trademarks of Oracle and/or its affiliates. + * Other names may be trademarks of their respective owners.] * * ------------------------------------------- * DefaultStatisticalCategoryDatasetTests.java Modified: branches/jfreechart-1.0.x-branch/tests/org/jfree/data/statistics/junit/HistogramBinTests.java =================================================================== --- branches/jfreechart-1.0.x-branch/tests/org/jfree/data/statistics/junit/HistogramBinTests.java 2011-10-30 21:22:37 UTC (rev 2413) +++ branches/jfreechart-1.0.x-branch/tests/org/jfree/data/statistics/junit/HistogramBinTests.java 2011-10-30 21:23:25 UTC (rev 2414) @@ -2,7 +2,7 @@ * JFreeChart : a free chart library for the Java(tm) platform * =========================================================== * - * (C) Copyright 2000-2008, by Object Refinery Limited and Contributors. + * (C) Copyright 2000-2011, by Object Refinery Limited and Contributors. * * Project Info: http://www.jfree.org/jfreechart/index.html * @@ -21,8 +21,8 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, * USA. * - * [Java is a trademark or registered trademark of Sun Microsystems, Inc. - * in the United States and other countries.] + * [Oracle and Java are registered trademarks of Oracle and/or its affiliates. + * Other names may be trademarks of their respective owners.] * * ---------------------- * HistogramBinTests.java Modified: branches/jfreechart-1.0.x-branch/tests/org/jfree/data/statistics/junit/HistogramDatasetTests.java =================================================================== --- branches/jfreechart-1.0.x-branch/tests/org/jfree/data/statistics/junit/HistogramDatasetTests.java 2011-10-30 21:22:37 UTC (rev 2413) +++ branches/jfreechart-1.0.x-branch/tests/org/jfree/data/statistics/junit/HistogramDatasetTests.java 2011-10-30 21:23:25 UTC (rev 2414) @@ -2,7 +2,7 @@ * JFreeChart : a free chart library for the Java(tm) platform * =========================================================== * - * (C) Copyright 2000-2009, by Object Refinery Limited and Contributors. + * (C) Copyright 2000-2011, by Object Refinery Limited and Contributors. * * Project Info: http://www.jfree.org/jfreechart/index.html * @@ -21,8 +21,8 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, * USA. * - * [Java is a trademark or registered trademark of Sun Microsystems, Inc. - * in the United States and other countries.] + * [Oracle and Java are registered trademarks of Oracle and/or its affiliates. + * Other names may be trademarks of their respective owners.] * * -------------------------- * HistogramDatasetTests.java Modified: branches/jfreechart-1.0.x-branch/tests/org/jfree/data/statistics/junit/MeanAndStandardDeviationTests.java =================================================================== --- branches/jfreechart-1.0.x-branch/tests/org/jfree/data/statistics/junit/MeanAndStandardDeviationTests.java 2011-10-30 21:22:37 UTC (rev 2413) +++ branches/jfreechart-1.0.x-branch/tests/org/jfree/data/statistics/junit/MeanAndStandardDeviationTests.java 2011-10-30 21:23:25 UTC (rev 2414) @@ -2,7 +2,7 @@ * JFreeChart : a free chart library for the Java(tm) platform * =========================================================== * - * (C) Copyright 2000-2008, by Object Refinery Limited and Contributors. + * (C) Copyright 2000-2011, by Object Refinery Limited and Contributors. * * Project Info: http://www.jfree.org/jfreechart/index.html * @@ -21,8 +21,8 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, * USA. * - * [Java is a trademark or registered trademark of Sun Microsystems, Inc. - * in the United States and other countries.] + * [Oracle and Java are registered trademarks of Oracle and/or its affiliates. + * Other names may be trademarks of their respective owners.] * * ---------------------------------- * MeanAndStandardDeviationTests.java Modified: branches/jfreechart-1.0.x-branch/tests/org/jfree/data/statistics/junit/RegressionTests.java =================================================================== --- branches/jfreechart-1.0.x-branch/tests/org/jfree/data/statistics/junit/RegressionTests.java 2011-10-30 21:22:37 UTC (rev 2413) +++ branches/jfreechart-1.0.x-branch/tests/org/jfree/data/statistics/junit/RegressionTests.java 2011-10-30 21:23:25 UTC (rev 2414) @@ -2,7 +2,7 @@ * JFreeChart : a free chart library for the Java(tm) platform * =========================================================== * - * (C) Copyright 2000-2008, by Object Refinery Limited and Contributors. + * (C) Copyright 2000-2011, by Object Refinery Limited and Contributors. * * Project Info: http://www.jfree.org/jfreechart/index.html * @@ -21,8 +21,8 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, * USA. * - * [Java is a trademark or registered trademark of Sun Microsystems, Inc. - * in the United States and other countries.] + * [Oracle and Java are registered trademarks of Oracle and/or its affiliates. + * Other names may be trademarks of their respective owners.] * * -------------------- * RegressionTests.java Modified: branches/jfreechart-1.0.x-branch/tests/org/jfree/data/statistics/junit/SimpleHistogramBinTests.java =================================================================== --- branches/jfreechart-1.0.x-branch/tests/org/jfree/data/statistics/junit/SimpleHistogramBinTests.java 2011-10-30 21:22:37 UTC (rev 2413) +++ branches/jfreechart-1.0.x-branch/tests/org/jfree/data/statistics/junit/SimpleHistogramBinTests.java 2011-10-30 21:23:25 UTC (rev 2414) @@ -2,7 +2,7 @@ * JFreeChart : a free chart library for the Java(tm) platform * =========================================================== * - * (C) Copyright 2000-2008, by Object Refinery Limited and Contributors. + * (C) Copyright 2000-2011, by Object Refinery Limited and Contributors. * * Project Info: http://www.jfree.org/jfreechart/index.html * @@ -21,8 +21,8 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, * USA. * - * [Java is a trademark or registered trademark of Sun Microsystems, Inc. - * in the United States and other countries.] + * [Oracle and Java are registered trademarks of Oracle and/or its affiliates. + * Other names may be trademarks of their respective owners.] * * ---------------------------- * SimpleHistogramBinTests.java Modified: branches/jfreechart-1.0.x-branch/tests/org/jfree/data/statistics/junit/SimpleHistogramDatasetTests.java =================================================================== --- branches/jfreechart-1.0.x-branch/tests/org/jfree/data/statistics/junit/SimpleHistogramDatasetTests.java 2011-10-30 21:22:37 UTC (rev 2413) +++ branches/jfreechart-1.0.x-branch/tests/org/jfree/data/statistics/junit/SimpleHistogramDatasetTests.java 2011-10-30 21:23:25 UTC (rev 2414) @@ -2,7 +2,7 @@ * JFreeChart : a free chart library for the Java(tm) platform * =========================================================== * - * (C) Copyright 2000-2008, by Object Refinery Limited and Contributors. + * (C) Copyright 2000-2011, by Object Refinery Limited and Contributors. * * Project Info: http://www.jfree.org/jfreechart/index.html * @@ -21,8 +21,8 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, * USA. * - * [Java is a trademark or registered trademark of Sun Microsystems, Inc. - * in the United States and other countries.] + * [Oracle and Java are registered trademarks of Oracle and/or its affiliates. + * Other names may be trademarks of their respective owners.] * * -------------------------------- * SimpleHistogramDatasetTests.java Modified: branches/jfreechart-1.0.x-branch/tests/org/jfree/data/statistics/junit/StatisticsTests.java =================================================================== --- branches/jfreechart-1.0.x-branch/tests/org/jfree/data/statistics/junit/StatisticsTests.java 2011-10-30 21:22:37 UTC (rev 2413) +++ branches/jfreechart-1.0.x-branch/tests/org/jfree/data/statistics/junit/StatisticsTests.java 2011-10-30 21:23:25 UTC (rev 2414) @@ -2,7 +2,7 @@ * JFreeChart : a free chart library for the Java(tm) platform * =========================================================== * - * (C) Copyright 2000-2008, by Object Refinery Limited and Contributors. + * (C) Copyright 2000-2011, by Object Refinery Limited and Contributors. * * Project Info: http://www.jfree.org/jfreechart/index.html * @@ -21,8 +21,8 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, * USA. * - * [Java is a trademark or registered trademark of Sun Microsystems, Inc. - * in the United States and other countries.] + * [Oracle and Java are registered trademarks of Oracle and/or its affiliates. + * Other names may be trademarks of their respective owners.] * * -------------------- * StatisticsTests.java This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <mu...@us...> - 2013-08-02 05:41:26
|
Revision: 2804 http://sourceforge.net/p/jfreechart/code/2804 Author: mungady Date: 2013-08-02 05:41:23 +0000 (Fri, 02 Aug 2013) Log Message: ----------- Remove System.err.println. Modified Paths: -------------- branches/jfreechart-1.0.x-branch/tests/org/jfree/data/statistics/junit/BoxAndWhiskerItemTests.java branches/jfreechart-1.0.x-branch/tests/org/jfree/data/statistics/junit/HistogramBinTests.java branches/jfreechart-1.0.x-branch/tests/org/jfree/data/statistics/junit/MeanAndStandardDeviationTests.java branches/jfreechart-1.0.x-branch/tests/org/jfree/data/statistics/junit/SimpleHistogramBinTests.java Modified: branches/jfreechart-1.0.x-branch/tests/org/jfree/data/statistics/junit/BoxAndWhiskerItemTests.java =================================================================== --- branches/jfreechart-1.0.x-branch/tests/org/jfree/data/statistics/junit/BoxAndWhiskerItemTests.java 2013-08-02 05:37:45 UTC (rev 2803) +++ branches/jfreechart-1.0.x-branch/tests/org/jfree/data/statistics/junit/BoxAndWhiskerItemTests.java 2013-08-02 05:41:23 UTC (rev 2804) @@ -42,6 +42,7 @@ import java.io.ByteArrayInputStream; import java.io.ByteArrayOutputStream; +import java.io.IOException; import java.io.ObjectInput; import java.io.ObjectInputStream; import java.io.ObjectOutput; @@ -100,32 +101,24 @@ /** * Serialize an instance, restore it, and check for equality. */ - public void testSerialization() { + public void testSerialization() throws IOException, ClassNotFoundException { - BoxAndWhiskerItem i1 = new BoxAndWhiskerItem( - new Double(1.0), new Double(2.0), new Double(3.0), new Double(4.0), - new Double(5.0), new Double(6.0), new Double(7.0), new Double(8.0), - new ArrayList() - ); - BoxAndWhiskerItem i2 = null; + BoxAndWhiskerItem i1 = new BoxAndWhiskerItem(new Double(1.0), + new Double(2.0), new Double(3.0), new Double(4.0), + new Double(5.0), new Double(6.0), new Double(7.0), + new Double(8.0), new ArrayList()); + BoxAndWhiskerItem i2; - try { - ByteArrayOutputStream buffer = new ByteArrayOutputStream(); - ObjectOutput out = new ObjectOutputStream(buffer); - out.writeObject(i1); - out.close(); + ByteArrayOutputStream buffer = new ByteArrayOutputStream(); + ObjectOutput out = new ObjectOutputStream(buffer); + out.writeObject(i1); + out.close(); - ObjectInput in = new ObjectInputStream( - new ByteArrayInputStream(buffer.toByteArray()) - ); - i2 = (BoxAndWhiskerItem) in.readObject(); - in.close(); - } - catch (Exception e) { - System.out.println(e.toString()); - } + ObjectInput in = new ObjectInputStream(new ByteArrayInputStream( + buffer.toByteArray())); + i2 = (BoxAndWhiskerItem) in.readObject(); + in.close(); assertEquals(i1, i2); - } } Modified: branches/jfreechart-1.0.x-branch/tests/org/jfree/data/statistics/junit/HistogramBinTests.java =================================================================== --- branches/jfreechart-1.0.x-branch/tests/org/jfree/data/statistics/junit/HistogramBinTests.java 2013-08-02 05:37:45 UTC (rev 2803) +++ branches/jfreechart-1.0.x-branch/tests/org/jfree/data/statistics/junit/HistogramBinTests.java 2013-08-02 05:41:23 UTC (rev 2804) @@ -42,6 +42,7 @@ import java.io.ByteArrayInputStream; import java.io.ByteArrayOutputStream; +import java.io.IOException; import java.io.ObjectInput; import java.io.ObjectInputStream; import java.io.ObjectOutput; @@ -94,17 +95,11 @@ /** * Confirm that cloning works. */ - public void testCloning() { + public void testCloning() throws CloneNotSupportedException { double start = 10.0; double end = 20.0; HistogramBin b1 = new HistogramBin(start, end); - HistogramBin b2 = null; - try { - b2 = (HistogramBin) b1.clone(); - } - catch (CloneNotSupportedException e) { - System.err.println("Failed to clone."); - } + HistogramBin b2 = (HistogramBin) b1.clone(); assertTrue(b1 != b2); assertTrue(b1.getClass() == b2.getClass()); assertTrue(b1.equals(b2)); @@ -113,30 +108,22 @@ /** * Serialize an instance, restore it, and check for equality. */ - public void testSerialization() { - + public void testSerialization() throws IOException, ClassNotFoundException { double start = 10.0; double end = 20.0; HistogramBin b1 = new HistogramBin(start, end); - HistogramBin b2 = null; + HistogramBin b2; - try { - ByteArrayOutputStream buffer = new ByteArrayOutputStream(); - ObjectOutput out = new ObjectOutputStream(buffer); - out.writeObject(b1); - out.close(); + ByteArrayOutputStream buffer = new ByteArrayOutputStream(); + ObjectOutput out = new ObjectOutputStream(buffer); + out.writeObject(b1); + out.close(); - ObjectInput in = new ObjectInputStream( - new ByteArrayInputStream(buffer.toByteArray()) - ); - b2 = (HistogramBin) in.readObject(); - in.close(); - } - catch (Exception e) { - System.out.println(e.toString()); - } + ObjectInput in = new ObjectInputStream(new ByteArrayInputStream( + buffer.toByteArray())); + b2 = (HistogramBin) in.readObject(); + in.close(); assertEquals(b1, b2); - } } Modified: branches/jfreechart-1.0.x-branch/tests/org/jfree/data/statistics/junit/MeanAndStandardDeviationTests.java =================================================================== --- branches/jfreechart-1.0.x-branch/tests/org/jfree/data/statistics/junit/MeanAndStandardDeviationTests.java 2013-08-02 05:37:45 UTC (rev 2803) +++ branches/jfreechart-1.0.x-branch/tests/org/jfree/data/statistics/junit/MeanAndStandardDeviationTests.java 2013-08-02 05:41:23 UTC (rev 2804) @@ -42,6 +42,7 @@ import java.io.ByteArrayInputStream; import java.io.ByteArrayOutputStream; +import java.io.IOException; import java.io.ObjectInput; import java.io.ObjectInputStream; import java.io.ObjectOutput; @@ -107,26 +108,18 @@ /** * Serialize an instance, restore it, and check for equality. */ - public void testSerialization() { + public void testSerialization() throws IOException, ClassNotFoundException { MeanAndStandardDeviation m1 = new MeanAndStandardDeviation(1.2, 3.4); - MeanAndStandardDeviation m2 = null; + MeanAndStandardDeviation m2; + ByteArrayOutputStream buffer = new ByteArrayOutputStream(); + ObjectOutput out = new ObjectOutputStream(buffer); + out.writeObject(m1); + out.close(); - try { - ByteArrayOutputStream buffer = new ByteArrayOutputStream(); - ObjectOutput out = new ObjectOutputStream(buffer); - out.writeObject(m1); - out.close(); - - ObjectInput in = new ObjectInputStream( - new ByteArrayInputStream(buffer.toByteArray()) - ); - m2 = (MeanAndStandardDeviation) in.readObject(); - in.close(); - } - catch (Exception e) { - System.out.println(e.toString()); - } + ObjectInput in = new ObjectInputStream(new ByteArrayInputStream( + buffer.toByteArray())); + m2 = (MeanAndStandardDeviation) in.readObject(); + in.close(); assertEquals(m1, m2); - } } Modified: branches/jfreechart-1.0.x-branch/tests/org/jfree/data/statistics/junit/SimpleHistogramBinTests.java =================================================================== --- branches/jfreechart-1.0.x-branch/tests/org/jfree/data/statistics/junit/SimpleHistogramBinTests.java 2013-08-02 05:37:45 UTC (rev 2803) +++ branches/jfreechart-1.0.x-branch/tests/org/jfree/data/statistics/junit/SimpleHistogramBinTests.java 2013-08-02 05:41:23 UTC (rev 2804) @@ -42,6 +42,7 @@ import java.io.ByteArrayInputStream; import java.io.ByteArrayOutputStream; +import java.io.IOException; import java.io.ObjectInput; import java.io.ObjectInputStream; import java.io.ObjectOutput; @@ -158,16 +159,10 @@ /** * Some checks for the clone() method. */ - public void testCloning() { + public void testCloning() throws CloneNotSupportedException { SimpleHistogramBin b1 = new SimpleHistogramBin(1.1, 2.2, false, true); b1.setItemCount(99); - SimpleHistogramBin b2 = null; - try { - b2 = (SimpleHistogramBin) b1.clone(); - } - catch (CloneNotSupportedException e) { - System.err.println("Failed to clone."); - } + SimpleHistogramBin b2 = (SimpleHistogramBin) b1.clone(); assertTrue(b1 != b2); assertTrue(b1.getClass() == b2.getClass()); assertTrue(b1.equals(b2)); @@ -180,25 +175,18 @@ /** * Serialize an instance, restore it, and check for equality. */ - public void testSerialization() { - + public void testSerialization() throws IOException, ClassNotFoundException { SimpleHistogramBin b1 = new SimpleHistogramBin(1.0, 2.0, false, true); b1.setItemCount(123); - SimpleHistogramBin b2 = null; - try { - ByteArrayOutputStream buffer = new ByteArrayOutputStream(); - ObjectOutput out = new ObjectOutputStream(buffer); - out.writeObject(b1); - out.close(); - ObjectInput in = new ObjectInputStream( - new ByteArrayInputStream(buffer.toByteArray()) - ); - b2 = (SimpleHistogramBin) in.readObject(); - in.close(); - } - catch (Exception e) { - System.out.println(e.toString()); - } + SimpleHistogramBin b2; + ByteArrayOutputStream buffer = new ByteArrayOutputStream(); + ObjectOutput out = new ObjectOutputStream(buffer); + out.writeObject(b1); + out.close(); + ObjectInput in = new ObjectInputStream(new ByteArrayInputStream( + buffer.toByteArray())); + b2 = (SimpleHistogramBin) in.readObject(); + in.close(); assertEquals(b1, b2); } This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |