Merge pull request #7 from janakaaleph/master

Implement comparable interface for Version

Author: G00fY2

versioncompare/src/main/java/com/g00fy2/versioncompare/Version.java

@@ -6,7 +6,7 @@
 import javax.annotation.Nullable;
 
 @SuppressWarnings("WeakerAccess")
-public class Version {
+public class Version implements Comparable<Version> {
 
   @Nullable private final String originalString;
   @Nonnull private final List<Integer> subversionNumbers = new ArrayList<>();
@@ -270,4 +270,17 @@ private void initVersion() {
       if (suffixSb != null) suffix = suffixSb.toString();
     }
   }
+
+  @Override
+  public int compareTo(@Nonnull Version version) {
+      if (this.isEqual(version)) return 0;
+      else if (this.isLowerThan(version)) return -1;
+      else return 1;
+  }
+
+  @Override
+  public boolean equals(Object o) {
+      if (o instanceof Version && this.isEqual((Version)o)) return true;
+      else return super.equals(o);
+  }
 }

versioncompare/src/test/java/com/g00fy2/versioncompare/VersionTestEquals.java

@@ -7,6 +7,7 @@
 import org.junit.runners.Parameterized;
 import org.junit.runners.Parameterized.Parameters;
 
+import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertTrue;
 
 @RunWith(Parameterized.class) public class VersionTestEquals {
@@ -33,13 +34,23 @@
   private final String equalVersionA;
   private final String equalVersionB;
 
+  private final Version equalVersionAObject;
+  private final Version equalVersionBObject;
+
   public VersionTestEquals(String versionA, String versionB) {
     equalVersionA = versionA;
+    equalVersionAObject = new Version(equalVersionA);
+
     equalVersionB = versionB;
+    equalVersionBObject = new Version(equalVersionB);
   }
 
   @Test public void isEqualIsCorrect() {
     assertTrue(equalVersionA + " and " + equalVersionB + " should be equal",
         new Version(equalVersionA).isEqual(equalVersionB));
   }
+
+  @Test public void isEqualsComparatorCorrect() {
+    assertEquals(equalVersionA + " and " + equalVersionB + " should be equal", equalVersionAObject, equalVersionBObject);
+  }
 }

versioncompare/src/test/java/com/g00fy2/versioncompare/VersionTestHigherLower.java

@@ -47,28 +47,54 @@
   private final String higherVersion;
   private final String lowerVersion;
 
+  private final Version higherVersionObject;
+  private final Version lowerVersionObject;
+
   public VersionTestHigherLower(String versionA, String versionB) {
     higherVersion = versionA;
+    higherVersionObject = new Version(higherVersion);
+
     lowerVersion = versionB;
+    lowerVersionObject = new Version(lowerVersion);
   }
 
   @Test public void isHigherThanIsCorrect() {
     assertTrue(higherVersion + " should be higher than " + lowerVersion,
         new Version(higherVersion).isHigherThan(lowerVersion));
   }
 
+  @Test public void isHigherThanComparatorIsCorrect() {
+    assertTrue(higherVersion + " should be higher than " + lowerVersion,
+            higherVersionObject.compareTo(lowerVersionObject) > 0);
+  }
+
   @Test public void isHigherThanIsNotCorrect() {
     assertFalse(lowerVersion + " should NOT be higher than " + higherVersion,
         new Version(lowerVersion).isHigherThan(higherVersion));
   }
 
+  @Test public void isHigherThanComparatorIsNotCorrect() {
+    assertFalse(lowerVersion + " should NOT be higher than " + higherVersion,
+            lowerVersionObject.compareTo(higherVersionObject) > 0);
+  }
+
   @Test public void isLowerThanIsCorrect() {
     assertTrue(lowerVersion + " should be lower than " + higherVersion,
         new Version(lowerVersion).isLowerThan(higherVersion));
   }
 
+  @Test public void isLowerThanComparatorIsCorrect() {
+    assertTrue(lowerVersion + " should be lower than " + higherVersion,
+            lowerVersionObject.compareTo(higherVersionObject) < 0);
+  }
+
   @Test public void isLowerThanIsNotCorrect() {
     assertFalse(higherVersion + " should NOT be lower than " + lowerVersion,
         new Version(higherVersion).isLowerThan(lowerVersion));
   }
+
+  @Test public void isLowerThanComparatorIsNotCorrect() {
+    assertFalse(higherVersion + " should NOT be lower than " + lowerVersion,
+            higherVersionObject.compareTo(lowerVersionObject) < 0);
+  }
 }

versioncompare/src/test/java/com/g00fy2/versioncompare/VersionTestIsAtLeast.java

@@ -31,13 +31,24 @@
   private final String atLeastVersionA;
   private final String atLeastVersionB;
 
+  private final Version atLeastVersionAObject;
+  private final Version atLeastVersionBObject;
+
   public VersionTestIsAtLeast(String versionA, String versionB) {
     atLeastVersionA = versionA;
+    atLeastVersionAObject = new Version(atLeastVersionA);
+
     atLeastVersionB = versionB;
+    atLeastVersionBObject = new Version(atLeastVersionB);
   }
 
   @Test public void isAtLeastIsCorrect() {
     assertTrue("Version " + atLeastVersionA + " should be equal or higher than " + atLeastVersionB,
         new Version(atLeastVersionA).isAtLeast(atLeastVersionB));
   }
+
+  @Test public void isAtLeastComparatorIsCorrect() {
+    assertTrue("Version " + atLeastVersionA + " should be equal or higher than " + atLeastVersionB,
+            atLeastVersionAObject.compareTo(atLeastVersionBObject) >= 0);
+  }
 }