Updated edge case handling and fixed test

CDCgov · Dec 23, 2024 · fe296f6 · fe296f6
1 parent b64eca5
commit fe296f6
Show file tree

Hide file tree

Showing 2 changed files with 20 additions and 6 deletions.
diff --git a/rs-e2e/src/main/java/gov/hhs/cdc/trustedintermediary/rse2e/hl7/HL7Parser.java b/rs-e2e/src/main/java/gov/hhs/cdc/trustedintermediary/rse2e/hl7/HL7Parser.java
@@ -38,9 +38,9 @@ public static HL7Message parseMessage(String content) {
     }
 
     public static String parseMessageFieldValue(HL7Message message, HL7Path hl7Path)
-            throws HL7MessageException {
-        if (hl7Path == null || hl7Path.indices().length == 0) {
-            return "";
+            throws HL7ParserException, HL7MessageException {
+        if (hl7Path == null || hl7Path.indices().length == 0 || message == null) {
+            throw new HL7ParserException("Invalid HL7 path: message or path is null or empty");
         }
 
         int[] indices = hl7Path.indices();

diff --git a/rs-e2e/src/test/groovy/gov/hhs/cdc/trustedintermediary/rse2e/hl7/HL7ParserTest.groovy b/rs-e2e/src/test/groovy/gov/hhs/cdc/trustedintermediary/rse2e/hl7/HL7ParserTest.groovy
@@ -70,12 +70,26 @@ PID|||12345"""
         "invalid index"    | "TST-5"       | ""
     }
 
-    def "parseMessageFieldValue returns an empty string when inputs are null"() {
+    def "parseMessageFieldValue returns an exception when either or both inputs are null"() {
         when:
-        def result = HL7Parser.parseMessageFieldValue(null, null)
+        HL7Parser.parseMessageFieldValue(null, null)
 
         then:
-        result == ""
+        thrown(HL7ParserException)
+
+        when:
+        def hl7Path = HL7Parser.parsePath("MSH-3")
+        HL7Parser.parseMessageFieldValue(null, hl7Path)
+
+        then:
+        thrown(HL7ParserException)
+
+        when:
+        def message = HL7Parser.parseMessage("MSH|fakeValues")
+        HL7Parser.parseMessageFieldValue(message, null)
+
+        then:
+        thrown(HL7ParserException)
     }
 
     def "parseMessageFieldValue returns an empty string if an empty message is given"() {