Skip to content

Commit 9229335

Browse files
lmsurprelmsurpre
authored
Merge pull request #3559 from IBM/issue-3526
Signed-off-by: Lee Surprenant <[email protected]>
2 parents 8d290cb + 7e6e9e4 commit 9229335

File tree

1 file changed

+21
-11
lines changed

1 file changed

+21
-11
lines changed

‎fhir-server-test/src/test/java/com/ibm/fhir/server/test/profiles/DavinciHealthRecordExchangeTest.java‎

Lines changed: 21 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -72,7 +72,17 @@ public void checkOperationExistsOnServer() throws Exception {
7272

7373
@Override
7474
public List<String> getRequiredProfiles() {
75-
return Arrays.asList("http://hl7.org/fhir/us/davinci-hrex/StructureDefinition/hrex-claimresponse|0.2.0", "http://hl7.org/fhir/us/davinci-hrex/StructureDefinition/hrex-consent|0.2.0", "http://hl7.org/fhir/us/davinci-hrex/StructureDefinition/hrex-coverage|0.2.0", "http://hl7.org/fhir/us/davinci-hrex/StructureDefinition/hrex-organization|0.2.0", "http://hl7.org/fhir/us/davinci-hrex/StructureDefinition/hrex-parameters-member-match-in|0.2.0", "http://hl7.org/fhir/us/davinci-hrex/StructureDefinition/hrex-parameters-member-match-out|0.2.0", "http://hl7.org/fhir/us/davinci-hrex/StructureDefinition/hrex-patient-demographics|0.2.0", "http://hl7.org/fhir/us/davinci-hrex/StructureDefinition/hrex-patient-member|0.2.0", "http://hl7.org/fhir/us/davinci-hrex/StructureDefinition/hrex-practitioner|0.2.0", "http://hl7.org/fhir/us/davinci-hrex/StructureDefinition/hrex-practitionerrole|0.2.0", "http://hl7.org/fhir/us/davinci-hrex/StructureDefinition/hrex-provenance|0.2.0", "http://hl7.org/fhir/us/davinci-hrex/StructureDefinition/hrex-task-data-request|0.2.0");
75+
return Arrays.asList(
76+
"http://hl7.org/fhir/us/davinci-hrex/StructureDefinition/hrex-claimresponse|1.0.0",
77+
"http://hl7.org/fhir/us/davinci-hrex/StructureDefinition/hrex-consent|1.0.0",
78+
"http://hl7.org/fhir/us/davinci-hrex/StructureDefinition/hrex-coverage|1.0.0",
79+
"http://hl7.org/fhir/us/davinci-hrex/StructureDefinition/hrex-organization|1.0.0",
80+
"http://hl7.org/fhir/us/davinci-hrex/StructureDefinition/hrex-parameters-member-match-in|1.0.0",
81+
"http://hl7.org/fhir/us/davinci-hrex/StructureDefinition/hrex-parameters-member-match-out|1.0.0",
82+
"http://hl7.org/fhir/us/davinci-hrex/StructureDefinition/hrex-patient-demographics|1.0.0",
83+
"http://hl7.org/fhir/us/davinci-hrex/StructureDefinition/hrex-practitioner|1.0.0",
84+
"http://hl7.org/fhir/us/davinci-hrex/StructureDefinition/hrex-practitionerrole|1.0.0",
85+
"http://hl7.org/fhir/us/davinci-hrex/StructureDefinition/hrex-task-data-request|1.0.0");
7686
}
7787

7888
@Override
@@ -84,12 +94,12 @@ public void loadResources() throws Exception {
8494

8595
public void loadCoverage() throws Exception {
8696
String resource = "Coverage-full.json";
87-
Resource coverage = HREXExamplesUtil.readLocalJSONResource("020", resource);
97+
Resource coverage = HREXExamplesUtil.readLocalJSONResource("100", resource);
8898
coverageId = createResourceAndReturnTheLogicalId("Coverage", coverage);
8999
}
90100

91101
public void loadMultiplePatients() throws Exception {
92-
Parameters source = HREXExamplesUtil.readLocalJSONResource("020", "Parameters-member-match-in.json");
102+
Parameters source = HREXExamplesUtil.readLocalJSONResource("100", "Parameters-member-match-in.json");
93103
Patient patient = source.getParameter().get(0).getResource().as(Patient.class);
94104

95105
Identifier.Builder idBuilder = patient.getIdentifier().get(0).toBuilder();
@@ -104,7 +114,7 @@ public void loadMultiplePatients() throws Exception {
104114

105115
public void loadSingleMatchPatientAndCoverage() throws Exception {
106116
singleMatchPatientId = UUID.randomUUID().toString();
107-
Parameters source = HREXExamplesUtil.readLocalJSONResource("020", "Parameters-member-match-in.json");
117+
Parameters source = HREXExamplesUtil.readLocalJSONResource("100", "Parameters-member-match-in.json");
108118
Patient patient = source.getParameter().get(0).getResource().as(Patient.class);
109119

110120
Identifier.Builder idBuilder = patient.getIdentifier().get(0).toBuilder();
@@ -198,7 +208,7 @@ public String datastore() {
198208
@Override
199209
public Parameters getInputParameters() {
200210
try {
201-
return HREXExamplesUtil.readLocalJSONResource("020", "Parameters-member-match-in.json");
211+
return HREXExamplesUtil.readLocalJSONResource("100", "Parameters-member-match-in.json");
202212
} catch (Exception e) {
203213
throw new AssertionError("Unexpected");
204214
}
@@ -243,7 +253,7 @@ public void testMemberMatch_WithBadProfile() throws Exception {
243253
@Override
244254
public Parameters getInputParameters() {
245255
try {
246-
Parameters source = HREXExamplesUtil.readLocalJSONResource("020", "Parameters-member-match-in.json");
256+
Parameters source = HREXExamplesUtil.readLocalJSONResource("100", "Parameters-member-match-in.json");
247257

248258
List<Parameters.Parameter> params = new ArrayList<>();
249259
Patient patient = source.getParameter().get(0).getResource().as(Patient.class);
@@ -278,7 +288,7 @@ public void testMemberMatch_WithoutCoverageToMatch() throws Exception {
278288
@Override
279289
public Parameters getInputParameters() {
280290
try {
281-
Parameters source = HREXExamplesUtil.readLocalJSONResource("020", "Parameters-member-match-in.json");
291+
Parameters source = HREXExamplesUtil.readLocalJSONResource("100", "Parameters-member-match-in.json");
282292
Parameters.Builder builder = Parameters.builder().parameter(Arrays.asList(source.getParameter().get(0), source.getParameter().get(3)));
283293
return builder.build();
284294
} catch (Exception e) {
@@ -302,7 +312,7 @@ public void testMemberMatch_WithBadProfileCoverage() throws Exception {
302312
@Override
303313
public Parameters getInputParameters() {
304314
try {
305-
Parameters source = HREXExamplesUtil.readLocalJSONResource("020", "Parameters-member-match-in.json");
315+
Parameters source = HREXExamplesUtil.readLocalJSONResource("100", "Parameters-member-match-in.json");
306316

307317
List<Parameters.Parameter> params = new ArrayList<>();
308318
Coverage coverage = source.getParameter().get(1).getResource().as(Coverage.class);
@@ -340,7 +350,7 @@ public void testMemberMatch_WithNoMatch() throws Exception {
340350
@Override
341351
public Parameters getInputParameters() {
342352
try {
343-
Parameters source = HREXExamplesUtil.readLocalJSONResource("020", "Parameters-member-match-in.json");
353+
Parameters source = HREXExamplesUtil.readLocalJSONResource("100", "Parameters-member-match-in.json");
344354

345355
List<Parameters.Parameter> params = new ArrayList<>();
346356
Patient patient = source.getParameter().get(0).getResource().as(Patient.class);
@@ -378,7 +388,7 @@ public void testMemberMatch_WithMultipleMatch() throws Exception {
378388
@Override
379389
public Parameters getInputParameters() {
380390
try {
381-
Parameters source = HREXExamplesUtil.readLocalJSONResource("020", "Parameters-member-match-in.json");
391+
Parameters source = HREXExamplesUtil.readLocalJSONResource("100", "Parameters-member-match-in.json");
382392

383393
List<Parameters.Parameter> params = new ArrayList<>();
384394
Patient patient = source.getParameter().get(0).getResource().as(Patient.class);
@@ -416,7 +426,7 @@ public void testMemberMatch_WithSingleMatch() throws Exception {
416426
@Override
417427
public Parameters getInputParameters() {
418428
try {
419-
Parameters source = HREXExamplesUtil.readLocalJSONResource("020", "Parameters-member-match-in.json");
429+
Parameters source = HREXExamplesUtil.readLocalJSONResource("100", "Parameters-member-match-in.json");
420430

421431
List<Parameters.Parameter> params = new ArrayList<>();
422432
Patient patient = source.getParameter().get(0).getResource().as(Patient.class);

0 commit comments

Comments
 (0)