Test fixes

hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/dao/index/IdHelperService.java

@@ -166,7 +166,7 @@ public IResourceLookup<JpaPid> resolveResourceIdentity(
 				resolveResourceIdentities(theRequestPartitionId, ids, theExcludeDeleted);
 
 		// We only pass 1 input in so only 0..1 will come back
-		if (outcome.isEmpty()) {
+		if (!outcome.containsKey(id)) {
 			throw new ResourceNotFoundException(Msg.code(2001) + "Resource " + id + " is not known");
 		}
 

hapi-fhir-jpaserver-base/src/test/java/ca/uhn/fhir/jpa/dao/index/IdHelperServiceTest.java

@@ -289,5 +289,5 @@ public void testResolveResourcePersistentIds_mapDefaultFunctionality(){
 		assertEquals(2L, result.get("B").getId());
 		assertEquals(3L, result.get("C").getId());
 	}
-	
+
 }

hapi-fhir-jpaserver-test-dstu2/src/test/java/ca/uhn/fhir/jpa/dao/dstu2/FhirResourceDaoDstu2Test.java

@@ -84,6 +84,8 @@
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Disabled;
 import org.junit.jupiter.api.Test;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.ValueSource;
 
 import java.io.IOException;
 import java.util.ArrayList;
@@ -439,11 +441,19 @@ public void testCreateWithIdFails() {
 		}
 	}
 
-	@Test
-	public void testCreateWithIllegalReference() {
+	@ParameterizedTest
+	@ValueSource(booleans = {true, false})
+	public void testCreateWithIllegalReference_WrongTypeForId(boolean theClientAssignedId) {
+		IIdType id1;
+
 		Observation o1 = new Observation();
 		o1.getCode().addCoding().setSystem("foo").setCode("testChoiceParam01");
-		IIdType id1 = myObservationDao.create(o1, mySrd).getId().toUnqualifiedVersionless();
+		if (theClientAssignedId) {
+			o1.setId("A");
+			id1 = myObservationDao.update(o1, mySrd).getId().toUnqualifiedVersionless();
+		} else {
+			id1 = myObservationDao.create(o1, mySrd).getId().toUnqualifiedVersionless();
+		}
 
 		try {
 			Patient p = new Patient();
@@ -459,16 +469,24 @@ public void testCreateWithIllegalReference() {
 			p.getManagingOrganization().setReference(new IdDt("Organization", id1.getIdPart()));
 			myPatientDao.create(p, mySrd);
 			fail("");
-		} catch (UnprocessableEntityException e) {
-			assertEquals(Msg.code(1095) + "Resource contains reference to unknown resource ID Organization/" + id1.getIdPart(), e.getMessage());
+		} catch (InvalidRequestException e) {
+			assertEquals(Msg.code(1094) + "Resource Organization/" + id1.getIdPart() + " not found, specified in path: Patient.managingOrganization", e.getMessage());
 		}
+	}
 
-		// Now with a forced ID
+	@ParameterizedTest
+	@ValueSource(booleans = {true, false})
+	public void testCreateWithIllegalReference_InvalidTypeForElement(boolean theClientAssignedId) {
 
-		o1 = new Observation();
-		o1.setId("testCreateWithIllegalReference");
+		Observation o1 = new Observation();
 		o1.getCode().addCoding().setSystem("foo").setCode("testChoiceParam01");
-		id1 = myObservationDao.update(o1, mySrd).getId().toUnqualifiedVersionless();
+		IIdType id1;
+		if (theClientAssignedId) {
+			o1.setId("testCreateWithIllegalReference");
+			id1 = myObservationDao.update(o1, mySrd).getId().toUnqualifiedVersionless();
+		} else {
+			id1 = myObservationDao.create(o1, mySrd).getId().toUnqualifiedVersionless();
+		}
 
 		try {
 			Patient p = new Patient();
@@ -479,15 +497,6 @@ public void testCreateWithIllegalReference() {
 			assertEquals(Msg.code(931) + "Invalid reference found at path 'Patient.managingOrganization'. Resource type 'Observation' is not valid for this path", e.getMessage());
 		}
 
-		try {
-			Patient p = new Patient();
-			p.getManagingOrganization().setReference(new IdDt("Organization", id1.getIdPart()));
-			myPatientDao.create(p, mySrd);
-			fail("");
-		} catch (InvalidRequestException e) {
-			assertEquals(Msg.code(1094) + "Resource Organization/testCreateWithIllegalReference not found, specified in path: Patient.managingOrganization", e.getMessage());
-		}
-
 	}
 
 	@Test
@@ -677,8 +686,8 @@ public void testDeleteResource() {
 	}
 
 	/**
-	 * See #773
-	 */
+     * See #773
+     */
 	@Test
 	public void testDeleteResourceWithOutboundDeletedResources() {
 		myStorageSettings.setEnforceReferentialIntegrityOnDelete(false);
@@ -1387,8 +1396,8 @@ public void testInstanceMetaOperations() {
 	}
 
 	/**
-	 * See #196
-	 */
+     * See #196
+     */
 	@Test
 	public void testInvalidChainNames() {
 		ReferenceParam param = null;