[bluetooth] Removed usage of deprecated method in tests (openhab#7405)

Signed-off-by: Connor Petty <mistercpp2000+gitsignoff@gmail.com>
andrewfg · Aug 31, 2020 · 675bdda · 675bdda
1 parent 39192d4
commit 675bdda
Showing 1 changed file with 31 additions and 10 deletions.
diff --git a/.../java/org/openhab/binding/bluetooth/discovery/internal/BluetoothDiscoveryServiceTest.java b/.../java/org/openhab/binding/bluetooth/discovery/internal/BluetoothDiscoveryServiceTest.java
@@ -300,9 +300,17 @@ public void removeDefaultDeviceTest() {
  discoveryService.deviceDiscovered(device);
  discoveryService.deviceRemoved(device);
 
+ ArgumentCaptor<DiscoveryResult> resultCaptor = ArgumentCaptor.forClass(DiscoveryResult.class);
  Mockito.verify(mockDiscoveryListener, Mockito.timeout(TIMEOUT).times(1))
- .thingRemoved(ArgumentMatchers.same(discoveryService), ArgumentMatchers
- .argThat(arg -> arg.getThingTypeUID().equals(BluetoothBindingConstants.THING_TYPE_BEACON)));
+ .thingDiscovered(ArgumentMatchers.same(discoveryService), resultCaptor.capture());
+
+ DiscoveryResult result = resultCaptor.getValue();
+
+ Assert.assertEquals(BluetoothBindingConstants.THING_TYPE_BEACON, result.getThingTypeUID());
+
+ Mockito.verify(mockDiscoveryListener, Mockito.timeout(TIMEOUT).times(1)).thingRemoved(
+ ArgumentMatchers.same(discoveryService),
+ ArgumentMatchers.argThat(arg -> arg.equals(result.getThingUID())));
  }
 
  @Test
@@ -314,10 +322,19 @@ public void removeUpdatedDefaultDeviceTest() {
  device.setName("somename");
  discoveryService.deviceDiscovered(device);
 
+ ArgumentCaptor<DiscoveryResult> resultCaptor = ArgumentCaptor.forClass(DiscoveryResult.class);
+ Mockito.verify(mockDiscoveryListener, Mockito.timeout(TIMEOUT).times(2))
+ .thingDiscovered(ArgumentMatchers.same(discoveryService), resultCaptor.capture());
+
+ DiscoveryResult result = resultCaptor.getValue();
+
+ Assert.assertEquals(BluetoothBindingConstants.THING_TYPE_BEACON, result.getThingTypeUID());
+
  discoveryService.deviceRemoved(device);
- Mockito.verify(mockDiscoveryListener, Mockito.timeout(TIMEOUT).times(1))
- .thingRemoved(ArgumentMatchers.same(discoveryService), ArgumentMatchers
- .argThat(arg -> arg.getThingTypeUID().equals(BluetoothBindingConstants.THING_TYPE_BEACON)));
+
+ Mockito.verify(mockDiscoveryListener, Mockito.timeout(TIMEOUT).times(1)).thingRemoved(
+ ArgumentMatchers.same(discoveryService),
+ ArgumentMatchers.argThat(arg -> arg.equals(result.getThingUID())));
  }
 
  @Test
@@ -357,18 +374,22 @@ public void replaceOlderDiscoveryTest() {
  // lets start with producing a default result
  discoveryService.deviceDiscovered(device);
 
+ ArgumentCaptor<DiscoveryResult> resultCaptor = ArgumentCaptor.forClass(DiscoveryResult.class);
  Mockito.verify(mockDiscoveryListener, Mockito.timeout(TIMEOUT).times(1))
- .thingDiscovered(ArgumentMatchers.same(discoveryService), ArgumentMatchers
- .argThat(arg -> arg.getThingTypeUID().equals(BluetoothBindingConstants.THING_TYPE_BEACON)));
+ .thingDiscovered(ArgumentMatchers.same(discoveryService), resultCaptor.capture());
+
+ DiscoveryResult result = resultCaptor.getValue();
+
+ Assert.assertEquals(BluetoothBindingConstants.THING_TYPE_BEACON, result.getThingTypeUID());
 
  device.setManufacturerId(10);
 
  // lets start with producing a default result
  discoveryService.deviceDiscovered(device);
 
- Mockito.verify(mockDiscoveryListener, Mockito.timeout(TIMEOUT).times(1))
- .thingRemoved(ArgumentMatchers.same(discoveryService), ArgumentMatchers
-  .argThat(arg -> arg.getThingTypeUID().equals(BluetoothBindingConstants.THING_TYPE_BEACON)));
+ Mockito.verify(mockDiscoveryListener, Mockito.timeout(TIMEOUT).times(1)).thingRemoved(
+ ArgumentMatchers.same(discoveryService),
+ ArgumentMatchers.argThat(arg -> arg.equals(result.getThingUID())));
 
  Mockito.verify(mockDiscoveryListener, Mockito.timeout(TIMEOUT).times(1)).thingDiscovered(
  ArgumentMatchers.same(discoveryService),