From: <mu...@us...> - 2013-08-04 16:43:03
|
Revision: 2850 http://sourceforge.net/p/jfreechart/code/2850 Author: mungady Date: 2013-08-04 16:42:59 +0000 (Sun, 04 Aug 2013) Log Message: ----------- Simplify code with TestUtilities.serialized() method. Modified Paths: -------------- branches/jfreechart-1.0.x-branch/tests/org/jfree/data/ComparableObjectItemTest.java branches/jfreechart-1.0.x-branch/tests/org/jfree/data/ComparableObjectSeriesTest.java branches/jfreechart-1.0.x-branch/tests/org/jfree/data/DefaultKeyedValueTest.java branches/jfreechart-1.0.x-branch/tests/org/jfree/data/DefaultKeyedValues2DTest.java branches/jfreechart-1.0.x-branch/tests/org/jfree/data/DefaultKeyedValuesTest.java branches/jfreechart-1.0.x-branch/tests/org/jfree/data/DomainOrderTest.java branches/jfreechart-1.0.x-branch/tests/org/jfree/data/KeyToGroupMapTest.java branches/jfreechart-1.0.x-branch/tests/org/jfree/data/KeyedObjectTest.java branches/jfreechart-1.0.x-branch/tests/org/jfree/data/KeyedObjects2DTest.java branches/jfreechart-1.0.x-branch/tests/org/jfree/data/KeyedObjectsTest.java branches/jfreechart-1.0.x-branch/tests/org/jfree/data/RangeTest.java branches/jfreechart-1.0.x-branch/tests/org/jfree/data/RangeTypeTest.java Modified: branches/jfreechart-1.0.x-branch/tests/org/jfree/data/ComparableObjectItemTest.java =================================================================== --- branches/jfreechart-1.0.x-branch/tests/org/jfree/data/ComparableObjectItemTest.java 2013-08-04 16:31:39 UTC (rev 2849) +++ branches/jfreechart-1.0.x-branch/tests/org/jfree/data/ComparableObjectItemTest.java 2013-08-04 16:42:59 UTC (rev 2850) @@ -24,10 +24,10 @@ * [Oracle and Java are registered trademarks of Oracle and/or its affiliates. * Other names may be trademarks of their respective owners.] * - * ------------------------------ - * ComparableObjectItemTests.java - * ------------------------------ - * (C) Copyright 2006-2008, by Object Refinery Limited and Contributors. + * ----------------------------- + * ComparableObjectItemTest.java + * ----------------------------- + * (C) Copyright 2006-2013, by Object Refinery Limited and Contributors. * * Original Author: David Gilbert (for Object Refinery Limited); * Contributor(s): -; @@ -40,19 +40,11 @@ package org.jfree.data; -import java.io.ByteArrayInputStream; -import java.io.ByteArrayOutputStream; -import java.io.IOException; -import java.io.ObjectInput; -import java.io.ObjectInputStream; -import java.io.ObjectOutput; -import java.io.ObjectOutputStream; - import junit.framework.Test; import junit.framework.TestCase; import junit.framework.TestSuite; +import org.jfree.chart.TestUtilities; -import org.jfree.data.ComparableObjectItem; /** * Tests for the {@link ComparableObjectItem} class. @@ -130,19 +122,11 @@ /** * Serialize an instance, restore it, and check for equality. */ - public void testSerialization() throws IOException, ClassNotFoundException { + public void testSerialization() { ComparableObjectItem item1 = new ComparableObjectItem(new Integer(1), "XYZ"); - ComparableObjectItem item2; - ByteArrayOutputStream buffer = new ByteArrayOutputStream(); - ObjectOutput out = new ObjectOutputStream(buffer); - out.writeObject(item1); - out.close(); - - ObjectInput in = new ObjectInputStream(new ByteArrayInputStream( - buffer.toByteArray())); - item2 = (ComparableObjectItem) in.readObject(); - in.close(); + ComparableObjectItem item2 = (ComparableObjectItem) + TestUtilities.serialised(item1); assertEquals(item1, item2); } Modified: branches/jfreechart-1.0.x-branch/tests/org/jfree/data/ComparableObjectSeriesTest.java =================================================================== --- branches/jfreechart-1.0.x-branch/tests/org/jfree/data/ComparableObjectSeriesTest.java 2013-08-04 16:31:39 UTC (rev 2849) +++ branches/jfreechart-1.0.x-branch/tests/org/jfree/data/ComparableObjectSeriesTest.java 2013-08-04 16:42:59 UTC (rev 2850) @@ -24,10 +24,10 @@ * [Oracle and Java are registered trademarks of Oracle and/or its affiliates. * Other names may be trademarks of their respective owners.] * - * -------------------------------- - * ComparableObjectSeriesTests.java - * -------------------------------- - * (C) Copyright 2006-2008, by Object Refinery Limited and Contributors. + * ------------------------------- + * ComparableObjectSeriesTest.java + * ------------------------------- + * (C) Copyright 2006-2013, by Object Refinery Limited and Contributors. * * Original Author: David Gilbert (for Object Refinery Limited); * Contributor(s): -; @@ -41,21 +41,11 @@ package org.jfree.data; -import java.io.ByteArrayInputStream; -import java.io.ByteArrayOutputStream; -import java.io.IOException; -import java.io.ObjectInput; -import java.io.ObjectInputStream; -import java.io.ObjectOutput; -import java.io.ObjectOutputStream; - import junit.framework.Test; import junit.framework.TestCase; import junit.framework.TestSuite; +import org.jfree.chart.TestUtilities; -import org.jfree.data.ComparableObjectItem; -import org.jfree.data.ComparableObjectSeries; - /** * Tests for the {@link ComparableObjectSeries} class. */ @@ -192,19 +182,11 @@ /** * Serialize an instance, restore it, and check for equality. */ - public void testSerialization() throws IOException, ClassNotFoundException { + public void testSerialization() { MyComparableObjectSeries s1 = new MyComparableObjectSeries("A"); s1.add(new Integer(1), "ABC"); - MyComparableObjectSeries s2; - ByteArrayOutputStream buffer = new ByteArrayOutputStream(); - ObjectOutput out = new ObjectOutputStream(buffer); - out.writeObject(s1); - out.close(); - - ObjectInput in = new ObjectInputStream(new ByteArrayInputStream( - buffer.toByteArray())); - s2 = (MyComparableObjectSeries) in.readObject(); - in.close(); + MyComparableObjectSeries s2 = (MyComparableObjectSeries) + TestUtilities.serialised(s1); assertEquals(s1, s2); } Modified: branches/jfreechart-1.0.x-branch/tests/org/jfree/data/DefaultKeyedValueTest.java =================================================================== --- branches/jfreechart-1.0.x-branch/tests/org/jfree/data/DefaultKeyedValueTest.java 2013-08-04 16:31:39 UTC (rev 2849) +++ branches/jfreechart-1.0.x-branch/tests/org/jfree/data/DefaultKeyedValueTest.java 2013-08-04 16:42:59 UTC (rev 2850) @@ -40,20 +40,11 @@ package org.jfree.data; -import java.io.ByteArrayInputStream; -import java.io.ByteArrayOutputStream; -import java.io.IOException; -import java.io.ObjectInput; -import java.io.ObjectInputStream; -import java.io.ObjectOutput; -import java.io.ObjectOutputStream; - import junit.framework.Test; import junit.framework.TestCase; import junit.framework.TestSuite; +import org.jfree.chart.TestUtilities; -import org.jfree.data.DefaultKeyedValue; - /** * Tests for the {@link DefaultKeyedValue} class. */ @@ -138,18 +129,9 @@ /** * Serialize an instance, restore it, and check for equality. */ - public void testSerialization() throws IOException, ClassNotFoundException { - + public void testSerialization() { DefaultKeyedValue v1 = new DefaultKeyedValue("Test", new Double(25.3)); - DefaultKeyedValue v2; - ByteArrayOutputStream buffer = new ByteArrayOutputStream(); - ObjectOutput out = new ObjectOutputStream(buffer); - out.writeObject(v1); - out.close(); - ObjectInput in = new ObjectInputStream(new ByteArrayInputStream( - buffer.toByteArray())); - v2 = (DefaultKeyedValue) in.readObject(); - in.close(); + DefaultKeyedValue v2 = (DefaultKeyedValue) TestUtilities.serialised(v1); assertEquals(v1, v2); } Modified: branches/jfreechart-1.0.x-branch/tests/org/jfree/data/DefaultKeyedValues2DTest.java =================================================================== --- branches/jfreechart-1.0.x-branch/tests/org/jfree/data/DefaultKeyedValues2DTest.java 2013-08-04 16:31:39 UTC (rev 2849) +++ branches/jfreechart-1.0.x-branch/tests/org/jfree/data/DefaultKeyedValues2DTest.java 2013-08-04 16:42:59 UTC (rev 2850) @@ -24,10 +24,10 @@ * [Oracle and Java are registered trademarks of Oracle and/or its affiliates. * Other names may be trademarks of their respective owners.] * - * ------------------------------ - * DefaultKeyedValues2DTests.java - * ------------------------------ - * (C) Copyright 2003-2008 by Object Refinery Limited and Contributors. + * ----------------------------- + * DefaultKeyedValues2DTest.java + * ----------------------------- + * (C) Copyright 2003-2013 by Object Refinery Limited and Contributors. * * Original Author: David Gilbert (for Object Refinery Limited); * Contributor(s): -; @@ -46,21 +46,11 @@ package org.jfree.data; -import java.io.ByteArrayInputStream; -import java.io.ByteArrayOutputStream; -import java.io.IOException; -import java.io.ObjectInput; -import java.io.ObjectInputStream; -import java.io.ObjectOutput; -import java.io.ObjectOutputStream; - import junit.framework.Test; import junit.framework.TestCase; import junit.framework.TestSuite; +import org.jfree.chart.TestUtilities; -import org.jfree.data.DefaultKeyedValues2D; -import org.jfree.data.UnknownKeyException; - /** * Tests for the {@link DefaultKeyedValues2D} class. */ @@ -131,23 +121,15 @@ /** * Serialize an instance, restore it, and check for equality. */ - public void testSerialization() throws IOException, ClassNotFoundException { + public void testSerialization() { DefaultKeyedValues2D kv2D1 = new DefaultKeyedValues2D(); kv2D1.addValue(new Double(234.2), "Row1", "Col1"); kv2D1.addValue(null, "Row1", "Col2"); kv2D1.addValue(new Double(345.9), "Row2", "Col1"); kv2D1.addValue(new Double(452.7), "Row2", "Col2"); - DefaultKeyedValues2D kv2D2; - ByteArrayOutputStream buffer = new ByteArrayOutputStream(); - ObjectOutput out = new ObjectOutputStream(buffer); - out.writeObject(kv2D1); - out.close(); - - ObjectInput in = new ObjectInputStream(new ByteArrayInputStream( - buffer.toByteArray())); - kv2D2 = (DefaultKeyedValues2D) in.readObject(); - in.close(); + DefaultKeyedValues2D kv2D2 = (DefaultKeyedValues2D) + TestUtilities.serialised(kv2D1); assertEquals(kv2D1, kv2D2); } Modified: branches/jfreechart-1.0.x-branch/tests/org/jfree/data/DefaultKeyedValuesTest.java =================================================================== --- branches/jfreechart-1.0.x-branch/tests/org/jfree/data/DefaultKeyedValuesTest.java 2013-08-04 16:31:39 UTC (rev 2849) +++ branches/jfreechart-1.0.x-branch/tests/org/jfree/data/DefaultKeyedValuesTest.java 2013-08-04 16:42:59 UTC (rev 2850) @@ -24,10 +24,10 @@ * [Oracle and Java are registered trademarks of Oracle and/or its affiliates. * Other names may be trademarks of their respective owners.] * - * ---------------------------- - * DefaultKeyedValuesTests.java - * ---------------------------- - * (C) Copyright 2003-2008, by Object Refinery Limited. + * --------------------------- + * DefaultKeyedValuesTest.java + * --------------------------- + * (C) Copyright 2003-2013, by Object Refinery Limited. * * Original Author: David Gilbert (for Object Refinery Limited); * Contributor(s): -; @@ -46,21 +46,13 @@ package org.jfree.data; -import java.io.ByteArrayInputStream; -import java.io.ByteArrayOutputStream; -import java.io.IOException; -import java.io.ObjectInput; -import java.io.ObjectInputStream; -import java.io.ObjectOutput; -import java.io.ObjectOutputStream; import java.util.List; import junit.framework.Test; import junit.framework.TestCase; import junit.framework.TestSuite; +import org.jfree.chart.TestUtilities; -import org.jfree.data.DefaultKeyedValues; -import org.jfree.data.UnknownKeyException; import org.jfree.util.SortOrder; /** @@ -501,22 +493,14 @@ /** * Serialize an instance, restore it, and check for equality. */ - public void testSerialization() throws IOException, ClassNotFoundException { + public void testSerialization() { DefaultKeyedValues v1 = new DefaultKeyedValues(); v1.addValue("Key 1", new Double(23)); v1.addValue("Key 2", null); v1.addValue("Key 3", new Double(42)); - DefaultKeyedValues v2; - ByteArrayOutputStream buffer = new ByteArrayOutputStream(); - ObjectOutput out = new ObjectOutputStream(buffer); - out.writeObject(v1); - out.close(); - - ObjectInput in = new ObjectInputStream(new ByteArrayInputStream( - buffer.toByteArray())); - v2 = (DefaultKeyedValues) in.readObject(); - in.close(); + DefaultKeyedValues v2 = (DefaultKeyedValues) + TestUtilities.serialised(v1); assertEquals(v1, v2); } Modified: branches/jfreechart-1.0.x-branch/tests/org/jfree/data/DomainOrderTest.java =================================================================== --- branches/jfreechart-1.0.x-branch/tests/org/jfree/data/DomainOrderTest.java 2013-08-04 16:31:39 UTC (rev 2849) +++ branches/jfreechart-1.0.x-branch/tests/org/jfree/data/DomainOrderTest.java 2013-08-04 16:42:59 UTC (rev 2850) @@ -24,10 +24,10 @@ * [Oracle and Java are registered trademarks of Oracle and/or its affiliates. * Other names may be trademarks of their respective owners.] * - * --------------------- - * DomainOrderTests.java - * --------------------- - * (C) Copyright 2005-2008, by Object Refinery Limited and Contributors. + * -------------------- + * DomainOrderTest.java + * -------------------- + * (C) Copyright 2005-2013, by Object Refinery Limited and Contributors. * * Original Author: David Gilbert (for Object Refinery Limited); * Contributor(s): -; @@ -40,20 +40,11 @@ package org.jfree.data; -import java.io.ByteArrayInputStream; -import java.io.ByteArrayOutputStream; -import java.io.IOException; -import java.io.ObjectInput; -import java.io.ObjectInputStream; -import java.io.ObjectOutput; -import java.io.ObjectOutputStream; - import junit.framework.Test; import junit.framework.TestCase; import junit.framework.TestSuite; +import org.jfree.chart.TestUtilities; -import org.jfree.data.DomainOrder; - /** * Tests for the {@link DomainOrder} class. */ @@ -110,21 +101,10 @@ /** * Serialize an instance, restore it, and check for equality. */ - public void testSerialization() throws IOException, ClassNotFoundException { + public void testSerialization() { DomainOrder d1 = DomainOrder.ASCENDING; - DomainOrder d2; - ByteArrayOutputStream buffer = new ByteArrayOutputStream(); - ObjectOutput out = new ObjectOutputStream(buffer); - out.writeObject(d1); - out.close(); - - ObjectInput in = new ObjectInputStream(new ByteArrayInputStream( - buffer.toByteArray())); - d2 = (DomainOrder) in.readObject(); - in.close(); - assertEquals(d1, d2); - boolean same = d1 == d2; - assertEquals(true, same); + DomainOrder d2 = (DomainOrder) TestUtilities.serialised(d1); + assertSame(d1, d2); } } Modified: branches/jfreechart-1.0.x-branch/tests/org/jfree/data/KeyToGroupMapTest.java =================================================================== --- branches/jfreechart-1.0.x-branch/tests/org/jfree/data/KeyToGroupMapTest.java 2013-08-04 16:31:39 UTC (rev 2849) +++ branches/jfreechart-1.0.x-branch/tests/org/jfree/data/KeyToGroupMapTest.java 2013-08-04 16:42:59 UTC (rev 2850) @@ -40,20 +40,11 @@ package org.jfree.data; -import java.io.ByteArrayInputStream; -import java.io.ByteArrayOutputStream; -import java.io.IOException; -import java.io.ObjectInput; -import java.io.ObjectInputStream; -import java.io.ObjectOutput; -import java.io.ObjectOutputStream; - import junit.framework.Test; import junit.framework.TestCase; import junit.framework.TestSuite; +import org.jfree.chart.TestUtilities; -import org.jfree.data.KeyToGroupMap; - /** * Tests for the {@link KeyToGroupMap} class. */ @@ -259,19 +250,9 @@ /** * Serialize an instance, restore it, and check for equality. */ - public void testSerialization() throws IOException, ClassNotFoundException { + public void testSerialization() { KeyToGroupMap m1 = new KeyToGroupMap("Test"); - KeyToGroupMap m2; - - ByteArrayOutputStream buffer = new ByteArrayOutputStream(); - ObjectOutput out = new ObjectOutputStream(buffer); - out.writeObject(m1); - out.close(); - - ObjectInput in = new ObjectInputStream(new ByteArrayInputStream( - buffer.toByteArray())); - m2 = (KeyToGroupMap) in.readObject(); - in.close(); + KeyToGroupMap m2 = (KeyToGroupMap) TestUtilities.serialised(m1); assertEquals(m1, m2); } Modified: branches/jfreechart-1.0.x-branch/tests/org/jfree/data/KeyedObjectTest.java =================================================================== --- branches/jfreechart-1.0.x-branch/tests/org/jfree/data/KeyedObjectTest.java 2013-08-04 16:31:39 UTC (rev 2849) +++ branches/jfreechart-1.0.x-branch/tests/org/jfree/data/KeyedObjectTest.java 2013-08-04 16:42:59 UTC (rev 2850) @@ -24,10 +24,10 @@ * [Oracle and Java are registered trademarks of Oracle and/or its affiliates. * Other names may be trademarks of their respective owners.] * - * --------------------- - * KeyedObjectTests.java - * --------------------- - * (C) Copyright 2004-2008, by Object Refinery Limited. + * -------------------- + * KeyedObjectTest.java + * -------------------- + * (C) Copyright 2004-2013, by Object Refinery Limited. * * Original Author: David Gilbert (for Object Refinery Limited); * Contributor(s): -; @@ -41,20 +41,13 @@ package org.jfree.data; -import java.io.ByteArrayInputStream; -import java.io.ByteArrayOutputStream; -import java.io.IOException; -import java.io.ObjectInput; -import java.io.ObjectInputStream; -import java.io.ObjectOutput; -import java.io.ObjectOutputStream; import java.util.ArrayList; import junit.framework.Test; import junit.framework.TestCase; import junit.framework.TestSuite; +import org.jfree.chart.TestUtilities; -import org.jfree.data.KeyedObject; import org.jfree.data.general.DefaultPieDataset; /** @@ -141,17 +134,9 @@ /** * Serialize an instance, restore it, and check for equality. */ - public void testSerialization() throws IOException, ClassNotFoundException { + public void testSerialization() { KeyedObject ko1 = new KeyedObject("Test", "Object"); - KeyedObject ko2; - ByteArrayOutputStream buffer = new ByteArrayOutputStream(); - ObjectOutput out = new ObjectOutputStream(buffer); - out.writeObject(ko1); - out.close(); - ObjectInput in = new ObjectInputStream(new ByteArrayInputStream( - buffer.toByteArray())); - ko2 = (KeyedObject) in.readObject(); - in.close(); + KeyedObject ko2 = (KeyedObject) TestUtilities.serialised(ko1); assertEquals(ko1, ko2); } Modified: branches/jfreechart-1.0.x-branch/tests/org/jfree/data/KeyedObjects2DTest.java =================================================================== --- branches/jfreechart-1.0.x-branch/tests/org/jfree/data/KeyedObjects2DTest.java 2013-08-04 16:31:39 UTC (rev 2849) +++ branches/jfreechart-1.0.x-branch/tests/org/jfree/data/KeyedObjects2DTest.java 2013-08-04 16:42:59 UTC (rev 2850) @@ -24,10 +24,10 @@ * [Oracle and Java are registered trademarks of Oracle and/or its affiliates. * Other names may be trademarks of their respective owners.] * - * ------------------------ - * KeyedObjects2DTests.java - * ------------------------ - * (C) Copyright 2004-2008, by Object Refinery Limited and Contributors. + * ----------------------- + * KeyedObjects2DTest.java + * ----------------------- + * (C) Copyright 2004-2013, by Object Refinery Limited and Contributors. * * Original Author: David Gilbert (for Object Refinery Limited); * Contributor(s): -; @@ -42,21 +42,11 @@ package org.jfree.data; -import java.io.ByteArrayInputStream; -import java.io.ByteArrayOutputStream; -import java.io.IOException; -import java.io.ObjectInput; -import java.io.ObjectInputStream; -import java.io.ObjectOutput; -import java.io.ObjectOutputStream; - import junit.framework.Test; import junit.framework.TestCase; import junit.framework.TestSuite; +import org.jfree.chart.TestUtilities; -import org.jfree.data.KeyedObjects2D; -import org.jfree.data.UnknownKeyException; - /** * Tests for the {@link KeyedObjects2D} class. */ @@ -116,23 +106,14 @@ /** * Serialize an instance, restore it, and check for equality. */ - public void testSerialization() throws IOException, ClassNotFoundException { + public void testSerialization() { KeyedObjects2D ko2D1 = new KeyedObjects2D(); ko2D1.addObject(new Double(234.2), "Row1", "Col1"); ko2D1.addObject(null, "Row1", "Col2"); ko2D1.addObject(new Double(345.9), "Row2", "Col1"); ko2D1.addObject(new Double(452.7), "Row2", "Col2"); - KeyedObjects2D ko2D2; - ByteArrayOutputStream buffer = new ByteArrayOutputStream(); - ObjectOutput out = new ObjectOutputStream(buffer); - out.writeObject(ko2D1); - out.close(); - - ObjectInput in = new ObjectInputStream(new ByteArrayInputStream( - buffer.toByteArray())); - ko2D2 = (KeyedObjects2D) in.readObject(); - in.close(); + KeyedObjects2D ko2D2 = (KeyedObjects2D) TestUtilities.serialised(ko2D1); assertEquals(ko2D1, ko2D2); } Modified: branches/jfreechart-1.0.x-branch/tests/org/jfree/data/KeyedObjectsTest.java =================================================================== --- branches/jfreechart-1.0.x-branch/tests/org/jfree/data/KeyedObjectsTest.java 2013-08-04 16:31:39 UTC (rev 2849) +++ branches/jfreechart-1.0.x-branch/tests/org/jfree/data/KeyedObjectsTest.java 2013-08-04 16:42:59 UTC (rev 2850) @@ -24,10 +24,10 @@ * [Oracle and Java are registered trademarks of Oracle and/or its affiliates. * Other names may be trademarks of their respective owners.] * - * ---------------------- - * KeyedObjectsTests.java - * ---------------------- - * (C) Copyright 2004-2008, by Object Refinery Limited. + * --------------------- + * KeyedObjectsTest.java + * --------------------- + * (C) Copyright 2004-2013, by Object Refinery Limited. * * Original Author: David Gilbert (for Object Refinery Limited); * Contributor(s): -; @@ -42,21 +42,13 @@ package org.jfree.data; -import java.io.ByteArrayInputStream; -import java.io.ByteArrayOutputStream; -import java.io.IOException; -import java.io.ObjectInput; -import java.io.ObjectInputStream; -import java.io.ObjectOutput; -import java.io.ObjectOutputStream; import java.util.ArrayList; import junit.framework.Test; import junit.framework.TestCase; import junit.framework.TestSuite; +import org.jfree.chart.TestUtilities; -import org.jfree.data.KeyedObjects; -import org.jfree.data.UnknownKeyException; import org.jfree.data.general.DefaultPieDataset; /** @@ -175,22 +167,12 @@ /** * Serialize an instance, restore it, and check for equality. */ - public void testSerialization() throws IOException, ClassNotFoundException { - + public void testSerialization() { KeyedObjects ko1 = new KeyedObjects(); ko1.addObject("Key 1", "Object 1"); ko1.addObject("Key 2", null); ko1.addObject("Key 3", "Object 2"); - - KeyedObjects ko2; - ByteArrayOutputStream buffer = new ByteArrayOutputStream(); - ObjectOutput out = new ObjectOutputStream(buffer); - out.writeObject(ko1); - out.close(); - ObjectInput in = new ObjectInputStream(new ByteArrayInputStream( - buffer.toByteArray())); - ko2 = (KeyedObjects) in.readObject(); - in.close(); + KeyedObjects ko2 = (KeyedObjects) TestUtilities.serialised(ko1); assertEquals(ko1, ko2); } Modified: branches/jfreechart-1.0.x-branch/tests/org/jfree/data/RangeTest.java =================================================================== --- branches/jfreechart-1.0.x-branch/tests/org/jfree/data/RangeTest.java 2013-08-04 16:31:39 UTC (rev 2849) +++ branches/jfreechart-1.0.x-branch/tests/org/jfree/data/RangeTest.java 2013-08-04 16:42:59 UTC (rev 2850) @@ -24,10 +24,10 @@ * [Oracle and Java are registered trademarks of Oracle and/or its affiliates. * Other names may be trademarks of their respective owners.] * - * --------------- - * RangeTests.java - * --------------- - * (C) Copyright 2003-2012, by Object Refinery Limited and Contributors. + * -------------- + * RangeTest.java + * -------------- + * (C) Copyright 2003-2013, by Object Refinery Limited and Contributors. * * Original Author: David Gilbert (for Object Refinery Limited); * Contributor(s): Sergei Ivanov; @@ -42,19 +42,11 @@ package org.jfree.data; -import java.io.ByteArrayInputStream; -import java.io.ByteArrayOutputStream; -import java.io.ObjectInput; -import java.io.ObjectInputStream; -import java.io.ObjectOutput; -import java.io.ObjectOutputStream; - import junit.framework.Test; import junit.framework.TestCase; import junit.framework.TestSuite; +import org.jfree.chart.TestUtilities; -import org.jfree.data.Range; - /** * Tests for the {@link Range} class. */ @@ -305,26 +297,9 @@ * Serialize an instance, restore it, and check for equality. */ public void testSerialization() { - Range r1 = new Range(25.0, 133.42); - Range r2 = null; - - try { - ByteArrayOutputStream buffer = new ByteArrayOutputStream(); - ObjectOutput out = new ObjectOutputStream(buffer); - out.writeObject(r1); - out.close(); - - ObjectInput in = new ObjectInputStream(new ByteArrayInputStream( - buffer.toByteArray())); - r2 = (Range) in.readObject(); - in.close(); - } - catch (Exception e) { - fail("Serialization is not supported"); - } + Range r2 = (Range) TestUtilities.serialised(r1); assertEquals(r1, r2); - } private static final double EPSILON = 0.0000000001; Modified: branches/jfreechart-1.0.x-branch/tests/org/jfree/data/RangeTypeTest.java =================================================================== --- branches/jfreechart-1.0.x-branch/tests/org/jfree/data/RangeTypeTest.java 2013-08-04 16:31:39 UTC (rev 2849) +++ branches/jfreechart-1.0.x-branch/tests/org/jfree/data/RangeTypeTest.java 2013-08-04 16:42:59 UTC (rev 2850) @@ -24,10 +24,10 @@ * [Oracle and Java are registered trademarks of Oracle and/or its affiliates. * Other names may be trademarks of their respective owners.] * - * ------------------- - * RangeTypeTests.java - * ------------------- - * (C) Copyright 2005-2008, by Object Refinery Limited and Contributors. + * ------------------ + * RangeTypeTest.java + * ------------------ + * (C) Copyright 2005-2013, by Object Refinery Limited and Contributors. * * Original Author: David Gilbert (for Object Refinery Limited); * Contributor(s): -; @@ -40,20 +40,11 @@ package org.jfree.data; -import java.io.ByteArrayInputStream; -import java.io.ByteArrayOutputStream; -import java.io.IOException; -import java.io.ObjectInput; -import java.io.ObjectInputStream; -import java.io.ObjectOutput; -import java.io.ObjectOutputStream; - import junit.framework.Test; import junit.framework.TestCase; import junit.framework.TestSuite; +import org.jfree.chart.TestUtilities; -import org.jfree.data.RangeType; - /** * Tests for the {@link RangeType} class. */ @@ -110,21 +101,10 @@ /** * Serialize an instance, restore it, and check for equality. */ - public void testSerialization() throws IOException, ClassNotFoundException { + public void testSerialization() { RangeType r1 = RangeType.FULL; - RangeType r2; - ByteArrayOutputStream buffer = new ByteArrayOutputStream(); - ObjectOutput out = new ObjectOutputStream(buffer); - out.writeObject(r1); - out.close(); - - ObjectInput in = new ObjectInputStream(new ByteArrayInputStream( - buffer.toByteArray())); - r2 = (RangeType) in.readObject(); - in.close(); - assertEquals(r1, r2); - boolean same = r1 == r2; - assertEquals(true, same); + RangeType r2 = (RangeType) TestUtilities.serialised(r1); + assertSame(r1, r2); } } This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |