From cc8c7be307c840c6d375efb5d0760372e81ebb59 Mon Sep 17 00:00:00 2001 From: Grahame Grieve Date: Tue, 18 Apr 2023 09:41:15 +0800 Subject: [PATCH] fix which servers tests are based on --- .../main/java/org/hl7/fhir/utilities/Servers.java | 1 - .../tests/ExternalTerminologyServiceTests.java | 2 +- .../validation/tests/ValidationEngineTests.java | 4 ++-- .../hl7/fhir/validation/tests/ValidationTests.java | 13 +++++++------ 4 files changed, 10 insertions(+), 10 deletions(-) diff --git a/org.hl7.fhir.utilities/src/main/java/org/hl7/fhir/utilities/Servers.java b/org.hl7.fhir.utilities/src/main/java/org/hl7/fhir/utilities/Servers.java index fa83255ad..dbc64d4aa 100644 --- a/org.hl7.fhir.utilities/src/main/java/org/hl7/fhir/utilities/Servers.java +++ b/org.hl7.fhir.utilities/src/main/java/org/hl7/fhir/utilities/Servers.java @@ -5,7 +5,6 @@ public class Servers { public static final String TX_SERVER_PROD = "http://tx.fhir.org"; public static final String TX_SERVER_DEV = "http://tx-dev.fhir.org"; public static final String TX_SERVER_LOCAL = "http://local.fhir.org"; - public static final String TX_SERVER_LOCAL2 = "http://local.fhir.org:8090"; public static boolean isTxFhirOrg(String s) { return Utilities.startsWithInList(s.replace("https://", "http://"), TX_SERVER_PROD, TX_SERVER_DEV, TX_SERVER_LOCAL); diff --git a/org.hl7.fhir.validation/src/test/java/org/hl7/fhir/terminology/tests/ExternalTerminologyServiceTests.java b/org.hl7.fhir.validation/src/test/java/org/hl7/fhir/terminology/tests/ExternalTerminologyServiceTests.java index 2df32a3db..c00d58a26 100644 --- a/org.hl7.fhir.validation/src/test/java/org/hl7/fhir/terminology/tests/ExternalTerminologyServiceTests.java +++ b/org.hl7.fhir.validation/src/test/java/org/hl7/fhir/terminology/tests/ExternalTerminologyServiceTests.java @@ -48,7 +48,7 @@ public class ExternalTerminologyServiceTests implements ITxTesterLoader { } private static final String SERVER = Servers.TX_SERVER_DEV; -// private static final String SERVER = Servers.TX_SERVER_LOCAL2; +// private static final String SERVER = Servers.TX_SERVER_LOCAL; @Parameters(name = "{index}: id {0}") public static Iterable data() throws IOException { diff --git a/org.hl7.fhir.validation/src/test/java/org/hl7/fhir/validation/tests/ValidationEngineTests.java b/org.hl7.fhir.validation/src/test/java/org/hl7/fhir/validation/tests/ValidationEngineTests.java index 3004cfbc2..dc79c88cb 100644 --- a/org.hl7.fhir.validation/src/test/java/org/hl7/fhir/validation/tests/ValidationEngineTests.java +++ b/org.hl7.fhir.validation/src/test/java/org/hl7/fhir/validation/tests/ValidationEngineTests.java @@ -21,8 +21,8 @@ import static org.junit.jupiter.api.Assertions.assertTrue; public class ValidationEngineTests { -// private static final String DEF_TX = Servers.TX_SERVER_DEV; - private static final String DEF_TX = Servers.TX_SERVER_LOCAL; + private static final String DEF_TX = Servers.TX_SERVER_DEV; +// private static final String DEF_TX = Servers.TX_SERVER_LOCAL; public static boolean inbuild; diff --git a/org.hl7.fhir.validation/src/test/java/org/hl7/fhir/validation/tests/ValidationTests.java b/org.hl7.fhir.validation/src/test/java/org/hl7/fhir/validation/tests/ValidationTests.java index 72a546de5..49e82d507 100644 --- a/org.hl7.fhir.validation/src/test/java/org/hl7/fhir/validation/tests/ValidationTests.java +++ b/org.hl7.fhir.validation/src/test/java/org/hl7/fhir/validation/tests/ValidationTests.java @@ -404,13 +404,14 @@ public class ValidationTests implements IEvaluationContext, IValidatorResourceFe private ValidationEngine buildVersionEngine(String ver, String txLog) throws Exception { + String server = Servers.TX_SERVER_DEV; switch (ver) { - case "1.0": return TestUtilities.getValidationEngine("hl7.fhir.r2.core#1.0.2", Servers.TX_SERVER_PROD, txLog, FhirPublication.DSTU2, true, "1.0.2"); - case "1.4": return TestUtilities.getValidationEngine("hl7.fhir.r2b.core#1.4.0", Servers.TX_SERVER_PROD, txLog, FhirPublication.DSTU2016May, true, "1.4.0"); - case "3.0": return TestUtilities.getValidationEngine("hl7.fhir.r3.core#3.0.2", Servers.TX_SERVER_PROD, txLog, FhirPublication.STU3, true, "3.0.2"); - case "4.0": return TestUtilities.getValidationEngine("hl7.fhir.r4.core#4.0.1", Servers.TX_SERVER_PROD, txLog, FhirPublication.R4, true, "4.0.1"); - case "4.3": return TestUtilities.getValidationEngine("hl7.fhir.r4b.core#4.3.0", Servers.TX_SERVER_PROD, txLog, FhirPublication.R4B, true, "4.3.0"); - case "5.0": return TestUtilities.getValidationEngine("hl7.fhir.r5.core#5.0.0", Servers.TX_SERVER_PROD, txLog, FhirPublication.R5, true, "5.0.0"); + case "1.0": return TestUtilities.getValidationEngine("hl7.fhir.r2.core#1.0.2", server, txLog, FhirPublication.DSTU2, true, "1.0.2"); + case "1.4": return TestUtilities.getValidationEngine("hl7.fhir.r2b.core#1.4.0", server, txLog, FhirPublication.DSTU2016May, true, "1.4.0"); + case "3.0": return TestUtilities.getValidationEngine("hl7.fhir.r3.core#3.0.2", server, txLog, FhirPublication.STU3, true, "3.0.2"); + case "4.0": return TestUtilities.getValidationEngine("hl7.fhir.r4.core#4.0.1", server, txLog, FhirPublication.R4, true, "4.0.1"); + case "4.3": return TestUtilities.getValidationEngine("hl7.fhir.r4b.core#4.3.0", server, txLog, FhirPublication.R4B, true, "4.3.0"); + case "5.0": return TestUtilities.getValidationEngine("hl7.fhir.r5.core#5.0.0", server, txLog, FhirPublication.R5, true, "5.0.0"); } throw new Exception("unknown version " + version); }