svn commit: r1161592 - /cxf/trunk/common/common/src/test/java/org/apache/cxf/staxutils/transform/OutTransformWriterTest.java

[sergeyb]

Author: sergeyb
Date: Thu Aug 25 14:58:36 2011
New Revision: 1161592

URL: http://svn.apache.org/viewvc?rev=1161592&view=rev
Log:
Attempting to fix transform tests for ibm jdk builds

Modified:
    
cxf/trunk/common/common/src/test/java/org/apache/cxf/staxutils/transform/OutTransformWriterTest.java

Modified: 
cxf/trunk/common/common/src/test/java/org/apache/cxf/staxutils/transform/OutTransformWriterTest.java
URL: 
http://svn.apache.org/viewvc/cxf/trunk/common/common/src/test/java/org/apache/cxf/staxutils/transform/OutTransformWriterTest.java?rev=1161592&r1=1161591&r2=1161592&view=diff
==============================================================================
--- 
cxf/trunk/common/common/src/test/java/org/apache/cxf/staxutils/transform/OutTransformWriterTest.java
 (original)
+++ 
cxf/trunk/common/common/src/test/java/org/apache/cxf/staxutils/transform/OutTransformWriterTest.java
 Thu Aug 25 14:58:36 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";)