fix HID integration tests

Author: AdamVe

desktop/src/main/java/com/yubico/yubikit/desktop/YubiKitManager.java

@@ -60,10 +60,10 @@ List<? extends UsbYubiKeyDevice> listDevices(Class<? extends YubiKeyConnection>
     public Map<YubiKeyDevice, DeviceInfo> listAllDevices(Set<Class<? extends YubiKeyConnection>> connectionTypes) {
         Map<UsbPid, UsbPidGroup> groups = new HashMap<>();
         for (Class<? extends YubiKeyConnection> connectionType : connectionTypes) {
-            Logger.trace(logger, "Enumerate devices for {}", connectionType);
+            Logger.debug(logger, "Enumerate devices for {}", connectionType);
             for (UsbYubiKeyDevice device : listDevices(connectionType)) {
                 UsbPid pid = device.getPid();
-                Logger.trace(logger, "Found device with PID {}", pid);
+                Logger.debug(logger, "Found device with PID {}", pid);
                 if (!groups.containsKey(pid)) {
                     groups.put(pid, new UsbPidGroup(pid));
                 }

desktop/src/main/java/com/yubico/yubikit/desktop/hid/HidManager.java

@@ -46,7 +46,7 @@ public HidManager() {
     public List<HidDevice> getHidDevices(int vendorId, @Nullable Integer usagePage) {
         List<HidDevice> yubikeys = new ArrayList<>();
         for (org.hid4java.HidDevice device: services.getAttachedHidDevices()) {
-            if(device.getProductId() == vendorId &&
+            if(device.getVendorId() == vendorId &&
                     (usagePage != null && (device.getUsagePage() & 0xffff) == usagePage)) {
                 yubikeys.add(new HidDevice(device));
             }

testing-desktop/src/main/java/com/yubico/yubikit/testing/desktop/framework/FidoInstrumentedTests.java

@@ -35,7 +35,7 @@ protected void withDevice(TestState.StatefulDeviceCallback<FidoTestState> callba
     protected void withDevice(boolean setPin, TestState.StatefulDeviceCallback<FidoTestState> callback) throws Throwable {
         FidoTestState state = new FidoTestState.Builder(device, usbPid, getPinUvAuthProtocol())
                 .scpKid(getScpKid())
-                //.reconnectDeviceCallback(this::reconnectDevice)
+                .reconnectDeviceCallback(this::reconnectDevice)
                 .setPin(setPin)
                 .build();
 
@@ -45,7 +45,7 @@ protected void withDevice(boolean setPin, TestState.StatefulDeviceCallback<FidoT
     protected void withCtap2Session(TestState.StatefulSessionCallback<Ctap2Session, FidoTestState> callback) throws Throwable {
         FidoTestState state = new FidoTestState.Builder(device, usbPid, getPinUvAuthProtocol())
                 .scpKid(getScpKid())
-                //.reconnectDeviceCallback(this::reconnectDevice)
+                .reconnectDeviceCallback(this::reconnectDevice)
                 .setPin(true)
                 .build();
 

testing-desktop/src/main/java/com/yubico/yubikit/testing/desktop/framework/OathInstrumentedTests.java

@@ -25,7 +25,7 @@ public class OathInstrumentedTests extends YKInstrumentedTests {
     protected void withDevice(TestState.StatefulDeviceCallback<OathTestState> callback) throws Throwable {
         final OathTestState state = new OathTestState.Builder(device, usbPid)
                 .scpKid(getScpKid())
-                //.reconnectDeviceCallback(this::reconnectDevice)
+                .reconnectDeviceCallback(this::reconnectDevice)
                 .build();
 
         state.withDeviceCallback(callback);

testing-desktop/src/main/java/com/yubico/yubikit/testing/desktop/framework/SecurityDomainInstrumentedTests.java

@@ -23,7 +23,7 @@ public class SecurityDomainInstrumentedTests extends YKInstrumentedTests {
 
     protected void withState(TestState.StatefulDeviceCallback<SecurityDomainTestState> callback) throws Throwable {
         final SecurityDomainTestState state = new SecurityDomainTestState.Builder(device, usbPid)
-                //.reconnectDeviceCallback(this::reconnectDevice)
+                .reconnectDeviceCallback(this::reconnectDevice)
                 .build();
 
         state.withDeviceCallback(callback);

testing-desktop/src/main/java/com/yubico/yubikit/testing/desktop/framework/YKInstrumentedTests.java

@@ -41,22 +41,41 @@ public class YKInstrumentedTests {
 
         @Override
         protected void before() throws Throwable {
-            device = testDriver.awaitSession();
-            if (device instanceof CompositeDevice) {
-                CompositeDevice compositeDevice = (CompositeDevice) device;
-                usbPid = compositeDevice.getPidGroup().getPid();
-            }
+            getDevice();
         }
 
         @Override
         protected void after() {
-            testDriver.returnSession(device);
-            device = null;
+            releaseDevice();
         }
     };
 
+    protected YubiKeyDevice reconnectDevice() {
+        releaseDevice();
+        getDevice();
+        return device;
+    }
+
     @Nullable
     protected Byte getScpKid() {
         return null;
     }
+
+    private void getDevice() {
+        try {
+            device = testDriver.awaitSession();
+            if (device instanceof CompositeDevice) {
+                CompositeDevice compositeDevice = (CompositeDevice) device;
+                usbPid = compositeDevice.getPidGroup().getPid();
+            }
+        } catch (InterruptedException interruptedException) {
+            throw new RuntimeException("awaitSession failed", interruptedException);
+        }
+    }
+
+    private void releaseDevice() {
+        testDriver.returnSession(device);
+        device = null;
+    }
+
 }