Use XMLUnit for comparing XML. Make Octet strings hex uppercase to ma…

…tch output of asn1c

asn1jvm-runtime/src/main/java/asn2pojo/runtime/types/Asn1OctetString.java

@@ -15,7 +15,7 @@ public class Asn1OctetString implements Asn1Type {
 
     @JsonValue
     public String getValue() {
-        HexFormat hexFormat = HexFormat.of();
+        HexFormat hexFormat = HexFormat.of().withUpperCase();
         if (octets != null) {
             return hexFormat.formatHex(octets);
         } else {

j2735-2024/build.gradle

@@ -25,6 +25,8 @@ dependencies {
     testImplementation 'org.junit.jupiter:junit-jupiter:5.9.1'
     testImplementation 'org.hamcrest:hamcrest-library:2.2'
     testImplementation 'commons-io:commons-io:2.18.0'
+    testImplementation 'org.xmlunit:xmlunit-core:2.10.0'
+    testImplementation 'org.xmlunit:xmlunit-matchers:2.10.0'
 
     testRuntimeOnly 'org.junit.platform:junit-platform-launcher'
 

j2735-2024/src/test/java/j2735/BasicSafetyMessage/BasicSafetyMessageTest.java

@@ -12,6 +12,7 @@
 import org.junit.jupiter.params.ParameterizedTest;
 import org.junit.jupiter.params.provider.Arguments;
 import org.junit.jupiter.params.provider.MethodSource;
+import static org.xmlunit.matchers.CompareMatcher.isIdenticalTo;
 
 public class BasicSafetyMessageTest extends BaseSerializeTest<BasicSafetyMessage> {
 
@@ -20,27 +21,45 @@ public BasicSafetyMessageTest() {
   }
 
   @ParameterizedTest
-  @MethodSource("getXmlResources")
-  public void xmlDeserializeTest(String resourcePath) throws IOException {
+  @MethodSource("getXmlResourcesNoExtensions")
+  public void canDeserializeXml_NoExtensionsTest(String resourcePath) throws IOException {
     String xml = loadResource(resourcePath);
     BasicSafetyMessage bsm = fromXml(xml);
     assertThat(bsm, notNullValue());
   }
 
   @ParameterizedTest
-  @MethodSource("getJsonResources")
-  public void jsonDeserializeTest(String resourcePath) throws IOException {
+  @MethodSource("getXmlResourcesNoExtensions")
+  public void canRoundTripXml_NoExtensionsTest(String resourcePath) throws IOException {
+    String xml = loadResource(resourcePath);
+    BasicSafetyMessage bsm = fromXml(xml);
+    assertThat(bsm, notNullValue());
+    String roundTripXml = toXml(bsm);
+    assertThat(roundTripXml, isIdenticalTo(xml).ignoreComments().ignoreWhitespace());
+  }
+
+  @ParameterizedTest
+  @MethodSource("getJsonResourcesNoExtensions")
+  public void jsonDeserializeNoExtensionsTest(String resourcePath) throws IOException {
     String json = loadResource(resourcePath);
     BasicSafetyMessage bsm = fromJson(json);
     assertThat(bsm, notNullValue());
   }
 
-  private static Stream<Arguments> getXmlResources()  {
-    return getResources("/BasicSafetyMessage/xml");
+  private static Stream<Arguments> getXmlResourcesNoExtensions() {
+    return getXmlResources("no_extensions");
+  }
+
+  private static Stream<Arguments> getJsonResourcesNoExtensions() {
+    return getJsonResources("no_extensions");
+  }
+
+  private static Stream<Arguments> getXmlResources(String subdirectory)  {
+    return getResources("/BasicSafetyMessage/xml/" + subdirectory);
   }
 
-  private static Stream<Arguments> getJsonResources() {
-    return getResources("/BasicSafetyMessage/json");
+  private static Stream<Arguments> getJsonResources(String subdirectory) {
+    return getResources("/BasicSafetyMessage/json/" + subdirectory);
   }
 
   private static Stream<Arguments> getResources(String directory) {