Skip to content

Commit fff5a28

Browse files
Chris0296Chris0296
committed
Update changelog tests
1 parent dbde3d5 commit fff5a28

1 file changed

Lines changed: 26 additions & 41 deletions

File tree

‎cqf-fhir-cr-hapi/src/test/java/org/opencds/cqf/fhir/cr/hapi/common/HapiCreateChangelogProcessorTest.java‎

Lines changed: 26 additions & 41 deletions
Original file line numberDiff line numberDiff line change
@@ -23,22 +23,7 @@
2323
class HapiCreateChangelogProcessorTest {
2424

2525
public HapiCreateChangelogProcessor createChangelogProcessor;
26-
27-
/* private Parameters createChangelogSetup() {
28-
loadTransaction("small-diff-bundle.json");
29-
var bundle = (Bundle) loadTransaction("small-dxtc-modified-diff-bundle.json");
30-
var maybeLib = bundle.getEntry().stream().filter(entry -> entry.getResponse().getLocation().contains("Library")).findFirst();
31-
Parameters diffParams = new Parameters();
32-
diffParams.addParameter("source", specificationLibReference);
33-
diffParams.addParameter("target", maybeLib.get().getResponse().getLocation());
34-
var endpoint = new Endpoint();
35-
endpoint.setAddress("https://cts.nlm.nih.gov/fhir");
36-
endpoint.addExtension("vsacUsername", new StringType("tahaattarismile"));
37-
endpoint.addExtension("apiKey", new StringType("e071d986-0c68-4d06-95ee-00602a2bb748"));
38-
diffParams.addParameter("target", maybeLib.get().getResponse().getLocation());
39-
// diffParams.addParameter().setName("terminologyEndpoint").setResource( endpoint);
40-
return diffParams;
41-
}*/
26+
public InMemoryFhirRepository repository;
4227

4328
@Test
4429
void create_changelog_pages() {
@@ -166,7 +151,7 @@ void create_changelog_codes() {
166151
assertTrue(page.get("oldData").get("codes").isArray());
167152
for (final var code : page.get("oldData").get("codes")) {
168153
CodeAndOperation expectedOldCode =
169-
oldCodes.get(code.get("code").asText());
154+
oldCodes.get(code.get("codeValue").asText());
170155
assertNotNull(expectedOldCode);
171156
if (expectedOldCode.operation != null) {
172157
assertEquals(
@@ -179,7 +164,7 @@ void create_changelog_codes() {
179164
assertTrue(page.get("newData").get("codes").isArray());
180165
for (final var code : page.get("newData").get("codes")) {
181166
CodeAndOperation expectedNewCode =
182-
newCodes.get(code.get("code").asText());
167+
newCodes.get(code.get("codeValue").asText());
183168
assertNotNull(expectedNewCode);
184169
if (expectedNewCode.operation != null) {
185170
assertEquals(
@@ -269,13 +254,13 @@ void create_changelog_conditions_and_priorities() {
269254
var pages = node.get("pages");
270255
for (final var page : pages) {
271256
if (Canonicals.getResourceType(page.get("url").asText()).equals("ValueSet")) {
272-
assertTrue(page.get("oldData").get("leafValuesets").isArray());
257+
assertTrue(page.get("oldData").get("leafValueSets").isArray());
273258
assertTrue(page.get("oldData")
274259
.get("priority")
275260
.get("value")
276261
.asText()
277262
.equals("routine"));
278-
for (final var leaf : page.get("oldData").get("leafValuesets")) {
263+
for (final var leaf : page.get("oldData").get("leafValueSets")) {
279264
assertTrue(leaf.get("conditions").isArray());
280265
var memberOid = leaf.get("memberOid").asText();
281266
assertTrue(oldLeafsAndConditions.containsKey(memberOid));
@@ -286,7 +271,7 @@ void create_changelog_conditions_and_priorities() {
286271
Optional<CodeAndOperation> conditionInList = expectedConditions.stream()
287272
.filter(c -> c.code != null
288273
&& c.code.equals(
289-
condition.get("code").asText()))
274+
condition.get("codeValue").asText()))
290275
.findAny();
291276
assertTrue(conditionInList.isPresent());
292277
if (conditionInList.get().operation != null) {
@@ -312,13 +297,13 @@ void create_changelog_conditions_and_priorities() {
312297
.asText());
313298
}
314299
}
315-
assertTrue(page.get("newData").get("leafValuesets").isArray());
300+
assertTrue(page.get("newData").get("leafValueSets").isArray());
316301
assertTrue(page.get("newData")
317302
.get("priority")
318303
.get("value")
319304
.asText()
320305
.equals("routine"));
321-
for (final var leaf : page.get("newData").get("leafValuesets")) {
306+
for (final var leaf : page.get("newData").get("leafValueSets")) {
322307
assertTrue(leaf.get("conditions").isArray());
323308
var memberOid = leaf.get("memberOid").asText();
324309
assertTrue(newLeafsAndConditions.containsKey(memberOid));
@@ -329,7 +314,7 @@ void create_changelog_conditions_and_priorities() {
329314
Optional<CodeAndOperation> conditionInList = expectedConditions.stream()
330315
.filter(c -> c.code != null
331316
&& c.code.equals(
332-
condition.get("code").asText()))
317+
condition.get("codeValue").asText()))
333318
.findAny();
334319
assertTrue(conditionInList.isPresent());
335320
if (conditionInList.get().operation != null) {
@@ -402,8 +387,8 @@ void create_changelog_grouped_leaf() {
402387
var pages = node.get("pages");
403388
for (final var page : pages) {
404389
if (Canonicals.getResourceType(page.get("url").asText()).equals("ValueSet")) {
405-
assertTrue(page.get("oldData").get("leafValuesets").isArray());
406-
for (final var leaf : page.get("oldData").get("leafValuesets")) {
390+
assertTrue(page.get("oldData").get("leafValueSets").isArray());
391+
for (final var leaf : page.get("oldData").get("leafValueSets")) {
407392
var expectedLeaf = oldLeafs.get(leaf.get("memberOid").asText());
408393
assertNotNull(expectedLeaf);
409394
if (!expectedLeaf.isBlank()) {
@@ -412,8 +397,8 @@ void create_changelog_grouped_leaf() {
412397
leaf.get("operation").get("type").asText());
413398
}
414399
}
415-
assertTrue(page.get("newData").get("leafValuesets").isArray());
416-
for (final var leaf : page.get("newData").get("leafValuesets")) {
400+
assertTrue(page.get("newData").get("leafValueSets").isArray());
401+
for (final var leaf : page.get("newData").get("leafValueSets")) {
417402
var expectedLeaf = newLeafs.get(leaf.get("memberOid").asText());
418403
assertNotNull(expectedLeaf);
419404
if (!expectedLeaf.isBlank()) {
@@ -473,9 +458,9 @@ void create_changelog_extracts_vs_name_and_url() {
473458
page.get("newData").get("name").get("value").asText()));
474459
}
475460
if (Canonicals.getIdPart(page.get("url").asText()).equals("dxtc")) {
476-
assertTrue(page.get("oldData").get("leafValuesets").isArray());
477-
assertEquals(3, page.get("oldData").get("leafValuesets").size());
478-
for (final var leaf : page.get("oldData").get("leafValuesets")) {
461+
assertTrue(page.get("oldData").get("leafValueSets").isArray());
462+
assertEquals(3, page.get("oldData").get("leafValueSets").size());
463+
for (final var leaf : page.get("oldData").get("leafValueSets")) {
479464
var name = leaf.get("name").asText();
480465
assertTrue(oldLeafValueSetNames.contains(name));
481466
assertNotNull(leaf.get("codeSystems")
@@ -489,9 +474,9 @@ void create_changelog_extracts_vs_name_and_url() {
489474
.get("oid")
490475
.asText());
491476
}
492-
assertTrue(page.get("newData").get("leafValuesets").isArray());
493-
assertEquals(3, page.get("newData").get("leafValuesets").size());
494-
for (final var leaf : page.get("newData").get("leafValuesets")) {
477+
assertTrue(page.get("newData").get("leafValueSets").isArray());
478+
assertEquals(3, page.get("newData").get("leafValueSets").size());
479+
for (final var leaf : page.get("newData").get("leafValueSets")) {
495480
var name = leaf.get("name").asText();
496481
assertTrue(newLeafValueSetNames.contains(name));
497482
if (leaf.get("url")
@@ -588,22 +573,22 @@ void created_deleted_groupers_should_be_visible() throws Exception {
588573
for (final var code : deletedGrouperPage.get().get("oldData").get("codes")) {
589574
// all codes have a "delete" operation
590575
assertTrue(code.get("operation").get("type").asText().equals("delete"));
591-
assertTrue(VSMGrouperCodes.contains(code.get("code").asText()));
576+
assertTrue(VSMGrouperCodes.contains(code.get("codeValue").asText()));
592577
assertNotNull(code.get("version").asText());
593578
assertTrue(versions.contains(code.get("version").asText()));
594579
}
595580

596581
assertEquals(
597582
VSMGrouperLeafVsets.size(),
598-
deletedGrouperPage.get().get("oldData").get("leafValuesets").size());
599-
for (final var leaf : deletedGrouperPage.get().get("oldData").get("leafValuesets")) {
583+
deletedGrouperPage.get().get("oldData").get("leafValueSets").size());
584+
for (final var leaf : deletedGrouperPage.get().get("oldData").get("leafValueSets")) {
600585
// all leaf valuesets have a "delete" operation
601586
assertTrue(leaf.get("operation").get("type").asText().equals("delete"));
602587
assertTrue(VSMGrouperLeafVsets.contains(leaf.get("memberOid").asText()));
603588
}
604589

605590
// reverse source and target
606-
var returnedBinary2 = (Binary) createChangelogProcessor.createChangelog(source, target, null);
591+
var returnedBinary2 = (Binary) createChangelogProcessor.createChangelog(target, source, null);
607592
assertNotNull(returnedBinary2);
608593
var node2 = mapper.readTree(new String(Base64.getDecoder().decode(returnedBinary2.getContentAsBase64())));
609594
assertTrue(node2.get("pages").isArray());
@@ -631,15 +616,15 @@ void created_deleted_groupers_should_be_visible() throws Exception {
631616
createdGrouperPage.get().get("newData").get("codes").size());
632617
for (final var code : createdGrouperPage.get().get("newData").get("codes")) {
633618
assertTrue(code.get("operation").get("type").asText().equals("insert"));
634-
assertTrue(VSMGrouperCodes.contains(code.get("code").asText()));
619+
assertTrue(VSMGrouperCodes.contains(code.get("codeValue").asText()));
635620
assertNotNull(code.get("version").asText());
636621
assertTrue(versions.contains(code.get("version").asText()));
637622
}
638623

639624
assertEquals(
640625
VSMGrouperLeafVsets.size(),
641-
createdGrouperPage.get().get("newData").get("leafValuesets").size());
642-
for (final var leaf : createdGrouperPage.get().get("newData").get("leafValuesets")) {
626+
createdGrouperPage.get().get("newData").get("leafValueSets").size());
627+
for (final var leaf : createdGrouperPage.get().get("newData").get("leafValueSets")) {
643628
assertTrue(leaf.get("operation").get("type").asText().equals("insert"));
644629
assertTrue(VSMGrouperLeafVsets.contains(leaf.get("memberOid").asText()));
645630
}

0 commit comments

Comments
 (0)