Menu
▾
▴
[Jfreechart-commit] SF.net SVN: jfreechart:[2824] branches/jfreechart-1.0.x-branch/tests/org/ jfree/data/xy/junit
|
From: <mu...@us...> - 2013-08-02 14:26:41
|
Revision: 2824
http://sourceforge.net/p/jfreechart/code/2824
Author: mungady
Date: 2013-08-02 14:26:36 +0000 (Fri, 02 Aug 2013)
Log Message:
-----------
Remove printStackTrace().
Modified Paths:
--------------
branches/jfreechart-1.0.x-branch/tests/org/jfree/data/xy/junit/DefaultOHLCDatasetTests.java
branches/jfreechart-1.0.x-branch/tests/org/jfree/data/xy/junit/DefaultTableXYDatasetTests.java
branches/jfreechart-1.0.x-branch/tests/org/jfree/data/xy/junit/DefaultWindDatasetTests.java
branches/jfreechart-1.0.x-branch/tests/org/jfree/data/xy/junit/DefaultXYDatasetTests.java
branches/jfreechart-1.0.x-branch/tests/org/jfree/data/xy/junit/DefaultXYZDatasetTests.java
branches/jfreechart-1.0.x-branch/tests/org/jfree/data/xy/junit/MatrixSeriesCollectionTests.java
branches/jfreechart-1.0.x-branch/tests/org/jfree/data/xy/junit/MatrixSeriesTests.java
branches/jfreechart-1.0.x-branch/tests/org/jfree/data/xy/junit/OHLCDataItemTests.java
branches/jfreechart-1.0.x-branch/tests/org/jfree/data/xy/junit/VectorDataItemTests.java
branches/jfreechart-1.0.x-branch/tests/org/jfree/data/xy/junit/VectorSeriesCollectionTests.java
branches/jfreechart-1.0.x-branch/tests/org/jfree/data/xy/junit/VectorSeriesTests.java
branches/jfreechart-1.0.x-branch/tests/org/jfree/data/xy/junit/VectorTests.java
branches/jfreechart-1.0.x-branch/tests/org/jfree/data/xy/junit/XIntervalDataItemTests.java
branches/jfreechart-1.0.x-branch/tests/org/jfree/data/xy/junit/XIntervalSeriesCollectionTests.java
branches/jfreechart-1.0.x-branch/tests/org/jfree/data/xy/junit/XIntervalSeriesTests.java
branches/jfreechart-1.0.x-branch/tests/org/jfree/data/xy/junit/XYBarDatasetTests.java
branches/jfreechart-1.0.x-branch/tests/org/jfree/data/xy/junit/XYCoordinateTests.java
branches/jfreechart-1.0.x-branch/tests/org/jfree/data/xy/junit/XYDataItemTests.java
branches/jfreechart-1.0.x-branch/tests/org/jfree/data/xy/junit/XYIntervalDataItemTests.java
branches/jfreechart-1.0.x-branch/tests/org/jfree/data/xy/junit/XYIntervalSeriesCollectionTests.java
branches/jfreechart-1.0.x-branch/tests/org/jfree/data/xy/junit/XYIntervalSeriesTests.java
branches/jfreechart-1.0.x-branch/tests/org/jfree/data/xy/junit/XYIntervalTests.java
branches/jfreechart-1.0.x-branch/tests/org/jfree/data/xy/junit/XYSeriesCollectionTests.java
branches/jfreechart-1.0.x-branch/tests/org/jfree/data/xy/junit/XYSeriesTests.java
branches/jfreechart-1.0.x-branch/tests/org/jfree/data/xy/junit/YIntervalDataItemTests.java
branches/jfreechart-1.0.x-branch/tests/org/jfree/data/xy/junit/YIntervalSeriesCollectionTests.java
branches/jfreechart-1.0.x-branch/tests/org/jfree/data/xy/junit/YIntervalSeriesTests.java
branches/jfreechart-1.0.x-branch/tests/org/jfree/data/xy/junit/YIntervalTests.java
branches/jfreechart-1.0.x-branch/tests/org/jfree/data/xy/junit/YWithXIntervalTests.java
Modified: branches/jfreechart-1.0.x-branch/tests/org/jfree/data/xy/junit/DefaultOHLCDatasetTests.java
===================================================================
--- branches/jfreechart-1.0.x-branch/tests/org/jfree/data/xy/junit/DefaultOHLCDatasetTests.java 2013-08-02 14:00:28 UTC (rev 2823)
+++ branches/jfreechart-1.0.x-branch/tests/org/jfree/data/xy/junit/DefaultOHLCDatasetTests.java 2013-08-02 14:26:36 UTC (rev 2824)
@@ -128,16 +128,10 @@
/**
* Confirm that cloning works.
*/
- public void testCloning() {
+ public void testCloning() throws CloneNotSupportedException {
DefaultOHLCDataset d1 = new DefaultOHLCDataset("Series 1",
new OHLCDataItem[0]);
- DefaultOHLCDataset d2 = null;
- try {
- d2 = (DefaultOHLCDataset) d1.clone();
- }
- catch (CloneNotSupportedException e) {
- e.printStackTrace();
- }
+ DefaultOHLCDataset d2 = (DefaultOHLCDataset) d1.clone();
assertTrue(d1 != d2);
assertTrue(d1.getClass() == d2.getClass());
assertTrue(d1.equals(d2));
@@ -146,7 +140,7 @@
/**
* Confirm that cloning works.
*/
- public void testCloning2() {
+ public void testCloning2() throws CloneNotSupportedException {
OHLCDataItem item1 = new OHLCDataItem(new Date(1L), 1.0, 2.0, 3.0, 4.0,
5.0);
OHLCDataItem item2 = new OHLCDataItem(new Date(2L), 6.0, 7.0, 8.0, 9.0,
@@ -154,13 +148,7 @@
// create an array of items in reverse order
OHLCDataItem[] items = new OHLCDataItem[] {item2, item1};
DefaultOHLCDataset d1 = new DefaultOHLCDataset("Series 1", items);
- DefaultOHLCDataset d2 = null;
- try {
- d2 = (DefaultOHLCDataset) d1.clone();
- }
- catch (CloneNotSupportedException e) {
- e.printStackTrace();
- }
+ DefaultOHLCDataset d2 = (DefaultOHLCDataset) d1.clone();
assertTrue(d1 != d2);
assertTrue(d1.getClass() == d2.getClass());
assertTrue(d1.equals(d2));
Modified: branches/jfreechart-1.0.x-branch/tests/org/jfree/data/xy/junit/DefaultTableXYDatasetTests.java
===================================================================
--- branches/jfreechart-1.0.x-branch/tests/org/jfree/data/xy/junit/DefaultTableXYDatasetTests.java 2013-08-02 14:00:28 UTC (rev 2823)
+++ branches/jfreechart-1.0.x-branch/tests/org/jfree/data/xy/junit/DefaultTableXYDatasetTests.java 2013-08-02 14:26:36 UTC (rev 2824)
@@ -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;
@@ -112,20 +113,15 @@
/**
* Confirm that cloning works.
*/
- public void testCloning() {
+ public void testCloning() throws CloneNotSupportedException {
DefaultTableXYDataset d1 = new DefaultTableXYDataset();
XYSeries s1 = new XYSeries("Series 1", true, false);
s1.add(1.0, 1.1);
s1.add(2.0, 2.2);
d1.addSeries(s1);
- DefaultTableXYDataset d2 = null;
- try {
- d2 = (DefaultTableXYDataset) d1.clone();
- }
- catch (CloneNotSupportedException e) {
- e.printStackTrace();
- }
+ DefaultTableXYDataset d2 = (DefaultTableXYDataset) d1.clone();
+
assertTrue(d1 != d2);
assertTrue(d1.getClass() == d2.getClass());
assertTrue(d1.equals(d2));
@@ -145,7 +141,7 @@
/**
* Serialize an instance, restore it, and check for equality.
*/
- public void testSerialization() {
+ public void testSerialization() throws IOException, ClassNotFoundException {
DefaultTableXYDataset d1 = new DefaultTableXYDataset();
XYSeries s1 = new XYSeries("Series 1", true, false);
@@ -153,22 +149,16 @@
s1.add(2.0, 2.2);
d1.addSeries(s1);
- DefaultTableXYDataset d2 = null;
+ DefaultTableXYDataset d2;
+ ByteArrayOutputStream buffer = new ByteArrayOutputStream();
+ ObjectOutput out = new ObjectOutputStream(buffer);
+ out.writeObject(d1);
+ out.close();
- try {
- ByteArrayOutputStream buffer = new ByteArrayOutputStream();
- ObjectOutput out = new ObjectOutputStream(buffer);
- out.writeObject(d1);
- out.close();
-
- ObjectInput in = new ObjectInputStream(
- new ByteArrayInputStream(buffer.toByteArray()));
- d2 = (DefaultTableXYDataset) in.readObject();
- in.close();
- }
- catch (Exception e) {
- e.printStackTrace();
- }
+ ObjectInput in = new ObjectInputStream(new ByteArrayInputStream(
+ buffer.toByteArray()));
+ d2 = (DefaultTableXYDataset) in.readObject();
+ in.close();
assertEquals(d1, d2);
}
Modified: branches/jfreechart-1.0.x-branch/tests/org/jfree/data/xy/junit/DefaultWindDatasetTests.java
===================================================================
--- branches/jfreechart-1.0.x-branch/tests/org/jfree/data/xy/junit/DefaultWindDatasetTests.java 2013-08-02 14:00:28 UTC (rev 2823)
+++ branches/jfreechart-1.0.x-branch/tests/org/jfree/data/xy/junit/DefaultWindDatasetTests.java 2013-08-02 14:26:36 UTC (rev 2824)
@@ -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;
@@ -98,28 +99,16 @@
/**
* Confirm that cloning works.
*/
- public void testCloning() {
+ public void testCloning() throws CloneNotSupportedException {
DefaultWindDataset d1 = new DefaultWindDataset();
- DefaultWindDataset d2 = null;
- try {
- d2 = (DefaultWindDataset) d1.clone();
- }
- catch (CloneNotSupportedException e) {
- e.printStackTrace();
- }
+ DefaultWindDataset d2 = (DefaultWindDataset) d1.clone();
assertTrue(d1 != d2);
assertTrue(d1.getClass() == d2.getClass());
assertTrue(d1.equals(d2));
// try a dataset with some content...
d1 = createSampleDataset1();
- d2 = null;
- try {
- d2 = (DefaultWindDataset) d1.clone();
- }
- catch (CloneNotSupportedException e) {
- e.printStackTrace();
- }
+ d2 = (DefaultWindDataset) d1.clone();
assertTrue(d1 != d2);
assertTrue(d1.getClass() == d2.getClass());
assertTrue(d1.equals(d2));
@@ -136,41 +125,31 @@
/**
* Serialize an instance, restore it, and check for equality.
*/
- public void testSerialization() {
+ public void testSerialization() throws IOException, ClassNotFoundException {
DefaultWindDataset d1 = new DefaultWindDataset();
- DefaultWindDataset d2 = null;
- try {
- ByteArrayOutputStream buffer = new ByteArrayOutputStream();
- ObjectOutput out = new ObjectOutputStream(buffer);
- out.writeObject(d1);
- out.close();
+ DefaultWindDataset d2;
+ ByteArrayOutputStream buffer = new ByteArrayOutputStream();
+ ObjectOutput out = new ObjectOutputStream(buffer);
+ out.writeObject(d1);
+ out.close();
- ObjectInput in = new ObjectInputStream(new ByteArrayInputStream(
- buffer.toByteArray()));
- d2 = (DefaultWindDataset) in.readObject();
- in.close();
- }
- catch (Exception e) {
- e.printStackTrace();
- }
+ ObjectInput in = new ObjectInputStream(new ByteArrayInputStream(
+ buffer.toByteArray()));
+ d2 = (DefaultWindDataset) in.readObject();
+ in.close();
assertEquals(d1, d2);
// try a dataset with some content...
d1 = createSampleDataset1();
- try {
- ByteArrayOutputStream buffer = new ByteArrayOutputStream();
- ObjectOutput out = new ObjectOutputStream(buffer);
- out.writeObject(d1);
- out.close();
+ buffer = new ByteArrayOutputStream();
+ out = new ObjectOutputStream(buffer);
+ out.writeObject(d1);
+ out.close();
- ObjectInput in = new ObjectInputStream(new ByteArrayInputStream(
- buffer.toByteArray()));
- d2 = (DefaultWindDataset) in.readObject();
- in.close();
- }
- catch (Exception e) {
- e.printStackTrace();
- }
+ in = new ObjectInputStream(new ByteArrayInputStream(
+ buffer.toByteArray()));
+ d2 = (DefaultWindDataset) in.readObject();
+ in.close();
assertEquals(d1, d2);
}
Modified: branches/jfreechart-1.0.x-branch/tests/org/jfree/data/xy/junit/DefaultXYDatasetTests.java
===================================================================
--- branches/jfreechart-1.0.x-branch/tests/org/jfree/data/xy/junit/DefaultXYDatasetTests.java 2013-08-02 14:00:28 UTC (rev 2823)
+++ branches/jfreechart-1.0.x-branch/tests/org/jfree/data/xy/junit/DefaultXYDatasetTests.java 2013-08-02 14:26:36 UTC (rev 2824)
@@ -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;
@@ -104,15 +105,9 @@
/**
* Confirm that cloning works.
*/
- public void testCloning() {
+ public void testCloning() throws CloneNotSupportedException {
DefaultXYDataset d1 = new DefaultXYDataset();
- DefaultXYDataset d2 = null;
- try {
- d2 = (DefaultXYDataset) d1.clone();
- }
- catch (CloneNotSupportedException e) {
- e.printStackTrace();
- }
+ DefaultXYDataset d2 = (DefaultXYDataset) d1.clone();
assertTrue(d1 != d2);
assertTrue(d1.getClass() == d2.getClass());
assertTrue(d1.equals(d2));
@@ -122,12 +117,7 @@
double[] y1 = new double[] {4.0, 5.0, 6.0};
double[][] data1 = new double[][] {x1, y1};
d1.addSeries("S1", data1);
- try {
- d2 = (DefaultXYDataset) d1.clone();
- }
- catch (CloneNotSupportedException e) {
- e.printStackTrace();
- }
+ d2 = (DefaultXYDataset) d1.clone();
assertTrue(d1 != d2);
assertTrue(d1.getClass() == d2.getClass());
assertTrue(d1.equals(d2));
@@ -150,26 +140,18 @@
/**
* Serialize an instance, restore it, and check for equality.
*/
- public void testSerialization() {
+ public void testSerialization() throws IOException, ClassNotFoundException {
DefaultXYDataset d1 = new DefaultXYDataset();
- DefaultXYDataset d2 = null;
-
- try {
- ByteArrayOutputStream buffer = new ByteArrayOutputStream();
- ObjectOutput out = new ObjectOutputStream(buffer);
- out.writeObject(d1);
- out.close();
-
- ObjectInput in = new ObjectInputStream(
- new ByteArrayInputStream(buffer.toByteArray())
- );
- d2 = (DefaultXYDataset) in.readObject();
- in.close();
- }
- catch (Exception e) {
- e.printStackTrace();
- }
+ DefaultXYDataset d2;
+ ByteArrayOutputStream buffer = new ByteArrayOutputStream();
+ ObjectOutput out = new ObjectOutputStream(buffer);
+ out.writeObject(d1);
+ out.close();
+ ObjectInput in = new ObjectInputStream(new ByteArrayInputStream(
+ buffer.toByteArray()));
+ d2 = (DefaultXYDataset) in.readObject();
+ in.close();
assertEquals(d1, d2);
// try a dataset with some content...
@@ -177,23 +159,16 @@
double[] y1 = new double[] {4.0, 5.0, 6.0};
double[][] data1 = new double[][] {x1, y1};
d1.addSeries("S1", data1);
- try {
- ByteArrayOutputStream buffer = new ByteArrayOutputStream();
- ObjectOutput out = new ObjectOutputStream(buffer);
- out.writeObject(d1);
- out.close();
+ buffer = new ByteArrayOutputStream();
+ out = new ObjectOutputStream(buffer);
+ out.writeObject(d1);
+ out.close();
- ObjectInput in = new ObjectInputStream(
- new ByteArrayInputStream(buffer.toByteArray())
- );
- d2 = (DefaultXYDataset) in.readObject();
- in.close();
- }
- catch (Exception e) {
- e.printStackTrace();
- }
+ in = new ObjectInputStream(new ByteArrayInputStream(
+ buffer.toByteArray()));
+ d2 = (DefaultXYDataset) in.readObject();
+ in.close();
assertEquals(d1, d2);
-
}
/**
Modified: branches/jfreechart-1.0.x-branch/tests/org/jfree/data/xy/junit/DefaultXYZDatasetTests.java
===================================================================
--- branches/jfreechart-1.0.x-branch/tests/org/jfree/data/xy/junit/DefaultXYZDatasetTests.java 2013-08-02 14:00:28 UTC (rev 2823)
+++ branches/jfreechart-1.0.x-branch/tests/org/jfree/data/xy/junit/DefaultXYZDatasetTests.java 2013-08-02 14:26:36 UTC (rev 2824)
@@ -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;
@@ -106,15 +107,9 @@
/**
* Confirm that cloning works.
*/
- public void testCloning() {
+ public void testCloning() throws CloneNotSupportedException {
DefaultXYZDataset d1 = new DefaultXYZDataset();
- DefaultXYZDataset d2 = null;
- try {
- d2 = (DefaultXYZDataset) d1.clone();
- }
- catch (CloneNotSupportedException e) {
- e.printStackTrace();
- }
+ DefaultXYZDataset d2 = (DefaultXYZDataset) d1.clone();
assertTrue(d1 != d2);
assertTrue(d1.getClass() == d2.getClass());
assertTrue(d1.equals(d2));
@@ -125,12 +120,7 @@
double[] z1 = new double[] {7.0, 8.0, 9.0};
double[][] data1 = new double[][] {x1, y1, z1};
d1.addSeries("S1", data1);
- try {
- d2 = (DefaultXYZDataset) d1.clone();
- }
- catch (CloneNotSupportedException e) {
- e.printStackTrace();
- }
+ d2 = (DefaultXYZDataset) d1.clone();
assertTrue(d1 != d2);
assertTrue(d1.getClass() == d2.getClass());
assertTrue(d1.equals(d2));
@@ -153,26 +143,18 @@
/**
* Serialize an instance, restore it, and check for equality.
*/
- public void testSerialization() {
-
+ public void testSerialization() throws IOException, ClassNotFoundException {
DefaultXYZDataset d1 = new DefaultXYZDataset();
- DefaultXYZDataset d2 = null;
+ DefaultXYZDataset d2;
+ ByteArrayOutputStream buffer = new ByteArrayOutputStream();
+ ObjectOutput out = new ObjectOutputStream(buffer);
+ out.writeObject(d1);
+ out.close();
- try {
- ByteArrayOutputStream buffer = new ByteArrayOutputStream();
- ObjectOutput out = new ObjectOutputStream(buffer);
- out.writeObject(d1);
- out.close();
-
- ObjectInput in = new ObjectInputStream(
- new ByteArrayInputStream(buffer.toByteArray())
- );
- d2 = (DefaultXYZDataset) in.readObject();
- in.close();
- }
- catch (Exception e) {
- e.printStackTrace();
- }
+ ObjectInput in = new ObjectInputStream(new ByteArrayInputStream(
+ buffer.toByteArray()));
+ d2 = (DefaultXYZDataset) in.readObject();
+ in.close();
assertEquals(d1, d2);
// try a dataset with some content...
@@ -181,22 +163,16 @@
double[] z1 = new double[] {7.0, 8.0, 9.0};
double[][] data1 = new double[][] {x1, y1, z1};
d1.addSeries("S1", data1);
- try {
- ByteArrayOutputStream buffer = new ByteArrayOutputStream();
- ObjectOutput out = new ObjectOutputStream(buffer);
- out.writeObject(d1);
- out.close();
+ buffer = new ByteArrayOutputStream();
+ out = new ObjectOutputStream(buffer);
+ out.writeObject(d1);
+ out.close();
- ObjectInput in = new ObjectInputStream(new ByteArrayInputStream(
- buffer.toByteArray()));
- d2 = (DefaultXYZDataset) in.readObject();
- in.close();
- }
- catch (Exception e) {
- e.printStackTrace();
- }
+ in = new ObjectInputStream(new ByteArrayInputStream(
+ buffer.toByteArray()));
+ d2 = (DefaultXYZDataset) in.readObject();
+ in.close();
assertEquals(d1, d2);
-
}
/**
Modified: branches/jfreechart-1.0.x-branch/tests/org/jfree/data/xy/junit/MatrixSeriesCollectionTests.java
===================================================================
--- branches/jfreechart-1.0.x-branch/tests/org/jfree/data/xy/junit/MatrixSeriesCollectionTests.java 2013-08-02 14:00:28 UTC (rev 2823)
+++ branches/jfreechart-1.0.x-branch/tests/org/jfree/data/xy/junit/MatrixSeriesCollectionTests.java 2013-08-02 14:26:36 UTC (rev 2824)
@@ -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;
@@ -104,18 +105,13 @@
/**
* Confirm that cloning works.
*/
- public void testCloning() {
+ public void testCloning() throws CloneNotSupportedException {
MatrixSeries s1 = new MatrixSeries("Series", 2, 3);
s1.update(0, 0, 1.1);
MatrixSeriesCollection c1 = new MatrixSeriesCollection();
c1.addSeries(s1);
- MatrixSeriesCollection c2 = null;
- try {
- c2 = (MatrixSeriesCollection) c1.clone();
- }
- catch (CloneNotSupportedException e) {
- e.printStackTrace();
- }
+ MatrixSeriesCollection c2 = (MatrixSeriesCollection) c1.clone();
+
assertTrue(c1 != c2);
assertTrue(c1.getClass() == c2.getClass());
assertTrue(c1.equals(c2));
@@ -136,27 +132,21 @@
/**
* Serialize an instance, restore it, and check for equality.
*/
- public void testSerialization() {
+ public void testSerialization() throws IOException, ClassNotFoundException {
MatrixSeries s1 = new MatrixSeries("Series", 2, 3);
s1.update(0, 0, 1.1);
MatrixSeriesCollection c1 = new MatrixSeriesCollection();
c1.addSeries(s1);
- MatrixSeriesCollection c2 = null;
+ MatrixSeriesCollection c2;
+ ByteArrayOutputStream buffer = new ByteArrayOutputStream();
+ ObjectOutput out = new ObjectOutputStream(buffer);
+ out.writeObject(c1);
+ out.close();
- try {
- ByteArrayOutputStream buffer = new ByteArrayOutputStream();
- ObjectOutput out = new ObjectOutputStream(buffer);
- out.writeObject(c1);
- out.close();
-
- ObjectInput in = new ObjectInputStream(
- new ByteArrayInputStream(buffer.toByteArray()));
- c2 = (MatrixSeriesCollection) in.readObject();
- in.close();
- }
- catch (Exception e) {
- e.printStackTrace();
- }
+ ObjectInput in = new ObjectInputStream(
+ new ByteArrayInputStream(buffer.toByteArray()));
+ c2 = (MatrixSeriesCollection) in.readObject();
+ in.close();
assertEquals(c1, c2);
}
Modified: branches/jfreechart-1.0.x-branch/tests/org/jfree/data/xy/junit/MatrixSeriesTests.java
===================================================================
--- branches/jfreechart-1.0.x-branch/tests/org/jfree/data/xy/junit/MatrixSeriesTests.java 2013-08-02 14:00:28 UTC (rev 2823)
+++ branches/jfreechart-1.0.x-branch/tests/org/jfree/data/xy/junit/MatrixSeriesTests.java 2013-08-02 14:26:36 UTC (rev 2824)
@@ -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;
@@ -114,17 +115,11 @@
/**
* Confirm that cloning works.
*/
- public void testCloning() {
+ public void testCloning() throws CloneNotSupportedException {
MatrixSeries m1 = new MatrixSeries("Test", 8, 3);
m1.update(0, 0, 11.0);
m1.update(7, 2, 22.0);
- MatrixSeries m2 = null;
- try {
- m2 = (MatrixSeries) m1.clone();
- }
- catch (CloneNotSupportedException e) {
- e.printStackTrace();
- }
+ MatrixSeries m2 = (MatrixSeries) m1.clone();
assertTrue(m1 != m2);
assertTrue(m1.getClass() == m2.getClass());
assertTrue(m1.equals(m2));
@@ -133,25 +128,20 @@
/**
* Serialize an instance, restore it, and check for equality.
*/
- public void testSerialization() {
+ public void testSerialization() throws IOException, ClassNotFoundException {
MatrixSeries m1 = new MatrixSeries("Test", 8, 3);
m1.update(0, 0, 11.0);
m1.update(7, 2, 22.0);
- MatrixSeries m2 = null;
- try {
- ByteArrayOutputStream buffer = new ByteArrayOutputStream();
- ObjectOutput out = new ObjectOutputStream(buffer);
- out.writeObject(m1);
- out.close();
+ MatrixSeries m2;
+ ByteArrayOutputStream buffer = new ByteArrayOutputStream();
+ ObjectOutput out = new ObjectOutputStream(buffer);
+ out.writeObject(m1);
+ out.close();
- ObjectInput in = new ObjectInputStream(
- new ByteArrayInputStream(buffer.toByteArray()));
- m2 = (MatrixSeries) in.readObject();
- in.close();
- }
- catch (Exception e) {
- e.printStackTrace();
- }
+ ObjectInput in = new ObjectInputStream(
+ new ByteArrayInputStream(buffer.toByteArray()));
+ m2 = (MatrixSeries) in.readObject();
+ in.close();
assertEquals(m1, m2);
}
Modified: branches/jfreechart-1.0.x-branch/tests/org/jfree/data/xy/junit/OHLCDataItemTests.java
===================================================================
--- branches/jfreechart-1.0.x-branch/tests/org/jfree/data/xy/junit/OHLCDataItemTests.java 2013-08-02 14:00:28 UTC (rev 2823)
+++ branches/jfreechart-1.0.x-branch/tests/org/jfree/data/xy/junit/OHLCDataItemTests.java 2013-08-02 14:26:36 UTC (rev 2824)
@@ -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;
@@ -104,27 +105,20 @@
/**
* Serialize an instance, restore it, and check for equality.
*/
- public void testSerialization() {
- OHLCDataItem i1 = new OHLCDataItem(
- new Date(1L), 1.0, 2.0, 3.0, 4.0, 5.0
- );
- OHLCDataItem i2 = null;
+ public void testSerialization() throws IOException, ClassNotFoundException {
+ OHLCDataItem i1 = new OHLCDataItem(new Date(1L), 1.0, 2.0, 3.0, 4.0,
+ 5.0);
+ OHLCDataItem i2;
- try {
- ByteArrayOutputStream buffer = new ByteArrayOutputStream();
- ObjectOutput out = new ObjectOutputStream(buffer);
- out.writeObject(i1);
- out.close();
+ ByteArrayOutputStream buffer = new ByteArrayOutputStream();
+ ObjectOutput out = new ObjectOutputStream(buffer);
+ out.writeObject(i1);
+ out.close();
- ObjectInput in = new ObjectInputStream(
- new ByteArrayInputStream(buffer.toByteArray())
- );
- i2 = (OHLCDataItem) in.readObject();
- in.close();
- }
- catch (Exception e) {
- e.printStackTrace();
- }
+ ObjectInput in = new ObjectInputStream(new ByteArrayInputStream(
+ buffer.toByteArray()));
+ i2 = (OHLCDataItem) in.readObject();
+ in.close();
assertEquals(i1, i2);
}
Modified: branches/jfreechart-1.0.x-branch/tests/org/jfree/data/xy/junit/VectorDataItemTests.java
===================================================================
--- branches/jfreechart-1.0.x-branch/tests/org/jfree/data/xy/junit/VectorDataItemTests.java 2013-08-02 14:00:28 UTC (rev 2823)
+++ branches/jfreechart-1.0.x-branch/tests/org/jfree/data/xy/junit/VectorDataItemTests.java 2013-08-02 14:26:36 UTC (rev 2824)
@@ -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;
@@ -122,15 +123,9 @@
/**
* Check cloning.
*/
- public void testCloning() {
+ public void testCloning() throws CloneNotSupportedException {
VectorDataItem v1 = new VectorDataItem(1.0, 2.0, 3.0, 4.0);
- VectorDataItem v2 = null;
- try {
- v2 = (VectorDataItem) v1.clone();
- }
- catch (CloneNotSupportedException e) {
- e.printStackTrace();
- }
+ VectorDataItem v2 = (VectorDataItem) v1.clone();
assertTrue(v1 != v2);
assertTrue(v1.getClass() == v2.getClass());
assertTrue(v1.equals(v2));
@@ -139,23 +134,18 @@
/**
* Serialize an instance, restore it, and check for equality.
*/
- public void testSerialization() {
+ public void testSerialization() throws IOException, ClassNotFoundException {
VectorDataItem v1 = new VectorDataItem(1.0, 2.0, 3.0, 4.0);
- VectorDataItem v2 = null;
- try {
- ByteArrayOutputStream buffer = new ByteArrayOutputStream();
- ObjectOutput out = new ObjectOutputStream(buffer);
- out.writeObject(v1);
- out.close();
+ VectorDataItem v2;
+ ByteArrayOutputStream buffer = new ByteArrayOutputStream();
+ ObjectOutput out = new ObjectOutputStream(buffer);
+ out.writeObject(v1);
+ out.close();
- ObjectInput in = new ObjectInputStream(
- new ByteArrayInputStream(buffer.toByteArray()));
- v2 = (VectorDataItem) in.readObject();
- in.close();
- }
- catch (Exception e) {
- e.printStackTrace();
- }
+ ObjectInput in = new ObjectInputStream(new ByteArrayInputStream(
+ buffer.toByteArray()));
+ v2 = (VectorDataItem) in.readObject();
+ in.close();
assertEquals(v1, v2);
}
Modified: branches/jfreechart-1.0.x-branch/tests/org/jfree/data/xy/junit/VectorSeriesCollectionTests.java
===================================================================
--- branches/jfreechart-1.0.x-branch/tests/org/jfree/data/xy/junit/VectorSeriesCollectionTests.java 2013-08-02 14:00:28 UTC (rev 2823)
+++ branches/jfreechart-1.0.x-branch/tests/org/jfree/data/xy/junit/VectorSeriesCollectionTests.java 2013-08-02 14:26:36 UTC (rev 2824)
@@ -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;
@@ -105,18 +106,12 @@
/**
* Confirm that cloning works.
*/
- public void testCloning() {
+ public void testCloning() throws CloneNotSupportedException {
VectorSeries s1 = new VectorSeries("Series");
s1.add(1.0, 1.1, 1.2, 1.3);
VectorSeriesCollection c1 = new VectorSeriesCollection();
c1.addSeries(s1);
- VectorSeriesCollection c2 = null;
- try {
- c2 = (VectorSeriesCollection) c1.clone();
- }
- catch (CloneNotSupportedException e) {
- e.printStackTrace();
- }
+ VectorSeriesCollection c2 = (VectorSeriesCollection) c1.clone();
assertTrue(c1 != c2);
assertTrue(c1.getClass() == c2.getClass());
assertTrue(c1.equals(c2));
@@ -137,27 +132,21 @@
/**
* Serialize an instance, restore it, and check for equality.
*/
- public void testSerialization() {
+ public void testSerialization() throws IOException, ClassNotFoundException {
VectorSeries s1 = new VectorSeries("Series");
s1.add(1.0, 1.1, 1.2, 1.3);
VectorSeriesCollection c1 = new VectorSeriesCollection();
c1.addSeries(s1);
- VectorSeriesCollection c2 = null;
+ VectorSeriesCollection c2;
+ ByteArrayOutputStream buffer = new ByteArrayOutputStream();
+ ObjectOutput out = new ObjectOutputStream(buffer);
+ out.writeObject(c1);
+ out.close();
- try {
- ByteArrayOutputStream buffer = new ByteArrayOutputStream();
- ObjectOutput out = new ObjectOutputStream(buffer);
- out.writeObject(c1);
- out.close();
-
- ObjectInput in = new ObjectInputStream(
- new ByteArrayInputStream(buffer.toByteArray()));
- c2 = (VectorSeriesCollection) in.readObject();
- in.close();
- }
- catch (Exception e) {
- e.printStackTrace();
- }
+ ObjectInput in = new ObjectInputStream(new ByteArrayInputStream(
+ buffer.toByteArray()));
+ c2 = (VectorSeriesCollection) in.readObject();
+ in.close();
assertEquals(c1, c2);
}
Modified: branches/jfreechart-1.0.x-branch/tests/org/jfree/data/xy/junit/VectorSeriesTests.java
===================================================================
--- branches/jfreechart-1.0.x-branch/tests/org/jfree/data/xy/junit/VectorSeriesTests.java 2013-08-02 14:00:28 UTC (rev 2823)
+++ branches/jfreechart-1.0.x-branch/tests/org/jfree/data/xy/junit/VectorSeriesTests.java 2013-08-02 14:26:36 UTC (rev 2824)
@@ -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;
@@ -143,16 +144,10 @@
/**
* Confirm that cloning works.
*/
- public void testCloning() {
+ public void testCloning() throws CloneNotSupportedException {
VectorSeries s1 = new VectorSeries("s1");
s1.add(1.0, 0.5, 1.5, 2.0);
- VectorSeries s2 = null;
- try {
- s2 = (VectorSeries) s1.clone();
- }
- catch (CloneNotSupportedException e) {
- e.printStackTrace();
- }
+ VectorSeries s2 = (VectorSeries) s1.clone();
assertTrue(s1 != s2);
assertTrue(s1.getClass() == s2.getClass());
assertTrue(s1.equals(s2));
@@ -161,26 +156,19 @@
/**
* Serialize an instance, restore it, and check for equality.
*/
- public void testSerialization() {
+ public void testSerialization() throws IOException, ClassNotFoundException {
VectorSeries s1 = new VectorSeries("s1");
s1.add(1.0, 0.5, 1.5, 2.0);
- VectorSeries s2 = null;
- try {
- ByteArrayOutputStream buffer = new ByteArrayOutputStream();
- ObjectOutput out = new ObjectOutputStream(buffer);
- out.writeObject(s1);
- out.close();
-
- ObjectInput in = new ObjectInputStream(
- new ByteArrayInputStream(buffer.toByteArray()));
- s2 = (VectorSeries) in.readObject();
- in.close();
- }
- catch (Exception e) {
- e.printStackTrace();
- }
+ VectorSeries s2;
+ ByteArrayOutputStream buffer = new ByteArrayOutputStream();
+ ObjectOutput out = new ObjectOutputStream(buffer);
+ out.writeObject(s1);
+ out.close();
+ ObjectInput in = new ObjectInputStream(new ByteArrayInputStream(
+ buffer.toByteArray()));
+ s2 = (VectorSeries) in.readObject();
+ in.close();
assertEquals(s1, s2);
-
}
/**
Modified: branches/jfreechart-1.0.x-branch/tests/org/jfree/data/xy/junit/VectorTests.java
===================================================================
--- branches/jfreechart-1.0.x-branch/tests/org/jfree/data/xy/junit/VectorTests.java 2013-08-02 14:00:28 UTC (rev 2823)
+++ branches/jfreechart-1.0.x-branch/tests/org/jfree/data/xy/junit/VectorTests.java 2013-08-02 14:26:36 UTC (rev 2824)
@@ -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;
@@ -120,23 +121,18 @@
/**
* Serialize an instance, restore it, and check for equality.
*/
- public void testSerialization() {
+ public void testSerialization() throws IOException, ClassNotFoundException {
Vector v1 = new Vector(1.0, 2.0);
- Vector v2 = null;
- try {
- ByteArrayOutputStream buffer = new ByteArrayOutputStream();
- ObjectOutput out = new ObjectOutputStream(buffer);
- out.writeObject(v1);
- out.close();
+ Vector v2;
+ ByteArrayOutputStream buffer = new ByteArrayOutputStream();
+ ObjectOutput out = new ObjectOutputStream(buffer);
+ out.writeObject(v1);
+ out.close();
- ObjectInput in = new ObjectInputStream(
- new ByteArrayInputStream(buffer.toByteArray()));
- v2 = (Vector) in.readObject();
- in.close();
- }
- catch (Exception e) {
- e.printStackTrace();
- }
+ ObjectInput in = new ObjectInputStream(
+ new ByteArrayInputStream(buffer.toByteArray()));
+ v2 = (Vector) in.readObject();
+ in.close();
assertEquals(v1, v2);
}
Modified: branches/jfreechart-1.0.x-branch/tests/org/jfree/data/xy/junit/XIntervalDataItemTests.java
===================================================================
--- branches/jfreechart-1.0.x-branch/tests/org/jfree/data/xy/junit/XIntervalDataItemTests.java 2013-08-02 14:00:28 UTC (rev 2823)
+++ branches/jfreechart-1.0.x-branch/tests/org/jfree/data/xy/junit/XIntervalDataItemTests.java 2013-08-02 14:26:36 UTC (rev 2824)
@@ -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;
@@ -127,15 +128,9 @@
/**
* Some checks for the clone() method.
*/
- public void testCloning() {
+ public void testCloning() throws CloneNotSupportedException {
XIntervalDataItem item1 = new XIntervalDataItem(1.0, 2.0, 3.0, 4.0);
- XIntervalDataItem item2 = null;
- try {
- item2 = (XIntervalDataItem) item1.clone();
- }
- catch (CloneNotSupportedException e) {
- e.printStackTrace();
- }
+ XIntervalDataItem item2 = (XIntervalDataItem) item1.clone();
assertTrue(item1 != item2);
assertTrue(item1.getClass() == item2.getClass());
assertTrue(item1.equals(item2));
@@ -144,23 +139,17 @@
/**
* Serialize an instance, restore it, and check for equality.
*/
- public void testSerialization() {
+ public void testSerialization() throws IOException, ClassNotFoundException {
XIntervalDataItem item1 = new XIntervalDataItem(1.0, 2.0, 3.0, 4.0);
- XIntervalDataItem item2 = null;
- try {
- ByteArrayOutputStream buffer = new ByteArrayOutputStream();
- ObjectOutput out = new ObjectOutputStream(buffer);
- out.writeObject(item1);
- out.close();
-
- ObjectInput in = new ObjectInputStream(
- new ByteArrayInputStream(buffer.toByteArray()));
- item2 = (XIntervalDataItem) in.readObject();
- in.close();
- }
- catch (Exception e) {
- e.printStackTrace();
- }
+ XIntervalDataItem item2;
+ ByteArrayOutputStream buffer = new ByteArrayOutputStream();
+ ObjectOutput out = new ObjectOutputStream(buffer);
+ out.writeObject(item1);
+ out.close();
+ ObjectInput in = new ObjectInputStream(new ByteArrayInputStream(
+ buffer.toByteArray()));
+ item2 = (XIntervalDataItem) in.readObject();
+ in.close();
assertEquals(item1, item2);
}
Modified: branches/jfreechart-1.0.x-branch/tests/org/jfree/data/xy/junit/XIntervalSeriesCollectionTests.java
===================================================================
--- branches/jfreechart-1.0.x-branch/tests/org/jfree/data/xy/junit/XIntervalSeriesCollectionTests.java 2013-08-02 14:00:28 UTC (rev 2823)
+++ branches/jfreechart-1.0.x-branch/tests/org/jfree/data/xy/junit/XIntervalSeriesCollectionTests.java 2013-08-02 14:26:36 UTC (rev 2824)
@@ -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;
@@ -108,18 +109,12 @@
/**
* Confirm that cloning works.
*/
- public void testCloning() {
+ public void testCloning() throws CloneNotSupportedException {
XIntervalSeriesCollection c1 = new XIntervalSeriesCollection();
XIntervalSeries s1 = new XIntervalSeries("Series");
s1.add(1.0, 1.1, 1.2, 1.3);
c1.addSeries(s1);
- XIntervalSeriesCollection c2 = null;
- try {
- c2 = (XIntervalSeriesCollection) c1.clone();
- }
- catch (CloneNotSupportedException e) {
- e.printStackTrace();
- }
+ XIntervalSeriesCollection c2 = (XIntervalSeriesCollection) c1.clone();
assertTrue(c1 != c2);
assertTrue(c1.getClass() == c2.getClass());
assertTrue(c1.equals(c2));
@@ -140,26 +135,19 @@
/**
* Serialize an instance, restore it, and check for equality.
*/
- public void testSerialization() {
+ public void testSerialization() throws IOException, ClassNotFoundException {
XIntervalSeriesCollection c1 = new XIntervalSeriesCollection();
XIntervalSeries s1 = new XIntervalSeries("Series");
s1.add(1.0, 1.1, 1.2, 1.3);
- XIntervalSeriesCollection 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 = (XIntervalSeriesCollection) in.readObject();
- in.close();
- }
- catch (Exception e) {
- e.printStackTrace();
- }
+ XIntervalSeriesCollection c2;
+ ByteArrayOutputStream buffer = new ByteArrayOutputStream();
+ ObjectOutput out = new ObjectOutputStream(buffer);
+ out.writeObject(c1);
+ out.close();
+ ObjectInput in = new ObjectInputStream(new ByteArrayInputStream(
+ buffer.toByteArray()));
+ c2 = (XIntervalSeriesCollection) in.readObject();
+ in.close();
assertEquals(c1, c2);
}
Modified: branches/jfreechart-1.0.x-branch/tests/org/jfree/data/xy/junit/XIntervalSeriesTests.java
===================================================================
--- branches/jfreechart-1.0.x-branch/tests/org/jfree/data/xy/junit/XIntervalSeriesTests.java 2013-08-02 14:00:28 UTC (rev 2823)
+++ branches/jfreechart-1.0.x-branch/tests/org/jfree/data/xy/junit/XIntervalSeriesTests.java 2013-08-02 14:26:36 UTC (rev 2824)
@@ -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;
@@ -142,16 +143,10 @@
/**
* Confirm that cloning works.
*/
- public void testCloning() {
+ public void testCloning() throws CloneNotSupportedException {
XIntervalSeries s1 = new XIntervalSeries("s1");
s1.add(1.0, 0.5, 1.5, 2.0);
- XIntervalSeries s2 = null;
- try {
- s2 = (XIntervalSeries) s1.clone();
- }
- catch (CloneNotSupportedException e) {
- e.printStackTrace();
- }
+ XIntervalSeries s2 = (XIntervalSeries) s1.clone();
assertTrue(s1 != s2);
assertTrue(s1.getClass() == s2.getClass());
assertTrue(s1.equals(s2));
@@ -160,26 +155,19 @@
/**
* Serialize an instance, restore it, and check for equality.
*/
- public void testSerialization() {
+ public void testSerialization() throws IOException, ClassNotFoundException {
XIntervalSeries s1 = new XIntervalSeries("s1");
s1.add(1.0, 0.5, 1.5, 2.0);
- XIntervalSeries s2 = null;
-
- try {
- ByteArrayOutputStream buffer = new ByteArrayOutputStream();
- ObjectOutput out = new ObjectOutputStream(buffer);
- out.writeObject(s1);
- out.close();
-
- ObjectInput in = new ObjectInputStream(
- new ByteArrayInputStream(buffer.toByteArray()));
- s2 = (XIntervalSeries) in.readObject();
- in.close();
- }
- catch (Exception e) {
- e.printStackTrace();
- }
+ XIntervalSeries s2;
+ ByteArrayOutputStream buffer = new ByteArrayOutputStream();
+ ObjectOutput out = new ObjectOutputStream(buffer);
+ out.writeObject(s1);
+ out.close();
+ ObjectInput in = new ObjectInputStream(
+ new ByteArrayInputStream(buffer.toByteArray()));
+ s2 = (XIntervalSeries) in.readObject();
+ in.close();
assertEquals(s1, s2);
}
Modified: branches/jfreechart-1.0.x-branch/tests/org/jfree/data/xy/junit/XYBarDatasetTests.java
===================================================================
--- branches/jfreechart-1.0.x-branch/tests/org/jfree/data/xy/junit/XYBarDatasetTests.java 2013-08-02 14:00:28 UTC (rev 2823)
+++ branches/jfreechart-1.0.x-branch/tests/org/jfree/data/xy/junit/XYBarDatasetTests.java 2013-08-02 14:26:36 UTC (rev 2824)
@@ -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;
@@ -103,20 +104,14 @@
/**
* Confirm that cloning works.
*/
- public void testCloning() {
+ public void testCloning() throws CloneNotSupportedException {
DefaultXYDataset d1 = new DefaultXYDataset();
double[] x1 = new double[] {1.0, 2.0, 3.0};
double[] y1 = new double[] {4.0, 5.0, 6.0};
double[][] data1 = new double[][] {x1, y1};
d1.addSeries("S1", data1);
XYBarDataset bd1 = new XYBarDataset(d1, 5.0);
- XYBarDataset bd2 = null;
- try {
- bd2 = (XYBarDataset) bd1.clone();
- }
- catch (CloneNotSupportedException e) {
- e.printStackTrace();
- }
+ XYBarDataset bd2 = (XYBarDataset) bd1.clone();
assertTrue(bd1 != bd2);
assertTrue(bd1.getClass() == bd2.getClass());
assertTrue(bd1.equals(bd2));
@@ -146,28 +141,23 @@
/**
* Serialize an instance, restore it, and check for equality.
*/
- public void testSerialization() {
+ public void testSerialization() throws IOException, ClassNotFoundException {
DefaultXYDataset d1 = new DefaultXYDataset();
double[] x1 = new double[] {1.0, 2.0, 3.0};
double[] y1 = new double[] {4.0, 5.0, 6.0};
double[][] data1 = new double[][] {x1, y1};
d1.addSeries("S1", data1);
XYBarDataset bd1 = new XYBarDataset(d1, 5.0);
- XYBarDataset bd2 = null;
- try {
- ByteArrayOutputStream buffer = new ByteArrayOutputStream();
- ObjectOutput out = new ObjectOutputStream(buffer);
- out.writeObject(bd1);
- out.close();
+ XYBarDataset bd2;
+ ByteArrayOutputStream buffer = new ByteArrayOutputStream();
+ ObjectOutput out = new ObjectOutputStream(buffer);
+ out.writeObject(bd1);
+ out.close();
- ObjectInput in = new ObjectInputStream(
- new ByteArrayInputStream(buffer.toByteArray()));
- bd2 = (XYBarDataset) in.readObject();
- in.close();
- }
- catch (Exception e) {
- e.printStackTrace();
- }
+ ObjectInput in = new ObjectInputStream(new ByteArrayInputStream(
+ buffer.toByteArray()));
+ bd2 = (XYBarDataset) in.readObject();
+ in.close();
assertEquals(bd1, bd2);
}
Modified: branches/jfreechart-1.0.x-branch/tests/org/jfree/data/xy/junit/XYCoordinateTests.java
===================================================================
--- branches/jfreechart-1.0.x-branch/tests/org/jfree/data/xy/junit/XYCoordinateTests.java 2013-08-02 14:00:28 UTC (rev 2823)
+++ branches/jfreechart-1.0.x-branch/tests/org/jfree/data/xy/junit/XYCoordinateTests.java 2013-08-02 14:26:36 UTC (rev 2824)
@@ -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;
@@ -120,23 +121,17 @@
/**
* Serialize an instance, restore it, and check for equality.
*/
- public void testSerialization() {
+ public void testSerialization() throws IOException, ClassNotFoundException {
XYCoordinate v1 = new XYCoordinate(1.0, 2.0);
- XYCoordinate v2 = null;
- try {
- ByteArrayOutputStream buffer = new ByteArrayOutputStream();
- ObjectOutput out = new ObjectOutputStream(buffer);
- out.writeObject(v1);
- out.close();
-
- ObjectInput in = new ObjectInputStream(
- new ByteArrayInputStream(buffer.toByteArray()));
- v2 = (XYCoordinate) in.readObject();
- in.close();
- }
- catch (Exception e) {
- e.printStackTrace();
- }
+ XYCoordinate v2;
+ ByteArrayOutputStream buffer = new ByteArrayOutputStream();
+ ObjectOutput out = new ObjectOutputStream(buffer);
+ out.writeObject(v1);
+ out.close();
+ ObjectInput in = new ObjectInputStream(new ByteArrayInputStream(
+ buffer.toByteArray()));
+ v2 = (XYCoordinate) in.readObject();
+ in.close();
assertEquals(v1, v2);
}
Modified: branches/jfreechart-1.0.x-branch/tests/org/jfree/data/xy/junit/XYDataItemTests.java
===================================================================
--- branches/jfreechart-1.0.x-branch/tests/org/jfree/data/xy/junit/XYDataItemTests.java 2013-08-02 14:00:28 UTC (rev 2823)
+++ branches/jfreechart-1.0.x-branch/tests/org/jfree/data/xy/junit/XYDataItemTests.java 2013-08-02 14:26:36 UTC (rev 2824)
@@ -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;
@@ -109,25 +110,19 @@
/**
* Serialize an instance, restore it, and check for equality.
*/
- public void testSerialization() {
+ public void testSerialization() throws IOException, ClassNotFoundException {
XYDataItem i1 = new XYDataItem(1.0, 1.1);
- XYDataItem i2 = null;
+ XYDataItem i2;
+ ByteArrayOutputStream buffer = new ByteArrayOutputStream();
+ ObjectOutput out = new ObjectOutputStream(buffer);
+ out.writeObject(i1);
+ out.close();
- try {
- ByteArrayOutputStream buffer = new ByteArrayOutputStream();
- ObjectOutput out = new ObjectOutputStream(buffer);
- out.writeObject(i1);
- out.close();
-
- ObjectInput in = new ObjectInputStream(
- new ByteArrayInputStream(buffer.toByteArray()));
- i2 = (XYDataItem) in.readObject();
- in.close();
- }
- catch (Exception e) {
- e.printStackTrace();
- }
+ ObjectInput in = new ObjectInputStream(new ByteArrayInputStream(
+ buffer.toByteArray()));
+ i2 = (XYDataItem) in.readObject();
+ in.close();
assertEquals(i1, i2);
}
Modified: branches/jfreechart-1.0.x-branch/tests/org/jfree/data/xy/junit/XYIntervalDataItemTests.java
===================================================================
--- branches/jfreechart-1.0.x-branch/tests/org/jfree/data/xy/junit/XYIntervalDataItemTests.java 2013-08-02 14:00:28 UTC (rev 2823)
+++ branches/jfreechart-1.0.x-branch/tests/org/jfree/data/xy/junit/XYIntervalDataItemTests.java 2013-08-02 14:26:36 UTC (rev 2824)
@@ -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;
@@ -142,16 +143,10 @@
/**
* Some checks for the clone() method.
*/
- public void testCloning() {
+ public void testCloning() throws CloneNotSupportedException {
XYIntervalDataItem item1 = new XYIntervalDataItem(1.0, 0.5, 1.5, 2.0,
1.9, 2.1);
- XYIntervalDataItem item2 = null;
- try {
- item2 = (XYIntervalDataItem) item1.clone();
- }
- catch (CloneNotSupportedException e) {
- e.printStackTrace();
- }
+ XYIntervalDataItem item2 = (XYIntervalDataItem) item1.clone();
assertTrue(item1 != item2);
assertTrue(item1.getClass() == item2.getClass());
assertTrue(item1.equals(item2));
@@ -160,24 +155,18 @@
/**
* Serialize an instance, restore it, and check for equality.
*/
- public void testSerialization() {
+ public void testSerialization() throws IOException, ClassNotFoundException {
XYIntervalDataItem item1 = new XYIntervalDataItem(1.0, 0.5, 1.5, 2.0,
1.9, 2.1);
- XYIntervalDataItem item2 = null;
- try {
- ByteArrayOutputStream buffer = new ByteArrayOutputStream();
- ObjectOutput out = new ObjectOutputStream(buffer);
- out.writeObject(item1);
- out.close();
-
- ObjectInput in = new ObjectInputStream(
- new ByteArrayInputStream(buffer.toByteArray()));
- item2 = (XYIntervalDataItem) in.readObject();
- in.close();
- }
- catch (Exception e) {
- e.printStackTrace();
- }
+ XYIntervalDataItem item2;
+ ByteArrayOutputStream buffer = new ByteArrayOutputStream();
+ ObjectOutput out = new ObjectOutputStream(buffer);
+ out.writeObject(item1);
+ out.close();
+ ObjectInput in = new ObjectInputStream(new ByteArrayInputStream(
+ buffer.toByteArray()));
+ item2 = (XYIntervalDataItem) in.readObject();
+ in.close();
assertEquals(item1, item2);
}
Modified: branches/jfreechart-1.0.x-branch/tests/org/jfree/data/xy/junit/XYIntervalSeriesCollectionTests.java
===================================================================
--- branches/jfreechart-1.0.x-branch/tests/org/jfree/data/xy/junit/XYIntervalSeriesCollectionTests.java 2013-08-02 14:00:28 UTC (rev 2823)
+++ branches/jfreechart-1.0.x-branch/tests/org/jfree/data/xy/junit/XYIntervalSeriesCollectionTests.java 2013-08-02 14:26:36 UTC (rev 2824)
@@ -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;
@@ -109,17 +110,11 @@
/**
* Confirm that cloning works.
*/
- public void testCloning() {
+ public void testCloning() throws CloneNotSupportedException {
XYIntervalSeriesCollection c1 = new XYIntervalSeriesCollection();
XYIntervalSeries s1 = new XYIntervalSeries("Series");
s1.add(1.0, 1.1, 1.2, 1.3, 1.4, 1.5);
- XYIntervalSeriesCollection c2 = null;
- try {
- c2 = (XYIntervalSeriesCollection) c1.clone();
- }
- catch (CloneNotSupportedException e) {
- e.printStackTrace();
- }
+ XYIntervalSeriesCollection c2 = (XYIntervalSeriesCollection) c1.clone();
assertTrue(c1 != c2);
assertTrue(c1.getClass() == c2.getClass());
assertTrue(c1.equals(c2));
@@ -142,26 +137,19 @@
/**
* Serialize an instance, restore it, and check for equality.
*/
- public void testSerialization() {
+ public void testSerialization() throws IOException, ClassNotFoundException {
XYIntervalSeriesCollection c1 = new XYIntervalSeriesCollection();
XYIntervalSeries s1 = new XYIntervalSeries("Series");
s1.add(1.0, 1.1, 1.2, 1.3, 1.4, 1.5);
- XYIntervalSeriesCollection 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 = (XYIntervalSeriesCollection) in.readObject();
- in.close();
- }
- catch (Exception e) {
- e.printStackTrace();
- }
+ XYIntervalSeriesCollection c2;
+ ByteArrayOutputStream buffer = new ByteArrayOutputStream();
+ ObjectOutput out = new ObjectOutputStream(buffer);
+ out.writeObject(c1);
+ out.close();
+ ObjectInput in = new ObjectInputStream(new ByteArrayInputStream(
+ buffer.toByteArray()));
+ c2 = (XYIntervalSeriesCollection) in.readObject();
+ in.close();
assertEquals(c1, c2);
// check independence
Modified: branches/jfreechart-1.0.x-branch/tests/org/jfree/data/xy/junit/XYIntervalSeriesTests.java
===================================================================
--- branches/jfreechart-1.0.x-branch/tests/org/jfree/data/xy/junit/XYIntervalSeriesTests.java 2013-08-02 14:00:28 UTC (rev 2823)
+++ branches/jfreechart-1.0.x-branch/tests/org/jfree/data/xy/junit/XYIntervalSeriesTests.java 2013-08-02 14:26:36 UTC (rev 2824)
@@ -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;
@@ -142,16 +143,10 @@
/**
* Confirm that cloning works.
*/
- public void testCloning() {
+ public void testCloning() throws CloneNotSupportedException {
XYIntervalSeries s1 = new XYIntervalSeries("s1");
s1.add(1.0, 0.5, 1.5, 2.0, 1.9, 2.01);
- XYIntervalSeries s2 = null;
- try {
- s2 = (XYIntervalSeries) s1.clone();
- }
- catch (CloneNotSupportedException e) {
- e.printStackTrace();
- }
+ XYIntervalSeries s2 = (XYIntervalSeries) s1.clone();
assertTrue(s1 != s2);
assertTrue(s1.getClass() == s2.getClass());
assertTrue(s1.equals(s2));
@@ -160,28 +155,21 @@
/**
* Serialize an instance, restore it, and check for equality.
*/
- public void testSerialization() {
+ public void testSerialization() throws IOException, ClassNotFoundException {
XYIntervalSeries s1 = new XYIntervalSeries("s1");
s1.add(1.0, 0.5, 1.5, 2.0, 1.9, 2.1);
- XYIntervalSeries s2 = null;
+ XYIntervalSeries s2;
+ ByteArrayOutputStream buffer = new ByteArrayOutputStream();
+ ObjectOutput out = new ObjectOutputStream(buffer);
+ out.writeObject(s1);
+ out.close();
- try {
- ByteArrayOutputStream buffer = new ByteArrayOutputStream();
- ObjectOutput out = new ObjectOutputStream(buffer);
- out.writeObject(s1);
- out.close();
-
- ObjectInput in = new ObjectInputStream(
- new ByteArrayInputStream(buffer.toByteArray()));
- s2 = (XYIntervalSeries) in.readObject();
- in.close();
- }
- catch (Exception e) {
- e.printStackTrace();
- }
+ ObjectInput in = new ObjectInputStream(new ByteArrayInputStream(
+ buffer.toByteArray()));
+ s2 = (XYIntervalSeries) in.readObject();
+ in.close();
assertEquals(s1, s2);
-
}
/**
Modified: branches/jfreechart-1.0.x-branch/tests/org/jfree/data/xy/junit/XYIntervalTests.java
===================================================================
--- bran...
[truncated message content] |