From 468df6b547040fd07733c29e1a25ca1a301f34dd Mon Sep 17 00:00:00 2001
From: Kevin Dougan <kevin.dougan@smilecdr.com>
Date: Thu, 24 Dec 2020 12:31:10 -0500
Subject: [PATCH] Added a test for EXM349.

---
 .../fhir/jpa/starter/ExampleServerR4IT.java   |  8 ++---
 ...on.manuallyeditedtoremovesupplementaldata} | 29 -------------------
 2 files changed, 2 insertions(+), 35 deletions(-)
 rename src/test/resources/r4/EXM349/{EXM349-2.10.000-bundle.json => EXM349-2.10.000-bundle.json.manuallyeditedtoremovesupplementaldata} (99%)

diff --git a/src/test/java/ca/uhn/fhir/jpa/starter/ExampleServerR4IT.java b/src/test/java/ca/uhn/fhir/jpa/starter/ExampleServerR4IT.java
index f11d7d5..7dfc46c 100644
--- a/src/test/java/ca/uhn/fhir/jpa/starter/ExampleServerR4IT.java
+++ b/src/test/java/ca/uhn/fhir/jpa/starter/ExampleServerR4IT.java
@@ -147,15 +147,11 @@ public class ExampleServerR4IT implements IServerSupport {
     Assert.assertEquals("Measure/"+measureId, report.getMeasure());
   }
 
-  // Fails with:
-  // ca.uhn.fhir.rest.server.exceptions.InternalErrorException:
-  // HTTP 500 Server Error: Failed to call access method: org.opencds.cqf.cql.engine.exception.CqlException:
-  // Could not resolve expression reference 'null' in library 'EXM349'.
-  //@Test
+  @Test
   public void testCQLEXM349EvaluateMeasure() throws IOException {
     String measureId = "measure-EXM349-2.10.000";
 
-    loadBundle("r4/EXM349/EXM349-2.10.000-bundle.json", ourCtx, ourClient);
+    loadBundle("r4/EXM349/EXM349-2.10.000-bundle.json.manuallyeditedtoremovesupplementaldata", ourCtx, ourClient);
 
     // http://localhost:8080/fhir/Measure/measure-EXM349-2.10.000/$evaluate-measure?periodStart=2019-01-01&periodEnd=2019-12-31
     Parameters inParams = new Parameters();
diff --git a/src/test/resources/r4/EXM349/EXM349-2.10.000-bundle.json b/src/test/resources/r4/EXM349/EXM349-2.10.000-bundle.json.manuallyeditedtoremovesupplementaldata
similarity index 99%
rename from src/test/resources/r4/EXM349/EXM349-2.10.000-bundle.json
rename to src/test/resources/r4/EXM349/EXM349-2.10.000-bundle.json.manuallyeditedtoremovesupplementaldata
index e2fe100..30552e6 100644
--- a/src/test/resources/r4/EXM349/EXM349-2.10.000-bundle.json
+++ b/src/test/resources/r4/EXM349/EXM349-2.10.000-bundle.json.manuallyeditedtoremovesupplementaldata
@@ -2806,35 +2806,6 @@
             } ]
           }
         } ]
-      } ],
-      "supplementalData": [ {
-        "usage": [ {
-          "coding": [ {
-            "system": "http://hl7.org/fhir/measure-data-usage",
-            "code": "supplemental-data"
-          } ]
-        } ]
-      }, {
-        "usage": [ {
-          "coding": [ {
-            "system": "http://hl7.org/fhir/measure-data-usage",
-            "code": "supplemental-data"
-          } ]
-        } ]
-      }, {
-        "usage": [ {
-          "coding": [ {
-            "system": "http://hl7.org/fhir/measure-data-usage",
-            "code": "supplemental-data"
-          } ]
-        } ]
-      }, {
-        "usage": [ {
-          "coding": [ {
-            "system": "http://hl7.org/fhir/measure-data-usage",
-            "code": "supplemental-data"
-          } ]
-        } ]
       } ]
     },
     "request": {