Skip to content

Commit 06ea151

Browse files
authored
Change ArgumentMatchers to Matchers (openhab#1118)
Signed-off-by: Chris Jackson <[email protected]>
1 parent 3b9f2a5 commit 06ea151

File tree

1 file changed

+8
-6
lines changed

1 file changed

+8
-6
lines changed

src/test/java/org/openhab/binding/zwave/handler/ZWaveThingHandlerTest.java

+8-6
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@
2828
import org.eclipse.smarthome.core.thing.type.ThingTypeBuilder;
2929
import org.junit.Test;
3030
import org.mockito.ArgumentCaptor;
31-
import org.mockito.ArgumentMatchers;
31+
import org.mockito.Matchers;
3232
import org.mockito.Mockito;
3333
import org.openhab.binding.zwave.ZWaveBindingConstants;
3434
import org.openhab.binding.zwave.internal.protocol.ZWaveAssociationGroup;
@@ -40,6 +40,8 @@
4040
import org.openhab.binding.zwave.internal.protocol.commandclass.ZWaveWakeUpCommandClass;
4141
import org.openhab.binding.zwave.internal.protocol.transaction.ZWaveCommandClassTransactionPayload;
4242

43+
import jdk.nashorn.internal.ir.annotations.Ignore;
44+
4345
/**
4446
* Test of the ZWaveThingHandler
4547
*
@@ -91,14 +93,14 @@ private ZWaveThingHandler doConfigurationUpdate(String param, Object value) {
9193

9294
Mockito.when(controller.getOwnNodeId()).thenReturn(1);
9395
Mockito.when(controllerHandler.getOwnNodeId()).thenReturn(1);
94-
Mockito.when(controllerHandler.getNode(ArgumentMatchers.anyInt())).thenReturn(node);
96+
Mockito.when(controllerHandler.getNode(Matchers.anyInt())).thenReturn(node);
9597
Mockito.when(node.getNodeId()).thenReturn(1);
96-
Mockito.when(node.getAssociationGroup(ArgumentMatchers.anyInt())).thenReturn(new ZWaveAssociationGroup(1));
97-
Mockito.when(node.getCommandClass(ArgumentMatchers.eq(CommandClass.COMMAND_CLASS_WAKE_UP)))
98+
Mockito.when(node.getAssociationGroup(Matchers.anyInt())).thenReturn(new ZWaveAssociationGroup(1));
99+
Mockito.when(node.getCommandClass(Matchers.eq(CommandClass.COMMAND_CLASS_WAKE_UP)))
98100
.thenReturn(wakeupClass);
99-
Mockito.when(node.getCommandClass(ArgumentMatchers.eq(CommandClass.COMMAND_CLASS_ASSOCIATION)))
101+
Mockito.when(node.getCommandClass(Matchers.eq(CommandClass.COMMAND_CLASS_ASSOCIATION)))
100102
.thenReturn(associationClass);
101-
Mockito.when(node.getCommandClass(ArgumentMatchers.eq(CommandClass.COMMAND_CLASS_NODE_NAMING)))
103+
Mockito.when(node.getCommandClass(Matchers.eq(CommandClass.COMMAND_CLASS_NODE_NAMING)))
102104
.thenReturn(namingClass);
103105
} catch (NoSuchFieldException | SecurityException e) {
104106
e.printStackTrace();

0 commit comments

Comments
 (0)