test: Refactoring and solves timezone sensitivity

- Makes them timezone-unaware by removing the TZ-offset from the reference JSON Consent
- Makes the tests more self-contained by using the date info from the deserialized reference Consent instead of hard-coded values which are coupled to the JSON content anyway
- Uses deep object equality between the target- and created Consent instances instead of String equality on their serialized form.

Author: lucienclin

src/test/java/de/ukt/mvh/TestConsentMapperParents_1_7_2_from_REDCap.java

@@ -1,29 +1,28 @@
 package de.ukt.mvh;
 
 import org.hl7.fhir.r4.model.Consent;
-import org.hl7.fhir.r4.model.Resource;
+import ca.uhn.fhir.parser.IParser;
 import org.junit.jupiter.api.Assertions;
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.api.BeforeAll;
-
-import java.io.FileReader;
+import java.io.InputStreamReader;
 import java.text.ParseException;
-import java.text.SimpleDateFormat;
 import java.util.Date;
-import java.util.TimeZone;
-
 import static ca.uhn.fhir.context.FhirContext.forR4Cached;
+import static org.apache.commons.lang3.time.DateUtils.addYears;
 import static org.junit.Assert.assertThrows;
 
 public class TestConsentMapperParents_1_7_2_from_REDCap {
 
+    private static Consent targetConsent;
     private static Date birthday;
 
     @BeforeAll
-    private static void init() throws Exception {
-        SimpleDateFormat dateFormat = new SimpleDateFormat("yyyy-MM-dd'T'HH:mm:ssX");
-        birthday = dateFormat.parse("2020-05-13T00:00:00+02");
-        TimeZone.setDefault(TimeZone.getTimeZone("GMT+2:00"));
+    public static void init() throws Exception {
+       var classLoader = TestConsentMapper_1_7_2.class.getClassLoader();
+       var jsonParser = forR4Cached().newJsonParser();
+       targetConsent = jsonParser.parseResource(Consent.class, new InputStreamReader(classLoader.getResourceAsStream("consent_parents.json")));
+       birthday = addYears(targetConsent.getProvision().getPeriod().getEnd(), -18);
     }
 
 
@@ -72,15 +71,7 @@ public void testConsentMapper() throws Exception {
 ]
 """;
         Consent consent = ConsentMapperParents_1_7_2_from_REDCap.makeConsent(redCapExport,birthday);
-        var jsonParser = forR4Cached().newJsonParser();
-
-        ClassLoader classLoader = getClass().getClassLoader();
-        var targetConsent = (Resource) jsonParser.parseResource(new FileReader(classLoader.getResource("consent_parents.json").getPath()));
-
-        System.out.println(jsonParser.encodeResourceToString(targetConsent));
-        System.out.println(jsonParser.encodeResourceToString(consent));
-
-        Assertions.assertEquals(jsonParser.encodeResourceToString(targetConsent), jsonParser.encodeResourceToString(consent));
+        Assertions.assertTrue(consent.equalsDeep(targetConsent));
     }
 
     @Test

src/test/java/de/ukt/mvh/TestConsentMapper_1_7_2.java

@@ -5,49 +5,47 @@
 import de.ukt.mvh.util.ConsentMapper_1_7_2;
 import de.ukt.mvh.util.ConsentMapper_7_to_11_1_7_2;
 import org.hl7.fhir.r4.model.Consent;
-import org.hl7.fhir.r4.model.Resource;
+import ca.uhn.fhir.parser.IParser;
 import org.junit.jupiter.api.Assertions;
 import org.junit.jupiter.api.BeforeAll;
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.params.ParameterizedTest;
 import org.junit.jupiter.params.provider.CsvSource;
-
-import java.io.FileReader;
-import java.text.SimpleDateFormat;
+import java.io.InputStreamReader;
 import java.util.Date;
-import java.util.TimeZone;
-
 import static ca.uhn.fhir.context.FhirContext.forR4Cached;
+import static org.apache.commons.lang3.time.DateUtils.addYears;
 
 
 public class TestConsentMapper_1_7_2 {
+
+    private static Consent targetConsent;
     private static Date consentDate;
     private static Date birthday;
+
     @BeforeAll
     public static void init() throws Exception {
-        SimpleDateFormat dateFormat = new SimpleDateFormat("yyyy-MM-dd'T'HH:mm:ssX");
-        consentDate = dateFormat.parse("2025-06-27T00:00:00+02");
-        birthday = dateFormat.parse("2020-05-13T00:00:00+02");
-        TimeZone.setDefault(TimeZone.getTimeZone("GMT+2:00"));
+       var classLoader = TestConsentMapper_1_7_2.class.getClassLoader();
+       var jsonParser = forR4Cached().newJsonParser();
+       targetConsent = jsonParser.parseResource(Consent.class, new InputStreamReader(classLoader.getResourceAsStream("consent.json")));
+       consentDate = targetConsent.getDateTime();
+       birthday = addYears(targetConsent.getProvision().getPeriod().getEnd(), -18);
     }
 
-
     @Test
     public void testConsentMapper() throws Exception {
         ConsentMapper_1_7_2 mapper = new ConsentMapper_1_7_2();
         Consent consent = mapper.makeConsent(consentDate);
-        consent.setProvision(mapper.makeProvisions(
-                consentDate,
-                birthday,
-                true, true, true,true,true,true,true,true,true, null, null));
-        var jsonParser = forR4Cached().newJsonParser();
-
-        ClassLoader classLoader = getClass().getClassLoader();
-        var targetConsent = (Resource) jsonParser.parseResource(new FileReader(classLoader.getResource("consent.json").getPath()));
-        Assertions.assertEquals(jsonParser.encodeResourceToString(targetConsent), jsonParser.encodeResourceToString(consent));
+        consent.setProvision(
+          mapper.makeProvisions(
+            consentDate,
+            birthday,
+            true,true,true,true,true,true,true,true,true,null,null
+          )
+        );
+        Assertions.assertTrue(consent.equalsDeep(targetConsent));
     }
 
-
     @Test
     public void testConsentMapperParents() throws Exception {
         ConsentMapperParents_1_7_2 mapper = new ConsentMapperParents_1_7_2();