You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cxf.apache.org by se...@apache.org on 2011/08/25 17:03:58 UTC
svn commit: r1161594 - in /cxf/branches/2.4.x-fixes: ./
common/common/src/test/java/org/apache/cxf/staxutils/transform/OutTransformWriterTest.java
Author: sergeyb
Date: Thu Aug 25 15:03:58 2011
New Revision: 1161594
URL: http://svn.apache.org/viewvc?rev=1161594&view=rev
Log:
Merged revisions 1161592 via svnmerge from
https://svn.apache.org/repos/asf/cxf/trunk
........
r1161592 | sergeyb | 2011-08-25 15:58:36 +0100 (Thu, 25 Aug 2011) | 1 line
Attempting to fix transform tests for ibm jdk builds
........
Modified:
cxf/branches/2.4.x-fixes/ (props changed)
cxf/branches/2.4.x-fixes/common/common/src/test/java/org/apache/cxf/staxutils/transform/OutTransformWriterTest.java
Propchange: cxf/branches/2.4.x-fixes/
------------------------------------------------------------------------------
svn:mergeinfo = /cxf/trunk:1161592
Propchange: cxf/branches/2.4.x-fixes/
------------------------------------------------------------------------------
Binary property 'svnmerge-integrated' - no diff available.
Modified: cxf/branches/2.4.x-fixes/common/common/src/test/java/org/apache/cxf/staxutils/transform/OutTransformWriterTest.java
URL: http://svn.apache.org/viewvc/cxf/branches/2.4.x-fixes/common/common/src/test/java/org/apache/cxf/staxutils/transform/OutTransformWriterTest.java?rev=1161594&r1=1161593&r2=1161594&view=diff
==============================================================================
--- cxf/branches/2.4.x-fixes/common/common/src/test/java/org/apache/cxf/staxutils/transform/OutTransformWriterTest.java (original)
+++ cxf/branches/2.4.x-fixes/common/common/src/test/java/org/apache/cxf/staxutils/transform/OutTransformWriterTest.java Thu Aug 25 15:03:58 2011
@@ -76,10 +76,15 @@ public class OutTransformWriterTest exte
Marshaller m = context.createMarshaller();
m.marshal(new TestBean(), transformWriter);
- String expected = "<?xml version='1.0' encoding='UTF-8'?>"
- + "<ps1:testBean xmlns:ps1=\"http://testbeans.com/v2\""
+ String xmlPI = "<?xml version='1.0' encoding='UTF-8'?>";
+ String start = "<ps1:testBean xmlns:ps1=\"http://testbeans.com/v2\"";
+ String expected1 = xmlPI + start
+ " xmlns:ps2=\"http://testbeans.com/v3\"><ps2:bean/></ps1:testBean>";
- assertEquals(expected, os.toString());
+ String expected2 = xmlPI + start
+ + "><ps2:bean xmlns:ps2=\"http://testbeans.com/v3\"/></ps1:testBean>";
+ String out = os.toString();
+ assertTrue("Output \"" + out + "\" does not match expected values",
+ expected1.equals(out) || expected2.equals(out));
}
@@ -101,10 +106,15 @@ public class OutTransformWriterTest exte
Marshaller m = context.createMarshaller();
m.marshal(new TestBean(), transformWriter);
- String expected = "<?xml version='1.0' encoding='UTF-8'?>"
- + "<testBean xmlns=\"http://testbeans.com/v2\""
+ String xmlPI = "<?xml version='1.0' encoding='UTF-8'?>";
+ String start = "<testBean xmlns=\"http://testbeans.com/v2\"";
+ String expected1 = xmlPI + start
+ " xmlns:ps2=\"http://testbeans.com/v3\"><ps2:bean/></testBean>";
- assertEquals(expected, os.toString());
+ String expected2 = xmlPI + start
+ + "><ps2:bean xmlns:ps2=\"http://testbeans.com/v3\"/></testBean>";
+ String out = os.toString();
+ assertTrue("Output \"" + out + "\" does not match expected values",
+ expected1.equals(out) || expected2.equals(out));
}
@XmlRootElement(name = "testBean", namespace = "http://testbeans.com")