Version isGreaterThanOrEqual and isLessOrEqual treat NULL in base version

as being equal to anything in comparing version

Author: pesse

src/main/java/org/utplsql/api/Version.java

@@ -167,10 +167,14 @@ public String getNormalizedString() {
     }
 
     private int compareToWithNulls(@Nullable Integer i1, @Nullable Integer i2) {
+        return compareToWithNulls(i1, i2, false);
+    }
+
+    private int compareToWithNulls(@Nullable Integer i1, @Nullable Integer i2, boolean nullMeansEqual) {
         if (i1 == null && i2 == null) {
             return 0;
         } else if (i1 == null) {
-            return -1;
+            return nullMeansEqual ? 0 : -1;
         } else if (i2 == null) {
             return 1;
         } else {
@@ -180,26 +184,30 @@ private int compareToWithNulls(@Nullable Integer i1, @Nullable Integer i2) {
 
     @Override
     public int compareTo(Version o) {
+        return compareTo(o, false);
+    }
+
+    public int compareTo(Version o, boolean nullMeansEqual) {
         int curResult;
 
         if (isValid() && o.isValid()) {
 
-            curResult = compareToWithNulls(getMajor(), o.getMajor());
+            curResult = compareToWithNulls(getMajor(), o.getMajor(), nullMeansEqual);
             if (curResult != 0) {
                 return curResult;
             }
 
-            curResult = compareToWithNulls(getMinor(), o.getMinor());
+            curResult = compareToWithNulls(getMinor(), o.getMinor(), nullMeansEqual);
             if (curResult != 0) {
                 return curResult;
             }
 
-            curResult = compareToWithNulls(getBugfix(), o.getBugfix());
+            curResult = compareToWithNulls(getBugfix(), o.getBugfix(), nullMeansEqual);
             if (curResult != 0) {
                 return curResult;
             }
 
-            curResult = compareToWithNulls(getBuild(), o.getBuild());
+            curResult = compareToWithNulls(getBuild(), o.getBuild(), nullMeansEqual);
             if (curResult != 0) {
                 return curResult;
             }
@@ -220,6 +228,7 @@ private void versionsAreValid(Version v) throws InvalidVersionException {
 
     /**
      * Compares this version to a given version and returns true if this version is greater or equal than the given one
+     * If one of the version parts of the base version is null, this level is assumed equal no matter the comparing level's version part
      * Throws an InvalidVersionException if either this or the given version are invalid
      *
      * @param v Version to compare with
@@ -230,7 +239,7 @@ public boolean isGreaterOrEqualThan(Version v) throws InvalidVersionException {
 
         versionsAreValid(v);
 
-        return compareTo(v) >= 0;
+        return compareTo(v, true) >= 0;
     }
 
 
@@ -240,11 +249,20 @@ public boolean isGreaterThan(Version v) throws InvalidVersionException {
         return compareTo(v) > 0;
     }
 
+    /**
+     * Compares this version to a given version and returns true if this version is less or equal than the given one
+     * If one of the version parts of the base version is null, this level is assumed equal no matter the comparing level's version part
+     * Throws an InvalidVersionException if either this or the given version are invalid
+     *
+     * @param v Version to compare with
+     * @return
+     * @throws InvalidVersionException
+     */
     public boolean isLessOrEqualThan(Version v) throws InvalidVersionException {
 
         versionsAreValid(v);
 
-        return compareTo(v) <= 0;
+        return compareTo(v, true) <= 0;
     }
 
     public boolean isLessThan(Version v) throws InvalidVersionException {

src/test/java/org/utplsql/api/VersionObjectTest.java

@@ -78,6 +78,29 @@ void versionCompareTo() {
         assertEquals(0, base.compareTo(Version.create("2.3.4.5")));
     }
 
+    @Test
+    void versionCompareToWithBaseNull() {
+        Version base = Version.create("2.3.4");
+
+        // Less than
+        assertEquals(-1, base.compareTo(Version.create("3")));
+        assertEquals(-1, base.compareTo(Version.create("3.2")));
+        assertEquals(-1, base.compareTo(Version.create("2.4.1")));
+        assertEquals(-1, base.compareTo(Version.create("2.3.9.1")));
+        assertEquals(-1, base.compareTo(Version.create("2.3.4.1")));
+        assertEquals(-1, base.compareTo(Version.create("2.3.4.5")));
+        assertEquals(-1, base.compareTo(Version.create("2.3.4.9")));
+
+        // Greater than
+        assertEquals(1, base.compareTo(Version.create("1")));
+        assertEquals(1, base.compareTo(Version.create("1.6")));
+        assertEquals(1, base.compareTo(Version.create("2.2.4")));
+        assertEquals(1, base.compareTo(Version.create("2.3.3")));
+
+        // Equal
+        assertEquals(0, base.compareTo(Version.create("2.3.4")));
+    }
+
     @Test
     void isGreaterOrEqualThan() throws InvalidVersionException {
         Version base = Version.create("2.3.4.5");
@@ -98,6 +121,26 @@ void isGreaterOrEqualThan() throws InvalidVersionException {
 
     }
 
+    @Test
+    void isGreaterOrEqualThanWithBaseNull() throws InvalidVersionException {
+        Version base = Version.create("2.3.4");
+
+        assertTrue(base.isGreaterOrEqualThan(Version.create("1")));
+        assertTrue(base.isGreaterOrEqualThan(Version.create("2")));
+        assertTrue(base.isGreaterOrEqualThan(Version.create("2.3")));
+        assertTrue(base.isGreaterOrEqualThan(Version.create("2.2")));
+        assertTrue(base.isGreaterOrEqualThan(Version.create("2.3.4")));
+        assertTrue(base.isGreaterOrEqualThan(Version.create("2.3.3")));
+        assertTrue(base.isGreaterOrEqualThan(Version.create("2.3.4.5")));
+        assertTrue(base.isGreaterOrEqualThan(Version.create("2.3.4.4")));
+        assertTrue(base.isGreaterOrEqualThan(Version.create("2.3.4.6")));
+
+        assertFalse(base.isGreaterOrEqualThan(Version.create("2.3.5")));
+        assertFalse(base.isGreaterOrEqualThan(Version.create("2.4")));
+        assertFalse(base.isGreaterOrEqualThan(Version.create("3")));
+
+    }
+
     @Test
     void isGreaterOrEqualThanFails() {
         // Given version is invalid