From: David G. <mu...@us...> - 2007-04-30 15:28:26
|
Update of /cvsroot/jfreechart/jfreechart/tests/org/jfree/data/junit In directory sc8-pr-cvs6.sourceforge.net:/tmp/cvs-serv1291/tests/org/jfree/data/junit Modified Files: Tag: STABLE_1-0-0 DefaultKeyedValuesTests.java Log Message: 2007-04-30 David Gilbert <dav...@ob...> * source/org/jfree/data/DefaultKeyedValues.java (insertValues(int, Comparable, double)): New method, (insertValues(int, Comparable, Double)): Likewise, * tests/org/jfree/data/junit/DefaultKeyedValuesTests.java (testConstructor): New test method, (testGetItemCount): Likewise, (testGetKeys): Likewise, (testGetValue): Extended, (testAddValue): New test method, (testInsertValue): Likewise. Index: DefaultKeyedValuesTests.java =================================================================== RCS file: /cvsroot/jfreechart/jfreechart/tests/org/jfree/data/junit/Attic/DefaultKeyedValuesTests.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 *** DefaultKeyedValuesTests.java 3 Oct 2006 15:41:42 -0000 1.1.2.1 --- DefaultKeyedValuesTests.java 30 Apr 2007 15:28:04 -0000 1.1.2.2 *************** *** 3,7 **** * =========================================================== * ! * (C) Copyright 2000-2006, by Object Refinery Limited and Contributors. * * Project Info: http://www.jfree.org/jfreechart/index.html --- 3,7 ---- * =========================================================== * ! * (C) Copyright 2000-2007, by Object Refinery Limited and Contributors. * * Project Info: http://www.jfree.org/jfreechart/index.html *************** *** 28,32 **** * DefaultKeyedValuesTests.java * ---------------------------- ! * (C) Copyright 2003-2006, by Object Refinery Limited. * * Original Author: David Gilbert (for Object Refinery Limited); --- 28,32 ---- * DefaultKeyedValuesTests.java * ---------------------------- ! * (C) Copyright 2003-2007, by Object Refinery Limited. * * Original Author: David Gilbert (for Object Refinery Limited); *************** *** 41,44 **** --- 41,45 ---- * 31-Jul-2006 : Added test for new clear() method (DG); * 01-Aug-2006 : Extended testGetIndex() method (DG); + * 30-Apr-2007 : Added some new tests (DG); * */ *************** *** 52,55 **** --- 53,57 ---- import java.io.ObjectOutput; import java.io.ObjectOutputStream; + import java.util.List; import junit.framework.Test; *************** *** 58,61 **** --- 60,64 ---- import org.jfree.data.DefaultKeyedValues; + import org.jfree.data.UnknownKeyException; import org.jfree.util.SortOrder; *************** *** 91,94 **** --- 94,140 ---- /** + * Checks that a new instance is empty. + */ + public void testConstructor() { + DefaultKeyedValues d = new DefaultKeyedValues(); + assertEquals(0, d.getItemCount()); + } + + /** + * Some checks for the getItemCount() method. + */ + public void testGetItemCount() { + DefaultKeyedValues d = new DefaultKeyedValues(); + assertEquals(0, d.getItemCount()); + d.addValue("A", 1.0); + assertEquals(1, d.getItemCount()); + d.addValue("B", 2.0); + assertEquals(2, d.getItemCount()); + d.clear(); + assertEquals(0, d.getItemCount()); + } + + /** + * Some checks for the getKeys() method. + */ + public void testGetKeys() { + DefaultKeyedValues d = new DefaultKeyedValues(); + List keys = d.getKeys(); + assertTrue(keys.isEmpty()); + d.addValue("A", 1.0); + keys = d.getKeys(); + assertEquals(1, keys.size()); + assertTrue(keys.contains("A")); + d.addValue("B", 2.0); + keys = d.getKeys(); + assertEquals(2, keys.size()); + assertTrue(keys.contains("A")); + assertTrue(keys.contains("B")); + d.clear(); + keys = d.getKeys(); + assertEquals(0, keys.size()); + } + + /** * A simple test for the clear() method. */ *************** *** 126,129 **** --- 172,184 ---- v2.addValue("K3", new Integer(3)); assertEquals(new Integer(3), v2.getValue(2)); + + boolean pass = false; + try { + /* Number n = */ v2.getValue("KK"); + } + catch (UnknownKeyException e) { + pass = true; + } + assertTrue(pass); } *************** *** 179,182 **** --- 234,287 ---- /** + * Some checks for the addValue() method. + */ + public void testAddValue() { + DefaultKeyedValues v1 = new DefaultKeyedValues(); + v1.addValue("A", 1.0); + assertEquals(new Double(1.0), v1.getValue("A")); + v1.addValue("B", 2.0); + assertEquals(new Double(2.0), v1.getValue("B")); + v1.addValue("B", 3.0); + assertEquals(new Double(3.0), v1.getValue("B")); + assertEquals(2, v1.getItemCount()); + v1.addValue("A", null); + assertNull(v1.getValue("A")); + assertEquals(2, v1.getItemCount()); + + boolean pass = false; + try { + v1.addValue(null, 99.9); + } + catch (IllegalArgumentException e) { + pass = true; + } + assertTrue(pass); + } + + /** + * Some checks for the insertValue() method. + */ + public void testInsertValue() { + DefaultKeyedValues v1 = new DefaultKeyedValues(); + v1.insertValue(0, "A", 1.0); + assertEquals(new Double(1.0), v1.getValue(0)); + v1.insertValue(0, "B", 2.0); + assertEquals(new Double(2.0), v1.getValue(0)); + assertEquals(new Double(1.0), v1.getValue(1)); + + // it's OK to use an index equal to the size of the list + v1.insertValue(2, "C", 3.0); + assertEquals(new Double(2.0), v1.getValue(0)); + assertEquals(new Double(1.0), v1.getValue(1)); + assertEquals(new Double(3.0), v1.getValue(2)); + + // try replacing an existing value + v1.insertValue(2, "B", 4.0); + assertEquals(new Double(1.0), v1.getValue(0)); + assertEquals(new Double(3.0), v1.getValue(1)); + assertEquals(new Double(4.0), v1.getValue(2)); + } + + /** * Some checks for the clone() method. */ |