Menu
▾
▴
[Jfreechart-commit] SF.net SVN: jfreechart:[2812] branches/jfreechart-1.0.x-branch/tests/org/ jfree/chart
|
From: <mu...@us...> - 2013-08-02 07:12:17
|
Revision: 2812
http://sourceforge.net/p/jfreechart/code/2812
Author: mungady
Date: 2013-08-02 07:12:12 +0000 (Fri, 02 Aug 2013)
Log Message:
-----------
Remove printStackTrace().
Modified Paths:
--------------
branches/jfreechart-1.0.x-branch/tests/org/jfree/chart/block/junit/ColumnArrangementTests.java
branches/jfreechart-1.0.x-branch/tests/org/jfree/chart/block/junit/FlowArrangementTests.java
branches/jfreechart-1.0.x-branch/tests/org/jfree/chart/block/junit/GridArrangementTests.java
branches/jfreechart-1.0.x-branch/tests/org/jfree/chart/block/junit/LabelBlockTests.java
branches/jfreechart-1.0.x-branch/tests/org/jfree/chart/entity/junit/CategoryItemEntityTests.java
branches/jfreechart-1.0.x-branch/tests/org/jfree/chart/entity/junit/CategoryLabelEntityTests.java
branches/jfreechart-1.0.x-branch/tests/org/jfree/chart/entity/junit/LegendItemEntityTests.java
branches/jfreechart-1.0.x-branch/tests/org/jfree/chart/entity/junit/PieSectionEntityTests.java
branches/jfreechart-1.0.x-branch/tests/org/jfree/chart/entity/junit/StandardEntityCollectionTests.java
branches/jfreechart-1.0.x-branch/tests/org/jfree/chart/entity/junit/TickLabelEntityTests.java
branches/jfreechart-1.0.x-branch/tests/org/jfree/chart/entity/junit/XYItemEntityTests.java
Modified: branches/jfreechart-1.0.x-branch/tests/org/jfree/chart/block/junit/ColumnArrangementTests.java
===================================================================
--- branches/jfreechart-1.0.x-branch/tests/org/jfree/chart/block/junit/ColumnArrangementTests.java 2013-08-02 07:04:14 UTC (rev 2811)
+++ branches/jfreechart-1.0.x-branch/tests/org/jfree/chart/block/junit/ColumnArrangementTests.java 2013-08-02 07:12:12 UTC (rev 2812)
@@ -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;
@@ -130,24 +131,19 @@
/**
* Serialize an instance, restore it, and check for equality.
*/
- public void testSerialization() {
+ public void testSerialization() throws IOException, ClassNotFoundException {
FlowArrangement f1 = new FlowArrangement(HorizontalAlignment.LEFT,
VerticalAlignment.TOP, 1.0, 2.0);
- FlowArrangement f2 = null;
- try {
- ByteArrayOutputStream buffer = new ByteArrayOutputStream();
- ObjectOutput out = new ObjectOutputStream(buffer);
- out.writeObject(f1);
- out.close();
+ FlowArrangement f2;
+ ByteArrayOutputStream buffer = new ByteArrayOutputStream();
+ ObjectOutput out = new ObjectOutputStream(buffer);
+ out.writeObject(f1);
+ out.close();
- ObjectInput in = new ObjectInputStream(new ByteArrayInputStream(
- buffer.toByteArray()));
- f2 = (FlowArrangement) in.readObject();
- in.close();
- }
- catch (Exception e) {
- e.printStackTrace();
- }
+ ObjectInput in = new ObjectInputStream(new ByteArrayInputStream(
+ buffer.toByteArray()));
+ f2 = (FlowArrangement) in.readObject();
+ in.close();
assertEquals(f1, f2);
}
Modified: branches/jfreechart-1.0.x-branch/tests/org/jfree/chart/block/junit/FlowArrangementTests.java
===================================================================
--- branches/jfreechart-1.0.x-branch/tests/org/jfree/chart/block/junit/FlowArrangementTests.java 2013-08-02 07:04:14 UTC (rev 2811)
+++ branches/jfreechart-1.0.x-branch/tests/org/jfree/chart/block/junit/FlowArrangementTests.java 2013-08-02 07:12:12 UTC (rev 2812)
@@ -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;
@@ -130,24 +131,18 @@
/**
* Serialize an instance, restore it, and check for equality.
*/
- public void testSerialization() {
+ public void testSerialization() throws IOException, ClassNotFoundException {
FlowArrangement f1 = new FlowArrangement(HorizontalAlignment.LEFT,
VerticalAlignment.TOP, 1.0, 2.0);
- FlowArrangement f2 = null;
- try {
- ByteArrayOutputStream buffer = new ByteArrayOutputStream();
- ObjectOutput out = new ObjectOutputStream(buffer);
- out.writeObject(f1);
- out.close();
-
- ObjectInput in = new ObjectInputStream(new ByteArrayInputStream(
- buffer.toByteArray()));
- f2 = (FlowArrangement) in.readObject();
- in.close();
- }
- catch (Exception e) {
- e.printStackTrace();
- }
+ FlowArrangement f2;
+ ByteArrayOutputStream buffer = new ByteArrayOutputStream();
+ ObjectOutput out = new ObjectOutputStream(buffer);
+ out.writeObject(f1);
+ out.close();
+ ObjectInput in = new ObjectInputStream(new ByteArrayInputStream(
+ buffer.toByteArray()));
+ f2 = (FlowArrangement) in.readObject();
+ in.close();
assertEquals(f1, f2);
}
Modified: branches/jfreechart-1.0.x-branch/tests/org/jfree/chart/block/junit/GridArrangementTests.java
===================================================================
--- branches/jfreechart-1.0.x-branch/tests/org/jfree/chart/block/junit/GridArrangementTests.java 2013-08-02 07:04:14 UTC (rev 2811)
+++ branches/jfreechart-1.0.x-branch/tests/org/jfree/chart/block/junit/GridArrangementTests.java 2013-08-02 07:12:12 UTC (rev 2812)
@@ -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;
@@ -115,23 +116,17 @@
/**
* Serialize an instance, restore it, and check for equality.
*/
- public void testSerialization() {
+ public void testSerialization() throws IOException, ClassNotFoundException {
GridArrangement f1 = new GridArrangement(33, 44);
- GridArrangement f2 = null;
- try {
- ByteArrayOutputStream buffer = new ByteArrayOutputStream();
- ObjectOutput out = new ObjectOutputStream(buffer);
- out.writeObject(f1);
- out.close();
-
- ObjectInput in = new ObjectInputStream(new ByteArrayInputStream(
- buffer.toByteArray()));
- f2 = (GridArrangement) in.readObject();
- in.close();
- }
- catch (Exception e) {
- e.printStackTrace();
- }
+ GridArrangement f2;
+ ByteArrayOutputStream buffer = new ByteArrayOutputStream();
+ ObjectOutput out = new ObjectOutputStream(buffer);
+ out.writeObject(f1);
+ out.close();
+ ObjectInput in = new ObjectInputStream(new ByteArrayInputStream(
+ buffer.toByteArray()));
+ f2 = (GridArrangement) in.readObject();
+ in.close();
assertEquals(f1, f2);
}
Modified: branches/jfreechart-1.0.x-branch/tests/org/jfree/chart/block/junit/LabelBlockTests.java
===================================================================
--- branches/jfreechart-1.0.x-branch/tests/org/jfree/chart/block/junit/LabelBlockTests.java 2013-08-02 07:04:14 UTC (rev 2811)
+++ branches/jfreechart-1.0.x-branch/tests/org/jfree/chart/block/junit/LabelBlockTests.java 2013-08-02 07:12:12 UTC (rev 2812)
@@ -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;
@@ -139,17 +140,10 @@
/**
* Confirm that cloning works.
*/
- public void testCloning() {
+ public void testCloning() throws CloneNotSupportedException {
LabelBlock b1 = new LabelBlock("ABC", new Font("Dialog",
Font.PLAIN, 12), Color.red);
- LabelBlock b2 = null;
-
- try {
- b2 = (LabelBlock) b1.clone();
- }
- catch (CloneNotSupportedException e) {
- e.printStackTrace();
- }
+ LabelBlock b2 = (LabelBlock) b1.clone();
assertTrue(b1 != b2);
assertTrue(b1.getClass() == b2.getClass());
assertTrue(b1.equals(b2));
@@ -158,26 +152,20 @@
/**
* Serialize an instance, restore it, and check for equality.
*/
- public void testSerialization() {
+ public void testSerialization() throws IOException, ClassNotFoundException {
GradientPaint gp = new GradientPaint(1.0f, 2.0f, Color.red, 3.0f, 4.0f,
Color.blue);
LabelBlock b1 = new LabelBlock("ABC", new Font("Dialog",
Font.PLAIN, 12), gp);
- LabelBlock b2 = null;
- try {
- ByteArrayOutputStream buffer = new ByteArrayOutputStream();
- ObjectOutput out = new ObjectOutputStream(buffer);
- out.writeObject(b1);
- out.close();
-
- ObjectInput in = new ObjectInputStream(
- new ByteArrayInputStream(buffer.toByteArray()));
- b2 = (LabelBlock) in.readObject();
- in.close();
- }
- catch (Exception e) {
- e.printStackTrace();
- }
+ LabelBlock b2;
+ ByteArrayOutputStream buffer = new ByteArrayOutputStream();
+ ObjectOutput out = new ObjectOutputStream(buffer);
+ out.writeObject(b1);
+ out.close();
+ ObjectInput in = new ObjectInputStream(new ByteArrayInputStream(
+ buffer.toByteArray()));
+ b2 = (LabelBlock) in.readObject();
+ in.close();
assertEquals(b1, b2);
}
Modified: branches/jfreechart-1.0.x-branch/tests/org/jfree/chart/entity/junit/CategoryItemEntityTests.java
===================================================================
--- branches/jfreechart-1.0.x-branch/tests/org/jfree/chart/entity/junit/CategoryItemEntityTests.java 2013-08-02 07:04:14 UTC (rev 2811)
+++ branches/jfreechart-1.0.x-branch/tests/org/jfree/chart/entity/junit/CategoryItemEntityTests.java 2013-08-02 07:12:12 UTC (rev 2812)
@@ -43,6 +43,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;
@@ -128,7 +129,7 @@
/**
* Confirm that cloning works.
*/
- public void testCloning() {
+ public void testCloning() throws CloneNotSupportedException {
DefaultCategoryDataset d = new DefaultCategoryDataset();
d.addValue(1.0, "R1", "C1");
d.addValue(2.0, "R1", "C2");
@@ -136,14 +137,7 @@
d.addValue(4.0, "R2", "C2");
CategoryItemEntity e1 = new CategoryItemEntity(new Rectangle2D.Double(
1.0, 2.0, 3.0, 4.0), "ToolTip", "URL", d, 1, "C2", 1);
- CategoryItemEntity e2 = null;
-
- try {
- e2 = (CategoryItemEntity) e1.clone();
- }
- catch (CloneNotSupportedException e) {
- e.printStackTrace();
- }
+ CategoryItemEntity e2 = (CategoryItemEntity) e1.clone();
assertTrue(e1 != e2);
assertTrue(e1.getClass() == e2.getClass());
assertTrue(e1.equals(e2));
@@ -152,7 +146,7 @@
/**
* Serialize an instance, restore it, and check for equality.
*/
- public void testSerialization() {
+ public void testSerialization() throws IOException, ClassNotFoundException {
DefaultCategoryDataset d = new DefaultCategoryDataset();
d.addValue(1.0, "R1", "C1");
d.addValue(2.0, "R1", "C2");
@@ -160,21 +154,16 @@
d.addValue(4.0, "R2", "C2");
CategoryItemEntity e1 = new CategoryItemEntity(new Rectangle2D.Double(
1.0, 2.0, 3.0, 4.0), "ToolTip", "URL", d, 1, "C2", 1);
- CategoryItemEntity e2 = null;
- try {
- ByteArrayOutputStream buffer = new ByteArrayOutputStream();
- ObjectOutput out = new ObjectOutputStream(buffer);
- out.writeObject(e1);
- out.close();
+ CategoryItemEntity e2;
+ ByteArrayOutputStream buffer = new ByteArrayOutputStream();
+ ObjectOutput out = new ObjectOutputStream(buffer);
+ out.writeObject(e1);
+ out.close();
- ObjectInput in = new ObjectInputStream(
- new ByteArrayInputStream(buffer.toByteArray()));
- e2 = (CategoryItemEntity) in.readObject();
- in.close();
- }
- catch (Exception e) {
- e.printStackTrace();
- }
+ ObjectInput in = new ObjectInputStream(new ByteArrayInputStream(
+ buffer.toByteArray()));
+ e2 = (CategoryItemEntity) in.readObject();
+ in.close();
assertEquals(e1, e2);
}
Modified: branches/jfreechart-1.0.x-branch/tests/org/jfree/chart/entity/junit/CategoryLabelEntityTests.java
===================================================================
--- branches/jfreechart-1.0.x-branch/tests/org/jfree/chart/entity/junit/CategoryLabelEntityTests.java 2013-08-02 07:04:14 UTC (rev 2811)
+++ branches/jfreechart-1.0.x-branch/tests/org/jfree/chart/entity/junit/CategoryLabelEntityTests.java 2013-08-02 07:12:12 UTC (rev 2812)
@@ -43,6 +43,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;
@@ -113,16 +114,10 @@
/**
* Confirm that cloning works.
*/
- public void testCloning() {
+ public void testCloning() throws CloneNotSupportedException {
CategoryLabelEntity e1 = new CategoryLabelEntity("A",
new Rectangle2D.Double(1.0, 2.0, 3.0, 4.0), "ToolTip", "URL");
- CategoryLabelEntity e2 = null;
- try {
- e2 = (CategoryLabelEntity) e1.clone();
- }
- catch (CloneNotSupportedException e) {
- e.printStackTrace();
- }
+ CategoryLabelEntity e2 = (CategoryLabelEntity) e1.clone();
assertTrue(e1 != e2);
assertTrue(e1.getClass() == e2.getClass());
assertTrue(e1.equals(e2));
@@ -131,24 +126,18 @@
/**
* Serialize an instance, restore it, and check for equality.
*/
- public void testSerialization() {
+ public void testSerialization() throws IOException, ClassNotFoundException {
CategoryLabelEntity e1 = new CategoryLabelEntity("A",
new Rectangle2D.Double(1.0, 2.0, 3.0, 4.0), "ToolTip", "URL");
- CategoryLabelEntity e2 = null;
- try {
- ByteArrayOutputStream buffer = new ByteArrayOutputStream();
- ObjectOutput out = new ObjectOutputStream(buffer);
- out.writeObject(e1);
- out.close();
-
- ObjectInput in = new ObjectInputStream(new ByteArrayInputStream(
- buffer.toByteArray()));
- e2 = (CategoryLabelEntity) in.readObject();
- in.close();
- }
- catch (Exception e) {
- e.printStackTrace();
- }
+ CategoryLabelEntity e2;
+ ByteArrayOutputStream buffer = new ByteArrayOutputStream();
+ ObjectOutput out = new ObjectOutputStream(buffer);
+ out.writeObject(e1);
+ out.close();
+ ObjectInput in = new ObjectInputStream(new ByteArrayInputStream(
+ buffer.toByteArray()));
+ e2 = (CategoryLabelEntity) in.readObject();
+ in.close();
assertEquals(e1, e2);
}
Modified: branches/jfreechart-1.0.x-branch/tests/org/jfree/chart/entity/junit/LegendItemEntityTests.java
===================================================================
--- branches/jfreechart-1.0.x-branch/tests/org/jfree/chart/entity/junit/LegendItemEntityTests.java 2013-08-02 07:04:14 UTC (rev 2811)
+++ branches/jfreechart-1.0.x-branch/tests/org/jfree/chart/entity/junit/LegendItemEntityTests.java 2013-08-02 07:12:12 UTC (rev 2812)
@@ -44,6 +44,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;
@@ -124,17 +125,10 @@
/**
* Confirm that cloning works.
*/
- public void testCloning() {
+ public void testCloning() throws CloneNotSupportedException {
LegendItemEntity e1 = new LegendItemEntity(new Rectangle2D.Double(1.0,
2.0, 3.0, 4.0));
- LegendItemEntity e2 = null;
-
- try {
- e2 = (LegendItemEntity) e1.clone();
- }
- catch (CloneNotSupportedException e) {
- e.printStackTrace();
- }
+ LegendItemEntity e2 = (LegendItemEntity) e1.clone();
assertTrue(e1 != e2);
assertTrue(e1.getClass() == e2.getClass());
assertTrue(e1.equals(e2));
@@ -143,24 +137,18 @@
/**
* Serialize an instance, restore it, and check for equality.
*/
- public void testSerialization() {
+ public void testSerialization() throws IOException, ClassNotFoundException {
LegendItemEntity e1 = new LegendItemEntity(new Rectangle2D.Double(1.0,
2.0, 3.0, 4.0));
- LegendItemEntity e2 = null;
- try {
- ByteArrayOutputStream buffer = new ByteArrayOutputStream();
- ObjectOutput out = new ObjectOutputStream(buffer);
- out.writeObject(e1);
- out.close();
-
- ObjectInput in = new ObjectInputStream(
- new ByteArrayInputStream(buffer.toByteArray()));
- e2 = (LegendItemEntity) in.readObject();
- in.close();
- }
- catch (Exception e) {
- e.printStackTrace();
- }
+ LegendItemEntity e2;
+ ByteArrayOutputStream buffer = new ByteArrayOutputStream();
+ ObjectOutput out = new ObjectOutputStream(buffer);
+ out.writeObject(e1);
+ out.close();
+ ObjectInput in = new ObjectInputStream(new ByteArrayInputStream(
+ buffer.toByteArray()));
+ e2 = (LegendItemEntity) in.readObject();
+ in.close();
assertEquals(e1, e2);
}
Modified: branches/jfreechart-1.0.x-branch/tests/org/jfree/chart/entity/junit/PieSectionEntityTests.java
===================================================================
--- branches/jfreechart-1.0.x-branch/tests/org/jfree/chart/entity/junit/PieSectionEntityTests.java 2013-08-02 07:04:14 UTC (rev 2811)
+++ branches/jfreechart-1.0.x-branch/tests/org/jfree/chart/entity/junit/PieSectionEntityTests.java 2013-08-02 07:12:12 UTC (rev 2812)
@@ -43,6 +43,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;
@@ -129,17 +130,11 @@
/**
* Confirm that cloning works.
*/
- public void testCloning() {
+ public void testCloning() throws CloneNotSupportedException {
PieSectionEntity e1 = new PieSectionEntity(new Rectangle2D.Double(1.0,
2.0, 3.0, 4.0), new DefaultPieDataset(), 1, 2, "Key",
"ToolTip", "URL");
- PieSectionEntity e2 = null;
- try {
- e2 = (PieSectionEntity) e1.clone();
- }
- catch (CloneNotSupportedException e) {
- e.printStackTrace();
- }
+ PieSectionEntity e2 = (PieSectionEntity) e1.clone();
assertTrue(e1 != e2);
assertTrue(e1.getClass() == e2.getClass());
assertTrue(e1.equals(e2));
@@ -148,25 +143,20 @@
/**
* Serialize an instance, restore it, and check for equality.
*/
- public void testSerialization() {
+ public void testSerialization() throws IOException, ClassNotFoundException {
PieSectionEntity e1 = new PieSectionEntity(new Rectangle2D.Double(1.0,
2.0, 3.0, 4.0), new DefaultPieDataset(), 1, 2, "Key",
"ToolTip", "URL");
- PieSectionEntity e2 = null;
- try {
- ByteArrayOutputStream buffer = new ByteArrayOutputStream();
- ObjectOutput out = new ObjectOutputStream(buffer);
- out.writeObject(e1);
- out.close();
+ PieSectionEntity e2;
+ ByteArrayOutputStream buffer = new ByteArrayOutputStream();
+ ObjectOutput out = new ObjectOutputStream(buffer);
+ out.writeObject(e1);
+ out.close();
- ObjectInput in = new ObjectInputStream(new ByteArrayInputStream(
- buffer.toByteArray()));
- e2 = (PieSectionEntity) in.readObject();
- in.close();
- }
- catch (Exception e) {
- e.printStackTrace();
- }
+ ObjectInput in = new ObjectInputStream(new ByteArrayInputStream(
+ buffer.toByteArray()));
+ e2 = (PieSectionEntity) in.readObject();
+ in.close();
assertEquals(e1, e2);
}
Modified: branches/jfreechart-1.0.x-branch/tests/org/jfree/chart/entity/junit/StandardEntityCollectionTests.java
===================================================================
--- branches/jfreechart-1.0.x-branch/tests/org/jfree/chart/entity/junit/StandardEntityCollectionTests.java 2013-08-02 07:04:14 UTC (rev 2811)
+++ branches/jfreechart-1.0.x-branch/tests/org/jfree/chart/entity/junit/StandardEntityCollectionTests.java 2013-08-02 07:12:12 UTC (rev 2812)
@@ -43,6 +43,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;
@@ -102,19 +103,13 @@
/**
* Confirm that cloning works.
*/
- public void testCloning() {
+ public void testCloning() throws CloneNotSupportedException {
PieSectionEntity e1 = new PieSectionEntity(new Rectangle2D.Double(1.0,
2.0, 3.0, 4.0), new DefaultPieDataset(), 0, 1, "Key",
"ToolTip", "URL");
StandardEntityCollection c1 = new StandardEntityCollection();
c1.add(e1);
- StandardEntityCollection c2 = null;
- try {
- c2 = (StandardEntityCollection) c1.clone();
- }
- catch (CloneNotSupportedException e) {
- e.printStackTrace();
- }
+ StandardEntityCollection c2 = (StandardEntityCollection) c1.clone();
assertTrue(c1 != c2);
assertTrue(c1.getClass() == c2.getClass());
assertTrue(c1.equals(c2));
@@ -129,27 +124,21 @@
/**
* Serialize an instance, restore it, and check for equality.
*/
- public void testSerialization() {
+ public void testSerialization() throws IOException, ClassNotFoundException {
PieSectionEntity e1 = new PieSectionEntity(new Rectangle2D.Double(1.0,
2.0, 3.0, 4.0), new DefaultPieDataset(), 0, 1, "Key",
"ToolTip", "URL");
StandardEntityCollection c1 = new StandardEntityCollection();
c1.add(e1);
- StandardEntityCollection c2 = null;
- try {
- ByteArrayOutputStream buffer = new ByteArrayOutputStream();
- ObjectOutput out = new ObjectOutputStream(buffer);
- out.writeObject(c1);
- out.close();
-
- ObjectInput in = new ObjectInputStream(new ByteArrayInputStream(
- buffer.toByteArray()));
- c2 = (StandardEntityCollection) in.readObject();
- in.close();
- }
- catch (Exception e) {
- e.printStackTrace();
- }
+ StandardEntityCollection c2;
+ ByteArrayOutputStream buffer = new ByteArrayOutputStream();
+ ObjectOutput out = new ObjectOutputStream(buffer);
+ out.writeObject(c1);
+ out.close();
+ ObjectInput in = new ObjectInputStream(new ByteArrayInputStream(
+ buffer.toByteArray()));
+ c2 = (StandardEntityCollection) in.readObject();
+ in.close();
assertEquals(c1, c2);
}
Modified: branches/jfreechart-1.0.x-branch/tests/org/jfree/chart/entity/junit/TickLabelEntityTests.java
===================================================================
--- branches/jfreechart-1.0.x-branch/tests/org/jfree/chart/entity/junit/TickLabelEntityTests.java 2013-08-02 07:04:14 UTC (rev 2811)
+++ branches/jfreechart-1.0.x-branch/tests/org/jfree/chart/entity/junit/TickLabelEntityTests.java 2013-08-02 07:12:12 UTC (rev 2812)
@@ -43,6 +43,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;
@@ -106,16 +107,10 @@
/**
* Confirm that cloning works.
*/
- public void testCloning() {
+ public void testCloning() throws CloneNotSupportedException {
TickLabelEntity e1 = new TickLabelEntity(new Rectangle2D.Double(1.0,
2.0, 3.0, 4.0), "ToolTip", "URL");
- TickLabelEntity e2 = null;
- try {
- e2 = (TickLabelEntity) e1.clone();
- }
- catch (CloneNotSupportedException e) {
- e.printStackTrace();
- }
+ TickLabelEntity e2 = (TickLabelEntity) e1.clone();
assertTrue(e1 != e2);
assertTrue(e1.getClass() == e2.getClass());
assertTrue(e1.equals(e2));
@@ -124,24 +119,18 @@
/**
* Serialize an instance, restore it, and check for equality.
*/
- public void testSerialization() {
+ public void testSerialization() throws IOException, ClassNotFoundException {
TickLabelEntity e1 = new TickLabelEntity(new Rectangle2D.Double(1.0,
2.0, 3.0, 4.0), "ToolTip", "URL");
- TickLabelEntity e2 = null;
- try {
- ByteArrayOutputStream buffer = new ByteArrayOutputStream();
- ObjectOutput out = new ObjectOutputStream(buffer);
- out.writeObject(e1);
- out.close();
-
- ObjectInput in = new ObjectInputStream(new ByteArrayInputStream(
- buffer.toByteArray()));
- e2 = (TickLabelEntity) in.readObject();
- in.close();
- }
- catch (Exception e) {
- e.printStackTrace();
- }
+ TickLabelEntity e2;
+ ByteArrayOutputStream buffer = new ByteArrayOutputStream();
+ ObjectOutput out = new ObjectOutputStream(buffer);
+ out.writeObject(e1);
+ out.close();
+ ObjectInput in = new ObjectInputStream(new ByteArrayInputStream(
+ buffer.toByteArray()));
+ e2 = (TickLabelEntity) in.readObject();
+ in.close();
assertEquals(e1, e2);
}
Modified: branches/jfreechart-1.0.x-branch/tests/org/jfree/chart/entity/junit/XYItemEntityTests.java
===================================================================
--- branches/jfreechart-1.0.x-branch/tests/org/jfree/chart/entity/junit/XYItemEntityTests.java 2013-08-02 07:04:14 UTC (rev 2811)
+++ branches/jfreechart-1.0.x-branch/tests/org/jfree/chart/entity/junit/XYItemEntityTests.java 2013-08-02 07:12:12 UTC (rev 2812)
@@ -43,6 +43,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;
@@ -118,17 +119,10 @@
/**
* Confirm that cloning works.
*/
- public void testCloning() {
+ public void testCloning() throws CloneNotSupportedException {
XYItemEntity e1 = new XYItemEntity(new Rectangle2D.Double(1.0, 2.0,
3.0, 4.0), new TimeSeriesCollection(), 1, 9, "ToolTip", "URL");
- XYItemEntity e2 = null;
-
- try {
- e2 = (XYItemEntity) e1.clone();
- }
- catch (CloneNotSupportedException e) {
- e.printStackTrace();
- }
+ XYItemEntity e2 = (XYItemEntity) e1.clone();
assertTrue(e1 != e2);
assertTrue(e1.getClass() == e2.getClass());
assertTrue(e1.equals(e2));
@@ -137,24 +131,18 @@
/**
* Serialize an instance, restore it, and check for equality.
*/
- public void testSerialization() {
+ public void testSerialization() throws IOException, ClassNotFoundException {
XYItemEntity e1 = new XYItemEntity(new Rectangle2D.Double(1.0, 2.0,
3.0, 4.0), new TimeSeriesCollection(), 1, 9, "ToolTip", "URL");
- XYItemEntity e2 = null;
- try {
- ByteArrayOutputStream buffer = new ByteArrayOutputStream();
- ObjectOutput out = new ObjectOutputStream(buffer);
- out.writeObject(e1);
- out.close();
-
- ObjectInput in = new ObjectInputStream(new ByteArrayInputStream(
- buffer.toByteArray()));
- e2 = (XYItemEntity) in.readObject();
- in.close();
- }
- catch (Exception e) {
- e.printStackTrace();
- }
+ XYItemEntity e2;
+ ByteArrayOutputStream buffer = new ByteArrayOutputStream();
+ ObjectOutput out = new ObjectOutputStream(buffer);
+ out.writeObject(e1);
+ out.close();
+ ObjectInput in = new ObjectInputStream(new ByteArrayInputStream(
+ buffer.toByteArray()));
+ e2 = (XYItemEntity) in.readObject();
+ in.close();
assertEquals(e1, e2);
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|