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

get all tests passing.

This commit is contained in:
Grahame Grieve 2020-04-28 11:14:54 +10:00
parent f9bdd5c9f0
commit d5fff86e8e
4 changed files with 8 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
org.hl7.fhir.utilities/src/main/java/org/hl7/fhir/utilities/Utilities.java
View File

@ -582,6 +582,8 @@ public class Utilities {
String ev = System.getenv(a.replace("[", "").replace("]", ""));
if (ev != null) {
a = ev;
} else {
a = "null";
}
}
}

6
org.hl7.fhir.utilities/src/test/java/org/hl7/fhir/utilities/tests/UtilitiesTests.java
View File

@ -54,7 +54,7 @@ public class UtilitiesTests {
return OSX_JAVA_HOME;
} else if (os.contains(LINUX)) {
return LINUX_JAVA_HOME;
} else if (os.contains(WINDOWS)) {
} else if (os.toUpperCase().contains(WINDOWS)) {
return WIN_JAVA_HOME;
} else {
throw new IllegalStateException("OS not recognized...cannot verify created directories.");
@ -67,7 +67,7 @@ public class UtilitiesTests {
return OSX_USER_DIR;
} else if (os.contains(LINUX)) {
return LINUX_USER_DIR;
} else if (os.contains(WINDOWS)) {
} else if (os.toUpperCase().contains(WINDOWS)) {
return WIN_USER_DIR;
} else {
throw new IllegalStateException("OS not recognized...cannot verify created directories.");
@ -80,7 +80,7 @@ public class UtilitiesTests {
return getOsxTempDir();
} else if (os.contains(LINUX)) {
return LINUX_TEMP_DIR;
} else if (os.contains(WINDOWS)) {
} else if (os.toUpperCase().contains(WINDOWS)) {
return WIN_TEMP_DIR;
} else {
throw new IllegalStateException("OS not recognized...cannot verify created directories.");

19
org.hl7.fhir.validation/src/test/java/org/hl7/fhir/validation/tests/AllR5ValidationTests.java
View File

@ -1,19 +0,0 @@
package org.hl7.fhir.validation.tests;
import org.hl7.fhir.conversion.tests.SnapShotGenerationTestsX;
import org.junit.runner.RunWith;
import org.junit.runners.Suite;
import org.junit.runners.Suite.SuiteClasses;
@RunWith(Suite.class)
@SuiteClasses({
SnapShotGenerationTestsX.class,
ValidationTestSuite.class,
ValidationEngineTests.class,
JsonSchemaTests.class,
NativeHostServiceTester.class,
// CDAValidationTestCase.class,
ProfileComparisonTests.class})
public class AllR5ValidationTests {
}

6
org.hl7.fhir.validation/src/test/java/org/hl7/fhir/validation/tests/ValidationTestSuite.java
View File

@ -302,16 +302,16 @@ public class ValidationTestSuite implements IEvaluationContext, IValidatorResour
for (ValidationMessage vm : errors) {
if (vm.getLevel() == IssueSeverity.FATAL || vm.getLevel() == IssueSeverity.ERROR) {
ec++;
System.out.println(vm.getDisplay());
// System.out.println(vm.getDisplay());
errLocs.add(vm.getLocation());
}
if (vm.getLevel() == IssueSeverity.WARNING) {
wc++;
System.out.println(vm.getDisplay());
// System.out.println(vm.getDisplay());
}
if (vm.getLevel() == IssueSeverity.INFORMATION) {
hc++;
System.out.println(vm.getDisplay());
// System.out.println(vm.getDisplay());
}
}
if (!TestingUtilities.context(version).isNoTerminologyServer() || !focus.has("tx-dependent")) {