From 6cf6d139c43230a47eb8522bb072f2580ec6524d Mon Sep 17 00:00:00 2001
From: Grahame Grieve <grahameg@gmail.ccom>
Date: Wed, 7 Sep 2022 08:12:20 +1000
Subject: [PATCH] fix up for r5 tests

---
 .../src/main/java/org/hl7/fhir/utilities/Utilities.java  | 9 +++++++++
 .../org.hl7.fhir.validation/4.0.1/all-systems.cache      | 8 ++++++++
 pom.xml                                                  | 2 +-
 3 files changed, 18 insertions(+), 1 deletion(-)

diff --git a/org.hl7.fhir.utilities/src/main/java/org/hl7/fhir/utilities/Utilities.java b/org.hl7.fhir.utilities/src/main/java/org/hl7/fhir/utilities/Utilities.java
index 3eb5189b0..343490142 100644
--- a/org.hl7.fhir.utilities/src/main/java/org/hl7/fhir/utilities/Utilities.java
+++ b/org.hl7.fhir.utilities/src/main/java/org/hl7/fhir/utilities/Utilities.java
@@ -1745,4 +1745,13 @@ public class Utilities {
     return Utilities.padLeft(Long.toString(i), ' ', len);
   }
 
+  public static Object makeSingleLine(String text) {
+    text = text.replace("\r", " ");
+    text = text.replace("\n", " ");
+    while (text.contains("  ")) {
+      text = text.replace("  ", " ");
+    }
+    return text;
+  }
+
 }
\ No newline at end of file
diff --git a/org.hl7.fhir.validation/src/test/resources/txCache/org.hl7.fhir.validation/4.0.1/all-systems.cache b/org.hl7.fhir.validation/src/test/resources/txCache/org.hl7.fhir.validation/4.0.1/all-systems.cache
index 795bf7576..f8c814514 100644
--- a/org.hl7.fhir.validation/src/test/resources/txCache/org.hl7.fhir.validation/4.0.1/all-systems.cache
+++ b/org.hl7.fhir.validation/src/test/resources/txCache/org.hl7.fhir.validation/4.0.1/all-systems.cache
@@ -1551,3 +1551,11 @@ v: {
   "system" : "urn:ietf:bcp:47"
 }
 -------------------------------------------------------------------------------------
+{"code" : {
+  "code" : "[%payloadFormat%]"
+}, "url": "http://hl7.org/fhir/ValueSet/mimetypes", "version": "4.0.1", "lang":"null", "useServer":"true", "useClient":"true", "guessSystem":"true", "valueSetMode":"ALL_CHECKS", "versionFlexible":"false"}####
+v: {
+  "severity" : "error",
+  "error" : "The code \"[%payloadFormat%]\" is not valid in the system urn:ietf:bcp:13; The code provided (urn:ietf:bcp:13#[%payloadFormat%]) is not valid in the value set 'Mime Types' (from http://tx.fhir.org/r4)"
+}
+-------------------------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index d5588b6ad..4cce2c35d 100644
--- a/pom.xml
+++ b/pom.xml
@@ -19,7 +19,7 @@
 
     <properties>
         <hapi_fhir_version>5.4.0</hapi_fhir_version>
-        <validator_test_case_version>v1.1.105</validator_test_case_version>
+        <validator_test_case_version>1.1.106-SNAPSHOT</validator_test_case_version>
         <junit_jupiter_version>5.7.1</junit_jupiter_version>
         <junit_platform_launcher_version>1.8.2</junit_platform_launcher_version>
         <maven_surefire_version>3.0.0-M5</maven_surefire_version>