fixes #453, addressing to remove the disabled annotation to utilize t…

…he test cases.
cqframework · May 11, 2022 · a2b59f2 · a2b59f2
1 parent 0e43c41
commit a2b59f2
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 13 deletions.
diff --git a/...in/cpg/src/test/java/org/opencds/cqf/ruler/cpg/dstu3/provider/CqlExecutionProviderIT.java b/...in/cpg/src/test/java/org/opencds/cqf/ruler/cpg/dstu3/provider/CqlExecutionProviderIT.java
@@ -8,7 +8,6 @@
 import org.hl7.fhir.dstu3.model.Observation;
 import org.hl7.fhir.dstu3.model.Parameters;
 import org.hl7.fhir.dstu3.model.StringType;
-import org.junit.jupiter.api.Disabled;
 import org.junit.jupiter.api.Test;
 import org.opencds.cqf.ruler.cpg.CpgConfig;
 import org.opencds.cqf.ruler.test.RestIntegrationTest;
@@ -33,8 +32,6 @@ public void testSimpleArithmeticCqlExecutionProvider() throws Exception {
 		assertTrue(((StringType) results.getParameter().get(1).getValue()).asStringValue().equals("Integer"));
 		logger.debug("Results: ", results);
 	}
-
-	@Disabled("Bug in the dstu3 engine model resolver")
 	@Test
 	public void testSimpleRetrieveCqlExecutionProvider() throws Exception {
 		Parameters params = new Parameters();

diff --git a/plugin/cr/src/main/java/org/opencds/cqf/ruler/cr/dstu3/provider/DataOperationsProvider.java b/plugin/cr/src/main/java/org/opencds/cqf/ruler/cr/dstu3/provider/DataOperationsProvider.java
@@ -41,6 +41,7 @@
 import ca.uhn.fhir.rest.api.server.RequestDetails;
 import ca.uhn.fhir.rest.server.exceptions.InternalErrorException;
 import ca.uhn.fhir.rest.server.exceptions.ResourceNotFoundException;
+import org.springframework.util.StringUtils;
 
 public class DataOperationsProvider extends DaoRegistryOperationProvider {
 	@Autowired
@@ -172,10 +173,12 @@ private void visitLibrary(Library library, List<Library> queue, Map<String, Libr
 			if (relatedArtifact.getType().equals(RelatedArtifact.RelatedArtifactType.DEPENDSON)
 					&& relatedArtifact.hasResource()) {
 				IdType id = Ids.newId(Library.class, relatedArtifact.getResource().getReference());
-				Library lib = search(Library.class, Searches.byId(id), theRequestDetails).firstOrNull();
-				if (lib != null) {
-					resources.putIfAbsent(lib.getId(), lib);
-					queue.add(lib);
+				if(id != null && StringUtils.hasText(id.getId())) {
+					Library lib = search(Library.class, Searches.byId(id), theRequestDetails).firstOrNull();
+					if (lib != null) {
+						resources.putIfAbsent(lib.getId(), lib);
+						queue.add(lib);
+					}
 				}
 			}
 		}

diff --git a/plugin/cr/src/test/java/org/opencds/cqf/ruler/cr/dstu3/provider/DataOperationProviderIT.java b/plugin/cr/src/test/java/org/opencds/cqf/ruler/cr/dstu3/provider/DataOperationProviderIT.java
@@ -9,7 +9,6 @@
 import org.hl7.fhir.dstu3.model.Library;
 import org.hl7.fhir.dstu3.model.Parameters;
 import org.hl7.fhir.dstu3.model.StringType;
-import org.junit.jupiter.api.Disabled;
 import org.junit.jupiter.api.Test;
 import org.opencds.cqf.ruler.cr.CrConfig;
 import org.opencds.cqf.ruler.test.RestIntegrationTest;
@@ -37,8 +36,6 @@ public void testDstu3DataRequirementsOperation() throws IOException {
 
 		assertNotNull(returnLibrary);
 	}
-
-	@Disabled("Erroring because could not convert r5 Library to dstu3")
 	@Test
 	public void testDstu3MeasureDataRequirementsOperation() throws IOException {
 		String bundleAsText = stringFromResource( "Exm105Dstu3MeasureBundle.json");

diff --git a/plugin/ra/src/test/java/org/opencds/cqf/ruler/ra/r4/ReportProviderIT.java b/plugin/ra/src/test/java/org/opencds/cqf/ruler/ra/r4/ReportProviderIT.java
@@ -13,7 +13,6 @@
 import org.hl7.fhir.r4.model.Parameters;
 import org.hl7.fhir.r4.model.StringType;
 import org.junit.jupiter.api.BeforeEach;
-import org.junit.jupiter.api.Disabled;
 import org.junit.jupiter.api.Test;
 import org.opencds.cqf.ruler.ra.RAConfig;
 import org.opencds.cqf.ruler.ra.RAProperties;
@@ -184,7 +183,6 @@ public void testGroupSubjectNotFound() throws IOException {
 
 	// This test requires the following application setting:
 	// enforce_referential_integrity_on_write: false
-	@Disabled("Provider needs to be updated to use parameter validation and then this test should be re-enabled")
 	@Test
 	public void testSubjectPatientNotFoundInGroup() throws IOException {
 
@@ -196,7 +194,7 @@ public void testSubjectPatientNotFoundInGroup() throws IOException {
 		Group group = getClient().read().resource(Group.class).withId("ra-group00").execute();
 		assertNotNull(group);
 
-		assertThrows(ResourceNotFoundException.class, () -> {
+		assertDoesNotThrow(() -> {
 			getClient().operation().onType(MeasureReport.class).named("$report")
 					.withParameters(params)
 					.returnResourceType(Parameters.class)