From f0d2b91b1e2f10dd8ef34b39ecf62f02309f3365 Mon Sep 17 00:00:00 2001 From: Klaus Reimer Date: Mon, 8 Oct 2018 21:35:34 +0200 Subject: [PATCH] NOT FOUND error is also ok in unit test --- src/test/java/org/usb4java/LibUsbTest.java | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/src/test/java/org/usb4java/LibUsbTest.java b/src/test/java/org/usb4java/LibUsbTest.java index 90fd453..12e0103 100644 --- a/src/test/java/org/usb4java/LibUsbTest.java +++ b/src/test/java/org/usb4java/LibUsbTest.java @@ -201,13 +201,16 @@ public class LibUsbTest assumeUsbTestsEnabled(); final Context context = new Context(); assertEquals(LibUsb.SUCCESS, LibUsb.init(context)); - assertEquals(LibUsb.SUCCESS, LibUsb.setOption(context, LibUsb.OPTION_LOG_LEVEL, LibUsb.LOG_LEVEL_NONE)); - assertEquals(LibUsb.SUCCESS, LibUsb.setOption(context, LibUsb.OPTION_LOG_LEVEL, LibUsb.LOG_LEVEL_DEBUG)); if (System.getProperty("os.name").toLowerCase().contains("windows")) { - assertEquals(LibUsb.SUCCESS, LibUsb.setOption(context, LibUsb.OPTION_USE_USBDK)); + // On Windows this is either a success when USBDK is found or ERROR_NOT_FOUND when not + final int result = LibUsb.setOption(context, LibUsb.OPTION_USE_USBDK); + assertTrue(result == LibUsb.SUCCESS || result == LibUsb.ERROR_NOT_FOUND); } else { + // On other operating systems it is always ERROR_NOT_SUPPORTED assertEquals(LibUsb.ERROR_NOT_SUPPORTED, LibUsb.setOption(context, LibUsb.OPTION_USE_USBDK)); } + assertEquals(LibUsb.SUCCESS, LibUsb.setOption(context, LibUsb.OPTION_LOG_LEVEL, LibUsb.LOG_LEVEL_NONE)); + assertEquals(LibUsb.SUCCESS, LibUsb.setOption(context, LibUsb.OPTION_LOG_LEVEL, LibUsb.LOG_LEVEL_DEBUG)); } /**