From c3144d43f8b83ac74eb480d2c5c3328bb8c11631 Mon Sep 17 00:00:00 2001
From: Jerome Lacoste <jerome.lacoste@gmail.com>
Date: Thu, 10 Jan 2013 12:43:08 +0100
Subject: [PATCH] Test failure on Mac: make sure we load resources in a
 platform independent way.

---
 .../test/java/jenkins/util/xstream/XStreamDOMTest.java   | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/core/src/test/java/jenkins/util/xstream/XStreamDOMTest.java b/core/src/test/java/jenkins/util/xstream/XStreamDOMTest.java
index 3bb3e6896d..671a9fbc30 100644
--- a/core/src/test/java/jenkins/util/xstream/XStreamDOMTest.java
+++ b/core/src/test/java/jenkins/util/xstream/XStreamDOMTest.java
@@ -67,9 +67,14 @@ public class XStreamDOMTest {
     }
 
     private String getTestData1() throws IOException {
-        return IOUtils.toString(XStreamDOMTest.class.getResourceAsStream("XStreamDOMTest.data1.xml")).replaceAll("\r\n", "\n");
+        return getTestData("XStreamDOMTest.data1.xml");
     }
 
+    private String getTestData(String resourceName) throws IOException {
+        return IOUtils.toString(getClass().getResourceAsStream(resourceName)).replaceAll("\r\n", "\n");
+    }
+
+
     private Foo createSomeFoo() {
         Foo foo = new Foo();
         foo.bar = new XStreamDOM("test1", Collections.singletonMap("key", "value"),"text!");
@@ -160,7 +165,7 @@ public class XStreamDOMTest {
     @Test
     public void readFromInputStream() throws Exception {
         for (String name : new String[]{"XStreamDOMTest.data1.xml","XStreamDOMTest.data2.xml"}) {
-            String input = IOUtils.toString(getClass().getResourceAsStream(name));
+            String input = getTestData(name);
             XStreamDOM dom = XStreamDOM.from(new StringReader(input));
             StringWriter sw = new StringWriter();
             dom.writeTo(sw);
-- 
GitLab