Merge branch 'jpa_view' of https://github.com/jamesagnew/hapi-fhir.git into jpa_view

Conflicts:
	hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/entity/ResourceSearchView.java
This commit is contained in:
frankjtao 2018-06-29 22:18:22 -04:00
commit 0ab15a05d6
1 changed files with 0 additions and 2 deletions

View File

@ -2908,10 +2908,8 @@ public class FhirResourceDaoDstu2Test extends BaseJpaDstu2Test {
myPatientDao.addTag(patientId, TagTypeEnum.TAG, "http://foo", "Cat", "Kittens"); myPatientDao.addTag(patientId, TagTypeEnum.TAG, "http://foo", "Cat", "Kittens");
myPatientDao.addTag(patientId, TagTypeEnum.TAG, "http://foo", "Cow", "Calves"); myPatientDao.addTag(patientId, TagTypeEnum.TAG, "http://foo", "Cow", "Calves");
System.out.println("patientId = " + patientId);
retrieved = myPatientDao.read(patientId, mySrd); retrieved = myPatientDao.read(patientId, mySrd);
published = (TagList) retrieved.getResourceMetadata().get(ResourceMetadataKeyEnum.TAG_LIST); published = (TagList) retrieved.getResourceMetadata().get(ResourceMetadataKeyEnum.TAG_LIST);
System.out.println("published = " + published);
sort(published); sort(published);
assertEquals(3, published.size()); assertEquals(3, published.size());
assertEquals(published.toString(), "Dog", published.get(0).getTerm()); assertEquals(published.toString(), "Dog", published.get(0).getTerm());