diff --git a/core/src/test/java/hudson/util/CopyOnWriteListTest.java b/core/src/test/java/hudson/util/CopyOnWriteListTest.java
index 3ba6cd1ff7..1478e0418b 100644
--- a/core/src/test/java/hudson/util/CopyOnWriteListTest.java
+++ b/core/src/test/java/hudson/util/CopyOnWriteListTest.java
@@ -27,7 +27,6 @@ import junit.framework.TestCase;
import java.util.ArrayList;
import java.util.List;
-import java.io.StringWriter;
/**
* @author Kohsuke Kawaguchi, Alan Harder
@@ -44,23 +43,22 @@ public class CopyOnWriteListTest extends TestCase {
public void testSerialization() throws Exception {
XStream2 xs = new XStream2();
TestData td = new TestData();
- StringWriter out = new StringWriter();
- xs.toXML(td, out);
+ String out = xs.toXML(td);
assertEquals("empty lists", ""
+ "",
- out.toString().replaceAll("\\s+", ""));
+ out.replaceAll("\\s+", ""));
TestData td2 = (TestData)xs.fromXML(out.toString());
assertTrue(td2.list1.isEmpty());
assertTrue(td2.list2.isEmpty());
td.list1.add("foobar1");
td.list2.add("foobar2");
- xs.toXML(td, out = new StringWriter());
+ out = xs.toXML(td);
assertEquals("lists", ""
+ "foobar1foobar2"
+ "",
- out.toString().replaceAll("\\s+", ""));
+ out.replaceAll("\\s+", ""));
td2 = (TestData)xs.fromXML(out.toString());
assertEquals("foobar1", td2.list1.getView().get(0));
assertEquals("foobar2", td2.list2.get(0));
diff --git a/core/src/test/java/hudson/util/CopyOnWriteMapTest.java b/core/src/test/java/hudson/util/CopyOnWriteMapTest.java
index 00a42ee46c..10d1983467 100644
--- a/core/src/test/java/hudson/util/CopyOnWriteMapTest.java
+++ b/core/src/test/java/hudson/util/CopyOnWriteMapTest.java
@@ -23,7 +23,6 @@
*/
package hudson.util;
-import java.io.StringWriter;
import java.util.Comparator;
import java.util.HashMap;
import java.util.TreeMap;
@@ -44,24 +43,24 @@ public class CopyOnWriteMapTest extends TestCase {
public void testHashSerialization() throws Exception {
HashData td = new HashData();
XStream2 xs = new XStream2();
- StringWriter out = new StringWriter();
- xs.toXML(td, out);
+
+ String out = xs.toXML(td);
assertEquals("empty maps", ""
+ "",
- out.toString().replaceAll("\\s+", ""));
- HashData td2 = (HashData)xs.fromXML(out.toString());
+ out.replaceAll("\\s+", ""));
+ HashData td2 = (HashData)xs.fromXML(out);
assertTrue(td2.map1.isEmpty());
assertTrue(td2.map2.isEmpty());
td.map1.put("foo1", "bar1");
td.map2.put("foo2", "bar2");
- xs.toXML(td, out = new StringWriter());
+ out = xs.toXML(td);
assertEquals("maps", ""
+ "foo1bar1"
+ "foo2bar2"
+ "",
- out.toString().replaceAll("\\s+", ""));
- td2 = (HashData)xs.fromXML(out.toString());
+ out.replaceAll("\\s+", ""));
+ td2 = (HashData)xs.fromXML(out);
assertEquals("bar1", td2.map1.get("foo1"));
assertEquals("bar2", td2.map2.get("foo2"));
}
@@ -86,20 +85,20 @@ public class CopyOnWriteMapTest extends TestCase {
public void testTreeSerialization() throws Exception {
TreeData td = new TreeData();
XStream2 xs = new XStream2();
- StringWriter out = new StringWriter();
- xs.toXML(td, out);
+
+ String out = xs.toXML(td);
assertEquals("empty maps", ""
+ ""
+ "",
- out.toString().replaceAll("\\s+", ""));
- TreeData td2 = (TreeData)xs.fromXML(out.toString());
+ out.replaceAll("\\s+", ""));
+ TreeData td2 = (TreeData)xs.fromXML(out);
assertTrue(td2.map1.isEmpty());
assertTrue(td2.map2.isEmpty());
td = new TreeData(String.CASE_INSENSITIVE_ORDER);
td.map1.put("foo1", "bar1");
td.map2.put("foo2", "bar2");
- xs.toXML(td, out = new StringWriter());
+ out = xs.toXML(td);
assertEquals("maps", ""
+ ""
+ "foo1bar1"
@@ -107,8 +106,8 @@ public class CopyOnWriteMapTest extends TestCase {
+ " reference=\"../../map1/comparator\"/>"
+ "foo2bar2"
+ "",
- out.toString().replaceAll(">\\s+<", "><"));
- td2 = (TreeData)xs.fromXML(out.toString());
+ out.replaceAll(">\\s+<", "><"));
+ td2 = (TreeData)xs.fromXML(out);
assertEquals("bar1", td2.map1.get("foo1"));
assertEquals("bar2", td2.map2.get("foo2"));
}