From 5efc4f8573c06ac324fd991420b288b3294a9af3 Mon Sep 17 00:00:00 2001
From: Klaus Reimer <k@ailis.de>
Date: Sat, 13 Jul 2013 21:45:59 +0200
Subject: [PATCH] Add unit test for Version class and catch uninitialized usage
 of it.

---
 src/main/c/src/Version.c                      | 16 +++-
 .../de/ailis/usb4java/libusb/VersionTest.java | 87 +++++++++++++++++++
 2 files changed, 99 insertions(+), 4 deletions(-)
 create mode 100644 src/test/java/de/ailis/usb4java/libusb/VersionTest.java

diff --git a/src/main/c/src/Version.c b/src/main/c/src/Version.c
index 3dd2f27..8902640 100644
--- a/src/main/c/src/Version.c
+++ b/src/main/c/src/Version.c
@@ -23,7 +23,9 @@ JNIEXPORT jint JNICALL METHOD_NAME(Version, major)
     JNIEnv *env, jobject this
 )
 {
-    return unwrapVersion(env, this)->major;
+    const struct libusb_version *version = unwrapVersion(env, this);
+    if (!version) return 0;
+    return version->major;
 }
 
 /**
@@ -34,7 +36,9 @@ JNIEXPORT jint JNICALL METHOD_NAME(Version, minor)
     JNIEnv *env, jobject this
 )
 {
-    return unwrapVersion(env, this)->minor;
+    const struct libusb_version *version = unwrapVersion(env, this);
+    if (!version) return 0;
+    return version->minor;
 }
 
 /**
@@ -45,7 +49,9 @@ JNIEXPORT jint JNICALL METHOD_NAME(Version, micro)
     JNIEnv *env, jobject this
 )
 {
-    return unwrapVersion(env, this)->micro;
+    const struct libusb_version *version = unwrapVersion(env, this);
+    if (!version) return 0;
+    return version->micro;
 }
 
 /**
@@ -56,7 +62,9 @@ JNIEXPORT jstring JNICALL METHOD_NAME(Version, rc)
     JNIEnv *env, jobject this
 )
 {
-    return (*env)->NewStringUTF(env, unwrapVersion(env, this)->rc);
+    const struct libusb_version *version = unwrapVersion(env, this);
+    if (!version) return NULL;
+    return (*env)->NewStringUTF(env, version->rc);
 }
 
 
diff --git a/src/test/java/de/ailis/usb4java/libusb/VersionTest.java b/src/test/java/de/ailis/usb4java/libusb/VersionTest.java
new file mode 100644
index 0000000..3ec5659
--- /dev/null
+++ b/src/test/java/de/ailis/usb4java/libusb/VersionTest.java
@@ -0,0 +1,87 @@
+/*
+ * Copyright (C) 2013 Klaus Reimer <k@ailis.de>
+ * See LICENSE.md for licensing information.
+ */
+
+package de.ailis.usb4java.libusb;
+
+import static de.ailis.usb4java.test.UsbAssume.assumeUsbTestsEnabled;
+
+import org.junit.After;
+import org.junit.Before;
+import org.junit.Test;
+
+/**
+ * Tests the {@link Version} class.
+ * 
+ * @author Klaus Reimer (k@ailis.de)
+ */
+public class VersionTest
+{
+    /** The test subject. */
+    private Version version;
+
+    /**
+     * Setup test.
+     */
+    @Before
+    public void setUp()
+    {
+        assumeUsbTestsEnabled();
+        LibUsb.init(null);
+        this.version = new Version();
+    }
+    
+    /**
+     * Tear down test.
+     */
+    @After    
+    public void tearDown()
+    {
+        LibUsb.exit(null);
+    }
+
+    /**
+     * Tests uninitialized access to
+     * {@link Version#major()}
+     */
+    @Test(expected = IllegalStateException.class)
+    public void testUninitializedMajor()
+    {
+        assumeUsbTestsEnabled();
+        this.version.major();
+    }
+
+    /**
+     * Tests uninitialized access to
+     * {@link Version#minor()}
+     */
+    @Test(expected = IllegalStateException.class)
+    public void testUninitializedMinor()
+    {
+        assumeUsbTestsEnabled();
+        this.version.minor();
+    }
+
+    /**
+     * Tests uninitialized access to
+     * {@link Version#micro()}
+     */
+    @Test(expected = IllegalStateException.class)
+    public void testUninitializedMicro()
+    {
+        assumeUsbTestsEnabled();
+        this.version.micro();
+    }
+
+    /**
+     * Tests uninitialized access to
+     * {@link Version#rc()}
+     */
+    @Test(expected = IllegalStateException.class)
+    public void testUninitializedRc()
+    {
+        assumeUsbTestsEnabled();
+        this.version.rc();
+    }
+}