Menu
▾
▴
[Jfreechart-commit] SF.net SVN: jfreechart:[2818] branches/jfreechart-1.0.x-branch/tests/org/ jfree/chart/renderer
|
From: <mu...@us...> - 2013-08-02 09:14:14
|
Revision: 2818
http://sourceforge.net/p/jfreechart/code/2818
Author: mungady
Date: 2013-08-02 09:14:09 +0000 (Fri, 02 Aug 2013)
Log Message:
-----------
Remove printStackTrace().
Modified Paths:
--------------
branches/jfreechart-1.0.x-branch/tests/org/jfree/chart/renderer/category/junit/AbstractCategoryItemRendererTests.java
branches/jfreechart-1.0.x-branch/tests/org/jfree/chart/renderer/category/junit/AreaRendererTests.java
branches/jfreechart-1.0.x-branch/tests/org/jfree/chart/renderer/category/junit/BarRenderer3DTests.java
branches/jfreechart-1.0.x-branch/tests/org/jfree/chart/renderer/category/junit/BarRendererTests.java
branches/jfreechart-1.0.x-branch/tests/org/jfree/chart/renderer/category/junit/BoxAndWhiskerRendererTests.java
branches/jfreechart-1.0.x-branch/tests/org/jfree/chart/renderer/category/junit/CategoryStepRendererTests.java
branches/jfreechart-1.0.x-branch/tests/org/jfree/chart/renderer/category/junit/GanttRendererTests.java
branches/jfreechart-1.0.x-branch/tests/org/jfree/chart/renderer/category/junit/GradientBarPainterTests.java
branches/jfreechart-1.0.x-branch/tests/org/jfree/chart/renderer/category/junit/GroupedStackedBarRendererTests.java
branches/jfreechart-1.0.x-branch/tests/org/jfree/chart/renderer/category/junit/IntervalBarRendererTests.java
branches/jfreechart-1.0.x-branch/tests/org/jfree/chart/renderer/category/junit/LayeredBarRendererTests.java
branches/jfreechart-1.0.x-branch/tests/org/jfree/chart/renderer/category/junit/LevelRendererTests.java
branches/jfreechart-1.0.x-branch/tests/org/jfree/chart/renderer/category/junit/LineAndShapeRendererTests.java
branches/jfreechart-1.0.x-branch/tests/org/jfree/chart/renderer/category/junit/LineRenderer3DTests.java
branches/jfreechart-1.0.x-branch/tests/org/jfree/chart/renderer/category/junit/ScatterRendererTests.java
branches/jfreechart-1.0.x-branch/tests/org/jfree/chart/renderer/category/junit/StackedAreaRendererTests.java
branches/jfreechart-1.0.x-branch/tests/org/jfree/chart/renderer/category/junit/StackedBarRenderer3DTests.java
branches/jfreechart-1.0.x-branch/tests/org/jfree/chart/renderer/category/junit/StandardBarPainterTests.java
branches/jfreechart-1.0.x-branch/tests/org/jfree/chart/renderer/category/junit/StatisticalBarRendererTests.java
branches/jfreechart-1.0.x-branch/tests/org/jfree/chart/renderer/category/junit/StatisticalLineAndShapeRendererTests.java
branches/jfreechart-1.0.x-branch/tests/org/jfree/chart/renderer/junit/AbstractRendererTests.java
branches/jfreechart-1.0.x-branch/tests/org/jfree/chart/renderer/junit/DefaultPolarItemRendererTests.java
branches/jfreechart-1.0.x-branch/tests/org/jfree/chart/renderer/junit/GrayPaintScaleTests.java
branches/jfreechart-1.0.x-branch/tests/org/jfree/chart/renderer/junit/LookupPaintScaleTests.java
branches/jfreechart-1.0.x-branch/tests/org/jfree/chart/renderer/xy/junit/AbstractXYItemRendererTests.java
branches/jfreechart-1.0.x-branch/tests/org/jfree/chart/renderer/xy/junit/CandlestickRendererTests.java
branches/jfreechart-1.0.x-branch/tests/org/jfree/chart/renderer/xy/junit/ClusteredXYBarRendererTests.java
Modified: branches/jfreechart-1.0.x-branch/tests/org/jfree/chart/renderer/category/junit/AbstractCategoryItemRendererTests.java
===================================================================
--- branches/jfreechart-1.0.x-branch/tests/org/jfree/chart/renderer/category/junit/AbstractCategoryItemRendererTests.java 2013-08-02 08:32:35 UTC (rev 2817)
+++ branches/jfreechart-1.0.x-branch/tests/org/jfree/chart/renderer/category/junit/AbstractCategoryItemRendererTests.java 2013-08-02 09:14:09 UTC (rev 2818)
@@ -177,16 +177,10 @@
/**
* Confirm that cloning works.
*/
- public void testCloning1() {
+ public void testCloning1() throws CloneNotSupportedException {
AbstractCategoryItemRenderer r1 = new BarRenderer();
r1.setItemLabelGenerator(new StandardCategoryItemLabelGenerator());
- AbstractCategoryItemRenderer r2 = null;
- try {
- r2 = (BarRenderer) r1.clone();
- }
- catch (CloneNotSupportedException e) {
- e.printStackTrace();
- }
+ AbstractCategoryItemRenderer r2 = (BarRenderer) r1.clone();
assertTrue(r1 != r2);
assertTrue(r1.getClass() == r2.getClass());
assertTrue(r1.equals(r2));
@@ -194,26 +188,15 @@
r1 = new BarRenderer();
r1.setSeriesItemLabelGenerator(0,
new StandardCategoryItemLabelGenerator());
- r2 = null;
- try {
- r2 = (BarRenderer) r1.clone();
- }
- catch (CloneNotSupportedException e) {
- e.printStackTrace();
- }
+ r2 = (BarRenderer) r1.clone();
+
assertTrue(r1 != r2);
assertTrue(r1.getClass() == r2.getClass());
assertTrue(r1.equals(r2));
r1 = new BarRenderer();
r1.setBaseItemLabelGenerator(new StandardCategoryItemLabelGenerator());
- r2 = null;
- try {
- r2 = (BarRenderer) r1.clone();
- }
- catch (CloneNotSupportedException e) {
- e.printStackTrace();
- }
+ r2 = (BarRenderer) r1.clone();
assertTrue(r1 != r2);
assertTrue(r1.getClass() == r2.getClass());
assertTrue(r1.equals(r2));
@@ -222,16 +205,11 @@
/**
* Confirm that cloning works.
*/
- public void testCloning2() {
+ public void testCloning2() throws CloneNotSupportedException {
BarRenderer r1 = new BarRenderer();
- r1.setItemLabelGenerator(new IntervalCategoryItemLabelGenerator());
- BarRenderer r2 = null;
- try {
- r2 = (BarRenderer) r1.clone();
- }
- catch (CloneNotSupportedException e) {
- e.printStackTrace();
- }
+ r1.setBaseItemLabelGenerator(new IntervalCategoryItemLabelGenerator());
+ BarRenderer r2 = (BarRenderer) r1.clone();
+
assertTrue(r1 != r2);
assertTrue(r1.getClass() == r2.getClass());
assertTrue(r1.equals(r2));
@@ -239,26 +217,15 @@
r1 = new BarRenderer();
r1.setSeriesItemLabelGenerator(0,
new IntervalCategoryItemLabelGenerator());
- r2 = null;
- try {
- r2 = (BarRenderer) r1.clone();
- }
- catch (CloneNotSupportedException e) {
- e.printStackTrace();
- }
+ r2 = (BarRenderer) r1.clone();
assertTrue(r1 != r2);
assertTrue(r1.getClass() == r2.getClass());
assertTrue(r1.equals(r2));
r1 = new BarRenderer();
r1.setBaseItemLabelGenerator(new IntervalCategoryItemLabelGenerator());
- r2 = null;
- try {
- r2 = (BarRenderer) r1.clone();
- }
- catch (CloneNotSupportedException e) {
- e.printStackTrace();
- }
+ r2 = (BarRenderer) r1.clone();
+
assertTrue(r1 != r2);
assertTrue(r1.getClass() == r2.getClass());
assertTrue(r1.equals(r2));
@@ -267,18 +234,14 @@
/**
* Check that the legendItemLabelGenerator is cloned.
*/
- public void testCloning_LegendItemLabelGenerator() {
+ public void testCloning_LegendItemLabelGenerator()
+ throws CloneNotSupportedException {
StandardCategorySeriesLabelGenerator generator
= new StandardCategorySeriesLabelGenerator("Series {0}");
BarRenderer r1 = new BarRenderer();
r1.setLegendItemLabelGenerator(generator);
- BarRenderer r2 = null;
- try {
- r2 = (BarRenderer) r1.clone();
- }
- catch (CloneNotSupportedException e) {
- e.printStackTrace();
- }
+ BarRenderer r2 = (BarRenderer) r1.clone();
+
assertTrue(r1 != r2);
assertTrue(r1.getClass() == r2.getClass());
assertTrue(r1.equals(r2));
@@ -291,18 +254,14 @@
/**
* Check that the legendItemToolTipGenerator is cloned.
*/
- public void testCloning_LegendItemToolTipGenerator() {
+ public void testCloning_LegendItemToolTipGenerator()
+ throws CloneNotSupportedException {
StandardCategorySeriesLabelGenerator generator
= new StandardCategorySeriesLabelGenerator("Series {0}");
BarRenderer r1 = new BarRenderer();
r1.setLegendItemToolTipGenerator(generator);
- BarRenderer r2 = null;
- try {
- r2 = (BarRenderer) r1.clone();
- }
- catch (CloneNotSupportedException e) {
- e.printStackTrace();
- }
+ BarRenderer r2 = (BarRenderer) r1.clone();
+
assertTrue(r1 != r2);
assertTrue(r1.getClass() == r2.getClass());
assertTrue(r1.equals(r2));
@@ -315,18 +274,13 @@
/**
* Check that the legendItemURLGenerator is cloned.
*/
- public void testCloning_LegendItemURLGenerator() {
+ public void testCloning_LegendItemURLGenerator()
+ throws CloneNotSupportedException {
StandardCategorySeriesLabelGenerator generator
= new StandardCategorySeriesLabelGenerator("Series {0}");
BarRenderer r1 = new BarRenderer();
r1.setLegendItemURLGenerator(generator);
- BarRenderer r2 = null;
- try {
- r2 = (BarRenderer) r1.clone();
- }
- catch (CloneNotSupportedException e) {
- e.printStackTrace();
- }
+ BarRenderer r2 = (BarRenderer) r1.clone();
assertTrue(r1 != r2);
assertTrue(r1.getClass() == r2.getClass());
assertTrue(r1.equals(r2));
Modified: branches/jfreechart-1.0.x-branch/tests/org/jfree/chart/renderer/category/junit/AreaRendererTests.java
===================================================================
--- branches/jfreechart-1.0.x-branch/tests/org/jfree/chart/renderer/category/junit/AreaRendererTests.java 2013-08-02 08:32:35 UTC (rev 2817)
+++ branches/jfreechart-1.0.x-branch/tests/org/jfree/chart/renderer/category/junit/AreaRendererTests.java 2013-08-02 09:14:09 UTC (rev 2818)
@@ -46,6 +46,7 @@
import java.io.ByteArrayInputStream;
import java.io.ByteArrayOutputStream;
+import java.io.IOException;
import java.io.ObjectInput;
import java.io.ObjectInputStream;
import java.io.ObjectOutput;
@@ -117,15 +118,9 @@
/**
* Confirm that cloning works.
*/
- public void testCloning() {
+ public void testCloning() throws CloneNotSupportedException {
AreaRenderer r1 = new AreaRenderer();
- AreaRenderer r2 = null;
- try {
- r2 = (AreaRenderer) r1.clone();
- }
- catch (CloneNotSupportedException e) {
- e.printStackTrace();
- }
+ AreaRenderer r2 = (AreaRenderer) r1.clone();
assertTrue(r1 != r2);
assertTrue(r1.getClass() == r2.getClass());
assertTrue(r1.equals(r2));
@@ -142,23 +137,17 @@
/**
* Serialize an instance, restore it, and check for equality.
*/
- public void testSerialization() {
+ public void testSerialization() throws IOException, ClassNotFoundException {
AreaRenderer r1 = new AreaRenderer();
- AreaRenderer r2 = null;
- try {
- ByteArrayOutputStream buffer = new ByteArrayOutputStream();
- ObjectOutput out = new ObjectOutputStream(buffer);
- out.writeObject(r1);
- out.close();
-
- ObjectInput in = new ObjectInputStream(
- new ByteArrayInputStream(buffer.toByteArray()));
- r2 = (AreaRenderer) in.readObject();
- in.close();
- }
- catch (Exception e) {
- e.printStackTrace();
- }
+ AreaRenderer r2;
+ ByteArrayOutputStream buffer = new ByteArrayOutputStream();
+ ObjectOutput out = new ObjectOutputStream(buffer);
+ out.writeObject(r1);
+ out.close();
+ ObjectInput in = new ObjectInputStream(new ByteArrayInputStream(
+ buffer.toByteArray()));
+ r2 = (AreaRenderer) in.readObject();
+ in.close();
assertEquals(r1, r2);
}
Modified: branches/jfreechart-1.0.x-branch/tests/org/jfree/chart/renderer/category/junit/BarRenderer3DTests.java
===================================================================
--- branches/jfreechart-1.0.x-branch/tests/org/jfree/chart/renderer/category/junit/BarRenderer3DTests.java 2013-08-02 08:32:35 UTC (rev 2817)
+++ branches/jfreechart-1.0.x-branch/tests/org/jfree/chart/renderer/category/junit/BarRenderer3DTests.java 2013-08-02 09:14:09 UTC (rev 2818)
@@ -47,6 +47,7 @@
import java.awt.GradientPaint;
import java.io.ByteArrayInputStream;
import java.io.ByteArrayOutputStream;
+import java.io.IOException;
import java.io.ObjectInput;
import java.io.ObjectInputStream;
import java.io.ObjectOutput;
@@ -123,15 +124,9 @@
/**
* Confirm that cloning works.
*/
- public void testCloning() {
+ public void testCloning() throws CloneNotSupportedException {
BarRenderer3D r1 = new BarRenderer3D();
- BarRenderer3D r2 = null;
- try {
- r2 = (BarRenderer3D) r1.clone();
- }
- catch (CloneNotSupportedException e) {
- e.printStackTrace();
- }
+ BarRenderer3D r2 = (BarRenderer3D) r1.clone();
assertTrue(r1 != r2);
assertTrue(r1.getClass() == r2.getClass());
assertTrue(r1.equals(r2));
@@ -148,25 +143,19 @@
/**
* Serialize an instance, restore it, and check for equality.
*/
- public void testSerialization() {
+ public void testSerialization() throws IOException, ClassNotFoundException {
BarRenderer3D r1 = new BarRenderer3D();
r1.setWallPaint(new GradientPaint(1.0f, 2.0f, Color.red, 4.0f, 3.0f,
Color.blue));
- BarRenderer3D r2 = null;
- try {
- ByteArrayOutputStream buffer = new ByteArrayOutputStream();
- ObjectOutput out = new ObjectOutputStream(buffer);
- out.writeObject(r1);
- out.close();
-
- ObjectInput in = new ObjectInputStream(
- new ByteArrayInputStream(buffer.toByteArray()));
- r2 = (BarRenderer3D) in.readObject();
- in.close();
- }
- catch (Exception e) {
- e.printStackTrace();
- }
+ BarRenderer3D r2;
+ ByteArrayOutputStream buffer = new ByteArrayOutputStream();
+ ObjectOutput out = new ObjectOutputStream(buffer);
+ out.writeObject(r1);
+ out.close();
+ ObjectInput in = new ObjectInputStream(new ByteArrayInputStream(
+ buffer.toByteArray()));
+ r2 = (BarRenderer3D) in.readObject();
+ in.close();
assertEquals(r1, r2);
}
Modified: branches/jfreechart-1.0.x-branch/tests/org/jfree/chart/renderer/category/junit/BarRendererTests.java
===================================================================
--- branches/jfreechart-1.0.x-branch/tests/org/jfree/chart/renderer/category/junit/BarRendererTests.java 2013-08-02 08:32:35 UTC (rev 2817)
+++ branches/jfreechart-1.0.x-branch/tests/org/jfree/chart/renderer/category/junit/BarRendererTests.java 2013-08-02 09:14:09 UTC (rev 2818)
@@ -51,6 +51,7 @@
import java.awt.Color;
import java.io.ByteArrayInputStream;
import java.io.ByteArrayOutputStream;
+import java.io.IOException;
import java.io.ObjectInput;
import java.io.ObjectInputStream;
import java.io.ObjectOutput;
@@ -210,17 +211,11 @@
/**
* Confirm that cloning works.
*/
- public void testCloning() {
+ public void testCloning() throws CloneNotSupportedException {
BarRenderer r1 = new BarRenderer();
r1.setBaseItemLabelGenerator(new StandardCategoryItemLabelGenerator());
r1.setBarPainter(new GradientBarPainter(0.11, 0.22, 0.33));
- BarRenderer r2 = null;
- try {
- r2 = (BarRenderer) r1.clone();
- }
- catch (CloneNotSupportedException e) {
- e.printStackTrace();
- }
+ BarRenderer r2 = (BarRenderer) r1.clone();
assertTrue(r1 != r2);
assertTrue(r1.getClass() == r2.getClass());
assertTrue(r1.equals(r2));
@@ -237,27 +232,19 @@
/**
* Serialize an instance, restore it, and check for equality.
*/
- public void testSerialization() {
-
+ public void testSerialization() throws IOException, ClassNotFoundException {
BarRenderer r1 = new BarRenderer();
- BarRenderer r2 = null;
+ BarRenderer r2;
+ ByteArrayOutputStream buffer = new ByteArrayOutputStream();
+ ObjectOutput out = new ObjectOutputStream(buffer);
+ out.writeObject(r1);
+ out.close();
- try {
- ByteArrayOutputStream buffer = new ByteArrayOutputStream();
- ObjectOutput out = new ObjectOutputStream(buffer);
- out.writeObject(r1);
- out.close();
-
- ObjectInput in = new ObjectInputStream(new ByteArrayInputStream(
- buffer.toByteArray()));
- r2 = (BarRenderer) in.readObject();
- in.close();
- }
- catch (Exception e) {
- e.printStackTrace();
- }
+ ObjectInput in = new ObjectInputStream(new ByteArrayInputStream(
+ buffer.toByteArray()));
+ r2 = (BarRenderer) in.readObject();
+ in.close();
assertEquals(r1, r2);
-
}
/**
Modified: branches/jfreechart-1.0.x-branch/tests/org/jfree/chart/renderer/category/junit/BoxAndWhiskerRendererTests.java
===================================================================
--- branches/jfreechart-1.0.x-branch/tests/org/jfree/chart/renderer/category/junit/BoxAndWhiskerRendererTests.java 2013-08-02 08:32:35 UTC (rev 2817)
+++ branches/jfreechart-1.0.x-branch/tests/org/jfree/chart/renderer/category/junit/BoxAndWhiskerRendererTests.java 2013-08-02 09:14:09 UTC (rev 2818)
@@ -55,6 +55,7 @@
import java.awt.image.BufferedImage;
import java.io.ByteArrayInputStream;
import java.io.ByteArrayOutputStream;
+import java.io.IOException;
import java.io.ObjectInput;
import java.io.ObjectInputStream;
import java.io.ObjectOutput;
@@ -158,15 +159,9 @@
/**
* Confirm that cloning works.
*/
- public void testCloning() {
+ public void testCloning() throws CloneNotSupportedException {
BoxAndWhiskerRenderer r1 = new BoxAndWhiskerRenderer();
- BoxAndWhiskerRenderer r2 = null;
- try {
- r2 = (BoxAndWhiskerRenderer) r1.clone();
- }
- catch (CloneNotSupportedException e) {
- e.printStackTrace();
- }
+ BoxAndWhiskerRenderer r2 = (BoxAndWhiskerRenderer) r1.clone();
assertTrue(r1 != r2);
assertTrue(r1.getClass() == r2.getClass());
assertTrue(r1.equals(r2));
@@ -183,25 +178,18 @@
/**
* Serialize an instance, restore it, and check for equality.
*/
- public void testSerialization() {
+ public void testSerialization() throws IOException, ClassNotFoundException {
BoxAndWhiskerRenderer r1 = new BoxAndWhiskerRenderer();
- BoxAndWhiskerRenderer r2 = null;
-
- try {
- ByteArrayOutputStream buffer = new ByteArrayOutputStream();
- ObjectOutput out = new ObjectOutputStream(buffer);
- out.writeObject(r1);
- out.close();
-
- ObjectInput in = new ObjectInputStream(
- new ByteArrayInputStream(buffer.toByteArray()));
- r2 = (BoxAndWhiskerRenderer) in.readObject();
- in.close();
- }
- catch (Exception e) {
- e.printStackTrace();
- }
+ BoxAndWhiskerRenderer r2;
+ ByteArrayOutputStream buffer = new ByteArrayOutputStream();
+ ObjectOutput out = new ObjectOutputStream(buffer);
+ out.writeObject(r1);
+ out.close();
+ ObjectInput in = new ObjectInputStream(new ByteArrayInputStream(
+ buffer.toByteArray()));
+ r2 = (BoxAndWhiskerRenderer) in.readObject();
+ in.close();
assertEquals(r1, r2);
}
@@ -503,7 +491,6 @@
* Draws a chart where the dataset contains a null max regular value.
*/
public void testDrawWithNullMaxRegular() {
- boolean success = false;
try {
DefaultBoxAndWhiskerCategoryDataset dataset
= new DefaultBoxAndWhiskerCategoryDataset();
@@ -518,13 +505,10 @@
JFreeChart chart = new JFreeChart(plot);
/* BufferedImage image = */ chart.createBufferedImage(300, 200,
info);
- success = true;
}
catch (Exception e) {
- e.printStackTrace();
- success = false;
+ fail("No exception should be thrown.");
}
- assertTrue(success);
}
/**
Modified: branches/jfreechart-1.0.x-branch/tests/org/jfree/chart/renderer/category/junit/CategoryStepRendererTests.java
===================================================================
--- branches/jfreechart-1.0.x-branch/tests/org/jfree/chart/renderer/category/junit/CategoryStepRendererTests.java 2013-08-02 08:32:35 UTC (rev 2817)
+++ branches/jfreechart-1.0.x-branch/tests/org/jfree/chart/renderer/category/junit/CategoryStepRendererTests.java 2013-08-02 09:14:09 UTC (rev 2818)
@@ -45,6 +45,7 @@
import java.io.ByteArrayInputStream;
import java.io.ByteArrayOutputStream;
+import java.io.IOException;
import java.io.ObjectInput;
import java.io.ObjectInputStream;
import java.io.ObjectOutput;
@@ -103,15 +104,9 @@
/**
* Confirm that cloning works.
*/
- public void testCloning() {
+ public void testCloning() throws CloneNotSupportedException {
CategoryStepRenderer r1 = new CategoryStepRenderer(false);
- CategoryStepRenderer r2 = null;
- try {
- r2 = (CategoryStepRenderer) r1.clone();
- }
- catch (CloneNotSupportedException e) {
- e.printStackTrace();
- }
+ CategoryStepRenderer r2 = (CategoryStepRenderer) r1.clone();
assertTrue(r1 != r2);
assertTrue(r1.getClass() == r2.getClass());
assertTrue(r1.equals(r2));
@@ -128,27 +123,18 @@
/**
* Serialize an instance, restore it, and check for equality.
*/
- public void testSerialization() {
-
+ public void testSerialization() throws IOException, ClassNotFoundException {
CategoryStepRenderer r1 = new CategoryStepRenderer();
- CategoryStepRenderer r2 = null;
-
- try {
- ByteArrayOutputStream buffer = new ByteArrayOutputStream();
- ObjectOutput out = new ObjectOutputStream(buffer);
- out.writeObject(r1);
- out.close();
-
- ObjectInput in = new ObjectInputStream(
- new ByteArrayInputStream(buffer.toByteArray()));
- r2 = (CategoryStepRenderer) in.readObject();
- in.close();
- }
- catch (Exception e) {
- e.printStackTrace();
- }
+ CategoryStepRenderer r2;
+ ByteArrayOutputStream buffer = new ByteArrayOutputStream();
+ ObjectOutput out = new ObjectOutputStream(buffer);
+ out.writeObject(r1);
+ out.close();
+ ObjectInput in = new ObjectInputStream(new ByteArrayInputStream(
+ buffer.toByteArray()));
+ r2 = (CategoryStepRenderer) in.readObject();
+ in.close();
assertEquals(r1, r2);
-
}
/**
Modified: branches/jfreechart-1.0.x-branch/tests/org/jfree/chart/renderer/category/junit/GanttRendererTests.java
===================================================================
--- branches/jfreechart-1.0.x-branch/tests/org/jfree/chart/renderer/category/junit/GanttRendererTests.java 2013-08-02 08:32:35 UTC (rev 2817)
+++ branches/jfreechart-1.0.x-branch/tests/org/jfree/chart/renderer/category/junit/GanttRendererTests.java 2013-08-02 09:14:09 UTC (rev 2818)
@@ -46,6 +46,7 @@
import java.awt.GradientPaint;
import java.io.ByteArrayInputStream;
import java.io.ByteArrayOutputStream;
+import java.io.IOException;
import java.io.ObjectInput;
import java.io.ObjectInputStream;
import java.io.ObjectOutput;
@@ -125,15 +126,9 @@
/**
* Confirm that cloning works.
*/
- public void testCloning() {
+ public void testCloning() throws CloneNotSupportedException {
GanttRenderer r1 = new GanttRenderer();
- GanttRenderer r2 = null;
- try {
- r2 = (GanttRenderer) r1.clone();
- }
- catch (CloneNotSupportedException e) {
- e.printStackTrace();
- }
+ GanttRenderer r2 = (GanttRenderer) r1.clone();
assertTrue(r1 != r2);
assertTrue(r1.getClass() == r2.getClass());
assertTrue(r1.equals(r2));
@@ -150,31 +145,24 @@
/**
* Serialize an instance, restore it, and check for equality.
*/
- public void testSerialization() {
-
+ public void testSerialization() throws IOException, ClassNotFoundException {
GanttRenderer r1 = new GanttRenderer();
r1.setCompletePaint(new GradientPaint(1.0f, 2.0f, Color.red, 3.0f,
4.0f, Color.blue));
r1.setIncompletePaint(new GradientPaint(4.0f, 3.0f, Color.red, 2.0f,
1.0f, Color.blue));
- GanttRenderer r2 = null;
+ GanttRenderer r2;
- try {
- ByteArrayOutputStream buffer = new ByteArrayOutputStream();
- ObjectOutput out = new ObjectOutputStream(buffer);
- out.writeObject(r1);
- out.close();
+ ByteArrayOutputStream buffer = new ByteArrayOutputStream();
+ ObjectOutput out = new ObjectOutputStream(buffer);
+ out.writeObject(r1);
+ out.close();
- ObjectInput in = new ObjectInputStream(
- new ByteArrayInputStream(buffer.toByteArray()));
- r2 = (GanttRenderer) in.readObject();
- in.close();
- }
- catch (Exception e) {
- e.printStackTrace();
- }
+ ObjectInput in = new ObjectInputStream(new ByteArrayInputStream(
+ buffer.toByteArray()));
+ r2 = (GanttRenderer) in.readObject();
+ in.close();
assertEquals(r1, r2);
-
}
}
Modified: branches/jfreechart-1.0.x-branch/tests/org/jfree/chart/renderer/category/junit/GradientBarPainterTests.java
===================================================================
--- branches/jfreechart-1.0.x-branch/tests/org/jfree/chart/renderer/category/junit/GradientBarPainterTests.java 2013-08-02 08:32:35 UTC (rev 2817)
+++ branches/jfreechart-1.0.x-branch/tests/org/jfree/chart/renderer/category/junit/GradientBarPainterTests.java 2013-08-02 09:14:09 UTC (rev 2818)
@@ -42,6 +42,7 @@
import java.io.ByteArrayInputStream;
import java.io.ByteArrayOutputStream;
+import java.io.IOException;
import java.io.ObjectInput;
import java.io.ObjectInputStream;
import java.io.ObjectOutput;
@@ -126,22 +127,17 @@
/**
* Serialize an instance, restore it, and check for equality.
*/
- public void testSerialization() {
+ public void testSerialization() throws IOException, ClassNotFoundException {
GradientBarPainter p1 = new GradientBarPainter(0.1, 0.2, 0.3);
- GradientBarPainter p2 = null;
- try {
- ByteArrayOutputStream buffer = new ByteArrayOutputStream();
- ObjectOutput out = new ObjectOutputStream(buffer);
- out.writeObject(p1);
- out.close();
- ObjectInput in = new ObjectInputStream(
- new ByteArrayInputStream(buffer.toByteArray()));
- p2 = (GradientBarPainter) in.readObject();
- in.close();
- }
- catch (Exception e) {
- e.printStackTrace();
- }
+ GradientBarPainter p2;
+ ByteArrayOutputStream buffer = new ByteArrayOutputStream();
+ ObjectOutput out = new ObjectOutputStream(buffer);
+ out.writeObject(p1);
+ out.close();
+ ObjectInput in = new ObjectInputStream(new ByteArrayInputStream(
+ buffer.toByteArray()));
+ p2 = (GradientBarPainter) in.readObject();
+ in.close();
assertEquals(p1, p2);
}
Modified: branches/jfreechart-1.0.x-branch/tests/org/jfree/chart/renderer/category/junit/GroupedStackedBarRendererTests.java
===================================================================
--- branches/jfreechart-1.0.x-branch/tests/org/jfree/chart/renderer/category/junit/GroupedStackedBarRendererTests.java 2013-08-02 08:32:35 UTC (rev 2817)
+++ branches/jfreechart-1.0.x-branch/tests/org/jfree/chart/renderer/category/junit/GroupedStackedBarRendererTests.java 2013-08-02 09:14:09 UTC (rev 2818)
@@ -43,6 +43,7 @@
import java.io.ByteArrayInputStream;
import java.io.ByteArrayOutputStream;
+import java.io.IOException;
import java.io.ObjectInput;
import java.io.ObjectInputStream;
import java.io.ObjectOutput;
@@ -108,15 +109,9 @@
/**
* Confirm that cloning works.
*/
- public void testCloning() {
+ public void testCloning() throws CloneNotSupportedException {
GroupedStackedBarRenderer r1 = new GroupedStackedBarRenderer();
- GroupedStackedBarRenderer r2 = null;
- try {
- r2 = (GroupedStackedBarRenderer) r1.clone();
- }
- catch (CloneNotSupportedException e) {
- e.printStackTrace();
- }
+ GroupedStackedBarRenderer r2 = (GroupedStackedBarRenderer) r1.clone();
assertTrue(r1 != r2);
assertTrue(r1.getClass() == r2.getClass());
assertTrue(r1.equals(r2));
@@ -133,26 +128,18 @@
/**
* Serialize an instance, restore it, and check for equality.
*/
- public void testSerialization() {
-
+ public void testSerialization() throws IOException, ClassNotFoundException {
GroupedStackedBarRenderer r1 = new GroupedStackedBarRenderer();
- GroupedStackedBarRenderer r2 = null;
- try {
- ByteArrayOutputStream buffer = new ByteArrayOutputStream();
- ObjectOutput out = new ObjectOutputStream(buffer);
- out.writeObject(r1);
- out.close();
-
- ObjectInput in = new ObjectInputStream(new ByteArrayInputStream(
- buffer.toByteArray()));
- r2 = (GroupedStackedBarRenderer) in.readObject();
- in.close();
- }
- catch (Exception e) {
- e.printStackTrace();
- }
+ GroupedStackedBarRenderer r2;
+ ByteArrayOutputStream buffer = new ByteArrayOutputStream();
+ ObjectOutput out = new ObjectOutputStream(buffer);
+ out.writeObject(r1);
+ out.close();
+ ObjectInput in = new ObjectInputStream(new ByteArrayInputStream(
+ buffer.toByteArray()));
+ r2 = (GroupedStackedBarRenderer) in.readObject();
+ in.close();
assertEquals(r1, r2);
-
}
/**
@@ -160,7 +147,6 @@
* no exceptions are thrown (particularly by code in the renderer).
*/
public void testDrawWithNullInfo() {
- boolean success = false;
try {
DefaultCategoryDataset dataset = new DefaultCategoryDataset();
dataset.addValue(1.0, "S1", "C1");
@@ -175,13 +161,10 @@
JFreeChart chart = new JFreeChart(plot);
/* BufferedImage image = */ chart.createBufferedImage(300, 200,
null);
- success = true;
}
catch (NullPointerException e) {
- e.printStackTrace();
- success = false;
+ fail("No exception should be thrown.");
}
- assertTrue(success);
}
/**
Modified: branches/jfreechart-1.0.x-branch/tests/org/jfree/chart/renderer/category/junit/IntervalBarRendererTests.java
===================================================================
--- branches/jfreechart-1.0.x-branch/tests/org/jfree/chart/renderer/category/junit/IntervalBarRendererTests.java 2013-08-02 08:32:35 UTC (rev 2817)
+++ branches/jfreechart-1.0.x-branch/tests/org/jfree/chart/renderer/category/junit/IntervalBarRendererTests.java 2013-08-02 09:14:09 UTC (rev 2818)
@@ -157,7 +157,6 @@
* no exceptions are thrown (particularly by code in the renderer).
*/
public void testDrawWithNullInfo() {
- boolean success = false;
try {
double[][] starts = new double[][] {{0.1, 0.2, 0.3},
{0.3, 0.4, 0.5}};
@@ -171,13 +170,10 @@
JFreeChart chart = new JFreeChart(plot);
/* BufferedImage image = */ chart.createBufferedImage(300, 200,
null);
- success = true;
}
catch (NullPointerException e) {
- e.printStackTrace();
- success = false;
+ fail("No exception should be thrown.");
}
- assertTrue(success);
}
/**
Modified: branches/jfreechart-1.0.x-branch/tests/org/jfree/chart/renderer/category/junit/LayeredBarRendererTests.java
===================================================================
--- branches/jfreechart-1.0.x-branch/tests/org/jfree/chart/renderer/category/junit/LayeredBarRendererTests.java 2013-08-02 08:32:35 UTC (rev 2817)
+++ branches/jfreechart-1.0.x-branch/tests/org/jfree/chart/renderer/category/junit/LayeredBarRendererTests.java 2013-08-02 09:14:09 UTC (rev 2818)
@@ -150,7 +150,6 @@
* no exceptions are thrown (particularly by code in the renderer).
*/
public void testDrawWithNullInfo() {
- boolean success = false;
try {
DefaultCategoryDataset dataset = new DefaultCategoryDataset();
dataset.addValue(1.0, "S1", "C1");
@@ -160,13 +159,10 @@
JFreeChart chart = new JFreeChart(plot);
/* BufferedImage image = */ chart.createBufferedImage(300, 200,
null);
- success = true;
}
catch (NullPointerException e) {
- e.printStackTrace();
- success = false;
+ fail("No exception should be thrown.");
}
- assertTrue(success);
}
}
Modified: branches/jfreechart-1.0.x-branch/tests/org/jfree/chart/renderer/category/junit/LevelRendererTests.java
===================================================================
--- branches/jfreechart-1.0.x-branch/tests/org/jfree/chart/renderer/category/junit/LevelRendererTests.java 2013-08-02 08:32:35 UTC (rev 2817)
+++ branches/jfreechart-1.0.x-branch/tests/org/jfree/chart/renderer/category/junit/LevelRendererTests.java 2013-08-02 09:14:09 UTC (rev 2818)
@@ -189,7 +189,6 @@
* no exceptions are thrown (particularly by code in the renderer).
*/
public void testDrawWithNullInfo() {
- boolean success = false;
try {
DefaultCategoryDataset dataset = new DefaultCategoryDataset();
dataset.addValue(1.0, "S1", "C1");
@@ -199,13 +198,10 @@
JFreeChart chart = new JFreeChart(plot);
/* BufferedImage image = */ chart.createBufferedImage(300, 200,
null);
- success = true;
}
catch (NullPointerException e) {
- e.printStackTrace();
- success = false;
+ fail("No exception should be thrown.");
}
- assertTrue(success);
}
/**
Modified: branches/jfreechart-1.0.x-branch/tests/org/jfree/chart/renderer/category/junit/LineAndShapeRendererTests.java
===================================================================
--- branches/jfreechart-1.0.x-branch/tests/org/jfree/chart/renderer/category/junit/LineAndShapeRendererTests.java 2013-08-02 08:32:35 UTC (rev 2817)
+++ branches/jfreechart-1.0.x-branch/tests/org/jfree/chart/renderer/category/junit/LineAndShapeRendererTests.java 2013-08-02 09:14:09 UTC (rev 2818)
@@ -46,6 +46,7 @@
import java.io.ByteArrayInputStream;
import java.io.ByteArrayOutputStream;
+import java.io.IOException;
import java.io.ObjectInput;
import java.io.ObjectInputStream;
import java.io.ObjectOutput;
@@ -174,21 +175,13 @@
/**
* Confirm that cloning works.
*/
- public void testCloning() {
+ public void testCloning() throws CloneNotSupportedException {
LineAndShapeRenderer r1 = new LineAndShapeRenderer();
- LineAndShapeRenderer r2 = null;
- try {
- r2 = (LineAndShapeRenderer) r1.clone();
- }
- catch (CloneNotSupportedException e) {
- e.printStackTrace();
- }
+ LineAndShapeRenderer r2 = (LineAndShapeRenderer) r1.clone();
assertTrue(r1 != r2);
assertTrue(r1.getClass() == r2.getClass());
assertTrue(r1.equals(r2));
-
assertTrue(checkIndependence(r1, r2));
-
}
/**
@@ -312,27 +305,19 @@
/**
* Serialize an instance, restore it, and check for equality.
*/
- public void testSerialization() {
-
+ public void testSerialization() throws IOException, ClassNotFoundException {
LineAndShapeRenderer r1 = new LineAndShapeRenderer();
- LineAndShapeRenderer r2 = null;
+ LineAndShapeRenderer r2;
+ ByteArrayOutputStream buffer = new ByteArrayOutputStream();
+ ObjectOutput out = new ObjectOutputStream(buffer);
+ out.writeObject(r1);
+ out.close();
- try {
- ByteArrayOutputStream buffer = new ByteArrayOutputStream();
- ObjectOutput out = new ObjectOutputStream(buffer);
- out.writeObject(r1);
- out.close();
-
- ObjectInput in = new ObjectInputStream(
- new ByteArrayInputStream(buffer.toByteArray()));
- r2 = (LineAndShapeRenderer) in.readObject();
- in.close();
- }
- catch (Exception e) {
- e.printStackTrace();
- }
+ ObjectInput in = new ObjectInputStream(new ByteArrayInputStream(
+ buffer.toByteArray()));
+ r2 = (LineAndShapeRenderer) in.readObject();
+ in.close();
assertEquals(r1, r2);
-
}
/**
Modified: branches/jfreechart-1.0.x-branch/tests/org/jfree/chart/renderer/category/junit/LineRenderer3DTests.java
===================================================================
--- branches/jfreechart-1.0.x-branch/tests/org/jfree/chart/renderer/category/junit/LineRenderer3DTests.java 2013-08-02 08:32:35 UTC (rev 2817)
+++ branches/jfreechart-1.0.x-branch/tests/org/jfree/chart/renderer/category/junit/LineRenderer3DTests.java 2013-08-02 09:14:09 UTC (rev 2818)
@@ -45,6 +45,7 @@
import java.awt.GradientPaint;
import java.io.ByteArrayInputStream;
import java.io.ByteArrayOutputStream;
+import java.io.IOException;
import java.io.ObjectInput;
import java.io.ObjectInputStream;
import java.io.ObjectOutput;
@@ -121,21 +122,13 @@
/**
* Confirm that cloning works.
*/
- public void testCloning() {
+ public void testCloning() throws CloneNotSupportedException {
LineRenderer3D r1 = new LineRenderer3D();
- LineRenderer3D r2 = null;
- try {
- r2 = (LineRenderer3D) r1.clone();
- }
- catch (CloneNotSupportedException e) {
- e.printStackTrace();
- }
+ LineRenderer3D r2 = (LineRenderer3D) r1.clone();
assertTrue(r1 != r2);
assertTrue(r1.getClass() == r2.getClass());
assertTrue(r1.equals(r2));
-
assertTrue(checkIndependence(r1, r2));
-
}
/**
@@ -245,23 +238,17 @@
/**
* Serialize an instance, restore it, and check for equality.
*/
- public void testSerialization() {
+ public void testSerialization() throws IOException, ClassNotFoundException {
LineRenderer3D r1 = new LineRenderer3D();
- LineRenderer3D r2 = null;
- try {
- ByteArrayOutputStream buffer = new ByteArrayOutputStream();
- ObjectOutput out = new ObjectOutputStream(buffer);
- out.writeObject(r1);
- out.close();
-
- ObjectInput in = new ObjectInputStream(new ByteArrayInputStream(
- buffer.toByteArray()));
- r2 = (LineRenderer3D) in.readObject();
- in.close();
- }
- catch (Exception e) {
- e.printStackTrace();
- }
+ LineRenderer3D r2;
+ ByteArrayOutputStream buffer = new ByteArrayOutputStream();
+ ObjectOutput out = new ObjectOutputStream(buffer);
+ out.writeObject(r1);
+ out.close();
+ ObjectInput in = new ObjectInputStream(new ByteArrayInputStream(
+ buffer.toByteArray()));
+ r2 = (LineRenderer3D) in.readObject();
+ in.close();
assertEquals(r1, r2);
}
Modified: branches/jfreechart-1.0.x-branch/tests/org/jfree/chart/renderer/category/junit/ScatterRendererTests.java
===================================================================
--- branches/jfreechart-1.0.x-branch/tests/org/jfree/chart/renderer/category/junit/ScatterRendererTests.java 2013-08-02 08:32:35 UTC (rev 2817)
+++ branches/jfreechart-1.0.x-branch/tests/org/jfree/chart/renderer/category/junit/ScatterRendererTests.java 2013-08-02 09:14:09 UTC (rev 2818)
@@ -45,6 +45,7 @@
import java.io.ByteArrayInputStream;
import java.io.ByteArrayOutputStream;
+import java.io.IOException;
import java.io.ObjectInput;
import java.io.ObjectInputStream;
import java.io.ObjectOutput;
@@ -140,15 +141,9 @@
/**
* Confirm that cloning works.
*/
- public void testCloning() {
+ public void testCloning() throws CloneNotSupportedException {
ScatterRenderer r1 = new ScatterRenderer();
- ScatterRenderer r2 = null;
- try {
- r2 = (ScatterRenderer) r1.clone();
- }
- catch (CloneNotSupportedException e) {
- e.printStackTrace();
- }
+ ScatterRenderer r2 = (ScatterRenderer) r1.clone();
assertTrue(r1 != r2);
assertTrue(r1.getClass() == r2.getClass());
assertTrue(r1.equals(r2));
@@ -206,23 +201,17 @@
/**
* Serialize an instance, restore it, and check for equality.
*/
- public void testSerialization() {
+ public void testSerialization() throws IOException, ClassNotFoundException {
ScatterRenderer r1 = new ScatterRenderer();
- ScatterRenderer r2 = null;
- try {
- ByteArrayOutputStream buffer = new ByteArrayOutputStream();
- ObjectOutput out = new ObjectOutputStream(buffer);
- out.writeObject(r1);
- out.close();
-
- ObjectInput in = new ObjectInputStream(
- new ByteArrayInputStream(buffer.toByteArray()));
- r2 = (ScatterRenderer) in.readObject();
- in.close();
- }
- catch (Exception e) {
- e.printStackTrace();
- }
+ ScatterRenderer r2;
+ ByteArrayOutputStream buffer = new ByteArrayOutputStream();
+ ObjectOutput out = new ObjectOutputStream(buffer);
+ out.writeObject(r1);
+ out.close();
+ ObjectInput in = new ObjectInputStream(new ByteArrayInputStream(
+ buffer.toByteArray()));
+ r2 = (ScatterRenderer) in.readObject();
+ in.close();
assertEquals(r1, r2);
}
Modified: branches/jfreechart-1.0.x-branch/tests/org/jfree/chart/renderer/category/junit/StackedAreaRendererTests.java
===================================================================
--- branches/jfreechart-1.0.x-branch/tests/org/jfree/chart/renderer/category/junit/StackedAreaRendererTests.java 2013-08-02 08:32:35 UTC (rev 2817)
+++ branches/jfreechart-1.0.x-branch/tests/org/jfree/chart/renderer/category/junit/StackedAreaRendererTests.java 2013-08-02 09:14:09 UTC (rev 2818)
@@ -44,6 +44,7 @@
import java.io.ByteArrayInputStream;
import java.io.ByteArrayOutputStream;
+import java.io.IOException;
import java.io.ObjectInput;
import java.io.ObjectInputStream;
import java.io.ObjectOutput;
@@ -137,19 +138,12 @@
/**
* Confirm that cloning works.
*/
- public void testCloning() {
+ public void testCloning() throws CloneNotSupportedException {
StackedAreaRenderer r1 = new StackedAreaRenderer();
- StackedAreaRenderer r2 = null;
- try {
- r2 = (StackedAreaRenderer) r1.clone();
- }
- catch (CloneNotSupportedException e) {
- e.printStackTrace();
- }
+ StackedAreaRenderer r2 = (StackedAreaRenderer) r1.clone();
assertTrue(r1 != r2);
assertTrue(r1.getClass() == r2.getClass());
assertTrue(r1.equals(r2));
-
}
/**
@@ -163,27 +157,18 @@
/**
* Serialize an instance, restore it, and check for equality.
*/
- public void testSerialization() {
-
+ public void testSerialization() throws IOException, ClassNotFoundException {
StackedAreaRenderer r1 = new StackedAreaRenderer();
- StackedAreaRenderer r2 = null;
-
- try {
- ByteArrayOutputStream buffer = new ByteArrayOutputStream();
- ObjectOutput out = new ObjectOutputStream(buffer);
- out.writeObject(r1);
- out.close();
-
- ObjectInput in = new ObjectInputStream(
- new ByteArrayInputStream(buffer.toByteArray()));
- r2 = (StackedAreaRenderer) in.readObject();
- in.close();
- }
- catch (Exception e) {
- e.printStackTrace();
- }
+ StackedAreaRenderer r2;
+ ByteArrayOutputStream buffer = new ByteArrayOutputStream();
+ ObjectOutput out = new ObjectOutputStream(buffer);
+ out.writeObject(r1);
+ out.close();
+ ObjectInput in = new ObjectInputStream(new ByteArrayInputStream(
+ buffer.toByteArray()));
+ r2 = (StackedAreaRenderer) in.readObject();
+ in.close();
assertEquals(r1, r2);
-
}
}
Modified: branches/jfreechart-1.0.x-branch/tests/org/jfree/chart/renderer/category/junit/StackedBarRenderer3DTests.java
===================================================================
--- branches/jfreechart-1.0.x-branch/tests/org/jfree/chart/renderer/category/junit/StackedBarRenderer3DTests.java 2013-08-02 08:32:35 UTC (rev 2817)
+++ branches/jfreechart-1.0.x-branch/tests/org/jfree/chart/renderer/category/junit/StackedBarRenderer3DTests.java 2013-08-02 09:14:09 UTC (rev 2818)
@@ -45,6 +45,7 @@
import java.io.ByteArrayInputStream;
import java.io.ByteArrayOutputStream;
+import java.io.IOException;
import java.io.ObjectInput;
import java.io.ObjectInputStream;
import java.io.ObjectOutput;
@@ -147,15 +148,9 @@
/**
* Confirm that cloning works.
*/
- public void testCloning() {
+ public void testCloning() throws CloneNotSupportedException {
StackedBarRenderer3D r1 = new StackedBarRenderer3D();
- StackedBarRenderer3D r2 = null;
- try {
- r2 = (StackedBarRenderer3D) r1.clone();
- }
- catch (CloneNotSupportedException e) {
- e.printStackTrace();
- }
+ StackedBarRenderer3D r2 = (StackedBarRenderer3D) r1.clone();
assertTrue(r1 != r2);
assertTrue(r1.getClass() == r2.getClass());
assertTrue(r1.equals(r2));
@@ -172,25 +167,18 @@
/**
* Serialize an instance, restore it, and check for equality.
*/
- public void testSerialization() {
+ public void testSerialization() throws IOException, ClassNotFoundException {
StackedBarRenderer3D r1 = new StackedBarRenderer3D();
- StackedBarRenderer3D r2 = null;
-
- try {
- ByteArrayOutputStream buffer = new ByteArrayOutputStream();
- ObjectOutput out = new ObjectOutputStream(buffer);
- out.writeObject(r1);
- out.close();
-
- ObjectInput in = new ObjectInputStream(
- new ByteArrayInputStream(buffer.toByteArray()));
- r2 = (StackedBarRenderer3D) in.readObject();
- in.close();
- }
- catch (Exception e) {
- e.printStackTrace();
- }
+ StackedBarRenderer3D r2;
+ ByteArrayOutputStream buffer = new ByteArrayOutputStream();
+ ObjectOutput out = new ObjectOutputStream(buffer);
+ out.writeObject(r1);
+ out.close();
+ ObjectInput in = new ObjectInputStream(new ByteArrayInputStream(
+ buffer.toByteArray()));
+ r2 = (StackedBarRenderer3D) in.readObject();
+ in.close();
assertEquals(r1, r2);
}
Modified: branches/jfreechart-1.0.x-branch/tests/org/jfree/chart/renderer/category/junit/StandardBarPainterTests.java
===================================================================
--- branches/jfreechart-1.0.x-branch/tests/org/jfree/chart/renderer/category/junit/StandardBarPainterTests.java 2013-08-02 08:32:35 UTC (rev 2817)
+++ branches/jfreechart-1.0.x-branch/tests/org/jfree/chart/renderer/category/junit/StandardBarPainterTests.java 2013-08-02 09:14:09 UTC (rev 2818)
@@ -42,6 +42,7 @@
import java.io.ByteArrayInputStream;
import java.io.ByteArrayOutputStream;
+import java.io.IOException;
import java.io.ObjectInput;
import java.io.ObjectInputStream;
import java.io.ObjectOutput;
@@ -111,22 +112,17 @@
/**
* Serialize an instance, restore it, and check for equality.
*/
- public void testSerialization() {
+ public void testSerialization() throws IOException, ClassNotFoundException {
StandardBarPainter p1 = new StandardBarPainter();
- StandardBarPainter p2 = null;
- try {
- ByteArrayOutputStream buffer = new ByteArrayOutputStream();
- ObjectOutput out = new ObjectOutputStream(buffer);
- out.writeObject(p1);
- out.close();
- ObjectInput in = new ObjectInputStream(
- new ByteArrayInputStream(buffer.toByteArray()));
- p2 = (StandardBarPainter) in.readObject();
- in.close();
- }
- catch (Exception e) {
- e.printStackTrace();
- }
+ StandardBarPainter p2;
+ ByteArrayOutputStream buffer = new ByteArrayOutputStream();
+ ObjectOutput out = new ObjectOutputStream(buffer);
+ out.writeObject(p1);
+ out.close();
+ ObjectInput in = new ObjectInputStream(new ByteArrayInputStream(
+ buffer.toByteArray()));
+ p2 = (StandardBarPainter) in.readObject();
+ in.close();
assertEquals(p1, p2);
}
Modified: branches/jfreechart-1.0.x-branch/tests/org/jfree/chart/renderer/category/junit/StatisticalBarRendererTests.java
===================================================================
--- branches/jfreechart-1.0.x-branch/tests/org/jfree/chart/renderer/category/junit/StatisticalBarRendererTests.java 2013-08-02 08:32:35 UTC (rev 2817)
+++ branches/jfreechart-1.0.x-branch/tests/org/jfree/chart/renderer/category/junit/StatisticalBarRendererTests.java 2013-08-02 09:14:09 UTC (rev 2818)
@@ -48,6 +48,7 @@
import java.awt.Color;
import java.io.ByteArrayInputStream;
import java.io.ByteArrayOutputStream;
+import java.io.IOException;
import java.io.ObjectInput;
import java.io.ObjectInputStream;
import java.io.ObjectOutput;
@@ -124,15 +125,9 @@
/**
* Confirm that cloning works.
*/
- public void testCloning() {
+ public void testCloning() throws CloneNotSupportedException {
StatisticalBarRenderer r1 = new StatisticalBarRenderer();
- StatisticalBarRenderer r2 = null;
- try {
- r2 = (StatisticalBarRenderer) r1.clone();
- }
- catch (CloneNotSupportedException e) {
- e.printStackTrace();
- }
+ StatisticalBarRenderer r2 = (StatisticalBarRenderer) r1.clone();
assertTrue(r1 != r2);
assertTrue(r1.getClass() == r2.getClass());
assertTrue(r1.equals(r2));
@@ -149,27 +144,18 @@
/**
* Serialize an instance, restore it, and check for equality.
*/
- public void testSerialization() {
-
+ public void testSerialization() throws IOException, ClassNotFoundException {
StatisticalBarRenderer r1 = new StatisticalBarRenderer();
- StatisticalBarRenderer r2 = null;
-
- try {
- ByteArrayOutputStream buffer = new ByteArrayOutputStream();
- ObjectOutput out = new ObjectOutputStream(buffer);
- out.writeObject(r1);
- out.close();
-
- ObjectInput in = new ObjectInputStream(new ByteArrayInputStream(
- buffer.toByteArray()));
- r2 = (StatisticalBarRenderer) in.readObject();
- in.close();
- }
- catch (Exception e) {
- e.printStackTrace();
- }
+ StatisticalBarRenderer r2;
+ ByteArrayOutputStream buffer = new ByteArrayOutputStream();
+ ObjectOutput out = new ObjectOutputStream(buffer);
+ out.writeObject(r1);
+ out.close();
+ ObjectInput in = new ObjectInputStream(new ByteArrayInputStream(
+ buffer.toByteArray()));
+ r2 = (StatisticalBarRenderer) in.readObject();
+ in.close();
assertEquals(r1, r2);
-
}
/**
@@ -177,7 +163,6 @@
* no exceptions are thrown (particularly by code in the renderer).
*/
public void testDrawWithNullInfo() {
- boolean success = false;
try {
DefaultStatisticalCategoryDataset dataset
= new DefaultStatisticalCategoryDataset();
@@ -189,13 +174,10 @@
JFreeChart chart = new JFreeChart(plot);
/* BufferedImage image = */ chart.createBufferedImage(300, 200,
null);
- success = true;
}
catch (NullPointerException e) {
- e.printStackTrace();
- success = false;
+ fail("No exception should be thrown.");
}
- assertTrue(success);
}
/**
@@ -204,7 +186,6 @@
* bug report 1779941.
*/
public void testDrawWithNullMeanVertical() {
- boolean success = false;
try {
DefaultStatisticalCategoryDataset dataset
= new DefaultStatisticalCategoryDataset();
@@ -216,13 +197,10 @@
JFreeChart chart = new JFreeChart(plot);
/* BufferedImage image = */ chart.createBufferedImage(300, 200,
null);
- success = true;
}
catch (NullPointerException e) {
- e.printStackTrace();
- success = false;
+ fail("No exception should be thrown.");
}
- assertTrue(success);
}
/**
@@ -231,7 +209,6 @@
* bug report 1779941.
*/
public void testDrawWithNullMeanHorizontal() {
- boolean success = false;
try {
DefaultStatisticalCategoryDataset dataset
= new DefaultStatisticalCategoryDataset();
@@ -244,13 +221,10 @@
JFreeChart chart = new JFreeChart(plot);
/* BufferedImage image = */ chart.createBufferedImage(300, 200,
null);
- success = true;
}
catch (NullPointerException e) {
- e.printStackTrace();
- success = false;
+ fail("No exception should be thrown.");
}
- assertTrue(success);
}
/**
@@ -259,7 +233,6 @@
* See bug report 1779941.
*/
public void testDrawWithNullDeviationVertical() {
- boolean success = false;
try {
DefaultStatisticalCategoryDataset dataset
= new DefaultStatisticalCategoryDataset();
@@ -271,13 +244,10 @@
JFreeChart chart = new JFreeChart(plot);
/* BufferedImage image = */ chart.createBufferedImage(300, 200,
null);
- success = true;
}
catch (NullPointerException e) {
- e.printStackTrace();
- success = false;
+ fail("No exception should be thrown.");
}
- assertTrue(success);
}
/**
@@ -286,7 +256,6 @@
* See bug report 1779941.
*/
public void testDrawWithNullDeviationHorizontal() {
- boolean success = false;
try {
DefaultStatisticalCategoryDataset dataset
= new DefaultStatisticalCategoryDataset();
@@ -299,13 +268,10 @@
JFreeChart chart = new JFreeChart(plot);
/* BufferedImage image = */ chart.createBufferedImage(300, 200,
null);
- success = true;
}
catch (NullPointerException e) {
- e.printStackTrace();
- success = false;
+ fail("No exception should be thrown.");
}
- assertTrue(success);
}
/**
Modified: branches/jfreechart-1.0.x-branch/tests/org/jfree/chart/renderer/category/junit/StatisticalLineAndShapeRendererTests.java
===================================================================
--- branches/jfreechart-1.0.x-branch/tests/org/jfree/chart/renderer/category/junit/StatisticalLineAndShapeRendererTests.java 2013-08-02 08:32:35 UTC (rev 2817)
+++ branches/jfreechart-1.0.x-branch/tests/org/jfree/chart/renderer/category/junit/StatisticalLineAndShapeRendererTests.java 2013-08-02 09:14:09 UTC (rev 2818)
@@ -166,7 +166,6 @@
* no exceptions are thrown (particularly by code in the renderer).
*/
public void testDrawWithNullInfo() {
- boolean success = false;
try {
DefaultStatisticalCategoryDataset dataset
= new DefaultStatisticalCategoryDataset();
@@ -178,13 +177,10 @@
JFreeChart chart = new JFreeChart(plot);
/* BufferedImage image = */ chart.createBufferedImage(300, 200,
null);
- success = true;
}
catch (NullPointerException e) {
- e.printStackTrace();
- success = false;
+ fail("No exception should be thrown.");
}
- assertTrue(success);
}
/**
Modified: branches/jfreechart-1.0.x-branch/tests/org/jfree/chart/renderer/junit/AbstractRendererTests.java
===================================================================
--- branches/jfreechart-1.0.x-branch/tests/org/jfree/chart/renderer/junit/AbstractRendererTests.java 2013-08-02 08:32:35 UTC (rev 2817)
+++ branches/jfreechart-1.0.x-branch/tests/org/jfree/chart/renderer/junit/AbstractRendererTests.java 2013-08-02 09:14:09 UTC (rev 2818)
@@ -58,6 +58,7 @@
import java.awt.geom.Rectangle2D;
import java.io.ByteArrayInputStream;
import java.io.ByteArrayOutputStream;
+import java.io.IOException;
import java.io.ObjectInput;
import java.io.ObjectInputStream;
import java.io.ObjectOutput;
@@ -471,7 +472,7 @@
/**
* Confirm that cloning works.
*/
- public void testCloning() {
+ public void testCloning() throws CloneNotSupportedException {
LineAndShapeRenderer r1 = new LineAndShapeRenderer();
Rectangle2D shape = new Rectangle2D.Double(1.0, 2.0, 3.0, 4.0);
Rectangle2D baseShape = new Rectangle2D.Double(11.0, 12.0, 13.0, 14.0);
@@ -481,13 +482,7 @@
r1.setBaseLegendTextFont(new Font("Dialog", Font.PLAIN, 3));
r1.setBaseLegendTextPaint(new Color(1, 2, 3));
- LineAndShapeRenderer r2 = null;
- try {
- r2 = (LineAndShapeRenderer) r1.clone();
- }
- catch (CloneNotSupportedException e) {
- e.printStackTrace();
- }
+ LineAndShapeRenderer r2 = (LineAndShapeRenderer) r1.clone();
assertTrue(r1 != r2);
assertTrue(r1.getClass() == r2.getClass());
assertTrue(r1.equals(r2));
@@ -620,18 +615,12 @@
/**
* A check for cloning.
*/
- public void testCloning2() {
+ public void testCloning2() throws CloneNotSupportedException {
LineAndShapeRenderer r1 = new LineAndShapeRenderer();
r1.setBasePaint(Color.blue);
r1.setBaseLegendTextPaint(new GradientPaint(1.0f, 2.0f, Color.red,
3.0f, 4.0f, Color.blue));
- LineAndShapeRenderer r2 = null;
- try {
- r2 = (LineAndShapeRenderer) r1.clone();
- }
- catch (CloneNotSupportedException e) {
- e.printStackTrace();
- }
+ LineAndShapeRenderer r2 = (LineAndShapeRenderer) r1.clone();
assertTrue(r1 != r2);
assertTrue(r1.getC...
[truncated message content] |