Rename TestUtilities --> TestUtils.

jfree · May 6, 2017 · ff45162 · ff45162
1 parent 8714902
commit ff45162
Show file tree

Hide file tree

Showing 297 changed files with 618 additions and 618 deletions.
diff --git a/src/test/java/org/jfree/chart/ChartRenderingInfoTest.java b/src/test/java/org/jfree/chart/ChartRenderingInfoTest.java
@@ -121,7 +121,7 @@ public void testCloning() throws CloneNotSupportedException {
     public void testSerialization() {
         ChartRenderingInfo i1 = new ChartRenderingInfo();
         i1.setChartArea(new Rectangle2D.Double(1.0, 2.0, 3.0, 4.0));
-        ChartRenderingInfo i2 = (ChartRenderingInfo) TestUtilities.serialised(i1);
+        ChartRenderingInfo i2 = (ChartRenderingInfo) TestUtils.serialised(i1);
         assertEquals(i1, i2);
     }
 
@@ -133,7 +133,7 @@ public void testSerialization2() {
         ChartRenderingInfo i1 = new ChartRenderingInfo();
         i1.getPlotInfo().setDataArea(new Rectangle2D.Double(1.0, 2.0, 3.0,
                 4.0));
-        ChartRenderingInfo i2 = (ChartRenderingInfo) TestUtilities.serialised(i1);
+        ChartRenderingInfo i2 = (ChartRenderingInfo) TestUtils.serialised(i1);
         assertEquals(i1, i2);
         assertEquals(i2, i2.getPlotInfo().getOwner());
     }

diff --git a/src/test/java/org/jfree/chart/JFreeChartTest.java b/src/test/java/org/jfree/chart/JFreeChartTest.java
@@ -266,7 +266,7 @@ public void testSerialization1() {
         data.setValue("Type 3", 45.8);
 
         JFreeChart c1 = ChartFactory.createPieChart("Test", data);
-        JFreeChart c2 = (JFreeChart) TestUtilities.serialised(c1);
+        JFreeChart c2 = (JFreeChart) TestUtils.serialised(c1);
         assertEquals(c1, c2);
         LegendTitle lt2 = c2.getLegend();
         assertSame(lt2.getSources()[0], c2.getPlot());
@@ -282,7 +282,7 @@ public void testSerialization2() {
         data.setValue("Type 2", 23.9);
         data.setValue("Type 3", 45.8);
         JFreeChart c1 = ChartFactory.createPieChart3D("Test", data);
-        JFreeChart c2 = (JFreeChart) TestUtilities.serialised(c1);
+        JFreeChart c2 = (JFreeChart) TestUtils.serialised(c1);
         assertEquals(c1, c2);
     }
 
@@ -340,7 +340,7 @@ public void testSerialization3() {
         // create the chart...
         JFreeChart c1 = ChartFactory.createBarChart("Vertical Bar Chart",
                 "Category", "Value", dataset);
-        JFreeChart c2 = (JFreeChart) TestUtilities.serialised(c1);
+        JFreeChart c2 = (JFreeChart) TestUtils.serialised(c1);
         assertEquals(c1, c2);
     }
 
@@ -360,7 +360,7 @@ public void testSerialization4() {
 
         JFreeChart c1 = ChartFactory.createTimeSeriesChart("Test", "Date",
                 "Value", dataset);
-        JFreeChart c2 = (JFreeChart) TestUtilities.serialised(c1);
+        JFreeChart c2 = (JFreeChart) TestUtils.serialised(c1);
         assertEquals(c1, c2);
     }
 

diff --git a/src/test/java/org/jfree/chart/LegendItemCollectionTest.java b/src/test/java/org/jfree/chart/LegendItemCollectionTest.java
@@ -95,7 +95,7 @@ public void testSerialization() {
         LegendItemCollection c1 = new LegendItemCollection();
         c1.add(new LegendItem("Item", "Description", "ToolTip", "URL",
                 new Rectangle2D.Double(1.0, 2.0, 3.0, 4.0), Color.RED));
-        LegendItemCollection c2 = (LegendItemCollection) TestUtilities.serialised(c1);
+        LegendItemCollection c2 = (LegendItemCollection) TestUtils.serialised(c1);
         assertEquals(c1, c2);
     }
 

diff --git a/src/test/java/org/jfree/chart/LegendItemTest.java b/src/test/java/org/jfree/chart/LegendItemTest.java
@@ -322,7 +322,7 @@ public void testSerialization() {
         item1.setLinePaint(new GradientPaint(1.0f, 2.0f, Color.WHITE, 3.0f,
                 4.0f, Color.RED));
         LegendItem item2;
-        item2 = (LegendItem) TestUtilities.serialised(item1);
+        item2 = (LegendItem) TestUtils.serialised(item1);
         assertEquals(item1, item2);
     }
 
@@ -335,7 +335,7 @@ public void testSerialization2() {
         as.addAttribute(TextAttribute.FONT, new Font("Dialog", Font.PLAIN, 12));
         LegendItem item1 = new LegendItem(as, "Description", "ToolTip", "URL",
                 new Rectangle2D.Double(1.0, 2.0, 3.0, 4.0), Color.RED);
-        LegendItem item2 = (LegendItem) TestUtilities.serialised(item1);
+        LegendItem item2 = (LegendItem) TestUtils.serialised(item1);
         assertEquals(item1, item2);
     }
 

diff --git a/src/test/java/org/jfree/chart/PaintMapTest.java b/src/test/java/org/jfree/chart/PaintMapTest.java
@@ -149,7 +149,7 @@ public void testCloning() throws CloneNotSupportedException {
     @Test
     public void testSerialization1() {
         PaintMap m1 = new PaintMap();
-        PaintMap m2 = (PaintMap) TestUtilities.serialised(m1);
+        PaintMap m2 = (PaintMap) TestUtils.serialised(m1);
         assertEquals(m1, m2);
     }
 
@@ -162,7 +162,7 @@ public void testSerialization2() {
         m1.put("K1", Color.RED);
         m1.put("K2", new GradientPaint(1.0f, 2.0f, Color.green, 3.0f, 4.0f,
                 Color.YELLOW));
-        PaintMap m2 = (PaintMap) TestUtilities.serialised(m1);
+        PaintMap m2 = (PaintMap) TestUtils.serialised(m1);
         assertEquals(m1, m2);
     }
 

diff --git a/src/test/java/org/jfree/chart/StandardChartThemeTest.java b/src/test/java/org/jfree/chart/StandardChartThemeTest.java
@@ -259,7 +259,7 @@ public void testEquals() {
     @Test
     public void testSerialization() {
         StandardChartTheme t1 = new StandardChartTheme("Name");
-        StandardChartTheme t2 = (StandardChartTheme) TestUtilities.serialised(t1);
+        StandardChartTheme t2 = (StandardChartTheme) TestUtils.serialised(t1);
         assertTrue(t1.equals(t2));
     }
 

diff --git a/src/test/java/org/jfree/chart/StrokeMapTest.java b/src/test/java/org/jfree/chart/StrokeMapTest.java
@@ -144,7 +144,7 @@ public void testCloning() throws CloneNotSupportedException {
     @Test
     public void testSerialization1() {
         StrokeMap m1 = new StrokeMap();
-        StrokeMap m2 = (StrokeMap) TestUtilities.serialised(m1);
+        StrokeMap m2 = (StrokeMap) TestUtils.serialised(m1);
         assertEquals(m1, m2);
     }
 
@@ -156,7 +156,7 @@ public void testSerialization2() {
         StrokeMap m1 = new StrokeMap();
         m1.put("K1", new BasicStroke(1.1f));
         m1.put("K2", new BasicStroke(2.2f));
-        StrokeMap m2 = (StrokeMap) TestUtilities.serialised(m1);
+        StrokeMap m2 = (StrokeMap) TestUtils.serialised(m1);
         assertEquals(m1, m2);
     }
 

diff --git a/...t/java/org/jfree/chart/TestUtilities.java → src/test/java/org/jfree/chart/TestUtils.java b/...t/java/org/jfree/chart/TestUtilities.java → src/test/java/org/jfree/chart/TestUtils.java
@@ -53,7 +53,7 @@
 /**
  * Some utility methods for use by the testing code.
  */
-public class TestUtilities {
+public class TestUtils {
 
     /**
      * Returns {@code true} if the collections contains any object that

diff --git a/src/test/java/org/jfree/chart/annotations/CategoryLineAnnotationTest.java b/src/test/java/org/jfree/chart/annotations/CategoryLineAnnotationTest.java
@@ -48,7 +48,7 @@
 import java.awt.BasicStroke;
 import java.awt.Color;
 
-import org.jfree.chart.TestUtilities;
+import org.jfree.chart.TestUtils;
 import org.jfree.chart.util.PublicCloneable;
 
 import org.junit.Test;
@@ -155,7 +155,7 @@ public void testPublicCloneable() {
     public void testSerialization() {
         CategoryLineAnnotation a1 = new CategoryLineAnnotation("Category 1", 
                 1.0, "Category 2", 2.0, Color.RED, new BasicStroke(1.0f));
-        CategoryLineAnnotation a2 = (CategoryLineAnnotation) TestUtilities.serialised(a1);
+        CategoryLineAnnotation a2 = (CategoryLineAnnotation) TestUtils.serialised(a1);
         assertEquals(a1, a2);
     }
 

diff --git a/src/test/java/org/jfree/chart/annotations/CategoryPointerAnnotationTest.java b/src/test/java/org/jfree/chart/annotations/CategoryPointerAnnotationTest.java
@@ -49,7 +49,7 @@
 import java.awt.Color;
 import java.awt.Stroke;
 
-import org.jfree.chart.TestUtilities;
+import org.jfree.chart.TestUtils;
 import org.jfree.chart.util.PublicCloneable;
 
 import org.junit.Test;
@@ -181,7 +181,7 @@ public void testSerialization() {
         CategoryPointerAnnotation a1 = new CategoryPointerAnnotation("Label",
                 "A", 20.0, Math.PI);
         CategoryPointerAnnotation a2 = (CategoryPointerAnnotation) 
-                TestUtilities.serialised(a1);
+                TestUtils.serialised(a1);
         assertEquals(a1, a2);
     }
 

diff --git a/src/test/java/org/jfree/chart/annotations/CategoryTextAnnotationTest.java b/src/test/java/org/jfree/chart/annotations/CategoryTextAnnotationTest.java
@@ -46,7 +46,7 @@
 import static org.junit.Assert.assertTrue;
 import static org.junit.Assert.assertFalse;
 
-import org.jfree.chart.TestUtilities;
+import org.jfree.chart.TestUtils;
 
 import org.jfree.chart.axis.CategoryAnchor;
 import org.jfree.chart.util.PublicCloneable;
@@ -132,7 +132,7 @@ public void testPublicCloneable() {
     public void testSerialization() {
         CategoryTextAnnotation a1 = new CategoryTextAnnotation("Test", 
                 "Category", 1.0);
-        CategoryTextAnnotation a2 = (CategoryTextAnnotation) TestUtilities.serialised(a1);
+        CategoryTextAnnotation a2 = (CategoryTextAnnotation) TestUtils.serialised(a1);
         assertEquals(a1, a2);
     }
 

diff --git a/src/test/java/org/jfree/chart/annotations/XYBoxAnnotationTest.java b/src/test/java/org/jfree/chart/annotations/XYBoxAnnotationTest.java
@@ -52,7 +52,7 @@
 import java.awt.GradientPaint;
 
 import org.jfree.chart.JFreeChart;
-import org.jfree.chart.TestUtilities;
+import org.jfree.chart.TestUtils;
 import org.jfree.chart.axis.NumberAxis;
 import org.jfree.chart.plot.XYPlot;
 import org.jfree.chart.renderer.xy.XYLineAndShapeRenderer;
@@ -161,7 +161,7 @@ public void testPublicCloneable() {
     public void testSerialization() {
         XYBoxAnnotation a1 = new XYBoxAnnotation(1.0, 2.0, 3.0, 4.0,
                 new BasicStroke(1.2f), Color.RED, Color.BLUE);
-        XYBoxAnnotation a2 = (XYBoxAnnotation) TestUtilities.serialised(a1);
+        XYBoxAnnotation a2 = (XYBoxAnnotation) TestUtils.serialised(a1);
         assertEquals(a1, a2);
     }
 

diff --git a/src/test/java/org/jfree/chart/annotations/XYDrawableAnnotationTest.java b/src/test/java/org/jfree/chart/annotations/XYDrawableAnnotationTest.java
@@ -51,7 +51,7 @@
 import java.awt.geom.Rectangle2D;
 import java.io.Serializable;
 
-import org.jfree.chart.TestUtilities;
+import org.jfree.chart.TestUtils;
 import org.jfree.chart.ui.Drawable;
 import org.jfree.chart.util.PublicCloneable;
 
@@ -197,7 +197,7 @@ public void testPublicCloneable() {
     public void testSerialization() {
         XYDrawableAnnotation a1 = new XYDrawableAnnotation(10.0, 20.0, 100.0,
                 200.0, new TestDrawable());
-        XYDrawableAnnotation a2 = (XYDrawableAnnotation) TestUtilities.serialised(a1);
+        XYDrawableAnnotation a2 = (XYDrawableAnnotation) TestUtils.serialised(a1);
         assertEquals(a1, a2);
     }
 

diff --git a/src/test/java/org/jfree/chart/annotations/XYLineAnnotationTest.java b/src/test/java/org/jfree/chart/annotations/XYLineAnnotationTest.java
@@ -51,7 +51,7 @@
 import java.awt.GradientPaint;
 import java.awt.Stroke;
 
-import org.jfree.chart.TestUtilities;
+import org.jfree.chart.TestUtils;
 import org.jfree.chart.util.PublicCloneable;
 
 import org.junit.Test;
@@ -159,7 +159,7 @@ public void testSerialization() {
         Stroke stroke = new BasicStroke(2.0f);
         XYLineAnnotation a1 = new XYLineAnnotation(10.0, 20.0, 100.0, 200.0,
                 stroke, Color.BLUE);
-        XYLineAnnotation a2 = (XYLineAnnotation) TestUtilities.serialised(a1);
+        XYLineAnnotation a2 = (XYLineAnnotation) TestUtils.serialised(a1);
         assertEquals(a1, a2);
     }
 

diff --git a/src/test/java/org/jfree/chart/annotations/XYPointerAnnotationTest.java b/src/test/java/org/jfree/chart/annotations/XYPointerAnnotationTest.java
@@ -52,7 +52,7 @@
 import java.awt.Color;
 import java.awt.Stroke;
 
-import org.jfree.chart.TestUtilities;
+import org.jfree.chart.TestUtils;
 import org.jfree.chart.util.PublicCloneable;
 
 import org.junit.Test;
@@ -183,7 +183,7 @@ public void testPublicCloneable() {
     public void testSerialization() {
         XYPointerAnnotation a1 = new XYPointerAnnotation("Label", 10.0, 20.0,
                 Math.PI);
-        XYPointerAnnotation a2 = (XYPointerAnnotation) TestUtilities.serialised(a1);
+        XYPointerAnnotation a2 = (XYPointerAnnotation) TestUtils.serialised(a1);
         assertEquals(a1, a2);
     }
 

diff --git a/src/test/java/org/jfree/chart/annotations/XYPolygonAnnotationTest.java b/src/test/java/org/jfree/chart/annotations/XYPolygonAnnotationTest.java
@@ -50,7 +50,7 @@
 import java.awt.GradientPaint;
 import java.awt.Stroke;
 
-import org.jfree.chart.TestUtilities;
+import org.jfree.chart.TestUtils;
 import org.jfree.chart.util.PublicCloneable;
 import org.junit.Test;
 
@@ -159,7 +159,7 @@ public void testSerialization() {
         Stroke stroke1 = new BasicStroke(2.0f);
         XYPolygonAnnotation a1 = new XYPolygonAnnotation(new double[] {1.0,
                 2.0, 3.0, 4.0, 5.0, 6.0}, stroke1, Color.RED, Color.BLUE);
-        XYPolygonAnnotation a2 = (XYPolygonAnnotation) TestUtilities.serialised(a1);
+        XYPolygonAnnotation a2 = (XYPolygonAnnotation) TestUtils.serialised(a1);
         assertEquals(a1, a2);
     }
 

diff --git a/src/test/java/org/jfree/chart/annotations/XYShapeAnnotationTest.java b/src/test/java/org/jfree/chart/annotations/XYShapeAnnotationTest.java
@@ -51,7 +51,7 @@
 import java.awt.GradientPaint;
 import java.awt.geom.Rectangle2D;
 
-import org.jfree.chart.TestUtilities;
+import org.jfree.chart.TestUtils;
 import org.jfree.chart.util.PublicCloneable;
 
 import org.junit.Test;
@@ -176,7 +176,7 @@ public void testSerialization() {
         XYShapeAnnotation a1 = new XYShapeAnnotation(
                 new Rectangle2D.Double(1.0, 2.0, 3.0, 4.0),
                 new BasicStroke(1.2f), Color.RED, Color.BLUE);
-        XYShapeAnnotation a2 = (XYShapeAnnotation) TestUtilities.serialised(a1);
+        XYShapeAnnotation a2 = (XYShapeAnnotation) TestUtils.serialised(a1);
         assertEquals(a1, a2);
     }
 

diff --git a/src/test/java/org/jfree/chart/annotations/XYTextAnnotationTest.java b/src/test/java/org/jfree/chart/annotations/XYTextAnnotationTest.java
@@ -53,7 +53,7 @@
 import java.awt.Font;
 import java.awt.GradientPaint;
 
-import org.jfree.chart.TestUtilities;
+import org.jfree.chart.TestUtils;
 import org.jfree.chart.ui.TextAnchor;
 import org.jfree.chart.util.PublicCloneable;
 
@@ -189,7 +189,7 @@ public void testSerialization() {
         XYTextAnnotation a1 = new XYTextAnnotation("Text", 10.0, 20.0);
         a1.setOutlinePaint(new GradientPaint(1.0f, 2.0f, Color.RED, 3.0f, 4.0f,
                 Color.BLUE));
-        XYTextAnnotation a2 = (XYTextAnnotation) TestUtilities.serialised(a1);
+        XYTextAnnotation a2 = (XYTextAnnotation) TestUtils.serialised(a1);
         assertEquals(a1, a2);
     }
 

diff --git a/src/test/java/org/jfree/chart/annotations/XYTitleAnnotationTest.java b/src/test/java/org/jfree/chart/annotations/XYTitleAnnotationTest.java
@@ -47,7 +47,7 @@
 import static org.junit.Assert.fail;
 
 import org.jfree.chart.JFreeChart;
-import org.jfree.chart.TestUtilities;
+import org.jfree.chart.TestUtils;
 import org.jfree.chart.axis.NumberAxis;
 import org.jfree.chart.plot.XYPlot;
 import org.jfree.chart.renderer.xy.XYLineAndShapeRenderer;
@@ -122,7 +122,7 @@ public void testCloning() throws CloneNotSupportedException {
     public void testSerialization() {
         TextTitle t = new TextTitle("Title");
         XYTitleAnnotation a1 = new XYTitleAnnotation(1.0, 2.0, t);
-        XYTitleAnnotation a2 = (XYTitleAnnotation) TestUtilities.serialised(a1);
+        XYTitleAnnotation a2 = (XYTitleAnnotation) TestUtils.serialised(a1);
         assertEquals(a1, a2);
     }
 

diff --git a/src/test/java/org/jfree/chart/axis/AxisLocationTest.java b/src/test/java/org/jfree/chart/axis/AxisLocationTest.java
@@ -44,7 +44,7 @@
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertTrue;
 
-import org.jfree.chart.TestUtilities;
+import org.jfree.chart.TestUtils;
 import org.junit.Test;
 
 /**
@@ -83,7 +83,7 @@ public void testHashCode() {
     @Test
     public void testSerialization() {
         AxisLocation location1 = AxisLocation.BOTTOM_OR_RIGHT;
-        AxisLocation location2 = (AxisLocation) TestUtilities.serialised(location1);
+        AxisLocation location2 = (AxisLocation) TestUtils.serialised(location1);
         assertEquals(location1, location2);
         boolean same = location1 == location2;
         assertEquals(true, same);

diff --git a/src/test/java/org/jfree/chart/axis/AxisTest.java b/src/test/java/org/jfree/chart/axis/AxisTest.java
@@ -55,7 +55,7 @@
 import java.awt.GradientPaint;
 import java.awt.font.TextAttribute;
 import java.text.AttributedString;
-import org.jfree.chart.TestUtilities;
+import org.jfree.chart.TestUtils;
 import org.jfree.chart.ui.RectangleInsets;
 
 import org.junit.Test;
@@ -272,7 +272,7 @@ public void testSerialization() {
         label.addAttribute(TextAttribute.SUPERSCRIPT, 
                 TextAttribute.SUPERSCRIPT_SUB, 1, 4);
         a1.setAttributedLabel(label);
-        Axis a2 = (Axis) TestUtilities.serialised(a1);
+        Axis a2 = (Axis) TestUtils.serialised(a1);
         assertEquals(a1, a2);
     }
 

diff --git a/src/test/java/org/jfree/chart/axis/CategoryAnchorTest.java b/src/test/java/org/jfree/chart/axis/CategoryAnchorTest.java
@@ -45,7 +45,7 @@
 import static org.junit.Assert.assertFalse;
 import static org.junit.Assert.assertTrue;
 
-import org.jfree.chart.TestUtilities;
+import org.jfree.chart.TestUtils;
 import org.junit.Test;
 
 /**
@@ -84,7 +84,7 @@ public void testHashCode() {
     @Test
     public void testSerialization() {
         CategoryAnchor a1 = CategoryAnchor.MIDDLE;
-        CategoryAnchor a2 = (CategoryAnchor) TestUtilities.serialised(a1);
+        CategoryAnchor a2 = (CategoryAnchor) TestUtils.serialised(a1);
         assertEquals(a1, a2);
         assertTrue(a1 == a2);
     }