From 0851eb7a32977844cb979d913da01c01e3cd0c1a Mon Sep 17 00:00:00 2001 From: Luca Longinotti Date: Mon, 15 Jul 2013 18:49:41 +0200 Subject: [PATCH] Fix tests to react correctly to NULL passed to free() functions. --- .../de/ailis/usb4java/libusb/LibUSBDeviceTest.java | 2 +- .../java/de/ailis/usb4java/libusb/LibUSBTest.java | 13 ++++++++++++- 2 files changed, 13 insertions(+), 2 deletions(-) diff --git a/src/test/java/de/ailis/usb4java/libusb/LibUSBDeviceTest.java b/src/test/java/de/ailis/usb4java/libusb/LibUSBDeviceTest.java index e35b7b9..155c6cb 100644 --- a/src/test/java/de/ailis/usb4java/libusb/LibUSBDeviceTest.java +++ b/src/test/java/de/ailis/usb4java/libusb/LibUSBDeviceTest.java @@ -917,7 +917,7 @@ public class LibUSBDeviceTest * Tests the {@link LibUsb#freeConfigDescriptor(ConfigDescriptor)} method * without a descriptor. */ - @Test(expected = IllegalArgumentException.class) + @Test public void testFreeConfigDescriptorWithoutDescriptor() { assumeUsbTestsEnabled(); diff --git a/src/test/java/de/ailis/usb4java/libusb/LibUSBTest.java b/src/test/java/de/ailis/usb4java/libusb/LibUSBTest.java index c801e02..286a1f6 100644 --- a/src/test/java/de/ailis/usb4java/libusb/LibUSBTest.java +++ b/src/test/java/de/ailis/usb4java/libusb/LibUSBTest.java @@ -273,7 +273,7 @@ public class LibUSBTest * Tests {@link LibUsb#freeDeviceList(DeviceList, boolean)} method without * list. */ - @Test(expected = IllegalArgumentException.class) + @Test public void testFreeDeviceListWithoutList() { assumeUsbTestsEnabled(); @@ -638,6 +638,17 @@ public class LibUSBTest LibUsb.freeConfigDescriptor(new ConfigDescriptor()); } + /** + * Tests the {@link LibUsb#freeConfigDescriptor(ConfigDescriptor)} method + * with null parameter. Must do nothing. + */ + @Test + public void testFreeConfigDescriptorWithNull() + { + assumeUsbTestsEnabled(); + LibUsb.freeConfigDescriptor(null); + } + /** * Tests the * {@link LibUsb#getSsEndpointCompanionDescriptor(Context, EndpointDescriptor, SsEndpointCompanionDescriptor)}