[pkg-java] r2506 - branches/jaxme/feature/debian/src/jaxme/org/apache/ws/jaxme/junit

[Marcus Better]

Author: marcusb-guest
Date: 2006-09-29 09:26:27 +0000 (Fri, 29 Sep 2006)
New Revision: 2506

Modified:
   branches/jaxme/feature/debian/src/jaxme/org/apache/ws/jaxme/junit/WildcardTest.java
Log:
Order of attributes is not guaranteed, and libgcj gives different order. Nobody expects the Spanish inquisition!


Modified: branches/jaxme/feature/debian/src/jaxme/org/apache/ws/jaxme/junit/WildcardTest.java
===================================================================
--- branches/jaxme/feature/debian/src/jaxme/org/apache/ws/jaxme/junit/WildcardTest.java	2006-09-29 08:20:54 UTC (rev 2505)
+++ branches/jaxme/feature/debian/src/jaxme/org/apache/ws/jaxme/junit/WildcardTest.java	2006-09-29 09:26:27 UTC (rev 2506)
@@ -88,9 +88,10 @@
     }
 
     public void testMarshalAnyAttribute() throws Exception {
-        String expect = "<ex:AnyAttribute p:bar=\"value 1\" baz=\"value 2\" xmlns:ex=\"http://ws.apache.org/jaxme/test/misc/wildcards\" xmlns:p=\"foo\"/>";
+        String expect1 = "<ex:AnyAttribute p:bar=\"value 1\" baz=\"value 2\" xmlns:ex=\"http://ws.apache.org/jaxme/test/misc/wildcards\" xmlns:p=\"foo\"/>";
+        String expect2 = "<ex:AnyAttribute p:bar=\"value 1\" baz=\"value 2\" xmlns:p=\"foo\" xmlns:ex=\"http://ws.apache.org/jaxme/test/misc/wildcards\"/>";
         String got = getMarshalledAnyAttribute();
-        assertEquals(expect, got);
+        assertTrue(expect1.equals(got) || expect2.equals(got));
     }
 
     protected void assertEquals(WildcardAttribute[] pExpect, WildcardAttribute[] pGot) {
@@ -123,9 +124,10 @@
     }
 
     public void testMarshalListAttribute() throws Exception {
-        String expect = "<ex:ListAttribute p:foo=\"value 1\" ex:bar=\"value 2\" xmlns:ex=\"http://ws.apache.org/jaxme/test/misc/wildcards\" xmlns:p=\"http://ws.apache.org/jaxme/test/misc/wildcards/2\"/>";
+        String expect1 = "<ex:ListAttribute p:foo=\"value 1\" ex:bar=\"value 2\" xmlns:ex=\"http://ws.apache.org/jaxme/test/misc/wildcards\" xmlns:p=\"http://ws.apache.org/jaxme/test/misc/wildcards/2\"/>";
+        String expect2 = "<ex:ListAttribute p:foo=\"value 1\" ex:bar=\"value 2\" xmlns:p=\"http://ws.apache.org/jaxme/test/misc/wildcards/2\" xmlns:ex=\"http://ws.apache.org/jaxme/test/misc/wildcards\"/>";
         String got = getMarshalledListAttribute();
-        assertEquals(expect, got);
+        assertTrue(expect1.equals(got) || expect2.equals(got));
     }
 
     public void testUnmarshalListAttribute() throws Exception {
@@ -138,9 +140,10 @@
     }
 
     public void testMarshalOtherAttribute() throws Exception {
-        String expect = "<ex:OtherAttribute p:bar=\"value 1\" baz=\"value 2\" xmlns:ex=\"http://ws.apache.org/jaxme/test/misc/wildcards\" xmlns:p=\"foo\"/>";
+        String expect1 = "<ex:OtherAttribute p:bar=\"value 1\" baz=\"value 2\" xmlns:ex=\"http://ws.apache.org/jaxme/test/misc/wildcards\" xmlns:p=\"foo\"/>";
+        String expect2 = "<ex:OtherAttribute p:bar=\"value 1\" baz=\"value 2\" xmlns:p=\"foo\" xmlns:ex=\"http://ws.apache.org/jaxme/test/misc/wildcards\"/>";
         String got = getMarshalledOtherAttribute();
-        assertEquals(expect, got);
+        assertTrue(expect1.equals(got) || expect2.equals(got));
     }
 
     public void testUnmarshalOtherAttribute() throws Exception {