SIVA-550 Update ValidationReportSoapResponseTransformerTest assertions

open-eid · Apr 16, 2024 · 1ee8f41 · 1ee8f41
1 parent b2b6878
commit 1ee8f41
Showing 1 changed file with 13 additions and 1 deletion.
diff --git a/.../ee/openeid/siva/webapp/soap/transformer/ValidationReportSoapResponseTransformerTest.java b/.../ee/openeid/siva/webapp/soap/transformer/ValidationReportSoapResponseTransformerTest.java
@@ -84,6 +84,7 @@
 import static org.junit.jupiter.api.Assertions.assertArrayEquals;
 import static org.junit.jupiter.api.Assertions.assertEquals;
 import static org.junit.jupiter.api.Assertions.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
 import static org.junit.jupiter.api.Assertions.assertNull;
 import static org.junit.jupiter.api.Assertions.assertSame;
 
@@ -262,7 +263,7 @@ private void assertDiagnosticDataSignature(XmlSignature dssSignature, Signature
         assertEquals(dssSignature.getSignatureFilename(), signature.getSignatureFilename());
         assertEquals(dssSignature.getSignatureFormat(), signature.getSignatureFormat());
         assertEquals(dssSignature.getPolicy().getId(), signature.getPolicy().getId());
-        assertEquals(dssSignature.getPolicy().getUserNotice(), signature.getPolicy().getUserNotice());
+        assertUserNoticesEqual(dssSignature, signature);
         assertEquals(dssSignature.getPolicy().getProcessingError(), signature.getPolicy().getProcessingError());
         assertEquals(dssSignature.getPolicy().getUrl(), signature.getPolicy().getUrl());
         assertArrayEquals(dssSignature.getPolicy().getDigestAlgoAndValue().getDigestValue(), signature.getPolicy().getDigestAlgoAndValue().getDigestValue());
@@ -718,4 +719,15 @@ private XmlFoundTimestamp createMockedXmlTimestamp(String id) {
         xmlFoundTimestamp.setTimestamp(timestamp);
         return xmlFoundTimestamp;
     }
+
+    private static void assertUserNoticesEqual(XmlSignature dssSignature, Signature signature) {
+        if (dssSignature.getPolicy().getUserNotice() != null) {
+            assertNotNull(signature.getPolicy().getUserNotice());
+            assertEquals(dssSignature.getPolicy().getUserNotice().getOrganization(), signature.getPolicy().getUserNotice().getOrganization());
+            assertEquals(dssSignature.getPolicy().getUserNotice().getNoticeNumbers(), signature.getPolicy().getUserNotice().getNoticeNumbers());
+            assertEquals(dssSignature.getPolicy().getUserNotice().getExplicitText(), signature.getPolicy().getUserNotice().getExplicitText());
+        } else {
+            assertNull(signature.getPolicy().getUserNotice());
+        }
+    }
 }