From: <mu...@us...> - 2013-08-04 20:34:01
|
Revision: 2856 http://sourceforge.net/p/jfreechart/code/2856 Author: mungady Date: 2013-08-04 20:33:58 +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/time/DateRangeTest.java branches/jfreechart-1.0.x-branch/tests/org/jfree/data/time/DayTest.java branches/jfreechart-1.0.x-branch/tests/org/jfree/data/time/FixedMillisecondTest.java branches/jfreechart-1.0.x-branch/tests/org/jfree/data/time/HourTest.java branches/jfreechart-1.0.x-branch/tests/org/jfree/data/time/MillisecondTest.java branches/jfreechart-1.0.x-branch/tests/org/jfree/data/time/MinuteTest.java branches/jfreechart-1.0.x-branch/tests/org/jfree/data/time/MonthTest.java branches/jfreechart-1.0.x-branch/tests/org/jfree/data/time/MovingAverageTest.java branches/jfreechart-1.0.x-branch/tests/org/jfree/data/time/QuarterTest.java branches/jfreechart-1.0.x-branch/tests/org/jfree/data/time/SecondTest.java branches/jfreechart-1.0.x-branch/tests/org/jfree/data/time/SimpleTimePeriodTest.java branches/jfreechart-1.0.x-branch/tests/org/jfree/data/time/TimePeriodAnchorTest.java branches/jfreechart-1.0.x-branch/tests/org/jfree/data/time/TimePeriodValueTest.java branches/jfreechart-1.0.x-branch/tests/org/jfree/data/time/TimePeriodValuesCollectionTest.java branches/jfreechart-1.0.x-branch/tests/org/jfree/data/time/TimePeriodValuesTest.java branches/jfreechart-1.0.x-branch/tests/org/jfree/data/time/TimeSeriesCollectionTest.java branches/jfreechart-1.0.x-branch/tests/org/jfree/data/time/TimeSeriesDataItemTest.java branches/jfreechart-1.0.x-branch/tests/org/jfree/data/time/TimeSeriesTest.java branches/jfreechart-1.0.x-branch/tests/org/jfree/data/time/TimeTableXYDatasetTest.java branches/jfreechart-1.0.x-branch/tests/org/jfree/data/time/WeekTest.java branches/jfreechart-1.0.x-branch/tests/org/jfree/data/time/YearTest.java Modified: branches/jfreechart-1.0.x-branch/tests/org/jfree/data/time/DateRangeTest.java =================================================================== --- branches/jfreechart-1.0.x-branch/tests/org/jfree/data/time/DateRangeTest.java 2013-08-04 20:33:35 UTC (rev 2855) +++ branches/jfreechart-1.0.x-branch/tests/org/jfree/data/time/DateRangeTest.java 2013-08-04 20:33:58 UTC (rev 2856) @@ -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.] * - * ------------------- - * DateRangeTests.java - * ------------------- - * (C) Copyright 2004-2008, by Object Refinery Limited and Contributors. + * ------------------ + * DateRangeTest.java + * ------------------ + * (C) Copyright 2004-2013, by Object Refinery Limited and Contributors. * * Original Author: David Gilbert (for Object Refinery Limited); * Contributor(s): -; @@ -41,21 +41,13 @@ package org.jfree.data.time; -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.Date; import junit.framework.Test; import junit.framework.TestCase; import junit.framework.TestSuite; +import org.jfree.chart.TestUtilities; -import org.jfree.data.time.DateRange; - /** * Some tests for the {@link DateRange} class. */ @@ -102,17 +94,9 @@ /** * Serialize an instance, restore it, and check for equality. */ - public void testSerialization() throws IOException, ClassNotFoundException { + public void testSerialization() { DateRange r1 = new DateRange(new Date(1000L), new Date(2000L)); - DateRange r2; - ByteArrayOutputStream buffer = new ByteArrayOutputStream(); - ObjectOutput out = new ObjectOutputStream(buffer); - out.writeObject(r1); - out.close(); - ObjectInput in = new ObjectInputStream(new ByteArrayInputStream( - buffer.toByteArray())); - r2 = (DateRange) in.readObject(); - in.close(); + DateRange r2 = (DateRange) TestUtilities.serialised(r1); assertEquals(r1, r2); } Modified: branches/jfreechart-1.0.x-branch/tests/org/jfree/data/time/DayTest.java =================================================================== --- branches/jfreechart-1.0.x-branch/tests/org/jfree/data/time/DayTest.java 2013-08-04 20:33:35 UTC (rev 2855) +++ branches/jfreechart-1.0.x-branch/tests/org/jfree/data/time/DayTest.java 2013-08-04 20:33:58 UTC (rev 2856) @@ -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.] * - * ------------- - * DayTests.java - * ------------- - * (C) Copyright 2001-2009, by Object Refinery Limited. + * ------------ + * DayTest.java + * ------------ + * (C) Copyright 2001-2013, by Object Refinery Limited. * * Original Author: David Gilbert (for Object Refinery Limited); * Contributor(s): -; @@ -49,13 +49,6 @@ package org.jfree.data.time; -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.text.ParseException; import java.text.SimpleDateFormat; import java.util.Calendar; @@ -67,8 +60,8 @@ import junit.framework.Test; import junit.framework.TestCase; import junit.framework.TestSuite; +import org.jfree.chart.TestUtilities; -import org.jfree.data.time.Day; import org.jfree.date.MonthConstants; /** @@ -222,18 +215,9 @@ /** * Serialize an instance, restore it, and check for equality. */ - public void testSerialization() throws IOException, ClassNotFoundException { + public void testSerialization() { Day d1 = new Day(15, 4, 2000); - Day d2; - ByteArrayOutputStream buffer = new ByteArrayOutputStream(); - ObjectOutput out = new ObjectOutputStream(buffer); - out.writeObject(d1); - out.close(); - - ObjectInput in = new ObjectInputStream(new ByteArrayInputStream( - buffer.toByteArray())); - d2 = (Day) in.readObject(); - in.close(); + Day d2 = (Day) TestUtilities.serialised(d1); assertEquals(d1, d2); } Modified: branches/jfreechart-1.0.x-branch/tests/org/jfree/data/time/FixedMillisecondTest.java =================================================================== --- branches/jfreechart-1.0.x-branch/tests/org/jfree/data/time/FixedMillisecondTest.java 2013-08-04 20:33:35 UTC (rev 2855) +++ branches/jfreechart-1.0.x-branch/tests/org/jfree/data/time/FixedMillisecondTest.java 2013-08-04 20:33:58 UTC (rev 2856) @@ -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.] * - * -------------------------- - * FixedMillisecondTests.java - * -------------------------- - * (C) Copyright 2002-2008, by Object Refinery Limited. + * ------------------------- + * FixedMillisecondTest.java + * ------------------------- + * (C) Copyright 2002-2013, by Object Refinery Limited. * * Original Author: David Gilbert (for Object Refinery Limited); * Contributor(s): -; @@ -43,21 +43,13 @@ package org.jfree.data.time; -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.Date; import junit.framework.Test; import junit.framework.TestCase; import junit.framework.TestSuite; +import org.jfree.chart.TestUtilities; -import org.jfree.data.time.FixedMillisecond; - /** * Tests for the {@link FixedMillisecond} class. */ @@ -84,17 +76,9 @@ /** * Serialize an instance, restore it, and check for equality. */ - public void testSerialization() throws IOException, ClassNotFoundException { + public void testSerialization() { FixedMillisecond m1 = new FixedMillisecond(); - FixedMillisecond m2; - ByteArrayOutputStream buffer = new ByteArrayOutputStream(); - ObjectOutput out = new ObjectOutputStream(buffer); - out.writeObject(m1); - out.close(); - ObjectInput in = new ObjectInputStream(new ByteArrayInputStream( - buffer.toByteArray())); - m2 = (FixedMillisecond) in.readObject(); - in.close(); + FixedMillisecond m2 = (FixedMillisecond) TestUtilities.serialised(m1); assertEquals(m1, m2); } Modified: branches/jfreechart-1.0.x-branch/tests/org/jfree/data/time/HourTest.java =================================================================== --- branches/jfreechart-1.0.x-branch/tests/org/jfree/data/time/HourTest.java 2013-08-04 20:33:35 UTC (rev 2855) +++ branches/jfreechart-1.0.x-branch/tests/org/jfree/data/time/HourTest.java 2013-08-04 20:33:58 UTC (rev 2856) @@ -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.] * - * -------------- - * HourTests.java - * -------------- - * (C) Copyright 2002-2009, by Object Refinery Limited. + * ------------- + * HourTest.java + * ------------- + * (C) Copyright 2002-2013, by Object Refinery Limited. * * Original Author: David Gilbert (for Object Refinery Limited); * Contributor(s): -; @@ -46,13 +46,6 @@ package org.jfree.data.time; -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.Calendar; import java.util.Date; import java.util.GregorianCalendar; @@ -62,9 +55,8 @@ import junit.framework.Test; import junit.framework.TestCase; import junit.framework.TestSuite; +import org.jfree.chart.TestUtilities; -import org.jfree.data.time.Day; -import org.jfree.data.time.Hour; import org.jfree.date.MonthConstants; /** @@ -204,18 +196,9 @@ /** * Serialize an instance, restore it, and check for equality. */ - public void testSerialization() throws IOException, ClassNotFoundException { + public void testSerialization() { Hour h1 = new Hour(); - Hour h2; - ByteArrayOutputStream buffer = new ByteArrayOutputStream(); - ObjectOutput out = new ObjectOutputStream(buffer); - out.writeObject(h1); - out.close(); - - ObjectInput in = new ObjectInputStream(new ByteArrayInputStream( - buffer.toByteArray())); - h2 = (Hour) in.readObject(); - in.close(); + Hour h2 = (Hour) TestUtilities.serialised(h1); assertEquals(h1, h2); } Modified: branches/jfreechart-1.0.x-branch/tests/org/jfree/data/time/MillisecondTest.java =================================================================== --- branches/jfreechart-1.0.x-branch/tests/org/jfree/data/time/MillisecondTest.java 2013-08-04 20:33:35 UTC (rev 2855) +++ branches/jfreechart-1.0.x-branch/tests/org/jfree/data/time/MillisecondTest.java 2013-08-04 20:33:58 UTC (rev 2856) @@ -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.] * - * --------------------- - * MillisecondTests.java - * --------------------- - * (C) Copyright 2002-2009, by Object Refinery Limited. + * -------------------- + * MillisecondTest.java + * -------------------- + * (C) Copyright 2002-2013, by Object Refinery Limited. * * Original Author: David Gilbert (for Object Refinery Limited); * Contributor(s): -; @@ -46,13 +46,6 @@ package org.jfree.data.time; -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.Calendar; import java.util.Date; import java.util.GregorianCalendar; @@ -62,12 +55,8 @@ import junit.framework.Test; import junit.framework.TestCase; import junit.framework.TestSuite; +import org.jfree.chart.TestUtilities; -import org.jfree.data.time.Day; -import org.jfree.data.time.Hour; -import org.jfree.data.time.Millisecond; -import org.jfree.data.time.Minute; -import org.jfree.data.time.Second; import org.jfree.date.MonthConstants; /** @@ -170,18 +159,9 @@ /** * Serialize an instance, restore it, and check for equality. */ - public void testSerialization() throws IOException, ClassNotFoundException { + public void testSerialization() { Millisecond m1 = new Millisecond(); - Millisecond m2; - ByteArrayOutputStream buffer = new ByteArrayOutputStream(); - ObjectOutput out = new ObjectOutputStream(buffer); - out.writeObject(m1); - out.close(); - - ObjectInput in = new ObjectInputStream(new ByteArrayInputStream( - buffer.toByteArray())); - m2 = (Millisecond) in.readObject(); - in.close(); + Millisecond m2 = (Millisecond) TestUtilities.serialised(m1); assertEquals(m1, m2); } Modified: branches/jfreechart-1.0.x-branch/tests/org/jfree/data/time/MinuteTest.java =================================================================== --- branches/jfreechart-1.0.x-branch/tests/org/jfree/data/time/MinuteTest.java 2013-08-04 20:33:35 UTC (rev 2855) +++ branches/jfreechart-1.0.x-branch/tests/org/jfree/data/time/MinuteTest.java 2013-08-04 20:33:58 UTC (rev 2856) @@ -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.] * - * ---------------- - * MinuteTests.java - * ---------------- - * (C) Copyright 2002-2009, by Object Refinery Limited. + * --------------- + * MinuteTest.java + * --------------- + * (C) Copyright 2002-2013, by Object Refinery Limited. * * Original Author: David Gilbert (for Object Refinery Limited); * Contributor(s): -; @@ -47,13 +47,6 @@ package org.jfree.data.time; -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.Calendar; import java.util.Date; import java.util.GregorianCalendar; @@ -63,10 +56,8 @@ import junit.framework.Test; import junit.framework.TestCase; import junit.framework.TestSuite; +import org.jfree.chart.TestUtilities; -import org.jfree.data.time.Day; -import org.jfree.data.time.Hour; -import org.jfree.data.time.Minute; import org.jfree.date.MonthConstants; /** @@ -160,17 +151,9 @@ /** * Serialize an instance, restore it, and check for equality. */ - public void testSerialization() throws IOException, ClassNotFoundException { + public void testSerialization() { Minute m1 = new Minute(); - Minute m2; - ByteArrayOutputStream buffer = new ByteArrayOutputStream(); - ObjectOutput out = new ObjectOutputStream(buffer); - out.writeObject(m1); - out.close(); - ObjectInput in = new ObjectInputStream(new ByteArrayInputStream( - buffer.toByteArray())); - m2 = (Minute) in.readObject(); - in.close(); + Minute m2 = (Minute) TestUtilities.serialised(m1); assertEquals(m1, m2); } Modified: branches/jfreechart-1.0.x-branch/tests/org/jfree/data/time/MonthTest.java =================================================================== --- branches/jfreechart-1.0.x-branch/tests/org/jfree/data/time/MonthTest.java 2013-08-04 20:33:35 UTC (rev 2855) +++ branches/jfreechart-1.0.x-branch/tests/org/jfree/data/time/MonthTest.java 2013-08-04 20:33:58 UTC (rev 2856) @@ -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.] * - * --------------- - * MonthTests.java - * --------------- - * (C) Copyright 2001-2008, by Object Refinery Limited. + * -------------- + * MonthTest.java + * -------------- + * (C) Copyright 2001-2013, by Object Refinery Limited. * * Original Author: David Gilbert (for Object Refinery Limited); * Contributor(s): -; @@ -49,13 +49,6 @@ package org.jfree.data.time; -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.Calendar; import java.util.Date; import java.util.GregorianCalendar; @@ -65,10 +58,8 @@ import junit.framework.Test; import junit.framework.TestCase; import junit.framework.TestSuite; +import org.jfree.chart.TestUtilities; -import org.jfree.data.time.Month; -import org.jfree.data.time.TimePeriodFormatException; -import org.jfree.data.time.Year; import org.jfree.date.MonthConstants; /** @@ -249,17 +240,9 @@ /** * Serialize an instance, restore it, and check for equality. */ - public void testSerialization() throws IOException, ClassNotFoundException { + public void testSerialization() { Month m1 = new Month(12, 1999); - Month m2; - ByteArrayOutputStream buffer = new ByteArrayOutputStream(); - ObjectOutput out = new ObjectOutputStream(buffer); - out.writeObject(m1); - out.close(); - ObjectInput in = new ObjectInputStream(new ByteArrayInputStream( - buffer.toByteArray())); - m2 = (Month) in.readObject(); - in.close(); + Month m2 = (Month) TestUtilities.serialised(m1); assertEquals(m1, m2); } Modified: branches/jfreechart-1.0.x-branch/tests/org/jfree/data/time/MovingAverageTest.java =================================================================== --- branches/jfreechart-1.0.x-branch/tests/org/jfree/data/time/MovingAverageTest.java 2013-08-04 20:33:35 UTC (rev 2855) +++ branches/jfreechart-1.0.x-branch/tests/org/jfree/data/time/MovingAverageTest.java 2013-08-04 20:33:58 UTC (rev 2856) @@ -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.] * - * ----------------------- - * MovingAverageTests.java - * ----------------------- - * (C) Copyright 2003-2008, by Object Refinery Limited and Contributors. + * ---------------------- + * MovingAverageTest.java + * ---------------------- + * (C) Copyright 2003-2013, by Object Refinery Limited and Contributors. * * Original Author: David Gilbert (for Object Refinery Limited); * Contributor(s): -; @@ -45,9 +45,6 @@ import junit.framework.TestCase; import junit.framework.TestSuite; -import org.jfree.data.time.Day; -import org.jfree.data.time.MovingAverage; -import org.jfree.data.time.TimeSeries; import org.jfree.date.MonthConstants; /** Modified: branches/jfreechart-1.0.x-branch/tests/org/jfree/data/time/QuarterTest.java =================================================================== --- branches/jfreechart-1.0.x-branch/tests/org/jfree/data/time/QuarterTest.java 2013-08-04 20:33:35 UTC (rev 2855) +++ branches/jfreechart-1.0.x-branch/tests/org/jfree/data/time/QuarterTest.java 2013-08-04 20:33:58 UTC (rev 2856) @@ -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.] * - * ----------------- - * QuarterTests.java - * ----------------- - * (C) Copyright 2001-2008, by Object Refinery Limited. + * ---------------- + * QuarterTest.java + * ---------------- + * (C) Copyright 2001-2013, by Object Refinery Limited. * * Original Author: David Gilbert (for Object Refinery Limited); * Contributor(s): -; @@ -45,13 +45,6 @@ package org.jfree.data.time; -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.Calendar; import java.util.Date; import java.util.GregorianCalendar; @@ -61,11 +54,8 @@ import junit.framework.Test; import junit.framework.TestCase; import junit.framework.TestSuite; +import org.jfree.chart.TestUtilities; -import org.jfree.data.time.Quarter; -import org.jfree.data.time.TimePeriodFormatException; -import org.jfree.data.time.Year; - /** * Tests for the {link Quarter} class. */ @@ -244,17 +234,9 @@ /** * Serialize an instance, restore it, and check for equality. */ - public void testSerialization() throws IOException, ClassNotFoundException { + public void testSerialization() { Quarter q1 = new Quarter(4, 1999); - Quarter q2; - ByteArrayOutputStream buffer = new ByteArrayOutputStream(); - ObjectOutput out = new ObjectOutputStream(buffer); - out.writeObject(q1); - out.close(); - ObjectInput in = new ObjectInputStream(new ByteArrayInputStream( - buffer.toByteArray())); - q2 = (Quarter) in.readObject(); - in.close(); + Quarter q2 = (Quarter) TestUtilities.serialised(q1); assertEquals(q1, q2); } Modified: branches/jfreechart-1.0.x-branch/tests/org/jfree/data/time/SecondTest.java =================================================================== --- branches/jfreechart-1.0.x-branch/tests/org/jfree/data/time/SecondTest.java 2013-08-04 20:33:35 UTC (rev 2855) +++ branches/jfreechart-1.0.x-branch/tests/org/jfree/data/time/SecondTest.java 2013-08-04 20:33:58 UTC (rev 2856) @@ -25,9 +25,9 @@ * Other names may be trademarks of their respective owners.] * * ---------------- - * SecondTests.java + * SecondTest.java * ---------------- - * (C) Copyright 2002-2009, by Object Refinery Limited. + * (C) Copyright 2002-2013, by Object Refinery Limited. * * Original Author: David Gilbert (for Object Refinery Limited); * Contributor(s): -; @@ -45,13 +45,6 @@ package org.jfree.data.time; -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.Calendar; import java.util.Date; import java.util.GregorianCalendar; @@ -61,11 +54,8 @@ import junit.framework.Test; import junit.framework.TestCase; import junit.framework.TestSuite; +import org.jfree.chart.TestUtilities; -import org.jfree.data.time.Day; -import org.jfree.data.time.Hour; -import org.jfree.data.time.Minute; -import org.jfree.data.time.Second; import org.jfree.date.MonthConstants; /** @@ -160,18 +150,9 @@ /** * Serialize an instance, restore it, and check for equality. */ - public void testSerialization() throws IOException, ClassNotFoundException { + public void testSerialization() { Second s1 = new Second(); - Second s2; - ByteArrayOutputStream buffer = new ByteArrayOutputStream(); - ObjectOutput out = new ObjectOutputStream(buffer); - out.writeObject(s1); - out.close(); - - ObjectInput in = new ObjectInputStream(new ByteArrayInputStream( - buffer.toByteArray())); - s2 = (Second) in.readObject(); - in.close(); + Second s2 = (Second) TestUtilities.serialised(s1); assertEquals(s1, s2); } Modified: branches/jfreechart-1.0.x-branch/tests/org/jfree/data/time/SimpleTimePeriodTest.java =================================================================== --- branches/jfreechart-1.0.x-branch/tests/org/jfree/data/time/SimpleTimePeriodTest.java 2013-08-04 20:33:35 UTC (rev 2855) +++ branches/jfreechart-1.0.x-branch/tests/org/jfree/data/time/SimpleTimePeriodTest.java 2013-08-04 20:33:58 UTC (rev 2856) @@ -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.] * - * -------------------------- - * SimpleTimePeriodTests.java - * -------------------------- - * (C) Copyright 2003-2008, by Object Refinery Limited. + * ------------------------- + * SimpleTimePeriodTest.java + * ------------------------- + * (C) Copyright 2003-2013, by Object Refinery Limited. * * Original Author: David Gilbert (for Object Refinery Limited); * Contributor(s): -; @@ -42,21 +42,13 @@ package org.jfree.data.time; -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.Date; import junit.framework.Test; import junit.framework.TestCase; import junit.framework.TestSuite; +import org.jfree.chart.TestUtilities; -import org.jfree.data.time.SimpleTimePeriod; - /** * Tests for the {@link SimpleTimePeriod} class. */ @@ -123,18 +115,10 @@ /** * Serialize an instance, restore it, and check for equality. */ - public void testSerialization() throws IOException, ClassNotFoundException { + public void testSerialization() { SimpleTimePeriod p1 = new SimpleTimePeriod(new Date(1000L), new Date(1001L)); - SimpleTimePeriod p2; - ByteArrayOutputStream buffer = new ByteArrayOutputStream(); - ObjectOutput out = new ObjectOutputStream(buffer); - out.writeObject(p1); - out.close(); - ObjectInput in = new ObjectInputStream( - new ByteArrayInputStream(buffer.toByteArray())); - p2 = (SimpleTimePeriod) in.readObject(); - in.close(); + SimpleTimePeriod p2 = (SimpleTimePeriod) TestUtilities.serialised(p1); assertEquals(p1, p2); } Modified: branches/jfreechart-1.0.x-branch/tests/org/jfree/data/time/TimePeriodAnchorTest.java =================================================================== --- branches/jfreechart-1.0.x-branch/tests/org/jfree/data/time/TimePeriodAnchorTest.java 2013-08-04 20:33:35 UTC (rev 2855) +++ branches/jfreechart-1.0.x-branch/tests/org/jfree/data/time/TimePeriodAnchorTest.java 2013-08-04 20:33:58 UTC (rev 2856) @@ -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.] * - * -------------------------- - * TimePeriodAnchorTests.java - * -------------------------- - * (C) Copyright 2004-2008, by Object Refinery Limited and Contributors. + * ------------------------- + * TimePeriodAnchorTest.java + * ------------------------- + * (C) Copyright 2004-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.time; -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.time.TimePeriodAnchor; - /** * Tests for the {@link TimePeriodAnchor} class. */ @@ -89,19 +80,9 @@ /** * Serialize an instance, restore it, and check for identity. */ - public void testSerialization() throws IOException, ClassNotFoundException { - + public void testSerialization() { TimePeriodAnchor a1 = TimePeriodAnchor.START; - TimePeriodAnchor a2; - ByteArrayOutputStream buffer = new ByteArrayOutputStream(); - ObjectOutput out = new ObjectOutputStream(buffer); - out.writeObject(a1); - out.close(); - - ObjectInput in = new ObjectInputStream(new ByteArrayInputStream( - buffer.toByteArray())); - a2 = (TimePeriodAnchor) in.readObject(); - in.close(); + TimePeriodAnchor a2 = (TimePeriodAnchor) TestUtilities.serialised(a1); assertTrue(a1 == a2); } Modified: branches/jfreechart-1.0.x-branch/tests/org/jfree/data/time/TimePeriodValueTest.java =================================================================== --- branches/jfreechart-1.0.x-branch/tests/org/jfree/data/time/TimePeriodValueTest.java 2013-08-04 20:33:35 UTC (rev 2855) +++ branches/jfreechart-1.0.x-branch/tests/org/jfree/data/time/TimePeriodValueTest.java 2013-08-04 20:33:58 UTC (rev 2856) @@ -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.] * - * ------------------------- - * TimePeriodValueTests.java - * ------------------------- - * (C) Copyright 2003-2008, by Object Refinery Limited. + * ------------------------ + * TimePeriodValueTest.java + * ------------------------ + * (C) Copyright 2003-2013, by Object Refinery Limited. * * Original Author: David Gilbert (for Object Refinery Limited); * Contributor(s): -; @@ -40,21 +40,11 @@ package org.jfree.data.time; -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.time.Day; -import org.jfree.data.time.TimePeriodValue; - /** * Tests for the {@link TimePeriodValue} class. */ @@ -106,17 +96,9 @@ /** * Serialize an instance, restore it, and check for equality. */ - public void testSerialization() throws IOException, ClassNotFoundException { + public void testSerialization() { TimePeriodValue tpv1 = new TimePeriodValue(new Day(30, 7, 2003), 55.75); - TimePeriodValue tpv2; - ByteArrayOutputStream buffer = new ByteArrayOutputStream(); - ObjectOutput out = new ObjectOutputStream(buffer); - out.writeObject(tpv1); - out.close(); - ObjectInput in = new ObjectInputStream(new ByteArrayInputStream( - buffer.toByteArray())); - tpv2 = (TimePeriodValue) in.readObject(); - in.close(); + TimePeriodValue tpv2 = (TimePeriodValue) TestUtilities.serialised(tpv1); assertEquals(tpv1, tpv2); } Modified: branches/jfreechart-1.0.x-branch/tests/org/jfree/data/time/TimePeriodValuesCollectionTest.java =================================================================== --- branches/jfreechart-1.0.x-branch/tests/org/jfree/data/time/TimePeriodValuesCollectionTest.java 2013-08-04 20:33:35 UTC (rev 2855) +++ branches/jfreechart-1.0.x-branch/tests/org/jfree/data/time/TimePeriodValuesCollectionTest.java 2013-08-04 20:33:58 UTC (rev 2856) @@ -45,24 +45,12 @@ package org.jfree.data.time; -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.Range; -import org.jfree.data.time.Day; -import org.jfree.data.time.SimpleTimePeriod; -import org.jfree.data.time.TimePeriodAnchor; -import org.jfree.data.time.TimePeriodValues; -import org.jfree.data.time.TimePeriodValuesCollection; /** * Some tests for the {@link TimePeriodValuesCollection} class. @@ -146,18 +134,10 @@ /** * Serialize an instance, restore it, and check for equality. */ - public void testSerialization() throws IOException, ClassNotFoundException { + public void testSerialization() { TimePeriodValuesCollection c1 = new TimePeriodValuesCollection(); - TimePeriodValuesCollection c2; - ByteArrayOutputStream buffer = new ByteArrayOutputStream(); - ObjectOutput out = new ObjectOutputStream(buffer); - out.writeObject(c1); - out.close(); - - ObjectInput in = new ObjectInputStream( - new ByteArrayInputStream(buffer.toByteArray())); - c2 = (TimePeriodValuesCollection) in.readObject(); - in.close(); + TimePeriodValuesCollection c2 = (TimePeriodValuesCollection) + TestUtilities.serialised(c1); assertEquals(c1, c2); } Modified: branches/jfreechart-1.0.x-branch/tests/org/jfree/data/time/TimePeriodValuesTest.java =================================================================== --- branches/jfreechart-1.0.x-branch/tests/org/jfree/data/time/TimePeriodValuesTest.java 2013-08-04 20:33:35 UTC (rev 2855) +++ branches/jfreechart-1.0.x-branch/tests/org/jfree/data/time/TimePeriodValuesTest.java 2013-08-04 20:33:58 UTC (rev 2856) @@ -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.] * - * ------------------------- - * TimePeriodValueTests.java - * ------------------------- - * (C) Copyright 2003-2008, by Object Refinery Limited. + * ------------------------ + * TimePeriodValueTest.java + * ------------------------ + * (C) Copyright 2003-2013, by Object Refinery Limited. * * Original Author: David Gilbert (for Object Refinery Limited); * Contributor(s): -; @@ -42,28 +42,15 @@ package org.jfree.data.time; -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.Date; import junit.framework.Test; import junit.framework.TestCase; import junit.framework.TestSuite; +import org.jfree.chart.TestUtilities; import org.jfree.data.general.SeriesChangeEvent; import org.jfree.data.general.SeriesChangeListener; -import org.jfree.data.general.SeriesException; -import org.jfree.data.time.Day; -import org.jfree.data.time.RegularTimePeriod; -import org.jfree.data.time.SimpleTimePeriod; -import org.jfree.data.time.TimePeriodValue; -import org.jfree.data.time.TimePeriodValues; -import org.jfree.data.time.Year; import org.jfree.date.MonthConstants; /** @@ -155,22 +142,14 @@ /** * Serialize an instance, restore it, and check for equality. */ - public void testSerialization() throws IOException, ClassNotFoundException { + public void testSerialization() { TimePeriodValues s1 = new TimePeriodValues("A test"); s1.add(new Year(2000), 13.75); s1.add(new Year(2001), 11.90); s1.add(new Year(2002), null); s1.add(new Year(2005), 19.32); s1.add(new Year(2007), 16.89); - TimePeriodValues s2; - ByteArrayOutputStream buffer = new ByteArrayOutputStream(); - ObjectOutput out = new ObjectOutputStream(buffer); - out.writeObject(s1); - out.close(); - ObjectInput in = new ObjectInputStream( - new ByteArrayInputStream(buffer.toByteArray())); - s2 = (TimePeriodValues) in.readObject(); - in.close(); + TimePeriodValues s2 = (TimePeriodValues) TestUtilities.serialised(s1); assertTrue(s1.equals(s2)); } Modified: branches/jfreechart-1.0.x-branch/tests/org/jfree/data/time/TimeSeriesCollectionTest.java =================================================================== --- branches/jfreechart-1.0.x-branch/tests/org/jfree/data/time/TimeSeriesCollectionTest.java 2013-08-04 20:33:35 UTC (rev 2855) +++ branches/jfreechart-1.0.x-branch/tests/org/jfree/data/time/TimeSeriesCollectionTest.java 2013-08-04 20:33:58 UTC (rev 2856) @@ -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.] * - * ------------------------------ - * TimeSeriesCollectionTests.java - * ------------------------------ - * (C) Copyright 2003-2012, by Object Refinery Limited. + * ----------------------------- + * TimeSeriesCollectionTest.java + * ----------------------------- + * (C) Copyright 2003-2013, by Object Refinery Limited. * * Original Author: David Gilbert (for Object Refinery Limited); * Contributor(s): -; @@ -44,29 +44,16 @@ package org.jfree.data.time; -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 java.util.List; import java.util.TimeZone; import junit.framework.Test; import junit.framework.TestCase; import junit.framework.TestSuite; +import org.jfree.chart.TestUtilities; import org.jfree.data.Range; import org.jfree.data.general.DatasetUtilities; -import org.jfree.data.time.Day; -import org.jfree.data.time.RegularTimePeriod; -import org.jfree.data.time.TimePeriodAnchor; -import org.jfree.data.time.TimeSeries; -import org.jfree.data.time.TimeSeriesCollection; -import org.jfree.data.time.Year; /** * A collection of test cases for the {@link TimeSeriesCollection} class. @@ -247,18 +234,10 @@ /** * Serialize an instance, restore it, and check for equality. */ - public void testSerialization() throws IOException, ClassNotFoundException { + public void testSerialization() { TimeSeriesCollection c1 = new TimeSeriesCollection(createSeries()); - TimeSeriesCollection c2; - ByteArrayOutputStream buffer = new ByteArrayOutputStream(); - ObjectOutput out = new ObjectOutputStream(buffer); - out.writeObject(c1); - out.close(); - - ObjectInput in = new ObjectInputStream( - new ByteArrayInputStream(buffer.toByteArray())); - c2 = (TimeSeriesCollection) in.readObject(); - in.close(); + TimeSeriesCollection c2 = (TimeSeriesCollection) + TestUtilities.serialised(c1); assertEquals(c1, c2); } Modified: branches/jfreechart-1.0.x-branch/tests/org/jfree/data/time/TimeSeriesDataItemTest.java =================================================================== --- branches/jfreechart-1.0.x-branch/tests/org/jfree/data/time/TimeSeriesDataItemTest.java 2013-08-04 20:33:35 UTC (rev 2855) +++ branches/jfreechart-1.0.x-branch/tests/org/jfree/data/time/TimeSeriesDataItemTest.java 2013-08-04 20:33:58 UTC (rev 2856) @@ -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.] * - * ---------------------------- - * TimeSeriesDataItemTests.java - * ---------------------------- - * (C) Copyright 2003-2008, by Object Refinery Limited. + * --------------------------- + * TimeSeriesDataItemTest.java + * --------------------------- + * (C) Copyright 2003-2013, by Object Refinery Limited. * * Original Author: David Gilbert (for Object Refinery Limited); * Contributor(s): -; @@ -40,21 +40,11 @@ package org.jfree.data.time; -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.time.Day; -import org.jfree.data.time.TimeSeriesDataItem; - /** * Tests for the {@link TimeSeriesDataItem} class. */ @@ -119,19 +109,11 @@ /** * Serialize an instance, restore it, and check for equality. */ - public void testSerialization() throws IOException, ClassNotFoundException { + public void testSerialization() { TimeSeriesDataItem item1 = new TimeSeriesDataItem(new Day(23, 9, 2001), 99.7); - TimeSeriesDataItem item2; - ByteArrayOutputStream buffer = new ByteArrayOutputStream(); - ObjectOutput out = new ObjectOutputStream(buffer); - out.writeObject(item1); - out.close(); - - ObjectInput in = new ObjectInputStream(new ByteArrayInputStream( - buffer.toByteArray())); - item2 = (TimeSeriesDataItem) in.readObject(); - in.close(); + TimeSeriesDataItem item2 = (TimeSeriesDataItem) + TestUtilities.serialised(item1); assertEquals(item1, item2); } Modified: branches/jfreechart-1.0.x-branch/tests/org/jfree/data/time/TimeSeriesTest.java =================================================================== --- branches/jfreechart-1.0.x-branch/tests/org/jfree/data/time/TimeSeriesTest.java 2013-08-04 20:33:35 UTC (rev 2855) +++ branches/jfreechart-1.0.x-branch/tests/org/jfree/data/time/TimeSeriesTest.java 2013-08-04 20:33:58 UTC (rev 2856) @@ -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.] * - * -------------------- - * TimeSeriesTests.java - * -------------------- - * (C) Copyright 2001-2009, by Object Refinery Limited. + * ------------------- + * TimeSeriesTest.java + * ------------------- + * (C) Copyright 2001-2013, by Object Refinery Limited. * * Original Author: David Gilbert (for Object Refinery Limited); * Contributor(s): -; @@ -55,28 +55,15 @@ package org.jfree.data.time; -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.general.SeriesChangeEvent; import org.jfree.data.general.SeriesChangeListener; import org.jfree.data.general.SeriesException; -import org.jfree.data.time.Day; -import org.jfree.data.time.FixedMillisecond; -import org.jfree.data.time.Month; -import org.jfree.data.time.RegularTimePeriod; -import org.jfree.data.time.TimeSeries; -import org.jfree.data.time.TimeSeriesDataItem; -import org.jfree.data.time.Year; import org.jfree.date.MonthConstants; /** @@ -201,12 +188,10 @@ * Tests the retrieval of values. */ public void testGetValue() { - Number value1 = this.seriesA.getValue(new Year(1999)); assertNull(value1); int value2 = this.seriesA.getValue(new Year(2000)).intValue(); assertEquals(102000, value2); - } /** @@ -287,22 +272,14 @@ /** * Serialize an instance, restore it, and check for equality. */ - public void testSerialization() throws ClassNotFoundException, IOException { + public void testSerialization() { TimeSeries s1 = new TimeSeries("A test"); s1.add(new Year(2000), 13.75); s1.add(new Year(2001), 11.90); s1.add(new Year(2002), null); s1.add(new Year(2005), 19.32); s1.add(new Year(2007), 16.89); - TimeSeries s2; - ByteArrayOutputStream buffer = new ByteArrayOutputStream(); - ObjectOutput out = new ObjectOutputStream(buffer); - out.writeObject(s1); - out.close(); - ObjectInput in = new ObjectInputStream(new ByteArrayInputStream( - buffer.toByteArray())); - s2 = (TimeSeries) in.readObject(); - in.close(); + TimeSeries s2 = (TimeSeries) TestUtilities.serialised(s1); assertTrue(s1.equals(s2)); } Modified: branches/jfreechart-1.0.x-branch/tests/org/jfree/data/time/TimeTableXYDatasetTest.java =================================================================== --- branches/jfreechart-1.0.x-branch/tests/org/jfree/data/time/TimeTableXYDatasetTest.java 2013-08-04 20:33:35 UTC (rev 2855) +++ branches/jfreechart-1.0.x-branch/tests/org/jfree/data/time/TimeTableXYDatasetTest.java 2013-08-04 20:33:58 UTC (rev 2856) @@ -41,22 +41,13 @@ package org.jfree.data.time; -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.TimeZone; import junit.framework.Test; import junit.framework.TestCase; import junit.framework.TestSuite; +import org.jfree.chart.TestUtilities; -import org.jfree.data.time.TimeTableXYDataset; -import org.jfree.data.time.Year; - /** * A collection of test cases for the {@link TimeTableXYDataset} class. */ @@ -162,22 +153,12 @@ /** * Serialize an instance, restore it, and check for equality. */ - public void testSerialization() throws IOException, ClassNotFoundException { - + public void testSerialization() { TimeTableXYDataset d1 = new TimeTableXYDataset(); d1.add(new Year(1999), 123.4, "S1"); - TimeTableXYDataset d2 = null; - ByteArrayOutputStream buffer = new ByteArrayOutputStream(); - ObjectOutput out = new ObjectOutputStream(buffer); - out.writeObject(d1); - out.close(); - - ObjectInput in = new ObjectInputStream(new ByteArrayInputStream( - buffer.toByteArray())); - d2 = (TimeTableXYDataset) in.readObject(); - in.close(); + TimeTableXYDataset d2 = (TimeTableXYDataset) + TestUtilities.serialised(d1); assertTrue(d1.equals(d2)); - } /** Modified: branches/jfreechart-1.0.x-branch/tests/org/jfree/data/time/WeekTest.java =================================================================== --- branches/jfreechart-1.0.x-branch/tests/org/jfree/data/time/WeekTest.java 2013-08-04 20:33:35 UTC (rev 2855) +++ branches/jfreechart-1.0.x-branch/tests/org/jfree/data/time/WeekTest.java 2013-08-04 20:33:58 UTC (rev 2856) @@ -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.] * - * -------------- - * WeekTests.java - * -------------- - * (C) Copyright 2002-2008, by Object Refinery Limited. + * ------------- + * WeekTest.java + * ------------- + * (C) Copyright 2002-2013, by Object Refinery Limited. * * Original Author: David Gilbert (for Object Refinery Limited); * Contributor(s): -; @@ -50,13 +50,6 @@ package org.jfree.data.time; -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.Calendar; import java.util.Date; import java.util.GregorianCalendar; @@ -66,10 +59,8 @@ import junit.framework.Test; import junit.framework.TestCase; import junit.framework.TestSuite; +import org.jfree.chart.TestUtilities; -import org.jfree.data.time.Week; -import org.jfree.data.time.Year; - /** * Tests for the {@link Week} class. */ @@ -170,17 +161,9 @@ /** * Serialize an instance, restore it, and check for equality. */ - public void testSerialization() throws IOException, ClassNotFoundException { + public void testSerialization() { Week w1 = new Week(24, 1999); - Week w2; - ByteArrayOutputStream buffer = new ByteArrayOutputStream(); - ObjectOutput out = new ObjectOutputStream(buffer); - out.writeObject(w1); - out.close(); - ObjectInput in = new ObjectInputStream( - new ByteArrayInputStream(buffer.toByteArray())); - w2 = (Week) in.readObject(); - in.close(); + Week w2 = (Week) TestUtilities.serialised(w1); assertEquals(w1, w2); } Modified: branches/jfreechart-1.0.x-branch/tests/org/jfree/data/time/YearTest.java =================================================================== --- branches/jfreechart-1.0.x-branch/tests/org/jfree/data/time/YearTest.java 2013-08-04 20:33:35 UTC (rev 2855) +++ branches/jfreechart-1.0.x-branch/tests/org/jfree/data/time/YearTest.java 2013-08-04 20:33:58 UTC (rev 2856) @@ -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.] * - * -------------- - * YearTests.java - * -------------- - * (C) Copyright 2001-2008, by Object Refinery Limited. + * ------------- + * YearTest.java + * ------------- + * (C) Copyright 2001-2013, by Object Refinery Limited. * * Original Author: David Gilbert (for Object Refinery Limited); * Contributor(s): -; @@ -47,13 +47,6 @@ package org.jfree.data.time; -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.Calendar; import java.util.Date; import java.util.GregorianCalendar; @@ -63,10 +56,8 @@ import junit.framework.Test; import junit.framework.TestCase; import junit.framework.TestSuite; +import org.jfree.chart.TestUtilities; -import org.jfree.data.time.TimePeriodFormatException; -import org.jfree.data.time.Year; - /** * Tests for the {@link Year} class. */ @@ -236,17 +227,9 @@ /** * Serialize an instance, restore it, and check for equality. */ - public void testSerialization() throws IOException, ClassNotFoundException { + public void testSerialization() { Year y1 = new Year(1999); - Year y2; - ByteArrayOutputStream buffer = new ByteArrayOutputStream(); - ObjectOutput out = new ObjectOutputStream(buffer); - out.writeObject(y1); - out.close(); - ObjectInput in = new ObjectInputStream(new ByteArrayInputStream( - buffer.toByteArray())); - y2 = (Year) in.readObject(); - in.close(); + Year y2 = (Year) TestUtilities.serialised(y1); assertEquals(y1, y2); } This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <mu...@us...> - 2013-08-05 21:37:51
|
Revision: 2871 http://sourceforge.net/p/jfreechart/code/2871 Author: mungady Date: 2013-08-05 21:37:48 +0000 (Mon, 05 Aug 2013) Log Message: ----------- Convert to JUnit 4.11 Modified Paths: -------------- branches/jfreechart-1.0.x-branch/tests/org/jfree/data/time/DateRangeTest.java branches/jfreechart-1.0.x-branch/tests/org/jfree/data/time/DayTest.java branches/jfreechart-1.0.x-branch/tests/org/jfree/data/time/FixedMillisecondTest.java branches/jfreechart-1.0.x-branch/tests/org/jfree/data/time/HourTest.java branches/jfreechart-1.0.x-branch/tests/org/jfree/data/time/MillisecondTest.java branches/jfreechart-1.0.x-branch/tests/org/jfree/data/time/MinuteTest.java branches/jfreechart-1.0.x-branch/tests/org/jfree/data/time/MonthTest.java branches/jfreechart-1.0.x-branch/tests/org/jfree/data/time/MovingAverageTest.java branches/jfreechart-1.0.x-branch/tests/org/jfree/data/time/QuarterTest.java branches/jfreechart-1.0.x-branch/tests/org/jfree/data/time/SecondTest.java branches/jfreechart-1.0.x-branch/tests/org/jfree/data/time/SimpleTimePeriodTest.java branches/jfreechart-1.0.x-branch/tests/org/jfree/data/time/TimePeriodAnchorTest.java branches/jfreechart-1.0.x-branch/tests/org/jfree/data/time/TimePeriodValueTest.java branches/jfreechart-1.0.x-branch/tests/org/jfree/data/time/TimePeriodValuesCollectionTest.java branches/jfreechart-1.0.x-branch/tests/org/jfree/data/time/TimePeriodValuesTest.java branches/jfreechart-1.0.x-branch/tests/org/jfree/data/time/TimeSeriesCollectionTest.java branches/jfreechart-1.0.x-branch/tests/org/jfree/data/time/TimeSeriesDataItemTest.java branches/jfreechart-1.0.x-branch/tests/org/jfree/data/time/TimeSeriesTest.java branches/jfreechart-1.0.x-branch/tests/org/jfree/data/time/TimeTableXYDatasetTest.java branches/jfreechart-1.0.x-branch/tests/org/jfree/data/time/WeekTest.java branches/jfreechart-1.0.x-branch/tests/org/jfree/data/time/YearTest.java Removed Paths: ------------- branches/jfreechart-1.0.x-branch/tests/org/jfree/data/time/DataTimePackageTests.java Deleted: branches/jfreechart-1.0.x-branch/tests/org/jfree/data/time/DataTimePackageTests.java =================================================================== --- branches/jfreechart-1.0.x-branch/tests/org/jfree/data/time/DataTimePackageTests.java 2013-08-05 21:37:20 UTC (rev 2870) +++ branches/jfreechart-1.0.x-branch/tests/org/jfree/data/time/DataTimePackageTests.java 2013-08-05 21:37:48 UTC (rev 2871) @@ -1,105 +0,0 @@ -/* =========================================================== - * JFreeChart : a free chart library for the Java(tm) platform - * =========================================================== - * - * (C) Copyright 2000-2013, 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 - * (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 - * 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. - * - * [Oracle and Java are registered trademarks of Oracle and/or its affiliates. - * Other names may be trademarks of their respective owners.] - * - * ------------------------- - * DataTimePackageTests.java - * ------------------------- - * (C) Copyright 2003-2008, by Object Refinery Limited. - * - * Original Author: David Gilbert (for Object Refinery Limited); - * Contributor(s): -; - * - * Changes - * ------- - * 13-Mar-2001 : Version 1 (DG); - * 23-Aug-2004 : Restructured org.jfree.data package (DG); - * 18-Jan-2005 : Added main() method (DG); - * - */ - -package org.jfree.data.time; - -import junit.framework.Test; -import junit.framework.TestCase; -import junit.framework.TestSuite; - -/** - * Some tests for the <code>org.jfree.data.time</code> package that can be run - * using JUnit. You can find more information about JUnit at - * http://www.junit.org. - */ -public class DataTimePackageTests extends TestCase { - - /** - * Returns a test suite to the JUnit test runner. - * - * @return The test suite. - */ - public static Test suite() { - TestSuite suite = new TestSuite("org.jfree.data.time"); - suite.addTestSuite(DateRangeTest.class); - suite.addTestSuite(DayTest.class); - suite.addTestSuite(FixedMillisecondTest.class); - suite.addTestSuite(HourTest.class); - suite.addTestSuite(MinuteTest.class); - suite.addTestSuite(MillisecondTest.class); - suite.addTestSuite(MonthTest.class); - suite.addTestSuite(MovingAverageTest.class); - suite.addTestSuite(QuarterTest.class); - suite.addTestSuite(SecondTest.class); - suite.addTestSuite(SimpleTimePeriodTest.class); - suite.addTestSuite(TimePeriodAnchorTest.class); - suite.addTestSuite(TimePeriodValueTest.class); - suite.addTestSuite(TimePeriodValuesTest.class); - suite.addTestSuite(TimePeriodValuesCollectionTest.class); - suite.addTestSuite(TimeSeriesCollectionTest.class); - suite.addTestSuite(TimeSeriesTest.class); - suite.addTestSuite(TimeSeriesDataItemTest.class); - suite.addTestSuite(TimeTableXYDatasetTest.class); - suite.addTestSuite(WeekTest.class); - suite.addTestSuite(YearTest.class); - return suite; - } - - /** - * Constructs the test suite. - * - * @param name the test suite name. - */ - public DataTimePackageTests(String name) { - super(name); - } - - /** - * Runs the test suite using JUnit's text-based runner. - * - * @param args ignored. - */ - public static void main(String[] args) { - junit.textui.TestRunner.run(suite()); - } - -} Modified: branches/jfreechart-1.0.x-branch/tests/org/jfree/data/time/DateRangeTest.java =================================================================== --- branches/jfreechart-1.0.x-branch/tests/org/jfree/data/time/DateRangeTest.java 2013-08-05 21:37:20 UTC (rev 2870) +++ branches/jfreechart-1.0.x-branch/tests/org/jfree/data/time/DateRangeTest.java 2013-08-05 21:37:48 UTC (rev 2871) @@ -41,39 +41,24 @@ package org.jfree.data.time; +import static org.junit.Assert.assertTrue; +import static org.junit.Assert.assertFalse; +import static org.junit.Assert.assertEquals; + import java.util.Date; -import junit.framework.Test; -import junit.framework.TestCase; -import junit.framework.TestSuite; import org.jfree.chart.TestUtilities; +import org.junit.Test; /** * Some tests for the {@link DateRange} class. */ -public class DateRangeTest extends TestCase { +public class DateRangeTest { /** - * Returns the tests as a test suite. - * - * @return The test suite. - */ - public static Test suite() { - return new TestSuite(DateRangeTest.class); - } - - /** - * Constructs a new set of tests. - * - * @param name the name of the tests. - */ - public DateRangeTest(String name) { - super(name); - } - - /** * Confirm that the equals method can distinguish all the required fields. */ + @Test public void testEquals() { DateRange r1 = new DateRange(new Date(1000L), new Date(2000L)); DateRange r2 = new DateRange(new Date(1000L), new Date(2000L)); @@ -94,6 +79,7 @@ /** * Serialize an instance, restore it, and check for equality. */ + @Test public void testSerialization() { DateRange r1 = new DateRange(new Date(1000L), new Date(2000L)); DateRange r2 = (DateRange) TestUtilities.serialised(r1); @@ -104,6 +90,7 @@ * The {@link DateRange} class is immutable, so it doesn't need to * be cloneable. */ + @Test public void testClone() { DateRange r1 = new DateRange(new Date(1000L), new Date(2000L)); assertFalse(r1 instanceof Cloneable); @@ -112,6 +99,7 @@ /** * Confirm that a DateRange is immutable. */ + @Test public void testImmutable() { Date d1 = new Date(10L); Date d2 = new Date(20L); Modified: branches/jfreechart-1.0.x-branch/tests/org/jfree/data/time/DayTest.java =================================================================== --- branches/jfreechart-1.0.x-branch/tests/org/jfree/data/time/DayTest.java 2013-08-05 21:37:20 UTC (rev 2870) +++ branches/jfreechart-1.0.x-branch/tests/org/jfree/data/time/DayTest.java 2013-08-05 21:37:48 UTC (rev 2871) @@ -49,6 +49,11 @@ package org.jfree.data.time; +import static org.junit.Assert.assertTrue; +import static org.junit.Assert.assertFalse; +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertNull; + import java.text.ParseException; import java.text.SimpleDateFormat; import java.util.Calendar; @@ -57,48 +62,22 @@ import java.util.Locale; import java.util.TimeZone; -import junit.framework.Test; -import junit.framework.TestCase; -import junit.framework.TestSuite; import org.jfree.chart.TestUtilities; import org.jfree.date.MonthConstants; +import org.junit.Test; /** * Tests for the {@link Day} class. */ -public class DayTest extends TestCase { +public class DayTest { /** - * Returns the tests as a test suite. - * - * @return The test suite. - */ - public static Test suite() { - return new TestSuite(DayTest.class); - } - - /** - * Constructs a new set of tests. - * - * @param name the name of the tests. - */ - public DayTest(String name) { - super(name); - } - - /** - * Common test setup. - */ - protected void setUp() { - // no setup required - } - - /** * Check that a Day instance is equal to itself. * * SourceForge Bug ID: 558850. */ + @Test public void testEqualsSelf() { Day day = new Day(); assertTrue(day.equals(day)); @@ -107,6 +86,7 @@ /** * Tests the equals method. */ + @Test public void testEquals() { Day day1 = new Day(29, MonthConstants.MARCH, 2002); Day day2 = new Day(29, MonthConstants.MARCH, 2002); @@ -117,6 +97,7 @@ * In GMT, the end of 29 Feb 2004 is java.util.Date(1,078,099,199,999L). * Use this to check the day constructor. */ + @Test public void testDateConstructor1() { TimeZone zone = TimeZone.getTimeZone("GMT"); Locale locale = Locale.UK; @@ -135,6 +116,7 @@ * java.util.Date(1,078,091,999,999L). Use this to check the Day * constructor. */ + @Test public void testDateConstructor2() { TimeZone zone = TimeZone.getTimeZone("Europe/Helsinki"); Locale locale = Locale.getDefault(); // locale shouldn't matter here @@ -152,6 +134,7 @@ * Set up a day equal to 1 January 1900. Request the previous day, it * should be null. */ + @Test public void test1Jan1900Previous() { Day jan1st1900 = new Day(1, MonthConstants.JANUARY, 1900); Day previous = (Day) jan1st1900.previous(); @@ -162,6 +145,7 @@ * Set up a day equal to 1 January 1900. Request the next day, it should * be 2 January 1900. */ + @Test public void test1Jan1900Next() { Day jan1st1900 = new Day(1, MonthConstants.JANUARY, 1900); Day next = (Day) jan1st1900.next(); @@ -172,6 +156,7 @@ * Set up a day equal to 31 December 9999. Request the previous day, it * should be 30 December 9999. */ + @Test public void test31Dec9999Previous() { Day dec31st9999 = new Day(31, MonthConstants.DECEMBER, 9999); Day previous = (Day) dec31st9999.previous(); @@ -182,6 +167,7 @@ * Set up a day equal to 31 December 9999. Request the next day, it should * be null. */ + @Test public void test31Dec9999Next() { Day dec31st9999 = new Day(31, MonthConstants.DECEMBER, 9999); Day next = (Day) dec31st9999.next(); @@ -197,6 +183,7 @@ * * @throws ParseException on parsing errors. */ + @Test public void testParseDay() throws ParseException { GregorianCalendar gc = new GregorianCalendar(2001, 12, 31); SimpleDateFormat format = new SimpleDateFormat("dd/MM/yyyy"); @@ -215,6 +202,7 @@ /** * Serialize an instance, restore it, and check for equality. */ + @Test public void testSerialization() { Day d1 = new Day(15, 4, 2000); Day d2 = (Day) TestUtilities.serialised(d1); @@ -224,6 +212,7 @@ /** * Two objects that are equal are required to return the same hashCode. */ + @Test public void testHashcode() { Day d1 = new Day(1, 2, 2003); Day d2 = new Day(1, 2, 2003); @@ -236,6 +225,7 @@ /** * The {@link Day} class is immutable, so should not be {@link Cloneable}. */ + @Test public void testNotCloneable() { Day d = new Day(1, 2, 2003); assertFalse(d instanceof Cloneable); @@ -244,6 +234,7 @@ /** * Some checks for the getSerialIndex() method. */ + @Test public void testGetSerialIndex() { Day d = new Day(1, 1, 1900); assertEquals(2, d.getSerialIndex()); @@ -254,6 +245,7 @@ /** * Some checks for the getFirstMillisecond() method. */ + @Test public void testGetFirstMillisecond() { Locale saved = Locale.getDefault(); Locale.setDefault(Locale.UK); @@ -268,6 +260,7 @@ /** * Some checks for the getFirstMillisecond(TimeZone) method. */ + @Test public void testGetFirstMillisecondWithTimeZone() { Day d = new Day(26, 4, 1950); TimeZone zone = TimeZone.getTimeZone("America/Los_Angeles"); @@ -287,6 +280,7 @@ /** * Some checks for the getFirstMillisecond(TimeZone) method. */ + @Test public void testGetFirstMillisecondWithCalendar() { Day d = new Day(1, 12, 2001); GregorianCalendar calendar = new GregorianCalendar(Locale.GERMANY); @@ -307,6 +301,7 @@ /** * Some checks for the getLastMillisecond() method. */ + @Test public void testGetLastMillisecond() { Locale saved = Locale.getDefault(); Locale.setDefault(Locale.UK); @@ -321,6 +316,7 @@ /** * Some checks for the getLastMillisecond(TimeZone) method. */ + @Test public void testGetLastMillisecondWithTimeZone() { Day d = new Day(1, 2, 1950); TimeZone zone = TimeZone.getTimeZone("America/Los_Angeles"); @@ -340,6 +336,7 @@ /** * Some checks for the getLastMillisecond(TimeZone) method. */ + @Test public void testGetLastMillisecondWithCalendar() { Day d = new Day(4, 5, 2001); @@ -361,6 +358,7 @@ /** * Some checks for the testNext() method. */ + @Test public void testNext() { Day d = new Day(25, 12, 2000); d = (Day) d.next(); @@ -374,6 +372,7 @@ /** * Some checks for the getStart() method. */ + @Test public void testGetStart() { Locale saved = Locale.getDefault(); Locale.setDefault(Locale.ITALY); @@ -388,6 +387,7 @@ /** * Some checks for the getEnd() method. */ + @Test public void testGetEnd() { Locale saved = Locale.getDefault(); Locale.setDefault(Locale.ITALY); Modified: branches/jfreechart-1.0.x-branch/tests/org/jfree/data/time/FixedMillisecondTest.java =================================================================== --- branches/jfreechart-1.0.x-branch/tests/org/jfree/data/time/FixedMillisecondTest.java 2013-08-05 21:37:20 UTC (rev 2870) +++ branches/jfreechart-1.0.x-branch/tests/org/jfree/data/time/FixedMillisecondTest.java 2013-08-05 21:37:48 UTC (rev 2871) @@ -43,39 +43,24 @@ package org.jfree.data.time; +import static org.junit.Assert.assertTrue; +import static org.junit.Assert.assertFalse; +import static org.junit.Assert.assertEquals; + import java.util.Date; -import junit.framework.Test; -import junit.framework.TestCase; -import junit.framework.TestSuite; import org.jfree.chart.TestUtilities; +import org.junit.Test; /** * Tests for the {@link FixedMillisecond} class. */ -public class FixedMillisecondTest extends TestCase { +public class FixedMillisecondTest { /** - * Returns the tests as a test suite. - * - * @return The test suite. - */ - public static Test suite() { - return new TestSuite(FixedMillisecondTest.class); - } - - /** - * Constructs a new set of tests. - * - * @param name the name of the tests. - */ - public FixedMillisecondTest(String name) { - super(name); - } - - /** * Serialize an instance, restore it, and check for equality. */ + @Test public void testSerialization() { FixedMillisecond m1 = new FixedMillisecond(); FixedMillisecond m2 = (FixedMillisecond) TestUtilities.serialised(m1); @@ -85,6 +70,7 @@ /** * Two objects that are equal are required to return the same hashCode. */ + @Test public void testHashcode() { FixedMillisecond m1 = new FixedMillisecond(500000L); FixedMillisecond m2 = new FixedMillisecond(500000L); @@ -98,6 +84,7 @@ * The {@link FixedMillisecond} class is immutable, so should not be * {@link Cloneable}. */ + @Test public void testNotCloneable() { FixedMillisecond m = new FixedMillisecond(500000L); assertFalse(m instanceof Cloneable); @@ -106,6 +93,7 @@ /** * A check for immutability. */ + @Test public void testImmutability() { Date d = new Date(20L); FixedMillisecond fm = new FixedMillisecond(d); Modified: branches/jfreechart-1.0.x-branch/tests/org/jfree/data/time/HourTest.java =================================================================== --- branches/jfreechart-1.0.x-branch/tests/org/jfree/data/time/HourTest.java 2013-08-05 21:37:20 UTC (rev 2870) +++ branches/jfreechart-1.0.x-branch/tests/org/jfree/data/time/HourTest.java 2013-08-05 21:37:48 UTC (rev 2871) @@ -46,54 +46,33 @@ package org.jfree.data.time; +import static org.junit.Assert.assertTrue; +import static org.junit.Assert.assertFalse; +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertNull; + import java.util.Calendar; import java.util.Date; import java.util.GregorianCalendar; import java.util.Locale; import java.util.TimeZone; -import junit.framework.Test; -import junit.framework.TestCase; -import junit.framework.TestSuite; import org.jfree.chart.TestUtilities; import org.jfree.date.MonthConstants; +import org.junit.Test; /** * Tests for the {@link Hour} class. */ -public class HourTest extends TestCase { +public class HourTest { /** - * Returns the tests as a test suite. - * - * @return The test suite. - */ - public static Test suite() { - return new TestSuite(HourTest.class); - } - - /** - * Constructs a new set of tests. - * - * @param name the name of the tests. - */ - public HourTest(String name) { - super(name); - } - - /** - * Common test setup. - */ - protected void setUp() { - // no setup - } - - /** * Check that an Hour instance is equal to itself. * * SourceForge Bug ID: 558850. */ + @Test public void testEqualsSelf() { Hour hour = new Hour(); assertTrue(hour.equals(hour)); @@ -102,6 +81,7 @@ /** * Tests the equals method. */ + @Test public void testEquals() { Hour hour1 = new Hour(15, new Day(29, MonthConstants.MARCH, 2002)); Hour hour2 = new Hour(15, new Day(29, MonthConstants.MARCH, 2002)); @@ -112,6 +92,7 @@ * In GMT, the 4pm on 21 Mar 2002 is java.util.Date(1,014,307,200,000L). * Use this to check the hour constructor. */ + @Test public void testDateConstructor1() { TimeZone zone = TimeZone.getTimeZone("GMT"); Locale locale = Locale.getDefault(); // locale should not matter here @@ -129,6 +110,7 @@ * In Sydney, the 4pm on 21 Mar 2002 is java.util.Date(1,014,267,600,000L). * Use this to check the hour constructor. */ + @Test public void testDateConstructor2() { TimeZone zone = TimeZone.getTimeZone("Australia/Sydney"); Locale locale = Locale.getDefault(); // locale should not matter here @@ -146,6 +128,7 @@ * Set up an hour equal to hour zero, 1 January 1900. Request the * previous hour, it should be null. */ + @Test public void testFirstHourPrevious() { Hour first = new Hour(0, new Day(1, MonthConstants.JANUARY, 1900)); Hour previous = (Hour) first.previous(); @@ -156,6 +139,7 @@ * Set up an hour equal to hour zero, 1 January 1900. Request the next * hour, it should be null. */ + @Test public void testFirstHourNext() { Hour first = new Hour(0, new Day(1, MonthConstants.JANUARY, 1900)); Hour next = (Hour) first.next(); @@ -167,6 +151,7 @@ * Set up an hour equal to hour zero, 1 January 1900. Request the previous * hour, it should be null. */ + @Test public void testLastHourPrevious() { Hour last = new Hour(23, new Day(31, MonthConstants.DECEMBER, 9999)); Hour previous = (Hour) last.previous(); @@ -178,6 +163,7 @@ * Set up an hour equal to hour zero, 1 January 1900. Request the next * hour, it should be null. */ + @Test public void testLastHourNext() { Hour last = new Hour(23, new Day(31, MonthConstants.DECEMBER, 9999)); Hour next = (Hour) last.next(); @@ -187,6 +173,7 @@ /** * Problem for date parsing. */ + @Test public void testParseHour() { // test 1... Hour h = Hour.parseHour("2002-01-29 13"); @@ -196,6 +183,7 @@ /** * Serialize an instance, restore it, and check for equality. */ + @Test public void testSerialization() { Hour h1 = new Hour(); Hour h2 = (Hour) TestUtilities.serialised(h1); @@ -205,6 +193,7 @@ /** * Two objects that are equal are required to return the same hashCode. */ + @Test public void testHashcode() { Hour h1 = new Hour(7, 9, 10, 1999); Hour h2 = new Hour(7, 9, 10, 1999); @@ -217,14 +206,16 @@ /** * The {@link Hour} class is immutable, so should not be {@link Cloneable}. */ + @Test public void testNotCloneable() { Hour h = new Hour(7, 9, 10, 1999); assertFalse(h instanceof Cloneable); } -/** + /** * Some checks for the getFirstMillisecond() method. */ + @Test public void testGetFirstMillisecond() { Locale saved = Locale.getDefault(); Locale.setDefault(Locale.UK); @@ -239,6 +230,7 @@ /** * Some checks for the getFirstMillisecond(TimeZone) method. */ + @Test public void testGetFirstMillisecondWithTimeZone() { Hour h = new Hour(15, 1, 4, 1950); TimeZone zone = TimeZone.getTimeZone("America/Los_Angeles"); @@ -258,6 +250,7 @@ /** * Some checks for the getFirstMillisecond(TimeZone) method. */ + @Test public void testGetFirstMillisecondWithCalendar() { Hour h = new Hour(2, 15, 4, 2000); GregorianCalendar calendar = new GregorianCalendar(Locale.GERMANY); @@ -278,6 +271,7 @@ /** * Some checks for the getLastMillisecond() method. */ + @Test public void testGetLastMillisecond() { Locale saved = Locale.getDefault(); Locale.setDefault(Locale.UK); @@ -292,6 +286,7 @@ /** * Some checks for the getLastMillisecond(TimeZone) method. */ + @Test public void testGetLastMillisecondWithTimeZone() { Hour h = new Hour(2, 7, 7, 1950); TimeZone zone = TimeZone.getTimeZone("America/Los_Angeles"); @@ -311,6 +306,7 @@ /** * Some checks for the getLastMillisecond(TimeZone) method. */ + @Test public void testGetLastMillisecondWithCalendar() { Hour h = new Hour(21, 21, 4, 2001); GregorianCalendar calendar = new GregorianCalendar(Locale.GERMANY); @@ -331,6 +327,7 @@ /** * Some checks for the getSerialIndex() method. */ + @Test public void testGetSerialIndex() { Hour h = new Hour(1, 1, 1, 2000); assertEquals(876625L, h.getSerialIndex()); @@ -341,6 +338,7 @@ /** * Some checks for the testNext() method. */ + @Test public void testNext() { Hour h = new Hour(1, 12, 12, 2000); h = (Hour) h.next(); @@ -355,6 +353,7 @@ /** * Some checks for the getStart() method. */ + @Test public void testGetStart() { Locale saved = Locale.getDefault(); Locale.setDefault(Locale.ITALY); @@ -369,6 +368,7 @@ /** * Some checks for the getEnd() method. */ + @Test public void testGetEnd() { Locale saved = Locale.getDefault(); Locale.setDefault(Locale.ITALY); Modified: branches/jfreechart-1.0.x-branch/tests/org/jfree/data/time/MillisecondTest.java =================================================================== --- branches/jfreechart-1.0.x-branch/tests/org/jfree/data/time/MillisecondTest.java 2013-08-05 21:37:20 UTC (rev 2870) +++ branches/jfreechart-1.0.x-branch/tests/org/jfree/data/time/MillisecondTest.java 2013-08-05 21:37:48 UTC (rev 2871) @@ -46,54 +46,33 @@ package org.jfree.data.time; +import static org.junit.Assert.assertTrue; +import static org.junit.Assert.assertFalse; +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertNull; + import java.util.Calendar; import java.util.Date; import java.util.GregorianCalendar; import java.util.Locale; import java.util.TimeZone; -import junit.framework.Test; -import junit.framework.TestCase; -import junit.framework.TestSuite; import org.jfree.chart.TestUtilities; import org.jfree.date.MonthConstants; +import org.junit.Test; /** * Tests for the {@link Millisecond} class. */ -public class MillisecondTest extends TestCase { +public class MillisecondTest { /** - * Returns the tests as a test suite. - * - * @return The test suite. - */ - public static Test suite() { - return new TestSuite(MillisecondTest.class); - } - - /** - * Constructs a new set of tests. - * - * @param name the name of the tests. - */ - public MillisecondTest(String name) { - super(name); - } - - /** - * Common test setup. - */ - protected void setUp() { - // no setup - } - - /** * Check that a {@link Millisecond} instance is equal to itself. * * SourceForge Bug ID: 558850. */ + @Test public void testEqualsSelf() { Millisecond millisecond = new Millisecond(); assertTrue(millisecond.equals(millisecond)); @@ -102,6 +81,7 @@ /** * Tests the equals method. */ + @Test public void testEquals() { Day day1 = new Day(29, MonthConstants.MARCH, 2002); Hour hour1 = new Hour(15, day1); @@ -121,6 +101,7 @@ * java.util.Date(1016729759123L). Use this to check the Millisecond * constructor. */ + @Test public void testDateConstructor1() { TimeZone zone = TimeZone.getTimeZone("GMT"); Locale locale = Locale.getDefault(); // locale should not matter here @@ -141,6 +122,7 @@ * java.util.Date(1016722559123L). Use this to check the Millisecond * constructor. */ + @Test public void testDateConstructor2() { TimeZone zone = TimeZone.getTimeZone("Europe/Tallinn"); Locale locale = Locale.getDefault(); // locale should not matter here @@ -159,6 +141,7 @@ /** * Serialize an instance, restore it, and check for equality. */ + @Test public void testSerialization() { Millisecond m1 = new Millisecond(); Millisecond m2 = (Millisecond) TestUtilities.serialised(m1); @@ -168,6 +151,7 @@ /** * Two objects that are equal are required to return the same hashCode. */ + @Test public void testHashcode() { Millisecond m1 = new Millisecond(599, 23, 45, 7, 9, 10, 2007); Millisecond m2 = new Millisecond(599, 23, 45, 7, 9, 10, 2007); @@ -181,6 +165,7 @@ * A test for bug report 943985 - the calculation for the middle * millisecond is incorrect for odd milliseconds. */ + @Test public void test943985() { Millisecond ms = new Millisecond(new java.util.Date(4)); assertEquals(ms.getFirstMillisecond(), ms.getMiddleMillisecond()); @@ -194,6 +179,7 @@ * The {@link Millisecond} class is immutable, so should not be * {@link Cloneable}. */ + @Test public void testNotCloneable() { Millisecond m = new Millisecond(599, 23, 45, 7, 9, 10, 2007); assertFalse(m instanceof Cloneable); @@ -202,6 +188,7 @@ /** * Some checks for the getFirstMillisecond() method. */ + @Test public void testGetFirstMillisecond() { Locale saved = Locale.getDefault(); Locale.setDefault(Locale.UK); @@ -216,6 +203,7 @@ /** * Some checks for the getFirstMillisecond(TimeZone) method. */ + @Test public void testGetFirstMillisecondWithTimeZone() { Millisecond m = new Millisecond(500, 50, 59, 15, 1, 4, 1950); TimeZone zone = TimeZone.getTimeZone("America/Los_Angeles"); @@ -235,6 +223,7 @@ /** * Some checks for the getFirstMillisecond(TimeZone) method. */ + @Test public void testGetFirstMillisecondWithCalendar() { Millisecond m = new Millisecond(500, 55, 40, 2, 15, 4, 2000); GregorianCalendar calendar = new GregorianCalendar(Locale.GERMANY); @@ -255,6 +244,7 @@ /** * Some checks for the getLastMillisecond() method. */ + @Test public void testGetLastMillisecond() { Locale saved = Locale.getDefault(); Locale.setDefault(Locale.UK); @@ -269,6 +259,7 @@ /** * Some checks for the getLastMillisecond(TimeZone) method. */ + @Test public void testGetLastMillisecondWithTimeZone() { Millisecond m = new Millisecond(750, 55, 1, 2, 7, 7, 1950); TimeZone zone = TimeZone.getTimeZone("America/Los_Angeles"); @@ -288,6 +279,7 @@ /** * Some checks for the getLastMillisecond(TimeZone) method. */ + @Test public void testGetLastMillisecondWithCalendar() { Millisecond m = new Millisecond(250, 50, 45, 21, 21, 4, 2001); GregorianCalendar calendar = new GregorianCalendar(Locale.GERMANY); @@ -308,6 +300,7 @@ /** * Some checks for the getSerialIndex() method. */ + @Test public void testGetSerialIndex() { Millisecond m = new Millisecond(500, 1, 1, 1, 1, 1, 2000); assertEquals(3155850061500L, m.getSerialIndex()); @@ -319,6 +312,7 @@ /** * Some checks for the testNext() method. */ + @Test public void testNext() { Millisecond m = new Millisecond(555, 55, 30, 1, 12, 12, 2000); m = (Millisecond) m.next(); @@ -336,6 +330,7 @@ /** * Some checks for the getStart() method. */ + @Test public void testGetStart() { Locale saved = Locale.getDefault(); Locale.setDefault(Locale.ITALY); @@ -350,6 +345,7 @@ /** * Some checks for the getEnd() method. */ + @Test public void testGetEnd() { Locale saved = Locale.getDefault(); Locale.setDefault(Locale.ITALY); Modified: branches/jfreechart-1.0.x-branch/tests/org/jfree/data/time/MinuteTest.java =================================================================== --- branches/jfreechart-1.0.x-branch/tests/org/jfree/data/time/MinuteTest.java 2013-08-05 21:37:20 UTC (rev 2870) +++ branches/jfreechart-1.0.x-branch/tests/org/jfree/data/time/MinuteTest.java 2013-08-05 21:37:48 UTC (rev 2871) @@ -47,54 +47,33 @@ package org.jfree.data.time; +import static org.junit.Assert.assertTrue; +import static org.junit.Assert.assertFalse; +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertNull; + import java.util.Calendar; import java.util.Date; import java.util.GregorianCalendar; import java.util.Locale; import java.util.TimeZone; -import junit.framework.Test; -import junit.framework.TestCase; -import junit.framework.TestSuite; import org.jfree.chart.TestUtilities; import org.jfree.date.MonthConstants; +import org.junit.Test; /** * Tests for the {@link Minute} class. */ -public class MinuteTest extends TestCase { +public class MinuteTest { /** - * Returns the tests as a test suite. - * - * @return The test suite. - */ - public static Test suite() { - return new TestSuite(MinuteTest.class); - } - - /** - * Constructs a new set of tests. - * - * @param name the name of the tests. - */ - public MinuteTest(String name) { - super(name); - } - - /** - * Common test setup. - */ - protected void setUp() { - // no setup - } - - /** * Check that a Minute instance is equal to itself. * * SourceForge Bug ID: 558850. */ + @Test public void testEqualsSelf() { Minute minute = new Minute(); assertTrue(minute.equals(minute)); @@ -103,6 +82,7 @@ /** * Tests the equals method. */ + @Test public void testEquals() { Day day1 = new Day(29, MonthConstants.MARCH, 2002); Hour hour1 = new Hour(15, day1); @@ -117,6 +97,7 @@ * In GMT, the 4.55pm on 21 Mar 2002 is java.util.Date(1016729700000L). * Use this to check the Minute constructor. */ + @Test public void testDateConstructor1() { TimeZone zone = TimeZone.getTimeZone("GMT"); Locale locale = Locale.getDefault(); // locale should not matter here @@ -135,6 +116,7 @@ * java.util.Date(1,014,281,700,000L). Use this to check the Minute * constructor. */ + @Test public void testDateConstructor2() { TimeZone zone = TimeZone.getTimeZone("Asia/Singapore"); Locale locale = Locale.getDefault(); // locale should not matter here @@ -151,6 +133,7 @@ /** * Serialize an instance, restore it, and check for equality. */ + @Test public void testSerialization() { Minute m1 = new Minute(); Minute m2 = (Minute) TestUtilities.serialised(m1); @@ -160,6 +143,7 @@ /** * Two objects that are equal are required to return the same hashCode. */ + @Test public void testHashcode() { Minute m1 = new Minute(45, 5, 1, 2, 2003); Minute m2 = new Minute(45, 5, 1, 2, 2003); @@ -173,6 +157,7 @@ * The {@link Minute} class is immutable, so should not be * {@link Cloneable}. */ + @Test public void testNotCloneable() { Minute m = new Minute(45, 5, 1, 2, 2003); assertFalse(m instanceof Cloneable); @@ -181,6 +166,7 @@ /** * Some checks for the getFirstMillisecond() method. */ + @Test public void testGetFirstMillisecond() { Locale saved = Locale.getDefault(); Locale.setDefault(Locale.UK); @@ -195,6 +181,7 @@ /** * Some checks for the getFirstMillisecond(TimeZone) method. */ + @Test public void testGetFirstMillisecondWithTimeZone() { Minute m = new Minute(59, 15, 1, 4, 1950); TimeZone zone = TimeZone.getTimeZone("America/Los_Angeles"); @@ -214,6 +201,7 @@ /** * Some checks for the getFirstMillisecond(TimeZone) method. */ + @Test public void testGetFirstMillisecondWithCalendar() { Minute m = new Minute(40, 2, 15, 4, 2000); GregorianCalendar calendar = new GregorianCalendar(Locale.GERMANY); @@ -234,6 +222,7 @@ /** * Some checks for the getLastMillisecond() method. */ + @Test public void testGetLastMillisecond() { Locale saved = Locale.getDefault(); Locale.setDefault(Locale.UK); @@ -248,6 +237,7 @@ /** * Some checks for the getLastMillisecond(TimeZone) method. */ + @Test public void testGetLastMillisecondWithTimeZone() { Minute m = new Minute(1, 2, 7, 7, 1950); TimeZone zone = TimeZone.getTimeZone("America/Los_Angeles"); @@ -267,6 +257,7 @@ /** * Some checks for the getLastMillisecond(TimeZone) method. */ + @Test public void testGetLastMillisecondWithCalendar() { Minute m = new Minute(45, 21, 21, 4, 2001); GregorianCalendar calendar = new GregorianCalendar(Locale.GERMANY); @@ -287,6 +278,7 @@ /** * Some checks for the getSerialIndex() method. */ + @Test public void testGetSerialIndex() { Minute m = new Minute(1, 1, 1, 1, 2000); assertEquals(52597501L, m.getSerialIndex()); @@ -297,6 +289,7 @@ /** * Some checks for the testNext() method. */ + @Test public void testNext() { Minute m = new Minute(30, 1, 12, 12, 2000); m = (Minute) m.next(); @@ -312,6 +305,7 @@ /** * Some checks for the getStart() method. */ + @Test public void testGetStart() { Locale saved = Locale.getDefault(); Locale.setDefault(Locale.ITALY); @@ -329,6 +323,7 @@ /** * Some checks for the getEnd() method. */ + @Test public void testGetEnd() { Locale saved = Locale.getDefault(); Locale.setDefault(Locale.ITALY); @@ -346,6 +341,7 @@ /** * Test for bug 1611872 - previous() fails for first minute in hour. */ + @Test public void test1611872() { Minute m1 = new Minute(0, 10, 15, 4, 2000); Minute m2 = (Minute) m1.previous(); Modified: branches/jfreechart-1.0.x-branch/tests/org/jfree/data/time/MonthTest.java =================================================================== --- branches/jfreechart-1.0.x-branch/tests/org/jfree/data/time/MonthTest.java 2013-08-05 21:37:20 UTC (rev 2870) +++ branches/jfreechart-1.0.x-branch/tests/org/jfree/data/time/MonthTest.java 2013-08-05 21:37:48 UTC (rev 2871) @@ -49,23 +49,27 @@ package org.jfree.data.time; +import static org.junit.Assert.assertTrue; +import static org.junit.Assert.assertFalse; +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertNull; + import java.util.Calendar; import java.util.Date; import java.util.GregorianCalendar; import java.util.Locale; import java.util.TimeZone; -import junit.framework.Test; -import junit.framework.TestCase; -import junit.framework.TestSuite; import org.jfree.chart.TestUtilities; import org.jfree.date.MonthConstants; +import org.junit.Before; +import org.junit.Test; /** * Tests for the {@link Month} class. */ -public class MonthTest extends TestCase { +public class MonthTest { /** A month. */ private Month jan1900; @@ -80,26 +84,9 @@ private Month dec9999; /** - * Returns the tests as a test suite. - * - * @return The test suite. - */ - public static Test suite() { - return new TestSuite(MonthTest.class); - } - - /** - * Constructs a new set of tests. - * - * @param name the name of the tests. - */ - public MonthTest(String name) { - super(name); - } - - /** * Common test setup. */ + @Before protected void setUp() { this.jan1900 = new Month(MonthConstants.JANUARY, 1900); this.feb1900 = new Month(MonthConstants.FEBRUARY, 1900); @@ -112,6 +99,7 @@ * * SourceForge Bug ID: 558850. */ + @Test public void testEqualsSelf() { Month month = new Month(); assertTrue(month.equals(month)); @@ -120,6 +108,7 @@ /** * Tests the equals method. */ + @Test public void testEquals() { Month m1 = new Month(MonthConstants.MAY, 2002); Month m2 = new Month(MonthConstants.MAY, 2002); @@ -130,6 +119,7 @@ * In GMT, the end of Feb 2000 is java.util.Date(951,868,799,999L). Use * this to check the Month constructor. */ + @Test public void testDateConstructor1() { TimeZone zone = TimeZone.getTimeZone("GMT"); @@ -148,6 +138,7 @@ * In Auckland, the end of Feb 2000 is java.util.Date(951,821,999,999L). * Use this to check the Month constructor. */ + @Test public void testDateConstructor2() { TimeZone zone = TimeZone.getTimeZone("Pacific/Auckland"); @@ -166,6 +157,7 @@ * Set up a month equal to Jan 1900. Request the previous month, it should * be null. */ + @Test public void testJan1900Previous() { Month previous = (Month) this.jan1900.previous(); assertNull(previous); @@ -175,6 +167,7 @@ * Set up a month equal to Jan 1900. Request the next month, it should be * Feb 1900. */ + @Test public void testJan1900Next() { Month next = (Month) this.jan1900.next(); assertEquals(this.feb1900, next); @@ -184,6 +177,7 @@ * Set up a month equal to Dec 9999. Request the previous month, it should * be Nov 9999. */ + @Test public void testDec9999Previous() { Month previous = (Month) this.dec9999.previous(); assertEquals(this.nov9999, previous); @@ -193,6 +187,7 @@ * Set up a month equal to Dec 9999. Request the next month, it should be * null. */ + @Test public void testDec9999Next() { Month next = (Month) this.dec9999.next(); assertNull(next); @@ -201,6 +196,7 @@ /** * Tests the string parsing code... */ + @Test public void testParseMonth() { Month month = null; @@ -240,6 +236,7 @@ /** * Serialize an instance, restore it, and check for equality. */ + @Test public void testSerialization() { Month m1 = new Month(12, 1999); Month m2 = (Month) TestUtilities.serialised(m1); @@ -249,6 +246,7 @@ /** * Two objects that are equal are required to return the same hashCode. */ + @Test public void testHashcode() { Month m1 = new Month(2, 2003); Month m2 = new Month(2, 2003); @@ -261,6 +259,7 @@ /** * The {@link Month} class is immutable, so should not be {@link Cloneable}. */ + @Test public void testNotCloneable() { Month m = new Month(2, 2003); assertFalse(m instanceof Cloneable); @@ -269,6 +268,7 @@ /** * Some checks for the getFirstMillisecond() method. */ + @Test public void testGetFirstMillisecond() { Locale saved = Locale.getDefault(); Locale.setDefault(Locale.UK); @@ -283,6 +283,7 @@ /** * Some checks for the getFirstMillisecond(TimeZone) method. */ + @Test public void testGetFirstMillisecondWithTimeZone() { Month m = new Month(2, 1950); TimeZone zone = TimeZone.getTimeZone("America/Los_Angeles"); @@ -302,6 +303,7 @@ /** * Some checks for the getFirstMillisecond(TimeZone) method. */ + @Test public void testGetFirstMillisecondWithCalendar() { Month m = new Month(1, 2001); GregorianCalendar calendar = new GregorianCalendar(Locale.GERMANY); @@ -322,6 +324,7 @@ /** * Some checks for the getLastMillisecond() method. */ + @Test public void testGetLastMillisecond() { Locale saved = Locale.getDefault(); Locale.setDefault(Locale.UK); @@ -336,6 +339,7 @@ /** * Some checks for the getLastMillisecond(TimeZone) method. */ + @Test public void testGetLastMillisecondWithTimeZone() { Month m = new Month(2, 1950); TimeZone zone = TimeZone.getTimeZone("America/Los_Angeles"); @@ -355,6 +359,7 @@ /** * Some checks for the getLastMillisecond(TimeZone) method. */ + @Test public void testGetLastMillisecondWithCalendar() { Month m = new Month(3, 2001); GregorianCalendar calendar = new GregorianCalendar(Locale.GERMANY); @@ -375,6 +380,7 @@ /** * Some checks for the getSerialIndex() method. */ + @Test public void testGetSerialIndex() { Month m = new Month(1, 2000); assertEquals(24001L, m.getSerialIndex()); @@ -385,6 +391,7 @@ /** * Some checks for the testNext() method. */ + @Test public void testNext() { Month m = new Month(12, 2000); m = (Month) m.next(); @@ -397,6 +404,7 @@ /** * Some checks for the getStart() method. */ + @Test public void testGetStart() { Locale saved = Locale.getDefault(); Locale.setDefault(Locale.ITALY); @@ -411,6 +419,7 @@ /** * Some checks for the getEnd() method. */ + @Test public void testGetEnd() { Locale saved = Locale.getDefault(); Locale.setDefault(Locale.ITALY); Modified: branches/jfreechart-1.0.x-branch/tests/org/jfree/data/time/MovingAverageTest.java =================================================================== --- branches/jfreechart-1.0.x-branch/tests/org/jfree/data/time/MovingAverageTest.java 2013-08-05 21:37:20 UTC (rev 2870) +++ branches/jfreechart-1.0.x-branch/tests/org/jfree/data/time/MovingAverageTest.java 2013-08-05 21:37:48 UTC (rev 2871) @@ -41,45 +41,26 @@ package org.jfree.data.time; -import junit.framework.Test; -import junit.framework.TestCase; -import junit.framework.TestSuite; +import static org.junit.Assert.assertEquals; import org.jfree.date.MonthConstants; +import org.junit.Test; /** * Tests for the {@link MovingAverage} class. */ -public class MovingAverageTest extends TestCase { +public class MovingAverageTest { private static final double EPSILON = 0.0000000001; /** - * Returns the tests as a test suite. - * - * @return The test suite. - */ - public static Test suite() { - return new TestSuite(MovingAverageTest.class); - } - - /** - * Constructs a new set of tests. - * - * @param name the name of the tests. - */ - public MovingAverageTest(String name) { - super(name); - } - - /** * A test for the values calculated from a time series. */ + @Test public void test1() { TimeSeries source = createDailyTimeSeries1(); - TimeSeries maverage = MovingAverage.createMovingAverage( - source, "Moving Average", 3, 3 - ); + TimeSeries maverage = MovingAverage.createMovingAverage(source, + "Moving Average", 3, 3); // the moving average series has 7 items, the first three // days (11, 12, 13 August are skipped) @@ -106,7 +87,6 @@ * @return A sample series. */ private TimeSeries createDailyTimeSeries1() { - TimeSeries series = new TimeSeries("Series 1", Day.class); series.add(new Day(11, MonthConstants.AUGUST, 2003), 11.2); series.add(new Day(13, MonthConstants.AUGUST, 2003), 13.8); @@ -118,7 +98,6 @@ series.add(new Day(27, MonthConstants.AUGUST, 2003), 10.7); series.add(new Day(28, MonthConstants.AUGUST, 2003), 14.3); return series; - } } Modified: branches/jfreechart-1.0.x-branch/tests/org/jfree/data/time/QuarterTest.java =================================================================== --- branches/jfreechart-1.0.x-branch/tests/org/jfree/data/time/QuarterTest.java 2013-08-05 21:37:20 UTC (rev 2870) +++ branches/jfreechart-1.0.x-branch/tests/org/jfree/data/time/QuarterTest.java 2013-08-05 21:37:48 UTC (rev 2871) @@ -45,21 +45,25 @@ package org.jfree.data.time; +import static org.junit.Assert.assertTrue; +import static org.junit.Assert.assertFalse; +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertNull; + import java.util.Calendar; import java.util.Date; import java.util.GregorianCalendar; import java.util.Locale; import java.util.TimeZone; -import junit.framework.Test; -import junit.framework.TestCase; -import junit.framework.TestSuite; import org.jfree.chart.TestUtilities; +import org.junit.Before; +import org.junit.Test; /** * Tests for the {link Quarter} class. */ -public class QuarterTest extends TestCase { +public class QuarterTest { /** A quarter. */ private Quarter q1Y1900; @@ -74,27 +78,10 @@ private Quarter q4Y9999; /** - * Returns the tests as a test suite. - * - * @return The test suite. - */ - public static Test suite() { - return new TestSuite(QuarterTest.class); - } - - /** - * Constructs a new set of tests. - * - * @param name the name of the tests. - */ - public QuarterTest(String name) { - super(name); - } - - /** * Common test setup. */ - protected void setUp() { + @Before + public void setUp() { this.q1Y1900 = new Quarter(1, 1900); this.q2Y1900 = new Quarter(2, 1900); this.q3Y9999 = new Quarter(3, 9999); @@ -106,6 +93,7 @@ * * SourceForge Bug ID: 558850. */ + @Test public void testEqualsSelf() { Quarter quarter = new Quarter(); assertTrue(quarter.equals(quarter)); @@ -114,6 +102,7 @@ /** * Tests the equals method. */ + @Test public void testEquals() { Quarter q1 = new Quarter(2, 2002); Quarter q2 = new Quarter(2, 2002); @@ -124,6 +113,7 @@ * In GMT, the end of Q1 2002 is java.util.Date(1017619199999L). Use this * to check the quarter constructor. */ + @Test public void testDateConstructor1() { TimeZone zone = TimeZone.getTimeZone("GMT"); @@ -142,6 +132,7 @@ * In Istanbul, the end of Q1 2002 is java.util.Date(1017608399999L). Use * this to check the quarter constructor. */ + @Test public void testDateConstructor2() { TimeZone zone = TimeZone.getTimeZone("Europe/Istanbul"); @@ -160,6 +151,7 @@ * Set up a quarter equal to Q1 1900. Request the previous quarter, it * should be null. */ + @Test public void testQ1Y1900Previous() { Quarter previous = (Quarter) this.q1Y1900.previous(); assertNull(previous); @@ -169,6 +161,7 @@ * Set up a quarter equal to Q1 1900. Request the next quarter, it should * be Q2 1900. */ + @Test public void testQ1Y1900Next() { Quarter next = (Quarter) this.q1Y1900.next(); assertEquals(this.q2Y1900, next); @@ -178,6 +171,7 @@ * Set up a quarter equal to Q4 9999. Request the previous quarter, it * should be Q3 9999. */ + @Test public void testQ4Y9999Previous() { Quarter previous = (Quarter) this.q4Y9999.previous(); assertEquals(this.q3Y9999, previous); @@ -187,6 +181,7 @@ * Set up a quarter equal to Q4 9999. Request the next quarter, it should * be null. */ + @Test public void testQ4Y9999Next() { Quarter next = (Quarter) this.q4Y9999.next(); assertNull(next); @@ -195,6 +190,7 @@ /** * Test the string parsing code... */ + @Test public void testParseQuarter() { Quarter quarter = null; @@ -234,6 +230,7 @@ /** * Serialize an instance, restore it, and check for equality. */ + @Test public void testSerialization() { Quarter q1 = new Quarter(4, 1999); Quarter q2 = (Quarter) TestUtilities.serialised(q1); @@ -243,6 +240,7 @@ /** * Two objects that are equal are required to return the same hashCode. */ + @Test public void testHashcode() { Quarter q1 = new Quarter(2, 2003); Quarter q2 = new Quarter(2, 2003); @@ -256,6 +254,7 @@ * The {@link Quarter} class is immutable, so should not be * {@link Cloneable}. */ + @Test public void testNotCloneable() { Quarter q = new Quarter(2, 2003); assertFalse(q instanceof Cloneable); @@ -265,6 +264,7 @@ * Some tests for the constructor with (int, int) arguments. Covers bug * report 1377239. */ + @Test public void testConstructor() { boolean pass = false; try { @@ -288,6 +288,7 @@ /** * Some checks for the getFirstMillisecond() method. */ + @Test public void testGetFirstMillisecond() { Locale saved = Locale.getDefault(); Locale.setDefault(Locale.UK); @@ -302,6 +303,7 @@ /** * Some checks for the getFirstMillisecond(TimeZone) method. */ + @Test public void testGetFirstMillisecondWithTimeZone() { Quarter q = new Quarter(2, 1950); TimeZone zone = TimeZone.getTimeZone("America/Los_Angeles"); @@ -321,6 +323,7 @@ /** * Some checks for the getFirstMillisecond(TimeZone) method. */ + @Test public void testGetFirstMillisecondWithCalendar() { Quarter q = new Quarter(1, 2001); GregorianCalendar calendar = new GregorianCalendar(Locale.GERMANY); @@ -341,6 +344,7 @@ /** * Some checks for the getLastMillisecond() method. */ + @Test public void testGetLastMillisecond() { Locale saved = Locale.getDefault(); Locale.setDefault(Locale.UK); @@ -355,6 +359,7 @@ /** * Some checks for the getLastMillisecond(TimeZone) method. */ + @Test public void testGetLastMillisecondWithTimeZone() { Quarter q = new Quarter(2, 1950); TimeZone zone = TimeZone.getTimeZone("America/Los_Angeles"); @@ -374,6 +379,7 @@ /** * Some checks for the getLastMillisecond(TimeZone) method. */ + @Test public void testGetLastMillisecondWithCalendar() { Quarter q = new Quarter(3, 2001); GregorianCalendar calendar = new GregorianCalendar(Locale.GERMANY); @@ -394,6 +400,7 @@ /** * Some checks for the getSerialIndex() method. */ + @Test public void testGetSerialIndex() { Quarter q = new Quarter(1, 2000); assertEquals(8001L, q.getSerialIndex()); @@ -404,6 +411,7 @@ /** * Some checks for the testNext() method. */ + @Test public void testNext() { Quarter q = new Quarter(1, 2000); q = (Quarter) q.next(); @@ -416,6 +424,7 @@ /** * Some checks for the getStart() method. */ + @Test public void testGetStart() { Locale saved = Locale.getDefault(); Locale.setDefault(Locale.ITALY); @@ -430,6 +439,7 @@ /** * Some checks for the getEnd() method. */ + @Test public void testGetEnd() { Locale saved = Locale.getDefault(); Locale.setDefault(Locale.ITALY); Modified: branches/jfreechart-1.0.x-branch/tests/org/jfree/data/time/SecondTest.java =================================================================== --- branches/jfreechart-1.0.x-branch/tests/org/jfree/data/time/SecondTest.java 2013-08-05 21:37:20 UTC (rev 2870) +++ branches/jfreechart-1.0.x-branch/tests/org/jfree/data/time/SecondTest.java 2013-08-05 21:37:48 UTC (rev 2871) @@ -45,54 +45,33 @@ package org.jfree.data.time; +import static org.junit.Assert.assertTrue; +import static org.junit.Assert.assertFalse; +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertNull; + import java.util.Calendar; import java.util.Date; import java.util.GregorianCalendar; import java.util.Locale; import java.util.TimeZone; -import junit.framework.Test; -import junit.framework.TestCase; -import junit.framework.TestSuite; import org.jfree.chart.TestUtilities; import org.jfree.date.MonthConstants; +import org.junit.Test; /** * Tests for the {@link Second} class. */ -public class SecondTest extends TestCase { +public class SecondTest { /** - * Returns the tests as a test suite. - * - * @return The test suite. - */ - public static Test suite() { - return new TestSuite(SecondTest.class); - } - - /** - * Constructs a new set of tests. - * - * @param name the name of the tests. - */ - public SecondTest(String name) { - super(name); - } - - /** - * Common test setup. - */ - protected void setUp() { - // no setup - } - - /** * Test that a Second instance is equal to itself. * * SourceForge Bug ID: 558850. */ + @Test public void testEqualsSelf() { Second second = new Second(); assertTrue(second.equals(second)); @@ -101,6 +80,7 @@ /** * Tests the equals method. */ + @Test public void testEquals() { Day day1 = new Day(29, MonthConstants.MARCH, 2002); Hour hour1 = new Hour(15, day1); @@ -117,6 +97,7 @@ * In GMT, the 4.55:59pm on 21 Mar 2002 is java.util.Date(1016729759000L). * Use this to check the Second constructor. */ + @Test public void testDateConstructor1() { TimeZone zone = TimeZone.getTimeZone("GMT"); Locale locale = Locale.getDefault(); // locale shouldn't matter here @@ -134,6 +115,7 @@ * In Chicago, the 4.55:59pm on 21 Mar 2002 is * java.util.Date(1016751359000L). Use this to check the Second constructor. */ + @Test public void testDateConstructor2() { TimeZone zone = TimeZone.getTimeZone("America/Chicago"); Locale locale = Locale.getDefault(); // locale shouldn't matter here @@ -150,6 +132,7 @@ /** * Serialize an instance, restore it, and check for equality. */ + @Test public void testSerialization() { Second s1 = new Second(); Second s2 = (Second) TestUtilities.serialised(s1); @@ -159,6 +142,7 @@ /** * Two objects that are equal are required to return the same hashCode. */ + @Test public void testHashcode() { Second s1 = new Second(13, 45, 5, 1, 2, 2003); Second s2 = new Second(13, 45, 5, 1, 2, 2003); @@ -172,6 +156,7 @@ * The {@link Second} class is immutable, so should not be * {@link Cloneable}. */ + @Test public void testNotCloneable() { Second s = new Second(13, 45, 5, 1, 2, 2003); assertFalse(s instanceof Cloneable); @@ -180,6 +165,7 @@ /** * Some checks for the getFirstMillisecond() method. */ + @Test public void testGetFirstMillisecond() { Locale saved = Locale.getDefault(); Locale.setDefault(Locale.UK); @@ -194,6 +180,7 @@ /** * Some checks for the getFirstMillisecond(TimeZone) method. */ + @Test public void testGetFirstMillisecondWithTimeZone() { Second s = new Second(50, 59, 15, 1, 4, 1950); TimeZone zone = TimeZone.getTimeZone("America/Los_Angeles"); @@ -213,6 +200,7 @@ /** * Some checks for the getFirstMillisecond(TimeZone) method. */ + @Test public void testGetFirstMillisecondWithCalendar() { Second s = new Second(55, 40, 2, 15, 4, 2000); GregorianCalendar calendar = new GregorianCalendar(Locale.GERMANY); @@ -233,6 +221,7 @@ /** * Some checks for the getLastMillisecond() method. */ + @Test public void testGetLastMillisecond() { Locale saved = Locale.getDefault(); Locale.setDefault(Locale.UK); @@ -247,6 +236,7 @@ /** * Some checks for the getLastMillisecond(TimeZone) method. */ + @Test public void testGetLastMillisecondWithTimeZone() { Second s = new Second(55, 1, 2, 7, 7, 1950); TimeZone zone = TimeZone.getTimeZone("America/Los_Angeles"); @@ -266,6 +256,7 @@ /** * Some checks for the getLastMillisecond(TimeZone) method. */ + @Test public void testGetLast... [truncated message content] |
From: <mu...@us...> - 2013-11-23 05:57:11
|
Revision: 3061 http://sourceforge.net/p/jfreechart/code/3061 Author: mungady Date: 2013-11-23 05:57:09 +0000 (Sat, 23 Nov 2013) Log Message: ----------- Fix NB warnings. Modified Paths: -------------- branches/jfreechart-1.0.x-branch/tests/org/jfree/data/time/TimePeriodValuesTest.java branches/jfreechart-1.0.x-branch/tests/org/jfree/data/time/TimeSeriesTest.java Modified: branches/jfreechart-1.0.x-branch/tests/org/jfree/data/time/TimePeriodValuesTest.java =================================================================== --- branches/jfreechart-1.0.x-branch/tests/org/jfree/data/time/TimePeriodValuesTest.java 2013-11-23 05:56:59 UTC (rev 3060) +++ branches/jfreechart-1.0.x-branch/tests/org/jfree/data/time/TimePeriodValuesTest.java 2013-11-23 05:57:09 UTC (rev 3061) @@ -364,6 +364,7 @@ * * @param event the event. */ + @Override public void seriesChanged(SeriesChangeEvent event) { this.lastEvent = event; } Modified: branches/jfreechart-1.0.x-branch/tests/org/jfree/data/time/TimeSeriesTest.java =================================================================== --- branches/jfreechart-1.0.x-branch/tests/org/jfree/data/time/TimeSeriesTest.java 2013-11-23 05:56:59 UTC (rev 3060) +++ branches/jfreechart-1.0.x-branch/tests/org/jfree/data/time/TimeSeriesTest.java 2013-11-23 05:57:09 UTC (rev 3061) @@ -117,6 +117,7 @@ * * @param event the event. */ + @Override public void seriesChanged(SeriesChangeEvent event) { this.gotSeriesChangeEvent = true; } This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |