Skip to content

Commit

Permalink
issue #3855 - replace "ibm.com" with "example.com" in tests
Browse files Browse the repository at this point in the history
The one place I left ibm.com URLs is the cql tests which have extensions from ibm.com/fhir/cdm
... those should be updated as well but not until that IG is available with a different base url

Signed-off-by: Lee Surprenant <lmsurpre@merative.com>
  • Loading branch information
lmsurpre committed Aug 10, 2022
1 parent 4254760 commit e528df7
Show file tree
Hide file tree
Showing 139 changed files with 101,260 additions and 101,289 deletions.
200,000 changes: 100,000 additions & 100,000 deletions fhir-benchmark/src/main/resources/ValueSet-large.txt

Large diffs are not rendered by default.

Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*
* (C) Copyright IBM Corp. 2016, 2021
* (C) Copyright IBM Corp. 2016, 2022
*
* SPDX-License-Identifier: Apache-2.0
*/
Expand Down Expand Up @@ -113,7 +113,7 @@ public static Patient buildPatient() {
.birthDate(org.linuxforhealth.fhir.model.type.Date.of("1950-08-15"))
.telecom(ContactPoint.builder().system(ContactPointSystem.PHONE)
.use(ContactPointUse.HOME).value(string("555-1234")).build())
.extension(Extension.builder().url("http://ibm.com/fhir/extension/Patient/favorite-color")
.extension(Extension.builder().url("http://example.com/fhir/extension/Patient/favorite-color")
.value(string("blue")).build()).build();
return patient;
}
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*
* (C) Copyright IBM Corp. 2021
* (C) Copyright IBM Corp. 2021, 2022
*
* SPDX-License-Identifier: Apache-2.0
*/
Expand All @@ -21,15 +21,15 @@
public class URLSupportTest {
@Test
public void testGetQueryParameters() {
String url = "http://ibm.com/fhir/ValueSet/generalizes?system=http://ibm.com/fhir/CodeSystem/cs5&code=r";
String url = "http://example.com/fhir/ValueSet/generalizes?system=http://example.com/fhir/CodeSystem/cs5&code=r";
Map<String, List<String>> queryParameters = getQueryParameters(url);
Assert.assertEquals(getFirst(queryParameters, "system"), "http://ibm.com/fhir/CodeSystem/cs5");
Assert.assertEquals(getFirst(queryParameters, "system"), "http://example.com/fhir/CodeSystem/cs5");
Assert.assertEquals(getFirst(queryParameters, "code"), "r");
}

@Test
public void testGetPathSegments() {
String url = "http://ibm.com/fhir/ValueSet/generalizes?system=http://ibm.com/fhir/CodeSystem/cs5&code=r";
String url = "http://example.com/fhir/ValueSet/generalizes?system=http://example.com/fhir/CodeSystem/cs5&code=r";
List<String> actual = getPathSegments(url);
List<String> expected = Arrays.asList("fhir", "ValueSet", "generalizes");
Assert.assertEquals(actual, expected);
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@
import uk.co.jemos.podam.api.PodamFactoryImpl;

public class LargeValueSetCreator {
private static final Uri TEST_URI = Uri.of("http://ibm.com/fhir/valueset/test");
private static final Uri TEST_URI = Uri.of("http://example.com/fhir/valueset/test");

private final PodamFactory podam;

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -91,7 +91,7 @@
"_code": {
"extension": [
{
"url": "http://ibm.com/fhir/extension/custom-compartment-type",
"url": "http://fhir.linuxforhealth.org/extension/custom-compartment-type",
"valueCode": "Bogus"
}
]
Expand Down

Large diffs are not rendered by default.

Original file line number Diff line number Diff line change
Expand Up @@ -71,7 +71,7 @@
</useContext>
<purpose value="mD6nDMOvJR"/>
<code>
<extension url="http://ibm.com/fhir/extension/custom-compartment-type">
<extension url="http://fhir.linuxforhealth.org/extension/custom-compartment-type">
<valueCode value="Bogus"/>
</extension>
</code>
Expand Down

Large diffs are not rendered by default.

Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ public void testChoiceElement() throws Exception {
try {
Observation observation = Observation.builder()
.extension(Extension.builder()
.url("http://ibm.com/fhir/testExtension")
.url("http://example.com/fhir/testExtension")
.value(ObservationStatus.FINAL)
.build())
.status(ObservationStatus.FINAL)
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,7 @@ public class FHIRPathTermFunctionTest {
public void testExpand() throws Exception {
FHIRPathEvaluator evaluator = FHIRPathEvaluator.evaluator();

Collection<FHIRPathNode> result = evaluator.evaluate("%terminologies.expand('http://ibm.com/fhir/ValueSet/vs1')");
Collection<FHIRPathNode> result = evaluator.evaluate("%terminologies.expand('http://example.com/fhir/ValueSet/vs1')");
assertTrue(isSingleton(result));
assertTrue(isResourceNode(result));
assertTrue(getResourceNode(result).resource().is(ValueSet.class));
Expand All @@ -58,7 +58,7 @@ public void testLookup() throws Exception {
FHIRPathEvaluator evaluator = FHIRPathEvaluator.evaluator();

Coding coding = Coding.builder()
.system(Uri.of("http://ibm.com/fhir/CodeSystem/cs1"))
.system(Uri.of("http://example.com/fhir/CodeSystem/cs1"))
.version(string("1.0.0"))
.code(Code.of("a"))
.build();
Expand All @@ -79,13 +79,13 @@ public void testSubsumedBy1() throws Exception {
FHIRPathEvaluator evaluator = FHIRPathEvaluator.evaluator();

Coding codingA = Coding.builder()
.system(Uri.of("http://ibm.com/fhir/CodeSystem/cs5"))
.system(Uri.of("http://example.com/fhir/CodeSystem/cs5"))
.version(string("1.0.0"))
.code(Code.of("u"))
.build();

Coding codingB = Coding.builder()
.system(Uri.of("http://ibm.com/fhir/CodeSystem/cs5"))
.system(Uri.of("http://example.com/fhir/CodeSystem/cs5"))
.version(string("1.0.0"))
.code(Code.of("t"))
.build();
Expand All @@ -100,13 +100,13 @@ public void testSubsumedBy2() throws Exception {
FHIRPathEvaluator evaluator = FHIRPathEvaluator.evaluator();

Coding codingA = Coding.builder()
.system(Uri.of("http://ibm.com/fhir/CodeSystem/cs5"))
.system(Uri.of("http://example.com/fhir/CodeSystem/cs5"))
.version(string("1.0.0"))
.code(Code.of("t"))
.build();

Coding codingB = Coding.builder()
.system(Uri.of("http://ibm.com/fhir/CodeSystem/cs5"))
.system(Uri.of("http://example.com/fhir/CodeSystem/cs5"))
.version(string("1.0.0"))
.code(Code.of("u"))
.build();
Expand All @@ -121,13 +121,13 @@ public void testSubsumedBy3() throws Exception {
FHIRPathEvaluator evaluator = FHIRPathEvaluator.evaluator();

Coding codingA = Coding.builder()
.system(Uri.of("http://ibm.com/fhir/CodeSystem/cs5"))
.system(Uri.of("http://example.com/fhir/CodeSystem/cs5"))
.version(string("1.0.0"))
.code(Code.of("t"))
.build();

Coding codingB = Coding.builder()
.system(Uri.of("http://ibm.com/fhir/CodeSystem/cs5"))
.system(Uri.of("http://example.com/fhir/CodeSystem/cs5"))
.version(string("1.0.0"))
.code(Code.of("t"))
.build();
Expand All @@ -142,13 +142,13 @@ public void testSubsumes1() throws Exception {
FHIRPathEvaluator evaluator = FHIRPathEvaluator.evaluator();

Coding codingA = Coding.builder()
.system(Uri.of("http://ibm.com/fhir/CodeSystem/cs5"))
.system(Uri.of("http://example.com/fhir/CodeSystem/cs5"))
.version(string("1.0.0"))
.code(Code.of("t"))
.build();

Coding codingB = Coding.builder()
.system(Uri.of("http://ibm.com/fhir/CodeSystem/cs5"))
.system(Uri.of("http://example.com/fhir/CodeSystem/cs5"))
.version(string("1.0.0"))
.code(Code.of("u"))
.build();
Expand All @@ -166,13 +166,13 @@ public void testSubsumes2() throws Exception {
FHIRPathEvaluator evaluator = FHIRPathEvaluator.evaluator();

Coding codingA = Coding.builder()
.system(Uri.of("http://ibm.com/fhir/CodeSystem/cs5"))
.system(Uri.of("http://example.com/fhir/CodeSystem/cs5"))
.version(string("1.0.0"))
.code(Code.of("u"))
.build();

Coding codingB = Coding.builder()
.system(Uri.of("http://ibm.com/fhir/CodeSystem/cs5"))
.system(Uri.of("http://example.com/fhir/CodeSystem/cs5"))
.version(string("1.0.0"))
.code(Code.of("t"))
.build();
Expand All @@ -190,13 +190,13 @@ public void testSubsumes3() throws Exception {
FHIRPathEvaluator evaluator = FHIRPathEvaluator.evaluator();

Coding codingA = Coding.builder()
.system(Uri.of("http://ibm.com/fhir/CodeSystem/cs5"))
.system(Uri.of("http://example.com/fhir/CodeSystem/cs5"))
.version(string("1.0.0"))
.code(Code.of("t"))
.build();

Coding codingB = Coding.builder()
.system(Uri.of("http://ibm.com/fhir/CodeSystem/cs5"))
.system(Uri.of("http://example.com/fhir/CodeSystem/cs5"))
.version(string("1.0.0"))
.code(Code.of("t"))
.build();
Expand All @@ -219,7 +219,7 @@ public void testTranslate1() throws Exception {
.build();

Collection<FHIRPathNode> initialContext = singleton(FHIRPathElementNode.elementNode(coding));
Collection<FHIRPathNode> result = evaluator.evaluate(new EvaluationContext(), "%terminologies.translate('http://ibm.com/fhir/ConceptMap/snomed-ucum', %context)", initialContext);
Collection<FHIRPathNode> result = evaluator.evaluate(new EvaluationContext(), "%terminologies.translate('http://example.com/fhir/ConceptMap/snomed-ucum', %context)", initialContext);
assertTrue(isSingleton(result));
assertTrue(isResourceNode(result));
assertTrue(getResourceNode(result).resource().is(Parameters.class));
Expand Down Expand Up @@ -253,7 +253,7 @@ public void testTranslate2() throws Exception {
.build();

Collection<FHIRPathNode> initialContext = singleton(FHIRPathElementNode.elementNode(coding));
Collection<FHIRPathNode> result = evaluator.evaluate(new EvaluationContext(), "%terminologies.translate('http://ibm.com/fhir/ConceptMap/snomed-ucum', %context)", initialContext);
Collection<FHIRPathNode> result = evaluator.evaluate(new EvaluationContext(), "%terminologies.translate('http://example.com/fhir/ConceptMap/snomed-ucum', %context)", initialContext);
assertTrue(isSingleton(result));
assertTrue(isResourceNode(result));
assertTrue(getResourceNode(result).resource().is(Parameters.class));
Expand Down Expand Up @@ -282,13 +282,13 @@ public void testValidateCS1() throws Exception {
FHIRPathEvaluator evaluator = FHIRPathEvaluator.evaluator();

Coding coding = Coding.builder()
.system(Uri.of("http://ibm.com/fhir/CodeSystem/cs5"))
.system(Uri.of("http://example.com/fhir/CodeSystem/cs5"))
.version(string("1.0.0"))
.code(Code.of("m"))
.build();

Collection<FHIRPathNode> initialContext = singleton(FHIRPathElementNode.elementNode(coding));
Collection<FHIRPathNode> result = evaluator.evaluate(new EvaluationContext(), "%terminologies.validateCS('http://ibm.com/fhir/CodeSystem/cs5', %context)", initialContext);
Collection<FHIRPathNode> result = evaluator.evaluate(new EvaluationContext(), "%terminologies.validateCS('http://example.com/fhir/CodeSystem/cs5', %context)", initialContext);
assertTrue(isSingleton(result));
assertTrue(isResourceNode(result));
assertTrue(getResourceNode(result).resource().is(Parameters.class));
Expand All @@ -302,13 +302,13 @@ public void testValidateCS2() throws Exception {
FHIRPathEvaluator evaluator = FHIRPathEvaluator.evaluator();

Coding coding = Coding.builder()
.system(Uri.of("http://ibm.com/fhir/CodeSystem/cs5"))
.system(Uri.of("http://example.com/fhir/CodeSystem/cs5"))
.version(string("1.0.0"))
.code(Code.of("x"))
.build();

Collection<FHIRPathNode> initialContext = singleton(FHIRPathElementNode.elementNode(coding));
Collection<FHIRPathNode> result = evaluator.evaluate(new EvaluationContext(), "%terminologies.validateCS('http://ibm.com/fhir/CodeSystem/cs5', %context)", initialContext);
Collection<FHIRPathNode> result = evaluator.evaluate(new EvaluationContext(), "%terminologies.validateCS('http://example.com/fhir/CodeSystem/cs5', %context)", initialContext);
assertTrue(isSingleton(result));
assertTrue(isResourceNode(result));
assertTrue(getResourceNode(result).resource().is(Parameters.class));
Expand All @@ -322,13 +322,13 @@ public void testValidateVS1() throws Exception {
FHIRPathEvaluator evaluator = FHIRPathEvaluator.evaluator();

Coding coding = Coding.builder()
.system(Uri.of("http://ibm.com/fhir/CodeSystem/cs1"))
.system(Uri.of("http://example.com/fhir/CodeSystem/cs1"))
.version(string("1.0.0"))
.code(Code.of("a"))
.build();

Collection<FHIRPathNode> initialContext = singleton(FHIRPathElementNode.elementNode(coding));
Collection<FHIRPathNode> result = evaluator.evaluate(new EvaluationContext(), "%terminologies.validateVS('http://ibm.com/fhir/ValueSet/vs1', %context)", initialContext);
Collection<FHIRPathNode> result = evaluator.evaluate(new EvaluationContext(), "%terminologies.validateVS('http://example.com/fhir/ValueSet/vs1', %context)", initialContext);
assertTrue(isSingleton(result));
assertTrue(isResourceNode(result));
assertTrue(getResourceNode(result).resource().is(Parameters.class));
Expand All @@ -342,13 +342,13 @@ public void testValidateVS2() throws Exception {
FHIRPathEvaluator evaluator = FHIRPathEvaluator.evaluator();

Coding coding = Coding.builder()
.system(Uri.of("http://ibm.com/fhir/CodeSystem/cs1"))
.system(Uri.of("http://example.com/fhir/CodeSystem/cs1"))
.version(string("1.0.0"))
.code(Code.of("x"))
.build();

Collection<FHIRPathNode> initialContext = singleton(FHIRPathElementNode.elementNode(coding));
Collection<FHIRPathNode> result = evaluator.evaluate(new EvaluationContext(), "%terminologies.validateVS('http://ibm.com/fhir/ValueSet/vs1', %context)", initialContext);
Collection<FHIRPathNode> result = evaluator.evaluate(new EvaluationContext(), "%terminologies.validateVS('http://example.com/fhir/ValueSet/vs1', %context)", initialContext);
assertTrue(isSingleton(result));
assertTrue(isResourceNode(result));
assertTrue(getResourceNode(result).resource().is(Parameters.class));
Expand Down
Loading

0 comments on commit e528df7

Please sign in to comment.