From fbee962dee845fd97b15afb1457e0fdc43824668 Mon Sep 17 00:00:00 2001 From: Klaus Reimer Date: Wed, 17 Apr 2013 22:01:58 +0200 Subject: [PATCH] init and exit default USB context for devicelist test --- .../usb4java/libusb/LibUSBDeviceTest.java | 20 +++++++++++++------ 1 file changed, 14 insertions(+), 6 deletions(-) diff --git a/src/test/java/de/ailis/usb4java/libusb/LibUSBDeviceTest.java b/src/test/java/de/ailis/usb4java/libusb/LibUSBDeviceTest.java index 018eded..5ac230d 100644 --- a/src/test/java/de/ailis/usb4java/libusb/LibUSBDeviceTest.java +++ b/src/test/java/de/ailis/usb4java/libusb/LibUSBDeviceTest.java @@ -1158,17 +1158,25 @@ public class LibUSBDeviceTest { assumeUsbTestsEnabled(); DeviceList list = new DeviceList(); - assertTrue(LibUsb.getDeviceList(null, list) >= 0); - LibUsb.freeDeviceList(list, true); - + assertEquals(0, LibUsb.init(null)); try { + assertTrue(LibUsb.getDeviceList(null, list) >= 0); LibUsb.freeDeviceList(list, true); - fail("Double-free should throw IllegalStateException"); + + try + { + LibUsb.freeDeviceList(list, true); + fail("Double-free should throw IllegalStateException"); + } + catch (IllegalStateException e) + { + // Expected behavior + } } - catch (IllegalStateException e) + finally { - // Expected behavior + LibUsb.exit(null); } } }