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

Add more tests

This commit is contained in:
jamesagnew 2020-11-01 17:26:55 -05:00 committed by James Agnew
parent 0c01404a4f
commit 943bc7413c
2 changed files with 24 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
org.hl7.fhir.utilities/src/main/java/org/hl7/fhir/utilities/VersionUtilities.java
View File

@ -5,7 +5,6 @@ import java.util.List;
import org.apache.commons.lang3.StringUtils;
import org.hl7.fhir.exceptions.FHIRException;
import org.hl7.fhir.utilities.npm.NpmPackage;
/*
Copyright (c) 2011+, HL7, Inc.
@ -250,16 +249,20 @@ public class VersionUtilities {
if (testPart.equals(currentPart)) {
continue;
}
if (StringUtils.isNumeric(testPart) && StringUtils.isNumeric(currentPart)) {
return Integer.parseInt(currentPart) - Integer.parseInt(testPart) > 0;
} else {
return currentPart.compareTo(testPart) >= 0;
}
return compareVersionPart(testPart, currentPart);
}
return true;
}
private static boolean compareVersionPart(String theTestPart, String theCurrentPart) {
if (StringUtils.isNumeric(theTestPart) && StringUtils.isNumeric(theCurrentPart)) {
return Integer.parseInt(theCurrentPart) - Integer.parseInt(theTestPart) >= 0;
} else {
return theCurrentPart.compareTo(theTestPart) >= 0;
}
}
/**
* return true if the current version equals test for major and min, or later patch
*
@ -277,7 +280,7 @@ public class VersionUtilities {
return true;
}
if (pc!=null) {
return pc.compareTo(pt) >= 0;
return compareVersionPart(pt, pc);
}
}
return false;

14
org.hl7.fhir.utilities/src/test/java/org/hl7/fhir/utilities/VersionUtilitiesTest.java
View File

@ -31,4 +31,18 @@ public class VersionUtilitiesTest {
}
@Test
public void isMajMinOrLaterPatch_Simple() {
assertTrue(VersionUtilities.isMajMinOrLaterPatch("0.9.0", "0.9.0"));
assertTrue(VersionUtilities.isMajMinOrLaterPatch("0.9.0", "0.9.1"));
assertFalse(VersionUtilities.isThisOrLater("0.9.0", "0.8.1"));
}
@Test
public void isMajMinOrLaterPatch_VersionWithX() {
assertTrue(VersionUtilities.isMajMinOrLaterPatch("0.9.x", "0.9.0"));
assertTrue(VersionUtilities.isMajMinOrLaterPatch("0.9.x", "0.9.1"));
assertFalse(VersionUtilities.isThisOrLater("0.9.x", "0.8.1"));
}
}