Add more tests for Version class and removed Comparable stuff.

kayahr · kayahr · commit 725388d8fc43 · 2014-02-23T15:35:51.000+01:00
There can be only one Version state (The current libusb version) so
there is never any other version to compare it to.
diff --git a/src/main/java/org/usb4java/Version.java b/src/main/java/org/usb4java/Version.java
@@ -18,7 +18,6 @@
 
 package org.usb4java;
 
-import org.apache.commons.lang3.builder.CompareToBuilder;
 import org.apache.commons.lang3.builder.EqualsBuilder;
 import org.apache.commons.lang3.builder.HashCodeBuilder;
 
@@ -27,7 +26,7 @@
  *
  * @author Klaus Reimer (k@ailis.de)
  */
-public final class Version implements Comparable<Version>
+public final class Version
 {
     /** The native pointer to the version structure. */
     private long versionPointer;
@@ -125,27 +124,6 @@ public boolean equals(final Object obj)
             .isEquals();
     }
 
-    @Override
-    public int compareTo(final Version other)
-    {
-        if (this == other)
-        {
-            return 0;
-        }
-        if (other == null)
-        {
-            return 1;
-        }
-
-        return new CompareToBuilder()
-            .append(this.major(), other.major())
-            .append(this.minor(), other.minor())
-            .append(this.micro(), other.micro())
-            .append(this.nano(), other.nano())
-            .append(this.rc(), other.rc())
-            .toComparison();
-    }
-
     @Override
     public String toString()
     {
diff --git a/src/test/java/org/usb4java/VersionTest.java b/src/test/java/org/usb4java/VersionTest.java
@@ -5,14 +5,15 @@
 
 package org.usb4java;
 
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.assertTrue;
 import static org.usb4java.test.UsbAssume.assumeUsbTestsEnabled;
 import static org.usb4java.test.UsbAssume.isUsbTestsEnabled;
 
 import org.junit.After;
 import org.junit.Before;
 import org.junit.Test;
-import org.usb4java.LibUsb;
-import org.usb4java.Version;
 
 /**
  * Tests the {@link Version} class.
@@ -21,9 +22,6 @@
  */
 public class VersionTest
 {
-    /** The test subject. */
-    private Version version;
-
     /**
      * Setup test.
      */
@@ -33,7 +31,6 @@ public void setUp()
         if (isUsbTestsEnabled())
         {
             LibUsb.init(null);
-            this.version = new Version();
         }
     }
 
@@ -49,14 +46,34 @@ public void tearDown()
         }
     }
 
+    /**
+     * Tests the {@link Version#major()} method.
+     */
+    @Test
+    public void testMajor()
+    {
+        assumeUsbTestsEnabled();
+        assertTrue(LibUsb.getVersion().major() > 0);
+    }
+
     /**
      * Tests uninitialized access to {@link Version#major()}
      */
     @Test(expected = IllegalStateException.class)
     public void testUninitializedMajor()
     {
         assumeUsbTestsEnabled();
-        this.version.major();
+        new Version().major();
+    }
+
+    /**
+     * Tests the {@link Version#minor()} method.
+     */
+    @Test
+    public void testMinor()
+    {
+        assumeUsbTestsEnabled();
+        assertTrue(LibUsb.getVersion().minor() >= 0);
     }
 
     /**
@@ -66,7 +83,17 @@ public void testUninitializedMajor()
     public void testUninitializedMinor()
     {
         assumeUsbTestsEnabled();
-        this.version.minor();
+        new Version().minor();
+    }
+
+    /**
+     * Tests the {@link Version#micro()} method.
+     */
+    @Test
+    public void testMicro()
+    {
+        assumeUsbTestsEnabled();
+        assertTrue(LibUsb.getVersion().micro() >= 0);
     }
 
     /**
@@ -76,7 +103,17 @@ public void testUninitializedMinor()
     public void testUninitializedMicro()
     {
         assumeUsbTestsEnabled();
-        this.version.micro();
+        new Version().micro();
+    }
+
+    /**
+     * Tests the {@link Version#micro()} method.
+     */
+    @Test
+    public void testRc()
+    {
+        assumeUsbTestsEnabled();
+        assertNotNull(LibUsb.getVersion().rc());
     }
 
     /**
@@ -86,6 +123,47 @@ public void testUninitializedMicro()
     public void testUninitializedRc()
     {
         assumeUsbTestsEnabled();
-        this.version.rc();
+        new Version().rc();
+    }
+    
+    /**
+     * Tests the {@link Version#equals(Object)} method. This equals test
+     * is not complete because we can't generate a version object with a
+     * different LibUSB version.
+     */
+    @Test
+    public void testEquals()
+    {
+        assumeUsbTestsEnabled();
+        Version version = LibUsb.getVersion();
+        assertTrue(version.equals(version));
+        assertTrue(version.equals(LibUsb.getVersion()));
+        assertFalse(version.equals(null));
+        assertFalse(version.equals(""));        
+    }
+    
+    /**
+     * Tests the {@link Version#hashCode()} method. This test is not complete
+     * because we can't generate a version object with a different LibUSB
+     * version. So we just check that it doesn't crash.
+     */
+    @Test
+    public void testHashCode()
+    {
+        assumeUsbTestsEnabled();
+        Version version = LibUsb.getVersion();
+        version.hashCode();
+    }
+    
+    /**
+     * Tests the {@link Version#toString()} method
+     */
+    @Test
+    public void testToString()
+    {
+        assumeUsbTestsEnabled();
+        Version version = LibUsb.getVersion();
+        assertNotNull(version.toString());
+        assertTrue(version.toString().length() > 0);
     }
 }
