[Jfreechart-commit] jfreechart/tests/org/jfree/chart/renderer/xy/junit XYLineAndShapeRendererTests.java, 1.1.2.1, 1.1.2.2

[David G. <mu...@us...>]

Update of /cvsroot/jfreechart/jfreechart/tests/org/jfree/chart/renderer/xy/junit
In directory sc8-pr-cvs6.sourceforge.net:/tmp/cvs-serv816/tests/org/jfree/chart/renderer/xy/junit

Modified Files:
      Tag: STABLE_1-0-0
	XYLineAndShapeRendererTests.java 
Log Message:
2007-02-21  David Gilbert  <dav...@ob...>

	* source/org/jfree/chart/renderer/xy/XYLineAndShapeRenderer.java
	(clone): Reimplemented,
	(equals): Added checks for useFillPaint and drawSeriesLineAsPath,
	* tests/org/jfree/chart/renderer/xy/junit/XYLineAndShapeRendererTests.java
	(testEquals): Check additional fields,
	(testCloning): Check for independence.



Index: XYLineAndShapeRendererTests.java
===================================================================
RCS file: /cvsroot/jfreechart/jfreechart/tests/org/jfree/chart/renderer/xy/junit/Attic/XYLineAndShapeRendererTests.java,v
retrieving revision 1.1.2.1
retrieving revision 1.1.2.2
diff -C2 -d -r1.1.2.1 -r1.1.2.2
*** XYLineAndShapeRendererTests.java	3 Oct 2006 15:41:46 -0000	1.1.2.1
--- XYLineAndShapeRendererTests.java	21 Feb 2007 11:49:46 -0000	1.1.2.2
***************
*** 3,7 ****
   * ===========================================================
   *
!  * (C) Copyright 2000-2005, by Object Refinery Limited and Contributors.
   *
   * Project Info:  http://www.jfree.org/jfreechart/index.html
--- 3,7 ----
   * ===========================================================
   *
!  * (C) Copyright 2000-2007, by Object Refinery Limited and Contributors.
   *
   * Project Info:  http://www.jfree.org/jfreechart/index.html
***************
*** 28,32 ****
   * XYLineAndShapeRendererTests.java
   * --------------------------------
!  * (C) Copyright 2004, 2005, by Object Refinery Limited and Contributors.
   *
   * Original Author:  David Gilbert (for Object Refinery Limited);
--- 28,32 ----
   * XYLineAndShapeRendererTests.java
   * --------------------------------
!  * (C) Copyright 2004, 2005, 2007, by Object Refinery Limited and Contributors.
   *
   * Original Author:  David Gilbert (for Object Refinery Limited);
***************
*** 39,42 ****
--- 39,43 ----
   * 27-Jan-2004 : Version 1 (DG);
   * 07-Jan-2005 : Added check for findRangeBounds() method (DG);
+  * 21-Feb-2007 : Check independence in testCloning() (DG);
   * 
   */
***************
*** 45,48 ****
--- 46,50 ----
  
  import java.awt.geom.Line2D;
+ import java.awt.geom.Rectangle2D;
  import java.io.ByteArrayInputStream;
  import java.io.ByteArrayOutputStream;
***************
*** 158,161 ****
--- 160,173 ----
          r2.setUseOutlinePaint(true);
          assertTrue(r1.equals(r2));
+         
+         r1.setUseFillPaint(true);
+         assertFalse(r1.equals(r2));
+         r2.setUseFillPaint(true);
+         assertTrue(r1.equals(r2));
+         
+         r1.setDrawSeriesLineAsPath(true);
+         assertFalse(r1.equals(r2));
+         r2.setDrawSeriesLineAsPath(true);
+         assertTrue(r1.equals(r2));
      }
  
***************
*** 176,180 ****
--- 188,194 ----
       */
      public void testCloning() {
+         Rectangle2D legendShape = new Rectangle2D.Double(1.0, 2.0, 3.0, 4.0);
          XYLineAndShapeRenderer r1 = new XYLineAndShapeRenderer();
+         r1.setLegendLine(legendShape);
          XYLineAndShapeRenderer r2 = null;
          try {
***************
*** 182,190 ****
          }
          catch (CloneNotSupportedException e) {
!             System.err.println("Failed to clone.");
          }
          assertTrue(r1 != r2);
          assertTrue(r1.getClass() == r2.getClass());
          assertTrue(r1.equals(r2));
      }
  
--- 196,224 ----
          }
          catch (CloneNotSupportedException e) {
!             e.printStackTrace();
          }
          assertTrue(r1 != r2);
          assertTrue(r1.getClass() == r2.getClass());
          assertTrue(r1.equals(r2));
+         
+         r1.setSeriesLinesVisible(0, false);
+         assertFalse(r1.equals(r2));
+         r2.setSeriesLinesVisible(0, false);
+         assertTrue(r1.equals(r2));
+         
+         legendShape.setRect(4.0, 3.0, 2.0, 1.0);
+         assertFalse(r1.equals(r2));
+         r2.setLegendLine(new Rectangle2D.Double(4.0, 3.0, 2.0, 1.0));
+         assertTrue(r1.equals(r2));
+         
+         r1.setSeriesShapesVisible(1, true);
+         assertFalse(r1.equals(r2));
+         r2.setSeriesShapesVisible(1, true);
+         assertTrue(r1.equals(r2));
+         
+         r1.setSeriesShapesFilled(1, true);
+         assertFalse(r1.equals(r2));
+         r2.setSeriesShapesFilled(1, true);
+         assertTrue(r1.equals(r2));
      }
  
***************
*** 196,200 ****
          XYLineAndShapeRenderer r1 = new XYLineAndShapeRenderer();
          XYLineAndShapeRenderer r2 = null;
- 
          try {
              ByteArrayOutputStream buffer = new ByteArrayOutputStream();
--- 230,233 ----
***************
*** 204,214 ****
  
              ObjectInput in = new ObjectInputStream(
!                 new ByteArrayInputStream(buffer.toByteArray())
!             );
              r2 = (XYLineAndShapeRenderer) in.readObject();
              in.close();
          }
          catch (Exception e) {
!             System.out.println(e.toString());
          }
          assertEquals(r1, r2);
--- 237,246 ----
  
              ObjectInput in = new ObjectInputStream(
!                     new ByteArrayInputStream(buffer.toByteArray()));
              r2 = (XYLineAndShapeRenderer) in.readObject();
              in.close();
          }
          catch (Exception e) {
!             e.printStackTrace();
          }
          assertEquals(r1, r2);
***************
*** 221,229 ****
      public void testFindDomainBounds() {
          XYSeriesCollection dataset 
!             = RendererXYPackageTests.createTestXYSeriesCollection();
          JFreeChart chart = ChartFactory.createXYLineChart(
!             "Test Chart", "X", "Y", dataset, PlotOrientation.VERTICAL, 
!             false, false, false
!         );
          XYPlot plot = (XYPlot) chart.getPlot();
          NumberAxis domainAxis = (NumberAxis) plot.getDomainAxis();
--- 253,260 ----
      public void testFindDomainBounds() {
          XYSeriesCollection dataset 
!                 = RendererXYPackageTests.createTestXYSeriesCollection();
          JFreeChart chart = ChartFactory.createXYLineChart(
!                 "Test Chart", "X", "Y", dataset, PlotOrientation.VERTICAL, 
!                 false, false, false);
          XYPlot plot = (XYPlot) chart.getPlot();
          NumberAxis domainAxis = (NumberAxis) plot.getDomainAxis();
***************
*** 241,249 ****
      public void testFindRangeBounds() {
          TableXYDataset dataset 
!             = RendererXYPackageTests.createTestTableXYDataset();
          JFreeChart chart = ChartFactory.createXYLineChart(
!             "Test Chart", "X", "Y", dataset, PlotOrientation.VERTICAL, 
!             false, false, false
!         );
          XYPlot plot = (XYPlot) chart.getPlot();
          NumberAxis rangeAxis = (NumberAxis) plot.getRangeAxis();
--- 272,279 ----
      public void testFindRangeBounds() {
          TableXYDataset dataset 
!                 = RendererXYPackageTests.createTestTableXYDataset();
          JFreeChart chart = ChartFactory.createXYLineChart(
!                 "Test Chart", "X", "Y", dataset, PlotOrientation.VERTICAL, 
!                 false, false, false);
          XYPlot plot = (XYPlot) chart.getPlot();
          NumberAxis rangeAxis = (NumberAxis) plot.getRangeAxis();