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 bug loading implied packages with no version

This commit is contained in:
Grahame Grieve 2020-09-09 11:51:09 +10:00
parent 4616da8a82
commit a47ac539a5
2 changed files with 1 additions and 4 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/cache/PackageClient.java vendored
View File

@ -86,7 +86,7 @@ public class PackageClient {
public boolean exists(String id, String ver) throws IOException { public boolean exists(String id, String ver) throws IOException {
List<PackageInfo> vl = getVersions(id); List<PackageInfo> vl = getVersions(id);
for (PackageInfo pi : vl) { for (PackageInfo pi : vl) {
if (ver.equals(pi.getVersion())) { if (ver == null || ver.equals(pi.getVersion())) {
return true; return true;
} }
} }

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

@ -371,9 +371,6 @@ public class ValidationTestSuite implements IEvaluationContext, IValidatorResour
} }
if (!TestingUtilities.context(version).isNoTerminologyServer() || !focus.has("tx-dependent")) { if (!TestingUtilities.context(version).isNoTerminologyServer() || !focus.has("tx-dependent")) {
Assert.assertEquals("Test " + name + (profile == null ? "" : " profile: "+ profile) + ": Expected " + Integer.toString(java.get("errorCount").getAsInt()) + " errors, but found " + Integer.toString(ec) + ".", java.get("errorCount").getAsInt(), ec); Assert.assertEquals("Test " + name + (profile == null ? "" : " profile: "+ profile) + ": Expected " + Integer.toString(java.get("errorCount").getAsInt()) + " errors, but found " + Integer.toString(ec) + ".", java.get("errorCount").getAsInt(), ec);
if (name.equals("icd-9-condition.xml")) {
Assert.assertEquals("Test " + name + (profile == null ? "" : " profile: "+ profile) + ": Expected " + Integer.toString(1) + " errors, but found " + Integer.toString(ec) + ".", 1, ec);
}
if (java.has("warningCount")) { if (java.has("warningCount")) {
Assert.assertEquals( "Test " + name + (profile == null ? "" : " profile: "+ profile) + ": Expected " + Integer.toString(java.get("warningCount").getAsInt()) + " warnings, but found " + Integer.toString(wc) + ".", java.get("warningCount").getAsInt(), wc); Assert.assertEquals( "Test " + name + (profile == null ? "" : " profile: "+ profile) + ": Expected " + Integer.toString(java.get("warningCount").getAsInt()) + " warnings, but found " + Integer.toString(wc) + ".", java.get("warningCount").getAsInt(), wc);
} }