added test to ensure it doesn't only work with tokens

hapifhir · Mar 10, 2019 · 37ad04c · 37ad04c
1 parent 76d35c8
commit 37ad04c
Showing 1 changed file with 34 additions and 0 deletions.
diff --git a/...-jpaserver-base/src/test/java/ca/uhn/fhir/jpa/dao/r4/FhirResourceDaoR4SearchNoFtTest.java b/...-jpaserver-base/src/test/java/ca/uhn/fhir/jpa/dao/r4/FhirResourceDaoR4SearchNoFtTest.java
@@ -69,6 +69,40 @@ public void beforeDisableCacheReuse() {
 		myDaoConfig.setReuseCachedSearchResultsForMillis(null);
 	}
 
+	@Test
+	public void testHasConditionAgeCompare() {
+		Patient patient = new Patient();
+		String patientId = myPatientDao.create(patient).getId().toUnqualifiedVersionless().getValue();
+
+		Condition condition = new Condition();
+		Quantity onsetAge = new Age();
+		onsetAge.setValue(23);
+		condition.setOnset(onsetAge);
+		condition.getSubject().setReference(patientId);
+		myConditionDao.create(condition);
+		{
+			String criteria = "_has:Condition:subject:onset-age=gt20";
+			SearchParameterMap map = myMatchUrlService.translateMatchUrl(criteria, myFhirCtx.getResourceDefinition(Patient.class));
+
+			map.setLoadSynchronous(true);
+
+			IBundleProvider results = myPatientDao.search(map);
+			List<String> ids = toUnqualifiedVersionlessIdValues(results);
+			assertEquals(1, ids.size());
+			assertThat(ids, hasItems(patientId));
+		}
+		{
+			String criteria = "_has:Condition:subject:onset-age=lt20";
+			SearchParameterMap map = myMatchUrlService.translateMatchUrl(criteria, myFhirCtx.getResourceDefinition(Patient.class));
+
+			map.setLoadSynchronous(true);
+
+			IBundleProvider results = myPatientDao.search(map);
+			List<String> ids = toUnqualifiedVersionlessIdValues(results);
+			assertEquals(0, ids.size());
+		}
+	}
+
 	@Test
 	public void testHasCondition() {
 		Patient patient = new Patient();