honeymoose
/
org.hl7.fhir.core
mirror of https://github.com/hapifhir/org.hl7.fhir.core.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

fix which servers tests are based on

This commit is contained in:
Grahame Grieve 2023-04-18 09:41:15 +08:00
parent 02bd1d8ce7
commit cc8c7be307
4 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
org.hl7.fhir.utilities/src/main/java/org/hl7/fhir/utilities/Servers.java
View File

@ -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);

2
org.hl7.fhir.validation/src/test/java/org/hl7/fhir/terminology/tests/ExternalTerminologyServiceTests.java
View File

@ -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<Object[]> data() throws IOException {

4
org.hl7.fhir.validation/src/test/java/org/hl7/fhir/validation/tests/ValidationEngineTests.java
View File

@ -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;

13
org.hl7.fhir.validation/src/test/java/org/hl7/fhir/validation/tests/ValidationTests.java
View File

@ -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);
}