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

One more attempt at getting the tests using the deps

This commit is contained in:
James Agnew 2019-11-07 15:57:32 -05:00
parent c809b0f281
commit bcd8ddba34
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/test/utils/TestingUtilities.java
View File

@ -457,7 +457,7 @@ public class TestingUtilities {
// TODO: JA need to figure out how to detect that we're running in maven
private static boolean isTryToLoadFromFileSystem() {
return true;
return !"true".equals(System.getProperty("dont_load_from_filesystem"));
}
public static String loadTestResource(String... paths) throws IOException {
@ -480,7 +480,7 @@ public class TestingUtilities {
}
public static InputStream loadTestResourceStream(String... paths) throws IOException {
if (new File("../../fhir-test-cases").exists()) {
if (new File("../../fhir-test-cases").exists() && isTryToLoadFromFileSystem()) {
String n = Utilities.path(System.getProperty("user.dir"), "..", "..", "fhir-test-cases", Utilities.path(paths));
return new FileInputStream(n);
} else {
@ -490,7 +490,7 @@ public class TestingUtilities {
}
public static byte[] loadTestResourceBytes(String... paths) throws IOException {
if (new File("../../fhir-test-cases").exists()) {
if (new File("../../fhir-test-cases").exists() && isTryToLoadFromFileSystem()) {
String n = Utilities.path(System.getProperty("user.dir"), "..", "..", "fhir-test-cases", Utilities.path(paths));
return TextFile.fileToBytes(n);
} else {

2
pom.xml
View File

@ -17,7 +17,7 @@
<properties>
<hapi_fhir_version>4.1.0-SNAPSHOT</hapi_fhir_version>
<validator_test_case_version>1.0.2-SNAPSHOT</validator_test_case_version>
<validator_test_case_version>1.0.3-SNAPSHOT</validator_test_case_version>
</properties>
<artifactId>org.hl7.fhir.core</artifactId>