diff --git a/src/test/java/de/neemann/digital/core/memory/DataFieldConverterTest.java b/src/test/java/de/neemann/digital/core/memory/DataFieldConverterTest.java index 23801ad8d..104531038 100644 --- a/src/test/java/de/neemann/digital/core/memory/DataFieldConverterTest.java +++ b/src/test/java/de/neemann/digital/core/memory/DataFieldConverterTest.java @@ -53,6 +53,14 @@ public Test(DataField d1, DataField d2) { } } + void checkEquals(String d1, String d2, String xml) { + String prefix = ""; + String suffix = ""; + String case1 = prefix + d1 + d2 + suffix; + String case2 = prefix + d2 + d1 + suffix; + assertTrue(case1.equals(xml) || case2.equals(xml)); + } + public void testMarshalObj() { final DataField d1 = new DataField(20); d1.setData(0, 1); @@ -64,10 +72,11 @@ public void testMarshalObj() { XStream xs = getxStream(); String xml = xs.toXML(new Test(d1, d2)); - assertEquals("" + - "1,4*0,2" + - "3,7*0,4" + - "", xml); + + + String d1_str = "1,4*0,2"; + String d2_str = "3,7*0,4"; + checkEquals(d1_str, d2_str, xml); } public void testMarshalObj2() { @@ -79,10 +88,10 @@ public void testMarshalObj2() { XStream xs = getxStream(); String xml = xs.toXML(new Test(d1, d2)); - assertEquals("" + - "5*0,2" + - "8*0,4" + - "", xml); + + String d1_str = "5*0,2"; + String d2_str = "8*0,4"; + checkEquals(d1_str, d2_str, xml); } public void testMarshalObj3() { @@ -97,10 +106,10 @@ public void testMarshalObj3() { XStream xs = getxStream(); String xml = xs.toXML(new Test(d1, d2)); - assertEquals("" + - "11*2" + - "11*1,11*2,11*3,11*4,11*5,11*6,11*7,11*8,11*9,11*a,11*b" + - "", xml); + + String d1_str = "11*2"; + String d2_str = "11*1,11*2,11*3,11*4,11*5,11*6,11*7,11*8,11*9,11*a,11*b"; + checkEquals(d1_str, d2_str, xml); } public void testUnmarshalObj() {