diff --git a/com.zsmartsystems.zigbee.dongle.cc2531/src/test/java/com/zsmartsystems/zigbee/dongle/cc2531/Cc2351TestPacket.java b/com.zsmartsystems.zigbee.dongle.cc2531/src/test/java/com/zsmartsystems/zigbee/dongle/cc2531/Cc2351TestPacket.java index 72cd72964..95053a16c 100644 --- a/com.zsmartsystems.zigbee.dongle.cc2531/src/test/java/com/zsmartsystems/zigbee/dongle/cc2531/Cc2351TestPacket.java +++ b/com.zsmartsystems.zigbee.dongle.cc2531/src/test/java/com/zsmartsystems/zigbee/dongle/cc2531/Cc2351TestPacket.java @@ -7,7 +7,7 @@ */ package com.zsmartsystems.zigbee.dongle.cc2531; -import static org.junit.Assert.assertFalse; +import static org.junit.jupiter.api.Assertions.assertFalse; import java.io.ByteArrayInputStream; import java.io.IOException; diff --git a/com.zsmartsystems.zigbee.dongle.cc2531/src/test/java/com/zsmartsystems/zigbee/dongle/cc2531/UTIL_LED_CONTROL_Test.java b/com.zsmartsystems.zigbee.dongle.cc2531/src/test/java/com/zsmartsystems/zigbee/dongle/cc2531/UTIL_LED_CONTROL_Test.java index a85e17ddc..8ee119dc3 100644 --- a/com.zsmartsystems.zigbee.dongle.cc2531/src/test/java/com/zsmartsystems/zigbee/dongle/cc2531/UTIL_LED_CONTROL_Test.java +++ b/com.zsmartsystems.zigbee.dongle.cc2531/src/test/java/com/zsmartsystems/zigbee/dongle/cc2531/UTIL_LED_CONTROL_Test.java @@ -7,7 +7,7 @@ */ package com.zsmartsystems.zigbee.dongle.cc2531; -import org.junit.Test; +import org.junit.jupiter.api.Test; import com.zsmartsystems.zigbee.dongle.cc2531.network.packet.ZToolPacket; diff --git a/com.zsmartsystems.zigbee.dongle.cc2531/src/test/java/com/zsmartsystems/zigbee/dongle/cc2531/ZDO_ACTIVE_EP_RSP_Test.java b/com.zsmartsystems.zigbee.dongle.cc2531/src/test/java/com/zsmartsystems/zigbee/dongle/cc2531/ZDO_ACTIVE_EP_RSP_Test.java index 2937674d0..79111f71f 100644 --- a/com.zsmartsystems.zigbee.dongle.cc2531/src/test/java/com/zsmartsystems/zigbee/dongle/cc2531/ZDO_ACTIVE_EP_RSP_Test.java +++ b/com.zsmartsystems.zigbee.dongle.cc2531/src/test/java/com/zsmartsystems/zigbee/dongle/cc2531/ZDO_ACTIVE_EP_RSP_Test.java @@ -7,12 +7,12 @@ */ package com.zsmartsystems.zigbee.dongle.cc2531; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertTrue; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertTrue; import java.util.Arrays; -import org.junit.Test; +import org.junit.jupiter.api.Test; import com.zsmartsystems.zigbee.aps.ZigBeeApsFrame; import com.zsmartsystems.zigbee.dongle.cc2531.frame.ZdoActiveEndpoint; diff --git a/com.zsmartsystems.zigbee.dongle.cc2531/src/test/java/com/zsmartsystems/zigbee/dongle/cc2531/ZDO_END_DEVICE_ANNCE_IND_Test.java b/com.zsmartsystems.zigbee.dongle.cc2531/src/test/java/com/zsmartsystems/zigbee/dongle/cc2531/ZDO_END_DEVICE_ANNCE_IND_Test.java index dd30d7d19..f53e7e91e 100644 --- a/com.zsmartsystems.zigbee.dongle.cc2531/src/test/java/com/zsmartsystems/zigbee/dongle/cc2531/ZDO_END_DEVICE_ANNCE_IND_Test.java +++ b/com.zsmartsystems.zigbee.dongle.cc2531/src/test/java/com/zsmartsystems/zigbee/dongle/cc2531/ZDO_END_DEVICE_ANNCE_IND_Test.java @@ -7,12 +7,12 @@ */ package com.zsmartsystems.zigbee.dongle.cc2531; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertTrue; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertTrue; import java.util.Arrays; -import org.junit.Test; +import org.junit.jupiter.api.Test; import com.zsmartsystems.zigbee.aps.ZigBeeApsFrame; import com.zsmartsystems.zigbee.dongle.cc2531.frame.ZdoEndDeviceAnnounce; diff --git a/com.zsmartsystems.zigbee.dongle.cc2531/src/test/java/com/zsmartsystems/zigbee/dongle/cc2531/ZDO_IEEE_ADDR_RSP_Test.java b/com.zsmartsystems.zigbee.dongle.cc2531/src/test/java/com/zsmartsystems/zigbee/dongle/cc2531/ZDO_IEEE_ADDR_RSP_Test.java index d065efa95..3d126edff 100644 --- a/com.zsmartsystems.zigbee.dongle.cc2531/src/test/java/com/zsmartsystems/zigbee/dongle/cc2531/ZDO_IEEE_ADDR_RSP_Test.java +++ b/com.zsmartsystems.zigbee.dongle.cc2531/src/test/java/com/zsmartsystems/zigbee/dongle/cc2531/ZDO_IEEE_ADDR_RSP_Test.java @@ -7,12 +7,12 @@ */ package com.zsmartsystems.zigbee.dongle.cc2531; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertTrue; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertTrue; import java.util.Arrays; -import org.junit.Test; +import org.junit.jupiter.api.Test; import com.zsmartsystems.zigbee.aps.ZigBeeApsFrame; import com.zsmartsystems.zigbee.dongle.cc2531.frame.ZdoIeeeAddress; diff --git a/com.zsmartsystems.zigbee.dongle.cc2531/src/test/java/com/zsmartsystems/zigbee/dongle/cc2531/ZDO_MGMT_LEAVE_RSP_Test.java b/com.zsmartsystems.zigbee.dongle.cc2531/src/test/java/com/zsmartsystems/zigbee/dongle/cc2531/ZDO_MGMT_LEAVE_RSP_Test.java index 4657f17c2..0ef6caad3 100644 --- a/com.zsmartsystems.zigbee.dongle.cc2531/src/test/java/com/zsmartsystems/zigbee/dongle/cc2531/ZDO_MGMT_LEAVE_RSP_Test.java +++ b/com.zsmartsystems.zigbee.dongle.cc2531/src/test/java/com/zsmartsystems/zigbee/dongle/cc2531/ZDO_MGMT_LEAVE_RSP_Test.java @@ -7,12 +7,12 @@ */ package com.zsmartsystems.zigbee.dongle.cc2531; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertTrue; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertTrue; import java.util.Arrays; -import org.junit.Test; +import org.junit.jupiter.api.Test; import com.zsmartsystems.zigbee.aps.ZigBeeApsFrame; import com.zsmartsystems.zigbee.dongle.cc2531.frame.ZdoManagementLeave; diff --git a/com.zsmartsystems.zigbee.dongle.cc2531/src/test/java/com/zsmartsystems/zigbee/dongle/cc2531/ZDO_MGMT_LQI_RSP_Test.java b/com.zsmartsystems.zigbee.dongle.cc2531/src/test/java/com/zsmartsystems/zigbee/dongle/cc2531/ZDO_MGMT_LQI_RSP_Test.java index 99991eb7f..b812d7332 100644 --- a/com.zsmartsystems.zigbee.dongle.cc2531/src/test/java/com/zsmartsystems/zigbee/dongle/cc2531/ZDO_MGMT_LQI_RSP_Test.java +++ b/com.zsmartsystems.zigbee.dongle.cc2531/src/test/java/com/zsmartsystems/zigbee/dongle/cc2531/ZDO_MGMT_LQI_RSP_Test.java @@ -7,12 +7,12 @@ */ package com.zsmartsystems.zigbee.dongle.cc2531; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertTrue; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertTrue; import java.util.Arrays; -import org.junit.Test; +import org.junit.jupiter.api.Test; import com.zsmartsystems.zigbee.aps.ZigBeeApsFrame; import com.zsmartsystems.zigbee.dongle.cc2531.frame.ZdoManagementLqi; diff --git a/com.zsmartsystems.zigbee.dongle.cc2531/src/test/java/com/zsmartsystems/zigbee/dongle/cc2531/ZDO_MGMT_RTG_RSP_Test.java b/com.zsmartsystems.zigbee.dongle.cc2531/src/test/java/com/zsmartsystems/zigbee/dongle/cc2531/ZDO_MGMT_RTG_RSP_Test.java index dff21f67b..e225a53e5 100644 --- a/com.zsmartsystems.zigbee.dongle.cc2531/src/test/java/com/zsmartsystems/zigbee/dongle/cc2531/ZDO_MGMT_RTG_RSP_Test.java +++ b/com.zsmartsystems.zigbee.dongle.cc2531/src/test/java/com/zsmartsystems/zigbee/dongle/cc2531/ZDO_MGMT_RTG_RSP_Test.java @@ -7,12 +7,12 @@ */ package com.zsmartsystems.zigbee.dongle.cc2531; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertTrue; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertTrue; import java.util.Arrays; -import org.junit.Test; +import org.junit.jupiter.api.Test; import com.zsmartsystems.zigbee.aps.ZigBeeApsFrame; import com.zsmartsystems.zigbee.dongle.cc2531.frame.ZdoManagementRouting; diff --git a/com.zsmartsystems.zigbee.dongle.cc2531/src/test/java/com/zsmartsystems/zigbee/dongle/cc2531/ZDO_MSG_CB_INCOMING_Test.java b/com.zsmartsystems.zigbee.dongle.cc2531/src/test/java/com/zsmartsystems/zigbee/dongle/cc2531/ZDO_MSG_CB_INCOMING_Test.java index ac507c762..75b872584 100644 --- a/com.zsmartsystems.zigbee.dongle.cc2531/src/test/java/com/zsmartsystems/zigbee/dongle/cc2531/ZDO_MSG_CB_INCOMING_Test.java +++ b/com.zsmartsystems.zigbee.dongle.cc2531/src/test/java/com/zsmartsystems/zigbee/dongle/cc2531/ZDO_MSG_CB_INCOMING_Test.java @@ -7,12 +7,12 @@ */ package com.zsmartsystems.zigbee.dongle.cc2531; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertTrue; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertTrue; import java.util.Arrays; -import org.junit.Test; +import org.junit.jupiter.api.Test; import com.zsmartsystems.zigbee.aps.ZigBeeApsFrame; import com.zsmartsystems.zigbee.dongle.cc2531.frame.ZdoCallbackIncoming; diff --git a/com.zsmartsystems.zigbee.dongle.cc2531/src/test/java/com/zsmartsystems/zigbee/dongle/cc2531/ZDO_NODE_DESC_RSP_Test.java b/com.zsmartsystems.zigbee.dongle.cc2531/src/test/java/com/zsmartsystems/zigbee/dongle/cc2531/ZDO_NODE_DESC_RSP_Test.java index d0cfa3ab4..8a596c2e3 100644 --- a/com.zsmartsystems.zigbee.dongle.cc2531/src/test/java/com/zsmartsystems/zigbee/dongle/cc2531/ZDO_NODE_DESC_RSP_Test.java +++ b/com.zsmartsystems.zigbee.dongle.cc2531/src/test/java/com/zsmartsystems/zigbee/dongle/cc2531/ZDO_NODE_DESC_RSP_Test.java @@ -7,12 +7,12 @@ */ package com.zsmartsystems.zigbee.dongle.cc2531; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertTrue; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertTrue; import java.util.Arrays; -import org.junit.Test; +import org.junit.jupiter.api.Test; import com.zsmartsystems.zigbee.aps.ZigBeeApsFrame; import com.zsmartsystems.zigbee.dongle.cc2531.frame.ZdoNodeDescriptor; diff --git a/com.zsmartsystems.zigbee.dongle.cc2531/src/test/java/com/zsmartsystems/zigbee/dongle/cc2531/ZDO_POWER_DESC_RSP_Test.java b/com.zsmartsystems.zigbee.dongle.cc2531/src/test/java/com/zsmartsystems/zigbee/dongle/cc2531/ZDO_POWER_DESC_RSP_Test.java index 69aa56069..fe414c24e 100644 --- a/com.zsmartsystems.zigbee.dongle.cc2531/src/test/java/com/zsmartsystems/zigbee/dongle/cc2531/ZDO_POWER_DESC_RSP_Test.java +++ b/com.zsmartsystems.zigbee.dongle.cc2531/src/test/java/com/zsmartsystems/zigbee/dongle/cc2531/ZDO_POWER_DESC_RSP_Test.java @@ -7,12 +7,12 @@ */ package com.zsmartsystems.zigbee.dongle.cc2531; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertTrue; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertTrue; import java.util.Arrays; -import org.junit.Test; +import org.junit.jupiter.api.Test; import com.zsmartsystems.zigbee.aps.ZigBeeApsFrame; import com.zsmartsystems.zigbee.dongle.cc2531.frame.ZdoPowerDescriptor; diff --git a/com.zsmartsystems.zigbee.dongle.cc2531/src/test/java/com/zsmartsystems/zigbee/dongle/cc2531/ZDO_SIMPLE_DESC_RSP_Test.java b/com.zsmartsystems.zigbee.dongle.cc2531/src/test/java/com/zsmartsystems/zigbee/dongle/cc2531/ZDO_SIMPLE_DESC_RSP_Test.java index 28165de54..b2f5e0dcb 100644 --- a/com.zsmartsystems.zigbee.dongle.cc2531/src/test/java/com/zsmartsystems/zigbee/dongle/cc2531/ZDO_SIMPLE_DESC_RSP_Test.java +++ b/com.zsmartsystems.zigbee.dongle.cc2531/src/test/java/com/zsmartsystems/zigbee/dongle/cc2531/ZDO_SIMPLE_DESC_RSP_Test.java @@ -7,12 +7,12 @@ */ package com.zsmartsystems.zigbee.dongle.cc2531; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertTrue; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertTrue; import java.util.Arrays; -import org.junit.Test; +import org.junit.jupiter.api.Test; import com.zsmartsystems.zigbee.aps.ZigBeeApsFrame; import com.zsmartsystems.zigbee.dongle.cc2531.frame.ZdoSimpleDescriptor; diff --git a/com.zsmartsystems.zigbee.dongle.cc2531/src/test/java/com/zsmartsystems/zigbee/dongle/cc2531/network/ZigBeeNetworkManagerTest.java b/com.zsmartsystems.zigbee.dongle.cc2531/src/test/java/com/zsmartsystems/zigbee/dongle/cc2531/network/ZigBeeNetworkManagerTest.java index 0ce061590..abe6d14d4 100644 --- a/com.zsmartsystems.zigbee.dongle.cc2531/src/test/java/com/zsmartsystems/zigbee/dongle/cc2531/network/ZigBeeNetworkManagerTest.java +++ b/com.zsmartsystems.zigbee.dongle.cc2531/src/test/java/com/zsmartsystems/zigbee/dongle/cc2531/network/ZigBeeNetworkManagerTest.java @@ -7,14 +7,14 @@ */ package com.zsmartsystems.zigbee.dongle.cc2531.network; -import static org.junit.Assert.assertTrue; +import static org.junit.jupiter.api.Assertions.assertTrue; import java.io.IOException; import java.lang.reflect.InvocationTargetException; import java.lang.reflect.Method; import java.util.Arrays; -import org.junit.Test; +import org.junit.jupiter.api.Test; import org.mockito.ArgumentCaptor; import org.mockito.Mockito; diff --git a/com.zsmartsystems.zigbee.dongle.conbee/src/test/java/com/zsmartsystems/zigbee/dongle/conbee/internal/frame/ConBeeDeviceStateChangedTest.java b/com.zsmartsystems.zigbee.dongle.conbee/src/test/java/com/zsmartsystems/zigbee/dongle/conbee/internal/frame/ConBeeDeviceStateChangedTest.java index 023842290..83a2971f1 100644 --- a/com.zsmartsystems.zigbee.dongle.conbee/src/test/java/com/zsmartsystems/zigbee/dongle/conbee/internal/frame/ConBeeDeviceStateChangedTest.java +++ b/com.zsmartsystems.zigbee.dongle.conbee/src/test/java/com/zsmartsystems/zigbee/dongle/conbee/internal/frame/ConBeeDeviceStateChangedTest.java @@ -7,15 +7,11 @@ */ package com.zsmartsystems.zigbee.dongle.conbee.internal.frame; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertFalse; -import static org.junit.Assert.assertTrue; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertFalse; +import static org.junit.jupiter.api.Assertions.assertTrue; -import org.junit.Test; - -import com.zsmartsystems.zigbee.dongle.conbee.internal.frame.ConBeeDeviceStateChanged; -import com.zsmartsystems.zigbee.dongle.conbee.internal.frame.ConBeeNetworkState; -import com.zsmartsystems.zigbee.dongle.conbee.internal.frame.ConBeeStatus; +import org.junit.jupiter.api.Test; /** * diff --git a/com.zsmartsystems.zigbee.dongle.conbee/src/test/java/com/zsmartsystems/zigbee/dongle/conbee/internal/frame/ConBeeDeviceStateRequestTest.java b/com.zsmartsystems.zigbee.dongle.conbee/src/test/java/com/zsmartsystems/zigbee/dongle/conbee/internal/frame/ConBeeDeviceStateRequestTest.java index 82a4b2375..224a540dc 100644 --- a/com.zsmartsystems.zigbee.dongle.conbee/src/test/java/com/zsmartsystems/zigbee/dongle/conbee/internal/frame/ConBeeDeviceStateRequestTest.java +++ b/com.zsmartsystems.zigbee.dongle.conbee/src/test/java/com/zsmartsystems/zigbee/dongle/conbee/internal/frame/ConBeeDeviceStateRequestTest.java @@ -7,13 +7,11 @@ */ package com.zsmartsystems.zigbee.dongle.conbee.internal.frame; -import static org.junit.Assert.assertTrue; +import static org.junit.jupiter.api.Assertions.assertTrue; import java.util.Arrays; -import org.junit.Test; - -import com.zsmartsystems.zigbee.dongle.conbee.internal.frame.ConBeeDeviceStateRequest; +import org.junit.jupiter.api.Test; /** * diff --git a/com.zsmartsystems.zigbee.dongle.conbee/src/test/java/com/zsmartsystems/zigbee/dongle/conbee/internal/frame/ConBeeDeviceStateResponseTest.java b/com.zsmartsystems.zigbee.dongle.conbee/src/test/java/com/zsmartsystems/zigbee/dongle/conbee/internal/frame/ConBeeDeviceStateResponseTest.java index 8e6f7dc6b..902ae5842 100644 --- a/com.zsmartsystems.zigbee.dongle.conbee/src/test/java/com/zsmartsystems/zigbee/dongle/conbee/internal/frame/ConBeeDeviceStateResponseTest.java +++ b/com.zsmartsystems.zigbee.dongle.conbee/src/test/java/com/zsmartsystems/zigbee/dongle/conbee/internal/frame/ConBeeDeviceStateResponseTest.java @@ -7,15 +7,11 @@ */ package com.zsmartsystems.zigbee.dongle.conbee.internal.frame; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertFalse; -import static org.junit.Assert.assertTrue; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertFalse; +import static org.junit.jupiter.api.Assertions.assertTrue; -import org.junit.Test; - -import com.zsmartsystems.zigbee.dongle.conbee.internal.frame.ConBeeDeviceStateResponse; -import com.zsmartsystems.zigbee.dongle.conbee.internal.frame.ConBeeNetworkState; -import com.zsmartsystems.zigbee.dongle.conbee.internal.frame.ConBeeStatus; +import org.junit.jupiter.api.Test; /** * diff --git a/com.zsmartsystems.zigbee.dongle.conbee/src/test/java/com/zsmartsystems/zigbee/dongle/conbee/internal/frame/ConBeeEnqueueSendDataRequestTest.java b/com.zsmartsystems.zigbee.dongle.conbee/src/test/java/com/zsmartsystems/zigbee/dongle/conbee/internal/frame/ConBeeEnqueueSendDataRequestTest.java index ed8f02c4d..8684507a8 100644 --- a/com.zsmartsystems.zigbee.dongle.conbee/src/test/java/com/zsmartsystems/zigbee/dongle/conbee/internal/frame/ConBeeEnqueueSendDataRequestTest.java +++ b/com.zsmartsystems.zigbee.dongle.conbee/src/test/java/com/zsmartsystems/zigbee/dongle/conbee/internal/frame/ConBeeEnqueueSendDataRequestTest.java @@ -7,15 +7,13 @@ */ package com.zsmartsystems.zigbee.dongle.conbee.internal.frame; -import static org.junit.Assert.assertTrue; +import static org.junit.jupiter.api.Assertions.assertTrue; import java.util.Arrays; -import org.junit.Test; +import org.junit.jupiter.api.Test; import com.zsmartsystems.zigbee.ZigBeeEndpointAddress; -import com.zsmartsystems.zigbee.dongle.conbee.internal.frame.ConBeeAddressMode; -import com.zsmartsystems.zigbee.dongle.conbee.internal.frame.ConBeeEnqueueSendDataRequest; /** * diff --git a/com.zsmartsystems.zigbee.dongle.conbee/src/test/java/com/zsmartsystems/zigbee/dongle/conbee/internal/frame/ConBeeEnqueueSendDataResponseTest.java b/com.zsmartsystems.zigbee.dongle.conbee/src/test/java/com/zsmartsystems/zigbee/dongle/conbee/internal/frame/ConBeeEnqueueSendDataResponseTest.java index 442dd29f4..c2bba1fd1 100644 --- a/com.zsmartsystems.zigbee.dongle.conbee/src/test/java/com/zsmartsystems/zigbee/dongle/conbee/internal/frame/ConBeeEnqueueSendDataResponseTest.java +++ b/com.zsmartsystems.zigbee.dongle.conbee/src/test/java/com/zsmartsystems/zigbee/dongle/conbee/internal/frame/ConBeeEnqueueSendDataResponseTest.java @@ -7,14 +7,10 @@ */ package com.zsmartsystems.zigbee.dongle.conbee.internal.frame; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertFalse; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertFalse; -import org.junit.Test; - -import com.zsmartsystems.zigbee.dongle.conbee.internal.frame.ConBeeEnqueueSendDataResponse; -import com.zsmartsystems.zigbee.dongle.conbee.internal.frame.ConBeeNetworkState; -import com.zsmartsystems.zigbee.dongle.conbee.internal.frame.ConBeeStatus; +import org.junit.jupiter.api.Test; /** * diff --git a/com.zsmartsystems.zigbee.dongle.conbee/src/test/java/com/zsmartsystems/zigbee/dongle/conbee/internal/frame/ConBeeFrameTest.java b/com.zsmartsystems.zigbee.dongle.conbee/src/test/java/com/zsmartsystems/zigbee/dongle/conbee/internal/frame/ConBeeFrameTest.java index ae45f20b9..14d5d1e9c 100644 --- a/com.zsmartsystems.zigbee.dongle.conbee/src/test/java/com/zsmartsystems/zigbee/dongle/conbee/internal/frame/ConBeeFrameTest.java +++ b/com.zsmartsystems.zigbee.dongle.conbee/src/test/java/com/zsmartsystems/zigbee/dongle/conbee/internal/frame/ConBeeFrameTest.java @@ -7,17 +7,11 @@ */ package com.zsmartsystems.zigbee.dongle.conbee.internal.frame; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertNotNull; -import static org.junit.Assert.assertTrue; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertNotNull; +import static org.junit.jupiter.api.Assertions.assertTrue; -import org.junit.Test; - -import com.zsmartsystems.zigbee.dongle.conbee.internal.frame.ConBeeDeviceStateResponse; -import com.zsmartsystems.zigbee.dongle.conbee.internal.frame.ConBeeEnqueueSendDataResponse; -import com.zsmartsystems.zigbee.dongle.conbee.internal.frame.ConBeeFrame; -import com.zsmartsystems.zigbee.dongle.conbee.internal.frame.ConBeeNetworkState; -import com.zsmartsystems.zigbee.dongle.conbee.internal.frame.ConBeeQuerySendDataResponse; +import org.junit.jupiter.api.Test; /** * diff --git a/com.zsmartsystems.zigbee.dongle.conbee/src/test/java/com/zsmartsystems/zigbee/dongle/conbee/internal/frame/ConBeeReadParameterRequestTest.java b/com.zsmartsystems.zigbee.dongle.conbee/src/test/java/com/zsmartsystems/zigbee/dongle/conbee/internal/frame/ConBeeReadParameterRequestTest.java index 9e749621a..2253adb3e 100644 --- a/com.zsmartsystems.zigbee.dongle.conbee/src/test/java/com/zsmartsystems/zigbee/dongle/conbee/internal/frame/ConBeeReadParameterRequestTest.java +++ b/com.zsmartsystems.zigbee.dongle.conbee/src/test/java/com/zsmartsystems/zigbee/dongle/conbee/internal/frame/ConBeeReadParameterRequestTest.java @@ -7,14 +7,11 @@ */ package com.zsmartsystems.zigbee.dongle.conbee.internal.frame; -import static org.junit.Assert.assertTrue; +import static org.junit.jupiter.api.Assertions.assertTrue; import java.util.Arrays; -import org.junit.Test; - -import com.zsmartsystems.zigbee.dongle.conbee.internal.frame.ConBeeNetworkParameter; -import com.zsmartsystems.zigbee.dongle.conbee.internal.frame.ConBeeReadParameterRequest; +import org.junit.jupiter.api.Test; /** * diff --git a/com.zsmartsystems.zigbee.dongle.conbee/src/test/java/com/zsmartsystems/zigbee/dongle/conbee/internal/frame/ConBeeReadParameterResponseTest.java b/com.zsmartsystems.zigbee.dongle.conbee/src/test/java/com/zsmartsystems/zigbee/dongle/conbee/internal/frame/ConBeeReadParameterResponseTest.java index 389dc8270..9a4b74c32 100644 --- a/com.zsmartsystems.zigbee.dongle.conbee/src/test/java/com/zsmartsystems/zigbee/dongle/conbee/internal/frame/ConBeeReadParameterResponseTest.java +++ b/com.zsmartsystems.zigbee.dongle.conbee/src/test/java/com/zsmartsystems/zigbee/dongle/conbee/internal/frame/ConBeeReadParameterResponseTest.java @@ -7,15 +7,12 @@ */ package com.zsmartsystems.zigbee.dongle.conbee.internal.frame; -import static org.junit.Assert.assertEquals; +import static org.junit.jupiter.api.Assertions.assertEquals; -import org.junit.Test; +import org.junit.jupiter.api.Test; import com.zsmartsystems.zigbee.ExtendedPanId; import com.zsmartsystems.zigbee.IeeeAddress; -import com.zsmartsystems.zigbee.dongle.conbee.internal.frame.ConBeeNetworkParameter; -import com.zsmartsystems.zigbee.dongle.conbee.internal.frame.ConBeeReadParameterResponse; -import com.zsmartsystems.zigbee.dongle.conbee.internal.frame.ConBeeStatus; /** * diff --git a/com.zsmartsystems.zigbee.dongle.conbee/src/test/java/com/zsmartsystems/zigbee/dongle/conbee/internal/frame/ConBeeReadReceivedDataResponseTest.java b/com.zsmartsystems.zigbee.dongle.conbee/src/test/java/com/zsmartsystems/zigbee/dongle/conbee/internal/frame/ConBeeReadReceivedDataResponseTest.java index 5b7f68823..da86d81f2 100644 --- a/com.zsmartsystems.zigbee.dongle.conbee/src/test/java/com/zsmartsystems/zigbee/dongle/conbee/internal/frame/ConBeeReadReceivedDataResponseTest.java +++ b/com.zsmartsystems.zigbee.dongle.conbee/src/test/java/com/zsmartsystems/zigbee/dongle/conbee/internal/frame/ConBeeReadReceivedDataResponseTest.java @@ -7,13 +7,11 @@ */ package com.zsmartsystems.zigbee.dongle.conbee.internal.frame; -import static org.junit.Assert.assertEquals; +import static org.junit.jupiter.api.Assertions.assertEquals; -import org.junit.Test; +import org.junit.jupiter.api.Test; import com.zsmartsystems.zigbee.IeeeAddress; -import com.zsmartsystems.zigbee.dongle.conbee.internal.frame.ConBeeReadReceivedDataResponse; -import com.zsmartsystems.zigbee.dongle.conbee.internal.frame.ConBeeStatus; /** * diff --git a/com.zsmartsystems.zigbee.dongle.conbee/src/test/java/com/zsmartsystems/zigbee/dongle/conbee/internal/frame/ConBeeVersionRequestTest.java b/com.zsmartsystems.zigbee.dongle.conbee/src/test/java/com/zsmartsystems/zigbee/dongle/conbee/internal/frame/ConBeeVersionRequestTest.java index af0e5bd9a..de2919224 100644 --- a/com.zsmartsystems.zigbee.dongle.conbee/src/test/java/com/zsmartsystems/zigbee/dongle/conbee/internal/frame/ConBeeVersionRequestTest.java +++ b/com.zsmartsystems.zigbee.dongle.conbee/src/test/java/com/zsmartsystems/zigbee/dongle/conbee/internal/frame/ConBeeVersionRequestTest.java @@ -7,13 +7,11 @@ */ package com.zsmartsystems.zigbee.dongle.conbee.internal.frame; -import static org.junit.Assert.assertTrue; +import static org.junit.jupiter.api.Assertions.assertTrue; import java.util.Arrays; -import org.junit.Test; - -import com.zsmartsystems.zigbee.dongle.conbee.internal.frame.ConBeeVersionRequest; +import org.junit.jupiter.api.Test; /** * diff --git a/com.zsmartsystems.zigbee.dongle.conbee/src/test/java/com/zsmartsystems/zigbee/dongle/conbee/internal/frame/ConBeeVersionResponseTest.java b/com.zsmartsystems.zigbee.dongle.conbee/src/test/java/com/zsmartsystems/zigbee/dongle/conbee/internal/frame/ConBeeVersionResponseTest.java index 96ab83abd..b0e5aaddf 100644 --- a/com.zsmartsystems.zigbee.dongle.conbee/src/test/java/com/zsmartsystems/zigbee/dongle/conbee/internal/frame/ConBeeVersionResponseTest.java +++ b/com.zsmartsystems.zigbee.dongle.conbee/src/test/java/com/zsmartsystems/zigbee/dongle/conbee/internal/frame/ConBeeVersionResponseTest.java @@ -7,11 +7,9 @@ */ package com.zsmartsystems.zigbee.dongle.conbee.internal.frame; -import static org.junit.Assert.assertEquals; +import static org.junit.jupiter.api.Assertions.assertEquals; -import org.junit.Test; - -import com.zsmartsystems.zigbee.dongle.conbee.internal.frame.ConBeeVersionResponse; +import org.junit.jupiter.api.Test; /** * diff --git a/com.zsmartsystems.zigbee.dongle.conbee/src/test/java/com/zsmartsystems/zigbee/dongle/conbee/internal/frame/ZigBeeDongleConBeeTest.java b/com.zsmartsystems.zigbee.dongle.conbee/src/test/java/com/zsmartsystems/zigbee/dongle/conbee/internal/frame/ZigBeeDongleConBeeTest.java index b85cc1fe0..041c1d16e 100644 --- a/com.zsmartsystems.zigbee.dongle.conbee/src/test/java/com/zsmartsystems/zigbee/dongle/conbee/internal/frame/ZigBeeDongleConBeeTest.java +++ b/com.zsmartsystems.zigbee.dongle.conbee/src/test/java/com/zsmartsystems/zigbee/dongle/conbee/internal/frame/ZigBeeDongleConBeeTest.java @@ -7,9 +7,9 @@ */ package com.zsmartsystems.zigbee.dongle.conbee.internal.frame; -import static org.junit.Assert.assertEquals; +import static org.junit.jupiter.api.Assertions.assertEquals; -import org.junit.Test; +import org.junit.jupiter.api.Test; import com.zsmartsystems.zigbee.ZigBeeStatus; import com.zsmartsystems.zigbee.dongle.conbee.ZigBeeDongleConBee; diff --git a/com.zsmartsystems.zigbee.dongle.conbee/src/test/java/com/zsmartsystems/zigbee/dongle/conbee/internal/transaction/ConBeeSingleResponseTransactionTest.java b/com.zsmartsystems.zigbee.dongle.conbee/src/test/java/com/zsmartsystems/zigbee/dongle/conbee/internal/transaction/ConBeeSingleResponseTransactionTest.java index 7f58bd4ff..bf1a5029d 100644 --- a/com.zsmartsystems.zigbee.dongle.conbee/src/test/java/com/zsmartsystems/zigbee/dongle/conbee/internal/transaction/ConBeeSingleResponseTransactionTest.java +++ b/com.zsmartsystems.zigbee.dongle.conbee/src/test/java/com/zsmartsystems/zigbee/dongle/conbee/internal/transaction/ConBeeSingleResponseTransactionTest.java @@ -7,19 +7,17 @@ */ package com.zsmartsystems.zigbee.dongle.conbee.internal.transaction; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertFalse; -import static org.junit.Assert.assertNotNull; -import static org.junit.Assert.assertNull; -import static org.junit.Assert.assertTrue; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertFalse; +import static org.junit.jupiter.api.Assertions.assertNotNull; +import static org.junit.jupiter.api.Assertions.assertNull; +import static org.junit.jupiter.api.Assertions.assertTrue; -import org.junit.Test; +import org.junit.jupiter.api.Test; import com.zsmartsystems.zigbee.dongle.conbee.internal.frame.ConBeeDeviceStateRequest; import com.zsmartsystems.zigbee.dongle.conbee.internal.frame.ConBeeDeviceStateResponse; import com.zsmartsystems.zigbee.dongle.conbee.internal.frame.ConBeeEnqueueSendDataResponse; -import com.zsmartsystems.zigbee.dongle.conbee.internal.transaction.ConBeeSingleResponseTransaction; -import com.zsmartsystems.zigbee.dongle.conbee.internal.transaction.ConBeeTransaction; /** * diff --git a/com.zsmartsystems.zigbee.dongle.ember/src/main/java/com/zsmartsystems/zigbee/dongle/ember/ezsp/structure/NwkLayerStatusCode.java b/com.zsmartsystems.zigbee.dongle.ember/src/main/java/com/zsmartsystems/zigbee/dongle/ember/ezsp/structure/NwkLayerStatusCode.java index c6fb42511..52ea0a2d8 100644 --- a/com.zsmartsystems.zigbee.dongle.ember/src/main/java/com/zsmartsystems/zigbee/dongle/ember/ezsp/structure/NwkLayerStatusCode.java +++ b/com.zsmartsystems.zigbee.dongle.ember/src/main/java/com/zsmartsystems/zigbee/dongle/ember/ezsp/structure/NwkLayerStatusCode.java @@ -1,5 +1,5 @@ /** - * Copyright (c) 2016-2024 by the respective copyright holders. + * Copyright (c) 2016-2025 by the respective copyright holders. * All rights reserved. This program and the accompanying materials * are made available under the terms of the Eclipse Public License v1.0 * which accompanies this distribution, and is available at @@ -54,7 +54,7 @@ public enum NwkLayerStatusCode { * A device with the address supplied to the NLME-ADD-NEIGHBOR.request is already present in * the neighbor table of the device on which the NLME-ADD-NEIGHBOR.request was issued. */ - ALREADY_PRESENT (0x00C5), + ALREADY_PRESENT(0x00C5), /** * Used to indicate that an NLME-SYNC.request has failed at the MAC layer. @@ -100,7 +100,7 @@ public enum NwkLayerStatusCode { * Security processing has been attempted on an outgoing frame, and has failed because the * security engine produced erroneous output. */ - BAD_CCM_OUTPUT (0x00CE), + BAD_CCM_OUTPUT(0x00CE), /** * An attempt to discover a route has failed due to a reason other than a lack of routing capacity. @@ -133,12 +133,12 @@ public enum NwkLayerStatusCode { /** * A required TLV for processing the request was not present. */ - MISSING_TLV (0x00D6), + MISSING_TLV(0x00D6), /** * A TLV was malformed or missing relevant information. */ - INVALID_TLV (0x00D7); + INVALID_TLV(0x00D7); /** * A mapping between the integer code and its corresponding type to diff --git a/com.zsmartsystems.zigbee.dongle.ember/src/test/java/com/zsmartsystems/zigbee/dongle/ember/EmberCbkeExchangeTest.java b/com.zsmartsystems.zigbee.dongle.ember/src/test/java/com/zsmartsystems/zigbee/dongle/ember/EmberCbkeExchangeTest.java index d72261c52..0a06712a8 100644 --- a/com.zsmartsystems.zigbee.dongle.ember/src/test/java/com/zsmartsystems/zigbee/dongle/ember/EmberCbkeExchangeTest.java +++ b/com.zsmartsystems.zigbee.dongle.ember/src/test/java/com/zsmartsystems/zigbee/dongle/ember/EmberCbkeExchangeTest.java @@ -7,9 +7,9 @@ */ package com.zsmartsystems.zigbee.dongle.ember; -import static org.junit.Assert.assertNull; +import static org.junit.jupiter.api.Assertions.assertNull; -import org.junit.Test; +import org.junit.jupiter.api.Test; import org.mockito.ArgumentMatchers; import org.mockito.Mockito; diff --git a/com.zsmartsystems.zigbee.dongle.ember/src/test/java/com/zsmartsystems/zigbee/dongle/ember/EmberCbkeProviderTest.java b/com.zsmartsystems.zigbee.dongle.ember/src/test/java/com/zsmartsystems/zigbee/dongle/ember/EmberCbkeProviderTest.java index 2cfe38070..35e2daa47 100644 --- a/com.zsmartsystems.zigbee.dongle.ember/src/test/java/com/zsmartsystems/zigbee/dongle/ember/EmberCbkeProviderTest.java +++ b/com.zsmartsystems.zigbee.dongle.ember/src/test/java/com/zsmartsystems/zigbee/dongle/ember/EmberCbkeProviderTest.java @@ -7,11 +7,11 @@ */ package com.zsmartsystems.zigbee.dongle.ember; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertNotNull; -import static org.junit.Assert.assertNull; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertNotNull; +import static org.junit.jupiter.api.Assertions.assertNull; -import org.junit.Test; +import org.junit.jupiter.api.Test; import org.mockito.ArgumentMatchers; import org.mockito.Mockito; diff --git a/com.zsmartsystems.zigbee.dongle.ember/src/test/java/com/zsmartsystems/zigbee/dongle/ember/EmberNcpTest.java b/com.zsmartsystems.zigbee.dongle.ember/src/test/java/com/zsmartsystems/zigbee/dongle/ember/EmberNcpTest.java index 19b07396d..3ba07fb27 100644 --- a/com.zsmartsystems.zigbee.dongle.ember/src/test/java/com/zsmartsystems/zigbee/dongle/ember/EmberNcpTest.java +++ b/com.zsmartsystems.zigbee.dongle.ember/src/test/java/com/zsmartsystems/zigbee/dongle/ember/EmberNcpTest.java @@ -7,15 +7,15 @@ */ package com.zsmartsystems.zigbee.dongle.ember; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertNotNull; -import static org.junit.Assert.assertNull; -import static org.junit.Assert.assertTrue; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertNotNull; +import static org.junit.jupiter.api.Assertions.assertNull; +import static org.junit.jupiter.api.Assertions.assertTrue; import java.util.Collection; import java.util.List; -import org.junit.Test; +import org.junit.jupiter.api.Test; import org.mockito.ArgumentCaptor; import org.mockito.ArgumentMatchers; import org.mockito.Mockito; diff --git a/com.zsmartsystems.zigbee.dongle.ember/src/test/java/com/zsmartsystems/zigbee/dongle/ember/ZigBeeDongleEzspTest.java b/com.zsmartsystems.zigbee.dongle.ember/src/test/java/com/zsmartsystems/zigbee/dongle/ember/ZigBeeDongleEzspTest.java index 14d82471d..bbc6db24f 100644 --- a/com.zsmartsystems.zigbee.dongle.ember/src/test/java/com/zsmartsystems/zigbee/dongle/ember/ZigBeeDongleEzspTest.java +++ b/com.zsmartsystems.zigbee.dongle.ember/src/test/java/com/zsmartsystems/zigbee/dongle/ember/ZigBeeDongleEzspTest.java @@ -7,11 +7,11 @@ */ package com.zsmartsystems.zigbee.dongle.ember; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertFalse; -import static org.junit.Assert.assertNotNull; -import static org.junit.Assert.assertNull; -import static org.junit.Assert.assertTrue; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertFalse; +import static org.junit.jupiter.api.Assertions.assertNotNull; +import static org.junit.jupiter.api.Assertions.assertNull; +import static org.junit.jupiter.api.Assertions.assertTrue; import java.util.ArrayList; import java.util.Collection; @@ -23,7 +23,7 @@ import java.util.concurrent.Executors; import java.util.concurrent.ScheduledExecutorService; -import org.junit.Test; +import org.junit.jupiter.api.Test; import org.mockito.ArgumentCaptor; import org.mockito.ArgumentMatchers; import org.mockito.Mockito; diff --git a/com.zsmartsystems.zigbee.dongle.ember/src/test/java/com/zsmartsystems/zigbee/dongle/ember/ZigBeeTransportTransmitTest.java b/com.zsmartsystems.zigbee.dongle.ember/src/test/java/com/zsmartsystems/zigbee/dongle/ember/ZigBeeTransportTransmitTest.java index 61b5fadfb..76b271736 100644 --- a/com.zsmartsystems.zigbee.dongle.ember/src/test/java/com/zsmartsystems/zigbee/dongle/ember/ZigBeeTransportTransmitTest.java +++ b/com.zsmartsystems.zigbee.dongle.ember/src/test/java/com/zsmartsystems/zigbee/dongle/ember/ZigBeeTransportTransmitTest.java @@ -7,7 +7,7 @@ */ package com.zsmartsystems.zigbee.dongle.ember; -import org.junit.Before; +import org.junit.jupiter.api.BeforeEach; import org.mockito.ArgumentMatchers; import org.mockito.Mockito; @@ -35,7 +35,7 @@ */ public class ZigBeeTransportTransmitTest extends ZigBeeTransportTransmitAbstractTest { - @Before + @BeforeEach public void initialiseTransport() throws Exception { EmberNetworkParameters networkParameters = Mockito.mock(EmberNetworkParameters.class); Mockito.when(networkParameters.getRadioTxPower()).thenReturn(Integer.valueOf(0)); diff --git a/com.zsmartsystems.zigbee.dongle.ember/src/test/java/com/zsmartsystems/zigbee/dongle/ember/ezsp/EzspFrameRequestTest.java b/com.zsmartsystems.zigbee.dongle.ember/src/test/java/com/zsmartsystems/zigbee/dongle/ember/ezsp/EzspFrameRequestTest.java index 0e726d000..9f3f09675 100644 --- a/com.zsmartsystems.zigbee.dongle.ember/src/test/java/com/zsmartsystems/zigbee/dongle/ember/ezsp/EzspFrameRequestTest.java +++ b/com.zsmartsystems.zigbee.dongle.ember/src/test/java/com/zsmartsystems/zigbee/dongle/ember/ezsp/EzspFrameRequestTest.java @@ -7,11 +7,11 @@ */ package com.zsmartsystems.zigbee.dongle.ember.ezsp; -import static org.junit.Assert.assertTrue; +import static org.junit.jupiter.api.Assertions.assertTrue; import java.util.Arrays; -import org.junit.Test; +import org.junit.jupiter.api.Test; import org.mockito.Mockito; import com.zsmartsystems.zigbee.dongle.ember.internal.serializer.EzspSerializer; diff --git a/com.zsmartsystems.zigbee.dongle.ember/src/test/java/com/zsmartsystems/zigbee/dongle/ember/ezsp/EzspFrameResponseTest.java b/com.zsmartsystems.zigbee.dongle.ember/src/test/java/com/zsmartsystems/zigbee/dongle/ember/ezsp/EzspFrameResponseTest.java index 17530fbbe..8d5057180 100644 --- a/com.zsmartsystems.zigbee.dongle.ember/src/test/java/com/zsmartsystems/zigbee/dongle/ember/ezsp/EzspFrameResponseTest.java +++ b/com.zsmartsystems.zigbee.dongle.ember/src/test/java/com/zsmartsystems/zigbee/dongle/ember/ezsp/EzspFrameResponseTest.java @@ -7,11 +7,11 @@ */ package com.zsmartsystems.zigbee.dongle.ember.ezsp; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertFalse; -import static org.junit.Assert.assertTrue; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertFalse; +import static org.junit.jupiter.api.Assertions.assertTrue; -import org.junit.Test; +import org.junit.jupiter.api.Test; import com.zsmartsystems.zigbee.dongle.ember.ezsp.command.EzspNoCallbacksResponse; import com.zsmartsystems.zigbee.dongle.ember.ezsp.command.EzspVersionResponse; diff --git a/com.zsmartsystems.zigbee.dongle.ember/src/test/java/com/zsmartsystems/zigbee/dongle/ember/ezsp/EzspFrameTest.java b/com.zsmartsystems.zigbee.dongle.ember/src/test/java/com/zsmartsystems/zigbee/dongle/ember/ezsp/EzspFrameTest.java index a7a03bdd2..6331f0ca9 100644 --- a/com.zsmartsystems.zigbee.dongle.ember/src/test/java/com/zsmartsystems/zigbee/dongle/ember/ezsp/EzspFrameTest.java +++ b/com.zsmartsystems.zigbee.dongle.ember/src/test/java/com/zsmartsystems/zigbee/dongle/ember/ezsp/EzspFrameTest.java @@ -7,9 +7,9 @@ */ package com.zsmartsystems.zigbee.dongle.ember.ezsp; -import static org.junit.Assert.assertNull; +import static org.junit.jupiter.api.Assertions.assertNull; -import org.junit.Test; +import org.junit.jupiter.api.Test; /** * diff --git a/com.zsmartsystems.zigbee.dongle.ember/src/test/java/com/zsmartsystems/zigbee/dongle/ember/ezsp/command/EzspAddEndpointRequestTest.java b/com.zsmartsystems.zigbee.dongle.ember/src/test/java/com/zsmartsystems/zigbee/dongle/ember/ezsp/command/EzspAddEndpointRequestTest.java index 199e640f6..0a3747845 100644 --- a/com.zsmartsystems.zigbee.dongle.ember/src/test/java/com/zsmartsystems/zigbee/dongle/ember/ezsp/command/EzspAddEndpointRequestTest.java +++ b/com.zsmartsystems.zigbee.dongle.ember/src/test/java/com/zsmartsystems/zigbee/dongle/ember/ezsp/command/EzspAddEndpointRequestTest.java @@ -7,11 +7,11 @@ */ package com.zsmartsystems.zigbee.dongle.ember.ezsp.command; -import static org.junit.Assert.assertTrue; +import static org.junit.jupiter.api.Assertions.assertTrue; import java.util.Arrays; -import org.junit.Test; +import org.junit.jupiter.api.Test; import com.zsmartsystems.zigbee.TestUtilities; import com.zsmartsystems.zigbee.dongle.ember.ezsp.EzspFrame; diff --git a/com.zsmartsystems.zigbee.dongle.ember/src/test/java/com/zsmartsystems/zigbee/dongle/ember/ezsp/command/EzspAddEndpointResponseTest.java b/com.zsmartsystems.zigbee.dongle.ember/src/test/java/com/zsmartsystems/zigbee/dongle/ember/ezsp/command/EzspAddEndpointResponseTest.java index 7d911a6d4..da04adef3 100644 --- a/com.zsmartsystems.zigbee.dongle.ember/src/test/java/com/zsmartsystems/zigbee/dongle/ember/ezsp/command/EzspAddEndpointResponseTest.java +++ b/com.zsmartsystems.zigbee.dongle.ember/src/test/java/com/zsmartsystems/zigbee/dongle/ember/ezsp/command/EzspAddEndpointResponseTest.java @@ -7,13 +7,12 @@ */ package com.zsmartsystems.zigbee.dongle.ember.ezsp.command; -import static org.junit.Assert.assertEquals; +import static org.junit.jupiter.api.Assertions.assertEquals; -import org.junit.Test; +import org.junit.jupiter.api.Test; import com.zsmartsystems.zigbee.dongle.ember.ezsp.EzspFrame; import com.zsmartsystems.zigbee.dongle.ember.ezsp.EzspFrameTest; -import com.zsmartsystems.zigbee.dongle.ember.ezsp.command.EzspAddEndpointResponse; import com.zsmartsystems.zigbee.dongle.ember.ezsp.structure.EzspStatus; /** diff --git a/com.zsmartsystems.zigbee.dongle.ember/src/test/java/com/zsmartsystems/zigbee/dongle/ember/ezsp/command/EzspAesMmoHashRequestTest.java b/com.zsmartsystems.zigbee.dongle.ember/src/test/java/com/zsmartsystems/zigbee/dongle/ember/ezsp/command/EzspAesMmoHashRequestTest.java index 7e3b97322..9a26572a6 100644 --- a/com.zsmartsystems.zigbee.dongle.ember/src/test/java/com/zsmartsystems/zigbee/dongle/ember/ezsp/command/EzspAesMmoHashRequestTest.java +++ b/com.zsmartsystems.zigbee.dongle.ember/src/test/java/com/zsmartsystems/zigbee/dongle/ember/ezsp/command/EzspAesMmoHashRequestTest.java @@ -7,11 +7,11 @@ */ package com.zsmartsystems.zigbee.dongle.ember.ezsp.command; -import static org.junit.Assert.assertTrue; +import static org.junit.jupiter.api.Assertions.assertTrue; import java.util.Arrays; -import org.junit.Test; +import org.junit.jupiter.api.Test; import com.zsmartsystems.zigbee.TestUtilities; import com.zsmartsystems.zigbee.dongle.ember.ezsp.EzspFrame; diff --git a/com.zsmartsystems.zigbee.dongle.ember/src/test/java/com/zsmartsystems/zigbee/dongle/ember/ezsp/command/EzspChildJoinHandlerTest.java b/com.zsmartsystems.zigbee.dongle.ember/src/test/java/com/zsmartsystems/zigbee/dongle/ember/ezsp/command/EzspChildJoinHandlerTest.java index 8499e819d..cd710e7c1 100644 --- a/com.zsmartsystems.zigbee.dongle.ember/src/test/java/com/zsmartsystems/zigbee/dongle/ember/ezsp/command/EzspChildJoinHandlerTest.java +++ b/com.zsmartsystems.zigbee.dongle.ember/src/test/java/com/zsmartsystems/zigbee/dongle/ember/ezsp/command/EzspChildJoinHandlerTest.java @@ -7,15 +7,14 @@ */ package com.zsmartsystems.zigbee.dongle.ember.ezsp.command; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertTrue; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertTrue; -import org.junit.Test; +import org.junit.jupiter.api.Test; import com.zsmartsystems.zigbee.IeeeAddress; import com.zsmartsystems.zigbee.dongle.ember.ezsp.EzspFrame; import com.zsmartsystems.zigbee.dongle.ember.ezsp.EzspFrameTest; -import com.zsmartsystems.zigbee.dongle.ember.ezsp.command.EzspChildJoinHandler; import com.zsmartsystems.zigbee.dongle.ember.ezsp.structure.EmberNodeType; /** diff --git a/com.zsmartsystems.zigbee.dongle.ember/src/test/java/com/zsmartsystems/zigbee/dongle/ember/ezsp/command/EzspGetKeyRequestTest.java b/com.zsmartsystems.zigbee.dongle.ember/src/test/java/com/zsmartsystems/zigbee/dongle/ember/ezsp/command/EzspGetKeyRequestTest.java index 8336a4861..9fcf4f669 100644 --- a/com.zsmartsystems.zigbee.dongle.ember/src/test/java/com/zsmartsystems/zigbee/dongle/ember/ezsp/command/EzspGetKeyRequestTest.java +++ b/com.zsmartsystems.zigbee.dongle.ember/src/test/java/com/zsmartsystems/zigbee/dongle/ember/ezsp/command/EzspGetKeyRequestTest.java @@ -7,11 +7,11 @@ */ package com.zsmartsystems.zigbee.dongle.ember.ezsp.command; -import static org.junit.Assert.assertTrue; +import static org.junit.jupiter.api.Assertions.assertTrue; import java.util.Arrays; -import org.junit.Test; +import org.junit.jupiter.api.Test; import com.zsmartsystems.zigbee.TestUtilities; import com.zsmartsystems.zigbee.dongle.ember.ezsp.EzspFrame; diff --git a/com.zsmartsystems.zigbee.dongle.ember/src/test/java/com/zsmartsystems/zigbee/dongle/ember/ezsp/command/EzspGetKeyResponseTest.java b/com.zsmartsystems.zigbee.dongle.ember/src/test/java/com/zsmartsystems/zigbee/dongle/ember/ezsp/command/EzspGetKeyResponseTest.java index fb5dc05ab..643e0abb0 100644 --- a/com.zsmartsystems.zigbee.dongle.ember/src/test/java/com/zsmartsystems/zigbee/dongle/ember/ezsp/command/EzspGetKeyResponseTest.java +++ b/com.zsmartsystems.zigbee.dongle.ember/src/test/java/com/zsmartsystems/zigbee/dongle/ember/ezsp/command/EzspGetKeyResponseTest.java @@ -7,16 +7,15 @@ */ package com.zsmartsystems.zigbee.dongle.ember.ezsp.command; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertTrue; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertTrue; import java.util.Arrays; -import org.junit.Test; +import org.junit.jupiter.api.Test; import com.zsmartsystems.zigbee.dongle.ember.ezsp.EzspFrame; import com.zsmartsystems.zigbee.dongle.ember.ezsp.EzspFrameTest; -import com.zsmartsystems.zigbee.dongle.ember.ezsp.command.EzspGetKeyResponse; import com.zsmartsystems.zigbee.dongle.ember.ezsp.structure.EmberKeyType; import com.zsmartsystems.zigbee.dongle.ember.ezsp.structure.EmberStatus; diff --git a/com.zsmartsystems.zigbee.dongle.ember/src/test/java/com/zsmartsystems/zigbee/dongle/ember/ezsp/command/EzspGetKeyTableEntryRequestTest.java b/com.zsmartsystems.zigbee.dongle.ember/src/test/java/com/zsmartsystems/zigbee/dongle/ember/ezsp/command/EzspGetKeyTableEntryRequestTest.java index 6e24974f0..f2551755d 100644 --- a/com.zsmartsystems.zigbee.dongle.ember/src/test/java/com/zsmartsystems/zigbee/dongle/ember/ezsp/command/EzspGetKeyTableEntryRequestTest.java +++ b/com.zsmartsystems.zigbee.dongle.ember/src/test/java/com/zsmartsystems/zigbee/dongle/ember/ezsp/command/EzspGetKeyTableEntryRequestTest.java @@ -7,11 +7,11 @@ */ package com.zsmartsystems.zigbee.dongle.ember.ezsp.command; -import static org.junit.Assert.assertTrue; +import static org.junit.jupiter.api.Assertions.assertTrue; import java.util.Arrays; -import org.junit.Test; +import org.junit.jupiter.api.Test; import com.zsmartsystems.zigbee.TestUtilities; import com.zsmartsystems.zigbee.dongle.ember.ezsp.EzspFrame; diff --git a/com.zsmartsystems.zigbee.dongle.ember/src/test/java/com/zsmartsystems/zigbee/dongle/ember/ezsp/command/EzspGetKeyTableEntryResponseTest.java b/com.zsmartsystems.zigbee.dongle.ember/src/test/java/com/zsmartsystems/zigbee/dongle/ember/ezsp/command/EzspGetKeyTableEntryResponseTest.java index 121be6cd4..88b75272a 100644 --- a/com.zsmartsystems.zigbee.dongle.ember/src/test/java/com/zsmartsystems/zigbee/dongle/ember/ezsp/command/EzspGetKeyTableEntryResponseTest.java +++ b/com.zsmartsystems.zigbee.dongle.ember/src/test/java/com/zsmartsystems/zigbee/dongle/ember/ezsp/command/EzspGetKeyTableEntryResponseTest.java @@ -7,13 +7,12 @@ */ package com.zsmartsystems.zigbee.dongle.ember.ezsp.command; -import static org.junit.Assert.assertEquals; +import static org.junit.jupiter.api.Assertions.assertEquals; -import org.junit.Test; +import org.junit.jupiter.api.Test; import com.zsmartsystems.zigbee.dongle.ember.ezsp.EzspFrame; import com.zsmartsystems.zigbee.dongle.ember.ezsp.EzspFrameTest; -import com.zsmartsystems.zigbee.dongle.ember.ezsp.command.EzspGetKeyTableEntryResponse; import com.zsmartsystems.zigbee.dongle.ember.ezsp.structure.EmberStatus; /** diff --git a/com.zsmartsystems.zigbee.dongle.ember/src/test/java/com/zsmartsystems/zigbee/dongle/ember/ezsp/command/EzspGetNeighborResponseTest.java b/com.zsmartsystems.zigbee.dongle.ember/src/test/java/com/zsmartsystems/zigbee/dongle/ember/ezsp/command/EzspGetNeighborResponseTest.java index 4a39da8af..f9aeb03d8 100644 --- a/com.zsmartsystems.zigbee.dongle.ember/src/test/java/com/zsmartsystems/zigbee/dongle/ember/ezsp/command/EzspGetNeighborResponseTest.java +++ b/com.zsmartsystems.zigbee.dongle.ember/src/test/java/com/zsmartsystems/zigbee/dongle/ember/ezsp/command/EzspGetNeighborResponseTest.java @@ -7,15 +7,14 @@ */ package com.zsmartsystems.zigbee.dongle.ember.ezsp.command; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertNotNull; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertNotNull; -import org.junit.Test; +import org.junit.jupiter.api.Test; import com.zsmartsystems.zigbee.IeeeAddress; import com.zsmartsystems.zigbee.dongle.ember.ezsp.EzspFrame; import com.zsmartsystems.zigbee.dongle.ember.ezsp.EzspFrameTest; -import com.zsmartsystems.zigbee.dongle.ember.ezsp.command.EzspGetNeighborResponse; import com.zsmartsystems.zigbee.dongle.ember.ezsp.structure.EmberNeighborTableEntry; import com.zsmartsystems.zigbee.dongle.ember.ezsp.structure.EmberStatus; diff --git a/com.zsmartsystems.zigbee.dongle.ember/src/test/java/com/zsmartsystems/zigbee/dongle/ember/ezsp/command/EzspGetNetworkParametersResponseTest.java b/com.zsmartsystems.zigbee.dongle.ember/src/test/java/com/zsmartsystems/zigbee/dongle/ember/ezsp/command/EzspGetNetworkParametersResponseTest.java index 092b5d016..f2ffdd3de 100644 --- a/com.zsmartsystems.zigbee.dongle.ember/src/test/java/com/zsmartsystems/zigbee/dongle/ember/ezsp/command/EzspGetNetworkParametersResponseTest.java +++ b/com.zsmartsystems.zigbee.dongle.ember/src/test/java/com/zsmartsystems/zigbee/dongle/ember/ezsp/command/EzspGetNetworkParametersResponseTest.java @@ -7,13 +7,12 @@ */ package com.zsmartsystems.zigbee.dongle.ember.ezsp.command; -import static org.junit.Assert.assertEquals; +import static org.junit.jupiter.api.Assertions.assertEquals; -import org.junit.Test; +import org.junit.jupiter.api.Test; import com.zsmartsystems.zigbee.dongle.ember.ezsp.EzspFrame; import com.zsmartsystems.zigbee.dongle.ember.ezsp.EzspFrameTest; -import com.zsmartsystems.zigbee.dongle.ember.ezsp.command.EzspGetNetworkParametersResponse; import com.zsmartsystems.zigbee.dongle.ember.ezsp.structure.EmberJoinMethod; import com.zsmartsystems.zigbee.dongle.ember.ezsp.structure.EmberNetworkParameters; import com.zsmartsystems.zigbee.dongle.ember.ezsp.structure.EmberNodeType; diff --git a/com.zsmartsystems.zigbee.dongle.ember/src/test/java/com/zsmartsystems/zigbee/dongle/ember/ezsp/command/EzspGetRouteTableEntryResponseTest.java b/com.zsmartsystems.zigbee.dongle.ember/src/test/java/com/zsmartsystems/zigbee/dongle/ember/ezsp/command/EzspGetRouteTableEntryResponseTest.java index 1f5edf079..a72b6d47a 100644 --- a/com.zsmartsystems.zigbee.dongle.ember/src/test/java/com/zsmartsystems/zigbee/dongle/ember/ezsp/command/EzspGetRouteTableEntryResponseTest.java +++ b/com.zsmartsystems.zigbee.dongle.ember/src/test/java/com/zsmartsystems/zigbee/dongle/ember/ezsp/command/EzspGetRouteTableEntryResponseTest.java @@ -7,14 +7,13 @@ */ package com.zsmartsystems.zigbee.dongle.ember.ezsp.command; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertNotNull; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertNotNull; -import org.junit.Test; +import org.junit.jupiter.api.Test; import com.zsmartsystems.zigbee.dongle.ember.ezsp.EzspFrame; import com.zsmartsystems.zigbee.dongle.ember.ezsp.EzspFrameTest; -import com.zsmartsystems.zigbee.dongle.ember.ezsp.command.EzspGetRouteTableEntryResponse; import com.zsmartsystems.zigbee.dongle.ember.ezsp.structure.EmberRouteTableEntry; import com.zsmartsystems.zigbee.dongle.ember.ezsp.structure.EmberStatus; diff --git a/com.zsmartsystems.zigbee.dongle.ember/src/test/java/com/zsmartsystems/zigbee/dongle/ember/ezsp/command/EzspGpepIncomingMessageHandlerTest.java b/com.zsmartsystems.zigbee.dongle.ember/src/test/java/com/zsmartsystems/zigbee/dongle/ember/ezsp/command/EzspGpepIncomingMessageHandlerTest.java index 8800b2da7..d012530e7 100644 --- a/com.zsmartsystems.zigbee.dongle.ember/src/test/java/com/zsmartsystems/zigbee/dongle/ember/ezsp/command/EzspGpepIncomingMessageHandlerTest.java +++ b/com.zsmartsystems.zigbee.dongle.ember/src/test/java/com/zsmartsystems/zigbee/dongle/ember/ezsp/command/EzspGpepIncomingMessageHandlerTest.java @@ -7,10 +7,10 @@ */ package com.zsmartsystems.zigbee.dongle.ember.ezsp.command; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertFalse; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertFalse; -import org.junit.Test; +import org.junit.jupiter.api.Test; import com.zsmartsystems.zigbee.dongle.ember.ezsp.EzspFrame; import com.zsmartsystems.zigbee.dongle.ember.ezsp.EzspFrameTest; diff --git a/com.zsmartsystems.zigbee.dongle.ember/src/test/java/com/zsmartsystems/zigbee/dongle/ember/ezsp/command/EzspIncomingMessageHandlerTest.java b/com.zsmartsystems.zigbee.dongle.ember/src/test/java/com/zsmartsystems/zigbee/dongle/ember/ezsp/command/EzspIncomingMessageHandlerTest.java index 75f7ace01..64dd6a50f 100644 --- a/com.zsmartsystems.zigbee.dongle.ember/src/test/java/com/zsmartsystems/zigbee/dongle/ember/ezsp/command/EzspIncomingMessageHandlerTest.java +++ b/com.zsmartsystems.zigbee.dongle.ember/src/test/java/com/zsmartsystems/zigbee/dongle/ember/ezsp/command/EzspIncomingMessageHandlerTest.java @@ -7,13 +7,13 @@ */ package com.zsmartsystems.zigbee.dongle.ember.ezsp.command; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertTrue; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertTrue; import java.lang.reflect.Field; import java.util.Arrays; -import org.junit.Test; +import org.junit.jupiter.api.Test; import org.mockito.ArgumentCaptor; import org.mockito.Mockito; diff --git a/com.zsmartsystems.zigbee.dongle.ember/src/test/java/com/zsmartsystems/zigbee/dongle/ember/ezsp/command/EzspIncomingRouteRecordHandlerTest.java b/com.zsmartsystems.zigbee.dongle.ember/src/test/java/com/zsmartsystems/zigbee/dongle/ember/ezsp/command/EzspIncomingRouteRecordHandlerTest.java index 3109cf9aa..03d238015 100644 --- a/com.zsmartsystems.zigbee.dongle.ember/src/test/java/com/zsmartsystems/zigbee/dongle/ember/ezsp/command/EzspIncomingRouteRecordHandlerTest.java +++ b/com.zsmartsystems.zigbee.dongle.ember/src/test/java/com/zsmartsystems/zigbee/dongle/ember/ezsp/command/EzspIncomingRouteRecordHandlerTest.java @@ -7,14 +7,13 @@ */ package com.zsmartsystems.zigbee.dongle.ember.ezsp.command; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertTrue; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertTrue; -import org.junit.Test; +import org.junit.jupiter.api.Test; import com.zsmartsystems.zigbee.dongle.ember.ezsp.EzspFrame; import com.zsmartsystems.zigbee.dongle.ember.ezsp.EzspFrameTest; -import com.zsmartsystems.zigbee.dongle.ember.ezsp.command.EzspIncomingRouteRecordHandler; /** * @author Chris Jackson diff --git a/com.zsmartsystems.zigbee.dongle.ember/src/test/java/com/zsmartsystems/zigbee/dongle/ember/ezsp/command/EzspIncomingSenderEui64HandlerTest.java b/com.zsmartsystems.zigbee.dongle.ember/src/test/java/com/zsmartsystems/zigbee/dongle/ember/ezsp/command/EzspIncomingSenderEui64HandlerTest.java index dcd6be57c..abbcce0a1 100644 --- a/com.zsmartsystems.zigbee.dongle.ember/src/test/java/com/zsmartsystems/zigbee/dongle/ember/ezsp/command/EzspIncomingSenderEui64HandlerTest.java +++ b/com.zsmartsystems.zigbee.dongle.ember/src/test/java/com/zsmartsystems/zigbee/dongle/ember/ezsp/command/EzspIncomingSenderEui64HandlerTest.java @@ -7,14 +7,13 @@ */ package com.zsmartsystems.zigbee.dongle.ember.ezsp.command; -import static org.junit.Assert.assertEquals; +import static org.junit.jupiter.api.Assertions.assertEquals; -import org.junit.Test; +import org.junit.jupiter.api.Test; import com.zsmartsystems.zigbee.IeeeAddress; import com.zsmartsystems.zigbee.dongle.ember.ezsp.EzspFrame; import com.zsmartsystems.zigbee.dongle.ember.ezsp.EzspFrameTest; -import com.zsmartsystems.zigbee.dongle.ember.ezsp.command.EzspIncomingSenderEui64Handler; /** * @author Chris Jackson diff --git a/com.zsmartsystems.zigbee.dongle.ember/src/test/java/com/zsmartsystems/zigbee/dongle/ember/ezsp/command/EzspLookupEui64ByNodeIdRequestTest.java b/com.zsmartsystems.zigbee.dongle.ember/src/test/java/com/zsmartsystems/zigbee/dongle/ember/ezsp/command/EzspLookupEui64ByNodeIdRequestTest.java index 69ad9c8d5..ab95a44b3 100644 --- a/com.zsmartsystems.zigbee.dongle.ember/src/test/java/com/zsmartsystems/zigbee/dongle/ember/ezsp/command/EzspLookupEui64ByNodeIdRequestTest.java +++ b/com.zsmartsystems.zigbee.dongle.ember/src/test/java/com/zsmartsystems/zigbee/dongle/ember/ezsp/command/EzspLookupEui64ByNodeIdRequestTest.java @@ -7,11 +7,11 @@ */ package com.zsmartsystems.zigbee.dongle.ember.ezsp.command; -import static org.junit.Assert.assertTrue; +import static org.junit.jupiter.api.Assertions.assertTrue; import java.util.Arrays; -import org.junit.Test; +import org.junit.jupiter.api.Test; import com.zsmartsystems.zigbee.TestUtilities; import com.zsmartsystems.zigbee.dongle.ember.ezsp.EzspFrame; diff --git a/com.zsmartsystems.zigbee.dongle.ember/src/test/java/com/zsmartsystems/zigbee/dongle/ember/ezsp/command/EzspLookupEui64ByNodeIdResponseTest.java b/com.zsmartsystems.zigbee.dongle.ember/src/test/java/com/zsmartsystems/zigbee/dongle/ember/ezsp/command/EzspLookupEui64ByNodeIdResponseTest.java index f2d70cefd..8966c98d1 100644 --- a/com.zsmartsystems.zigbee.dongle.ember/src/test/java/com/zsmartsystems/zigbee/dongle/ember/ezsp/command/EzspLookupEui64ByNodeIdResponseTest.java +++ b/com.zsmartsystems.zigbee.dongle.ember/src/test/java/com/zsmartsystems/zigbee/dongle/ember/ezsp/command/EzspLookupEui64ByNodeIdResponseTest.java @@ -7,14 +7,13 @@ */ package com.zsmartsystems.zigbee.dongle.ember.ezsp.command; -import static org.junit.Assert.assertEquals; +import static org.junit.jupiter.api.Assertions.assertEquals; -import org.junit.Test; +import org.junit.jupiter.api.Test; import com.zsmartsystems.zigbee.IeeeAddress; import com.zsmartsystems.zigbee.dongle.ember.ezsp.EzspFrame; import com.zsmartsystems.zigbee.dongle.ember.ezsp.EzspFrameTest; -import com.zsmartsystems.zigbee.dongle.ember.ezsp.command.EzspLookupEui64ByNodeIdResponse; import com.zsmartsystems.zigbee.dongle.ember.ezsp.structure.EmberStatus; /** diff --git a/com.zsmartsystems.zigbee.dongle.ember/src/test/java/com/zsmartsystems/zigbee/dongle/ember/ezsp/command/EzspMacFilterMatchMessageHandlerTest.java b/com.zsmartsystems.zigbee.dongle.ember/src/test/java/com/zsmartsystems/zigbee/dongle/ember/ezsp/command/EzspMacFilterMatchMessageHandlerTest.java index cf6a1637b..1cdfd20e9 100644 --- a/com.zsmartsystems.zigbee.dongle.ember/src/test/java/com/zsmartsystems/zigbee/dongle/ember/ezsp/command/EzspMacFilterMatchMessageHandlerTest.java +++ b/com.zsmartsystems.zigbee.dongle.ember/src/test/java/com/zsmartsystems/zigbee/dongle/ember/ezsp/command/EzspMacFilterMatchMessageHandlerTest.java @@ -7,16 +7,15 @@ */ package com.zsmartsystems.zigbee.dongle.ember.ezsp.command; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertTrue; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertTrue; import java.util.Arrays; -import org.junit.Test; +import org.junit.jupiter.api.Test; import com.zsmartsystems.zigbee.dongle.ember.ezsp.EzspFrame; import com.zsmartsystems.zigbee.dongle.ember.ezsp.EzspFrameTest; -import com.zsmartsystems.zigbee.dongle.ember.ezsp.command.EzspMacFilterMatchMessageHandler; /** * diff --git a/com.zsmartsystems.zigbee.dongle.ember/src/test/java/com/zsmartsystems/zigbee/dongle/ember/ezsp/command/EzspMessageSentHandlerTest.java b/com.zsmartsystems.zigbee.dongle.ember/src/test/java/com/zsmartsystems/zigbee/dongle/ember/ezsp/command/EzspMessageSentHandlerTest.java index 356e39e11..168265202 100644 --- a/com.zsmartsystems.zigbee.dongle.ember/src/test/java/com/zsmartsystems/zigbee/dongle/ember/ezsp/command/EzspMessageSentHandlerTest.java +++ b/com.zsmartsystems.zigbee.dongle.ember/src/test/java/com/zsmartsystems/zigbee/dongle/ember/ezsp/command/EzspMessageSentHandlerTest.java @@ -7,15 +7,14 @@ */ package com.zsmartsystems.zigbee.dongle.ember.ezsp.command; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertNotNull; -import static org.junit.Assert.assertTrue; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertNotNull; +import static org.junit.jupiter.api.Assertions.assertTrue; -import org.junit.Test; +import org.junit.jupiter.api.Test; import com.zsmartsystems.zigbee.dongle.ember.ezsp.EzspFrame; import com.zsmartsystems.zigbee.dongle.ember.ezsp.EzspFrameTest; -import com.zsmartsystems.zigbee.dongle.ember.ezsp.command.EzspMessageSentHandler; import com.zsmartsystems.zigbee.dongle.ember.ezsp.structure.EmberApsFrame; import com.zsmartsystems.zigbee.dongle.ember.ezsp.structure.EmberApsOption; import com.zsmartsystems.zigbee.dongle.ember.ezsp.structure.EmberOutgoingMessageType; diff --git a/com.zsmartsystems.zigbee.dongle.ember/src/test/java/com/zsmartsystems/zigbee/dongle/ember/ezsp/command/EzspNeighborCountResponseTest.java b/com.zsmartsystems.zigbee.dongle.ember/src/test/java/com/zsmartsystems/zigbee/dongle/ember/ezsp/command/EzspNeighborCountResponseTest.java index bd3b1ac0e..4c004a388 100644 --- a/com.zsmartsystems.zigbee.dongle.ember/src/test/java/com/zsmartsystems/zigbee/dongle/ember/ezsp/command/EzspNeighborCountResponseTest.java +++ b/com.zsmartsystems.zigbee.dongle.ember/src/test/java/com/zsmartsystems/zigbee/dongle/ember/ezsp/command/EzspNeighborCountResponseTest.java @@ -7,13 +7,12 @@ */ package com.zsmartsystems.zigbee.dongle.ember.ezsp.command; -import static org.junit.Assert.assertEquals; +import static org.junit.jupiter.api.Assertions.assertEquals; -import org.junit.Test; +import org.junit.jupiter.api.Test; import com.zsmartsystems.zigbee.dongle.ember.ezsp.EzspFrame; import com.zsmartsystems.zigbee.dongle.ember.ezsp.EzspFrameTest; -import com.zsmartsystems.zigbee.dongle.ember.ezsp.command.EzspNeighborCountResponse; /** * diff --git a/com.zsmartsystems.zigbee.dongle.ember/src/test/java/com/zsmartsystems/zigbee/dongle/ember/ezsp/command/EzspNetworkFoundHandlerTest.java b/com.zsmartsystems.zigbee.dongle.ember/src/test/java/com/zsmartsystems/zigbee/dongle/ember/ezsp/command/EzspNetworkFoundHandlerTest.java index ea1b07629..e8ba0a2ce 100644 --- a/com.zsmartsystems.zigbee.dongle.ember/src/test/java/com/zsmartsystems/zigbee/dongle/ember/ezsp/command/EzspNetworkFoundHandlerTest.java +++ b/com.zsmartsystems.zigbee.dongle.ember/src/test/java/com/zsmartsystems/zigbee/dongle/ember/ezsp/command/EzspNetworkFoundHandlerTest.java @@ -7,10 +7,10 @@ */ package com.zsmartsystems.zigbee.dongle.ember.ezsp.command; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertTrue; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertTrue; -import org.junit.Test; +import org.junit.jupiter.api.Test; import com.zsmartsystems.zigbee.ExtendedPanId; import com.zsmartsystems.zigbee.dongle.ember.ezsp.EzspFrame; diff --git a/com.zsmartsystems.zigbee.dongle.ember/src/test/java/com/zsmartsystems/zigbee/dongle/ember/ezsp/command/EzspScanCompleteHandlerTest.java b/com.zsmartsystems.zigbee.dongle.ember/src/test/java/com/zsmartsystems/zigbee/dongle/ember/ezsp/command/EzspScanCompleteHandlerTest.java index 418f0b20e..caeeb1598 100644 --- a/com.zsmartsystems.zigbee.dongle.ember/src/test/java/com/zsmartsystems/zigbee/dongle/ember/ezsp/command/EzspScanCompleteHandlerTest.java +++ b/com.zsmartsystems.zigbee.dongle.ember/src/test/java/com/zsmartsystems/zigbee/dongle/ember/ezsp/command/EzspScanCompleteHandlerTest.java @@ -7,10 +7,10 @@ */ package com.zsmartsystems.zigbee.dongle.ember.ezsp.command; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertTrue; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertTrue; -import org.junit.Test; +import org.junit.jupiter.api.Test; import com.zsmartsystems.zigbee.dongle.ember.ezsp.EzspFrame; import com.zsmartsystems.zigbee.dongle.ember.ezsp.EzspFrameTest; diff --git a/com.zsmartsystems.zigbee.dongle.ember/src/test/java/com/zsmartsystems/zigbee/dongle/ember/ezsp/command/EzspSendBroadcastTest.java b/com.zsmartsystems.zigbee.dongle.ember/src/test/java/com/zsmartsystems/zigbee/dongle/ember/ezsp/command/EzspSendBroadcastTest.java index 48983fa7f..74d269341 100644 --- a/com.zsmartsystems.zigbee.dongle.ember/src/test/java/com/zsmartsystems/zigbee/dongle/ember/ezsp/command/EzspSendBroadcastTest.java +++ b/com.zsmartsystems.zigbee.dongle.ember/src/test/java/com/zsmartsystems/zigbee/dongle/ember/ezsp/command/EzspSendBroadcastTest.java @@ -7,11 +7,11 @@ */ package com.zsmartsystems.zigbee.dongle.ember.ezsp.command; -import static org.junit.Assert.assertTrue; +import static org.junit.jupiter.api.Assertions.assertTrue; import java.util.Arrays; -import org.junit.Test; +import org.junit.jupiter.api.Test; import com.zsmartsystems.zigbee.TestUtilities; import com.zsmartsystems.zigbee.ZigBeeEndpointAddress; diff --git a/com.zsmartsystems.zigbee.dongle.ember/src/test/java/com/zsmartsystems/zigbee/dongle/ember/ezsp/command/EzspSendUnicastTest.java b/com.zsmartsystems.zigbee.dongle.ember/src/test/java/com/zsmartsystems/zigbee/dongle/ember/ezsp/command/EzspSendUnicastTest.java index 4957b7b41..f0dbcebfc 100644 --- a/com.zsmartsystems.zigbee.dongle.ember/src/test/java/com/zsmartsystems/zigbee/dongle/ember/ezsp/command/EzspSendUnicastTest.java +++ b/com.zsmartsystems.zigbee.dongle.ember/src/test/java/com/zsmartsystems/zigbee/dongle/ember/ezsp/command/EzspSendUnicastTest.java @@ -7,12 +7,12 @@ */ package com.zsmartsystems.zigbee.dongle.ember.ezsp.command; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertTrue; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertTrue; import java.util.Arrays; -import org.junit.Test; +import org.junit.jupiter.api.Test; import com.zsmartsystems.zigbee.TestUtilities; import com.zsmartsystems.zigbee.ZigBeeEndpointAddress; diff --git a/com.zsmartsystems.zigbee.dongle.ember/src/test/java/com/zsmartsystems/zigbee/dongle/ember/ezsp/command/EzspSetConcentratorRequestTest.java b/com.zsmartsystems.zigbee.dongle.ember/src/test/java/com/zsmartsystems/zigbee/dongle/ember/ezsp/command/EzspSetConcentratorRequestTest.java index cae447381..6902d766c 100644 --- a/com.zsmartsystems.zigbee.dongle.ember/src/test/java/com/zsmartsystems/zigbee/dongle/ember/ezsp/command/EzspSetConcentratorRequestTest.java +++ b/com.zsmartsystems.zigbee.dongle.ember/src/test/java/com/zsmartsystems/zigbee/dongle/ember/ezsp/command/EzspSetConcentratorRequestTest.java @@ -7,11 +7,11 @@ */ package com.zsmartsystems.zigbee.dongle.ember.ezsp.command; -import static org.junit.Assert.assertTrue; +import static org.junit.jupiter.api.Assertions.assertTrue; import java.util.Arrays; -import org.junit.Test; +import org.junit.jupiter.api.Test; import com.zsmartsystems.zigbee.TestUtilities; import com.zsmartsystems.zigbee.dongle.ember.ezsp.EzspFrame; diff --git a/com.zsmartsystems.zigbee.dongle.ember/src/test/java/com/zsmartsystems/zigbee/dongle/ember/ezsp/command/EzspSetConfigurationValueRequestTest.java b/com.zsmartsystems.zigbee.dongle.ember/src/test/java/com/zsmartsystems/zigbee/dongle/ember/ezsp/command/EzspSetConfigurationValueRequestTest.java index 9989c6b13..9756d6613 100644 --- a/com.zsmartsystems.zigbee.dongle.ember/src/test/java/com/zsmartsystems/zigbee/dongle/ember/ezsp/command/EzspSetConfigurationValueRequestTest.java +++ b/com.zsmartsystems.zigbee.dongle.ember/src/test/java/com/zsmartsystems/zigbee/dongle/ember/ezsp/command/EzspSetConfigurationValueRequestTest.java @@ -7,11 +7,11 @@ */ package com.zsmartsystems.zigbee.dongle.ember.ezsp.command; -import static org.junit.Assert.assertTrue; +import static org.junit.jupiter.api.Assertions.assertTrue; import java.util.Arrays; -import org.junit.Test; +import org.junit.jupiter.api.Test; import com.zsmartsystems.zigbee.TestUtilities; import com.zsmartsystems.zigbee.dongle.ember.ezsp.EzspFrame; diff --git a/com.zsmartsystems.zigbee.dongle.ember/src/test/java/com/zsmartsystems/zigbee/dongle/ember/ezsp/command/EzspSetConfigurationValueResponseTest.java b/com.zsmartsystems.zigbee.dongle.ember/src/test/java/com/zsmartsystems/zigbee/dongle/ember/ezsp/command/EzspSetConfigurationValueResponseTest.java index da3a120f8..b0d4301a9 100644 --- a/com.zsmartsystems.zigbee.dongle.ember/src/test/java/com/zsmartsystems/zigbee/dongle/ember/ezsp/command/EzspSetConfigurationValueResponseTest.java +++ b/com.zsmartsystems.zigbee.dongle.ember/src/test/java/com/zsmartsystems/zigbee/dongle/ember/ezsp/command/EzspSetConfigurationValueResponseTest.java @@ -7,13 +7,12 @@ */ package com.zsmartsystems.zigbee.dongle.ember.ezsp.command; -import static org.junit.Assert.assertEquals; +import static org.junit.jupiter.api.Assertions.assertEquals; -import org.junit.Test; +import org.junit.jupiter.api.Test; import com.zsmartsystems.zigbee.dongle.ember.ezsp.EzspFrame; import com.zsmartsystems.zigbee.dongle.ember.ezsp.EzspFrameTest; -import com.zsmartsystems.zigbee.dongle.ember.ezsp.command.EzspSetConfigurationValueResponse; import com.zsmartsystems.zigbee.dongle.ember.ezsp.structure.EzspStatus; /** diff --git a/com.zsmartsystems.zigbee.dongle.ember/src/test/java/com/zsmartsystems/zigbee/dongle/ember/ezsp/command/EzspSetInitialSecurityStateRequestTest.java b/com.zsmartsystems.zigbee.dongle.ember/src/test/java/com/zsmartsystems/zigbee/dongle/ember/ezsp/command/EzspSetInitialSecurityStateRequestTest.java index 60aca4ada..3132075a0 100644 --- a/com.zsmartsystems.zigbee.dongle.ember/src/test/java/com/zsmartsystems/zigbee/dongle/ember/ezsp/command/EzspSetInitialSecurityStateRequestTest.java +++ b/com.zsmartsystems.zigbee.dongle.ember/src/test/java/com/zsmartsystems/zigbee/dongle/ember/ezsp/command/EzspSetInitialSecurityStateRequestTest.java @@ -7,11 +7,11 @@ */ package com.zsmartsystems.zigbee.dongle.ember.ezsp.command; -import static org.junit.Assert.assertTrue; +import static org.junit.jupiter.api.Assertions.assertTrue; import java.util.Arrays; -import org.junit.Test; +import org.junit.jupiter.api.Test; import com.zsmartsystems.zigbee.IeeeAddress; import com.zsmartsystems.zigbee.TestUtilities; diff --git a/com.zsmartsystems.zigbee.dongle.ember/src/test/java/com/zsmartsystems/zigbee/dongle/ember/ezsp/command/EzspSetValueRequestTest.java b/com.zsmartsystems.zigbee.dongle.ember/src/test/java/com/zsmartsystems/zigbee/dongle/ember/ezsp/command/EzspSetValueRequestTest.java index ee7b0a902..1eada2405 100644 --- a/com.zsmartsystems.zigbee.dongle.ember/src/test/java/com/zsmartsystems/zigbee/dongle/ember/ezsp/command/EzspSetValueRequestTest.java +++ b/com.zsmartsystems.zigbee.dongle.ember/src/test/java/com/zsmartsystems/zigbee/dongle/ember/ezsp/command/EzspSetValueRequestTest.java @@ -7,11 +7,11 @@ */ package com.zsmartsystems.zigbee.dongle.ember.ezsp.command; -import static org.junit.Assert.assertTrue; +import static org.junit.jupiter.api.Assertions.assertTrue; import java.util.Arrays; -import org.junit.Test; +import org.junit.jupiter.api.Test; import com.zsmartsystems.zigbee.TestUtilities; import com.zsmartsystems.zigbee.dongle.ember.ezsp.EzspFrame; diff --git a/com.zsmartsystems.zigbee.dongle.ember/src/test/java/com/zsmartsystems/zigbee/dongle/ember/ezsp/command/EzspStackStatusHandlerResponseTest.java b/com.zsmartsystems.zigbee.dongle.ember/src/test/java/com/zsmartsystems/zigbee/dongle/ember/ezsp/command/EzspStackStatusHandlerResponseTest.java index eb5ca1181..78490cc2f 100644 --- a/com.zsmartsystems.zigbee.dongle.ember/src/test/java/com/zsmartsystems/zigbee/dongle/ember/ezsp/command/EzspStackStatusHandlerResponseTest.java +++ b/com.zsmartsystems.zigbee.dongle.ember/src/test/java/com/zsmartsystems/zigbee/dongle/ember/ezsp/command/EzspStackStatusHandlerResponseTest.java @@ -7,13 +7,12 @@ */ package com.zsmartsystems.zigbee.dongle.ember.ezsp.command; -import static org.junit.Assert.assertEquals; +import static org.junit.jupiter.api.Assertions.assertEquals; -import org.junit.Test; +import org.junit.jupiter.api.Test; import com.zsmartsystems.zigbee.dongle.ember.ezsp.EzspFrame; import com.zsmartsystems.zigbee.dongle.ember.ezsp.EzspFrameTest; -import com.zsmartsystems.zigbee.dongle.ember.ezsp.command.EzspStackStatusHandler; import com.zsmartsystems.zigbee.dongle.ember.ezsp.structure.EmberStatus; /** diff --git a/com.zsmartsystems.zigbee.dongle.ember/src/test/java/com/zsmartsystems/zigbee/dongle/ember/ezsp/command/EzspStartScanRequestTest.java b/com.zsmartsystems.zigbee.dongle.ember/src/test/java/com/zsmartsystems/zigbee/dongle/ember/ezsp/command/EzspStartScanRequestTest.java index 8c523a7fe..e36b19db0 100644 --- a/com.zsmartsystems.zigbee.dongle.ember/src/test/java/com/zsmartsystems/zigbee/dongle/ember/ezsp/command/EzspStartScanRequestTest.java +++ b/com.zsmartsystems.zigbee.dongle.ember/src/test/java/com/zsmartsystems/zigbee/dongle/ember/ezsp/command/EzspStartScanRequestTest.java @@ -7,11 +7,11 @@ */ package com.zsmartsystems.zigbee.dongle.ember.ezsp.command; -import static org.junit.Assert.assertTrue; +import static org.junit.jupiter.api.Assertions.assertTrue; import java.util.Arrays; -import org.junit.Test; +import org.junit.jupiter.api.Test; import com.zsmartsystems.zigbee.TestUtilities; import com.zsmartsystems.zigbee.ZigBeeChannelMask; diff --git a/com.zsmartsystems.zigbee.dongle.ember/src/test/java/com/zsmartsystems/zigbee/dongle/ember/ezsp/command/EzspStartScanResponseTest.java b/com.zsmartsystems.zigbee.dongle.ember/src/test/java/com/zsmartsystems/zigbee/dongle/ember/ezsp/command/EzspStartScanResponseTest.java index e6899a201..20ac4da62 100644 --- a/com.zsmartsystems.zigbee.dongle.ember/src/test/java/com/zsmartsystems/zigbee/dongle/ember/ezsp/command/EzspStartScanResponseTest.java +++ b/com.zsmartsystems.zigbee.dongle.ember/src/test/java/com/zsmartsystems/zigbee/dongle/ember/ezsp/command/EzspStartScanResponseTest.java @@ -7,14 +7,12 @@ */ package com.zsmartsystems.zigbee.dongle.ember.ezsp.command; -import static org.junit.Assert.assertEquals; +import static org.junit.jupiter.api.Assertions.assertEquals; -import org.junit.Test; +import org.junit.jupiter.api.Test; import com.zsmartsystems.zigbee.dongle.ember.ezsp.EzspFrame; import com.zsmartsystems.zigbee.dongle.ember.ezsp.EzspFrameTest; -import com.zsmartsystems.zigbee.dongle.ember.ezsp.command.EzspStartScanResponse; -import com.zsmartsystems.zigbee.dongle.ember.ezsp.command.EzspVersionResponse; import com.zsmartsystems.zigbee.dongle.ember.ezsp.structure.EmberStatus; /** diff --git a/com.zsmartsystems.zigbee.dongle.ember/src/test/java/com/zsmartsystems/zigbee/dongle/ember/ezsp/command/EzspVersionRequestTest.java b/com.zsmartsystems.zigbee.dongle.ember/src/test/java/com/zsmartsystems/zigbee/dongle/ember/ezsp/command/EzspVersionRequestTest.java index cf23d880e..eead2105a 100644 --- a/com.zsmartsystems.zigbee.dongle.ember/src/test/java/com/zsmartsystems/zigbee/dongle/ember/ezsp/command/EzspVersionRequestTest.java +++ b/com.zsmartsystems.zigbee.dongle.ember/src/test/java/com/zsmartsystems/zigbee/dongle/ember/ezsp/command/EzspVersionRequestTest.java @@ -7,11 +7,11 @@ */ package com.zsmartsystems.zigbee.dongle.ember.ezsp.command; -import static org.junit.Assert.assertTrue; +import static org.junit.jupiter.api.Assertions.assertTrue; import java.util.Arrays; -import org.junit.Test; +import org.junit.jupiter.api.Test; import com.zsmartsystems.zigbee.TestUtilities; import com.zsmartsystems.zigbee.dongle.ember.ezsp.EzspFrame; diff --git a/com.zsmartsystems.zigbee.dongle.ember/src/test/java/com/zsmartsystems/zigbee/dongle/ember/ezsp/command/EzspVersionResponseTest.java b/com.zsmartsystems.zigbee.dongle.ember/src/test/java/com/zsmartsystems/zigbee/dongle/ember/ezsp/command/EzspVersionResponseTest.java index c40733e9f..0e6274855 100644 --- a/com.zsmartsystems.zigbee.dongle.ember/src/test/java/com/zsmartsystems/zigbee/dongle/ember/ezsp/command/EzspVersionResponseTest.java +++ b/com.zsmartsystems.zigbee.dongle.ember/src/test/java/com/zsmartsystems/zigbee/dongle/ember/ezsp/command/EzspVersionResponseTest.java @@ -7,13 +7,12 @@ */ package com.zsmartsystems.zigbee.dongle.ember.ezsp.command; -import static org.junit.Assert.assertEquals; +import static org.junit.jupiter.api.Assertions.assertEquals; -import org.junit.Test; +import org.junit.jupiter.api.Test; import com.zsmartsystems.zigbee.dongle.ember.ezsp.EzspFrame; import com.zsmartsystems.zigbee.dongle.ember.ezsp.EzspFrameTest; -import com.zsmartsystems.zigbee.dongle.ember.ezsp.command.EzspVersionResponse; /** * diff --git a/com.zsmartsystems.zigbee.dongle.ember/src/test/java/com/zsmartsystems/zigbee/dongle/ember/internal/EmberFirmwareUpdateHandlerTest.java b/com.zsmartsystems.zigbee.dongle.ember/src/test/java/com/zsmartsystems/zigbee/dongle/ember/internal/EmberFirmwareUpdateHandlerTest.java index 0c939bb52..858ec9ab9 100644 --- a/com.zsmartsystems.zigbee.dongle.ember/src/test/java/com/zsmartsystems/zigbee/dongle/ember/internal/EmberFirmwareUpdateHandlerTest.java +++ b/com.zsmartsystems.zigbee.dongle.ember/src/test/java/com/zsmartsystems/zigbee/dongle/ember/internal/EmberFirmwareUpdateHandlerTest.java @@ -7,9 +7,9 @@ */ package com.zsmartsystems.zigbee.dongle.ember.internal; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertNotNull; -import static org.junit.Assert.assertTrue; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertNotNull; +import static org.junit.jupiter.api.Assertions.assertTrue; import java.io.ByteArrayInputStream; import java.io.File; @@ -21,7 +21,7 @@ import java.lang.reflect.Method; import java.util.Arrays; -import org.junit.Test; +import org.junit.jupiter.api.Test; import com.zsmartsystems.zigbee.transport.ZigBeePort; @@ -169,7 +169,7 @@ public void write(int value) { @Override public void write(int[] bytes) { - for(int val : bytes) { + for (int val : bytes) { output[cnt++] = (byte) val; } } diff --git a/com.zsmartsystems.zigbee.dongle.ember/src/test/java/com/zsmartsystems/zigbee/dongle/ember/internal/ash/AshErrorCodeTest.java b/com.zsmartsystems.zigbee.dongle.ember/src/test/java/com/zsmartsystems/zigbee/dongle/ember/internal/ash/AshErrorCodeTest.java index 123f947ed..a92a87095 100644 --- a/com.zsmartsystems.zigbee.dongle.ember/src/test/java/com/zsmartsystems/zigbee/dongle/ember/internal/ash/AshErrorCodeTest.java +++ b/com.zsmartsystems.zigbee.dongle.ember/src/test/java/com/zsmartsystems/zigbee/dongle/ember/internal/ash/AshErrorCodeTest.java @@ -7,11 +7,9 @@ */ package com.zsmartsystems.zigbee.dongle.ember.internal.ash; -import static org.junit.Assert.assertEquals; +import static org.junit.jupiter.api.Assertions.assertEquals; -import org.junit.Test; - -import com.zsmartsystems.zigbee.dongle.ember.internal.ash.AshErrorCode; +import org.junit.jupiter.api.Test; /** * diff --git a/com.zsmartsystems.zigbee.dongle.ember/src/test/java/com/zsmartsystems/zigbee/dongle/ember/internal/ash/AshFrameAckTest.java b/com.zsmartsystems.zigbee.dongle.ember/src/test/java/com/zsmartsystems/zigbee/dongle/ember/internal/ash/AshFrameAckTest.java index 69fd1a03b..2aff6d761 100644 --- a/com.zsmartsystems.zigbee.dongle.ember/src/test/java/com/zsmartsystems/zigbee/dongle/ember/internal/ash/AshFrameAckTest.java +++ b/com.zsmartsystems.zigbee.dongle.ember/src/test/java/com/zsmartsystems/zigbee/dongle/ember/internal/ash/AshFrameAckTest.java @@ -7,12 +7,12 @@ */ package com.zsmartsystems.zigbee.dongle.ember.internal.ash; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertTrue; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertTrue; import java.util.Arrays; -import org.junit.Test; +import org.junit.jupiter.api.Test; /** * diff --git a/com.zsmartsystems.zigbee.dongle.ember/src/test/java/com/zsmartsystems/zigbee/dongle/ember/internal/ash/AshFrameDataTest.java b/com.zsmartsystems.zigbee.dongle.ember/src/test/java/com/zsmartsystems/zigbee/dongle/ember/internal/ash/AshFrameDataTest.java index c7a78048b..3b39781f8 100644 --- a/com.zsmartsystems.zigbee.dongle.ember/src/test/java/com/zsmartsystems/zigbee/dongle/ember/internal/ash/AshFrameDataTest.java +++ b/com.zsmartsystems.zigbee.dongle.ember/src/test/java/com/zsmartsystems/zigbee/dongle/ember/internal/ash/AshFrameDataTest.java @@ -7,12 +7,12 @@ */ package com.zsmartsystems.zigbee.dongle.ember.internal.ash; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertTrue; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertTrue; import java.util.Arrays; -import org.junit.Test; +import org.junit.jupiter.api.Test; import com.zsmartsystems.zigbee.TestUtilities; import com.zsmartsystems.zigbee.dongle.ember.ezsp.EzspFrame; diff --git a/com.zsmartsystems.zigbee.dongle.ember/src/test/java/com/zsmartsystems/zigbee/dongle/ember/internal/ash/AshFrameHandlerTest.java b/com.zsmartsystems.zigbee.dongle.ember/src/test/java/com/zsmartsystems/zigbee/dongle/ember/internal/ash/AshFrameHandlerTest.java index 269b068bf..c3bd14e8d 100644 --- a/com.zsmartsystems.zigbee.dongle.ember/src/test/java/com/zsmartsystems/zigbee/dongle/ember/internal/ash/AshFrameHandlerTest.java +++ b/com.zsmartsystems.zigbee.dongle.ember/src/test/java/com/zsmartsystems/zigbee/dongle/ember/internal/ash/AshFrameHandlerTest.java @@ -7,11 +7,11 @@ */ package com.zsmartsystems.zigbee.dongle.ember.internal.ash; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertFalse; -import static org.junit.Assert.assertNotNull; -import static org.junit.Assert.assertNull; -import static org.junit.Assert.assertTrue; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertFalse; +import static org.junit.jupiter.api.Assertions.assertNotNull; +import static org.junit.jupiter.api.Assertions.assertNull; +import static org.junit.jupiter.api.Assertions.assertTrue; import java.io.ByteArrayInputStream; import java.io.IOException; @@ -24,7 +24,7 @@ import java.util.List; import java.util.Map; -import org.junit.Test; +import org.junit.jupiter.api.Test; import org.mockito.Mockito; import com.zsmartsystems.zigbee.TestUtilities; diff --git a/com.zsmartsystems.zigbee.dongle.ember/src/test/java/com/zsmartsystems/zigbee/dongle/ember/internal/ash/AshFrameNakTest.java b/com.zsmartsystems.zigbee.dongle.ember/src/test/java/com/zsmartsystems/zigbee/dongle/ember/internal/ash/AshFrameNakTest.java index f801868e3..f282499f6 100644 --- a/com.zsmartsystems.zigbee.dongle.ember/src/test/java/com/zsmartsystems/zigbee/dongle/ember/internal/ash/AshFrameNakTest.java +++ b/com.zsmartsystems.zigbee.dongle.ember/src/test/java/com/zsmartsystems/zigbee/dongle/ember/internal/ash/AshFrameNakTest.java @@ -7,11 +7,11 @@ */ package com.zsmartsystems.zigbee.dongle.ember.internal.ash; -import static org.junit.Assert.assertTrue; +import static org.junit.jupiter.api.Assertions.assertTrue; import java.util.Arrays; -import org.junit.Test; +import org.junit.jupiter.api.Test; /** * diff --git a/com.zsmartsystems.zigbee.dongle.ember/src/test/java/com/zsmartsystems/zigbee/dongle/ember/internal/ash/AshFrameRstTest.java b/com.zsmartsystems.zigbee.dongle.ember/src/test/java/com/zsmartsystems/zigbee/dongle/ember/internal/ash/AshFrameRstTest.java index 2486c68b1..77bff47ee 100644 --- a/com.zsmartsystems.zigbee.dongle.ember/src/test/java/com/zsmartsystems/zigbee/dongle/ember/internal/ash/AshFrameRstTest.java +++ b/com.zsmartsystems.zigbee.dongle.ember/src/test/java/com/zsmartsystems/zigbee/dongle/ember/internal/ash/AshFrameRstTest.java @@ -7,11 +7,11 @@ */ package com.zsmartsystems.zigbee.dongle.ember.internal.ash; -import static org.junit.Assert.assertTrue; +import static org.junit.jupiter.api.Assertions.assertTrue; import java.util.Arrays; -import org.junit.Test; +import org.junit.jupiter.api.Test; /** * diff --git a/com.zsmartsystems.zigbee.dongle.ember/src/test/java/com/zsmartsystems/zigbee/dongle/ember/internal/ash/AshFrameTest.java b/com.zsmartsystems.zigbee.dongle.ember/src/test/java/com/zsmartsystems/zigbee/dongle/ember/internal/ash/AshFrameTest.java index 66dc22756..3a3d3744c 100644 --- a/com.zsmartsystems.zigbee.dongle.ember/src/test/java/com/zsmartsystems/zigbee/dongle/ember/internal/ash/AshFrameTest.java +++ b/com.zsmartsystems.zigbee.dongle.ember/src/test/java/com/zsmartsystems/zigbee/dongle/ember/internal/ash/AshFrameTest.java @@ -7,13 +7,13 @@ */ package com.zsmartsystems.zigbee.dongle.ember.internal.ash; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertNotNull; -import static org.junit.Assert.assertTrue; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertNotNull; +import static org.junit.jupiter.api.Assertions.assertTrue; import java.util.Arrays; -import org.junit.Test; +import org.junit.jupiter.api.Test; public class AshFrameTest { diff --git a/com.zsmartsystems.zigbee.dongle.ember/src/test/java/com/zsmartsystems/zigbee/dongle/ember/internal/serializer/EzspSerializerTest.java b/com.zsmartsystems.zigbee.dongle.ember/src/test/java/com/zsmartsystems/zigbee/dongle/ember/internal/serializer/EzspSerializerTest.java index 938406cbb..9a64ef41d 100644 --- a/com.zsmartsystems.zigbee.dongle.ember/src/test/java/com/zsmartsystems/zigbee/dongle/ember/internal/serializer/EzspSerializerTest.java +++ b/com.zsmartsystems.zigbee.dongle.ember/src/test/java/com/zsmartsystems/zigbee/dongle/ember/internal/serializer/EzspSerializerTest.java @@ -7,13 +7,13 @@ */ package com.zsmartsystems.zigbee.dongle.ember.internal.serializer; -import static org.junit.Assert.assertTrue; +import static org.junit.jupiter.api.Assertions.assertTrue; import java.util.Arrays; import java.util.HashSet; import java.util.Set; -import org.junit.Test; +import org.junit.jupiter.api.Test; import com.zsmartsystems.zigbee.dongle.ember.ezsp.structure.EmberInitialSecurityBitmask; diff --git a/com.zsmartsystems.zigbee.dongle.ember/src/test/java/com/zsmartsystems/zigbee/dongle/ember/internal/spi/SpiFrameHandlerTest.java b/com.zsmartsystems.zigbee.dongle.ember/src/test/java/com/zsmartsystems/zigbee/dongle/ember/internal/spi/SpiFrameHandlerTest.java index 09073be81..6e04a16ad 100644 --- a/com.zsmartsystems.zigbee.dongle.ember/src/test/java/com/zsmartsystems/zigbee/dongle/ember/internal/spi/SpiFrameHandlerTest.java +++ b/com.zsmartsystems.zigbee.dongle.ember/src/test/java/com/zsmartsystems/zigbee/dongle/ember/internal/spi/SpiFrameHandlerTest.java @@ -7,10 +7,10 @@ */ package com.zsmartsystems.zigbee.dongle.ember.internal.spi; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertFalse; -import static org.junit.Assert.assertNotNull; -import static org.junit.Assert.assertTrue; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertFalse; +import static org.junit.jupiter.api.Assertions.assertNotNull; +import static org.junit.jupiter.api.Assertions.assertTrue; import java.io.ByteArrayInputStream; import java.io.IOException; @@ -22,7 +22,7 @@ import java.util.ArrayList; import java.util.List; -import org.junit.Test; +import org.junit.jupiter.api.Test; import org.mockito.ArgumentCaptor; import org.mockito.Mockito; @@ -322,7 +322,7 @@ public void write(int value) { @Override public void write(int[] bytes) { - for(int val : bytes) { + for (int val : bytes) { portOutData.add(val); } } diff --git a/com.zsmartsystems.zigbee.dongle.ember/src/test/java/com/zsmartsystems/zigbee/dongle/ember/internal/transaction/EzspMultiResponseTransactionTest.java b/com.zsmartsystems.zigbee.dongle.ember/src/test/java/com/zsmartsystems/zigbee/dongle/ember/internal/transaction/EzspMultiResponseTransactionTest.java index c08c9d8bb..385942088 100644 --- a/com.zsmartsystems.zigbee.dongle.ember/src/test/java/com/zsmartsystems/zigbee/dongle/ember/internal/transaction/EzspMultiResponseTransactionTest.java +++ b/com.zsmartsystems.zigbee.dongle.ember/src/test/java/com/zsmartsystems/zigbee/dongle/ember/internal/transaction/EzspMultiResponseTransactionTest.java @@ -7,15 +7,15 @@ */ package com.zsmartsystems.zigbee.dongle.ember.internal.transaction; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertFalse; -import static org.junit.Assert.assertTrue; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertFalse; +import static org.junit.jupiter.api.Assertions.assertTrue; import java.util.Arrays; import java.util.HashSet; import java.util.Set; -import org.junit.Test; +import org.junit.jupiter.api.Test; import com.zsmartsystems.zigbee.ZigBeeChannelMask; import com.zsmartsystems.zigbee.dongle.ember.ezsp.EzspFrameTest; @@ -26,7 +26,6 @@ import com.zsmartsystems.zigbee.dongle.ember.ezsp.command.EzspStartScanResponse; import com.zsmartsystems.zigbee.dongle.ember.ezsp.structure.EmberStatus; import com.zsmartsystems.zigbee.dongle.ember.ezsp.structure.EzspNetworkScanType; -import com.zsmartsystems.zigbee.dongle.ember.internal.transaction.EzspMultiResponseTransaction; /** * diff --git a/com.zsmartsystems.zigbee.dongle.ember/src/test/java/com/zsmartsystems/zigbee/dongle/ember/internal/transaction/EzspScanTransactionTest.java b/com.zsmartsystems.zigbee.dongle.ember/src/test/java/com/zsmartsystems/zigbee/dongle/ember/internal/transaction/EzspScanTransactionTest.java index ae7472858..89ab590f8 100644 --- a/com.zsmartsystems.zigbee.dongle.ember/src/test/java/com/zsmartsystems/zigbee/dongle/ember/internal/transaction/EzspScanTransactionTest.java +++ b/com.zsmartsystems.zigbee.dongle.ember/src/test/java/com/zsmartsystems/zigbee/dongle/ember/internal/transaction/EzspScanTransactionTest.java @@ -7,15 +7,15 @@ */ package com.zsmartsystems.zigbee.dongle.ember.internal.transaction; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertFalse; -import static org.junit.Assert.assertTrue; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertFalse; +import static org.junit.jupiter.api.Assertions.assertTrue; import java.util.Arrays; import java.util.HashSet; import java.util.Set; -import org.junit.Test; +import org.junit.jupiter.api.Test; import com.zsmartsystems.zigbee.TestUtilities; import com.zsmartsystems.zigbee.ZigBeeChannelMask; diff --git a/com.zsmartsystems.zigbee.dongle.ember/src/test/java/com/zsmartsystems/zigbee/dongle/ember/internal/transaction/EzspSingleResponseTransactionTest.java b/com.zsmartsystems.zigbee.dongle.ember/src/test/java/com/zsmartsystems/zigbee/dongle/ember/internal/transaction/EzspSingleResponseTransactionTest.java index 39659b535..b67d55072 100644 --- a/com.zsmartsystems.zigbee.dongle.ember/src/test/java/com/zsmartsystems/zigbee/dongle/ember/internal/transaction/EzspSingleResponseTransactionTest.java +++ b/com.zsmartsystems.zigbee.dongle.ember/src/test/java/com/zsmartsystems/zigbee/dongle/ember/internal/transaction/EzspSingleResponseTransactionTest.java @@ -7,13 +7,13 @@ */ package com.zsmartsystems.zigbee.dongle.ember.internal.transaction; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertFalse; -import static org.junit.Assert.assertNotNull; -import static org.junit.Assert.assertNull; -import static org.junit.Assert.assertTrue; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertFalse; +import static org.junit.jupiter.api.Assertions.assertNotNull; +import static org.junit.jupiter.api.Assertions.assertNull; +import static org.junit.jupiter.api.Assertions.assertTrue; -import org.junit.Test; +import org.junit.jupiter.api.Test; import com.zsmartsystems.zigbee.TestUtilities; import com.zsmartsystems.zigbee.dongle.ember.ezsp.EzspFrame; diff --git a/com.zsmartsystems.zigbee.dongle.telegesis/src/test/java/com/zsmartsystems/zigbee/dongle/telegesis/ZigBeeDongleTelegesisTest.java b/com.zsmartsystems.zigbee.dongle.telegesis/src/test/java/com/zsmartsystems/zigbee/dongle/telegesis/ZigBeeDongleTelegesisTest.java index 0490b7d08..141822906 100644 --- a/com.zsmartsystems.zigbee.dongle.telegesis/src/test/java/com/zsmartsystems/zigbee/dongle/telegesis/ZigBeeDongleTelegesisTest.java +++ b/com.zsmartsystems.zigbee.dongle.telegesis/src/test/java/com/zsmartsystems/zigbee/dongle/telegesis/ZigBeeDongleTelegesisTest.java @@ -7,13 +7,13 @@ */ package com.zsmartsystems.zigbee.dongle.telegesis; -import static org.junit.Assert.assertEquals; +import static org.junit.jupiter.api.Assertions.assertEquals; import static org.mockito.ArgumentMatchers.any; import java.util.Map; import java.util.concurrent.ConcurrentHashMap; -import org.junit.Test; +import org.junit.jupiter.api.Test; import org.mockito.ArgumentMatchers; import org.mockito.Mockito; import org.mockito.invocation.InvocationOnMock; @@ -327,7 +327,7 @@ public TelegesisStatusCode answer(InvocationOnMock invocation) return TelegesisStatusCode.SUCCESS; } }).when(handler).sendRequest(ArgumentMatchers.any(TelegesisDisplayNetworkInformationCommand.class)); - + ZigBeeStatus status = dongle.startup(false); assertEquals(ZigBeeStatus.NO_NETWORK, status); diff --git a/com.zsmartsystems.zigbee.dongle.telegesis/src/test/java/com/zsmartsystems/zigbee/dongle/telegesis/internal/TelegesisEventFactoryTest.java b/com.zsmartsystems.zigbee.dongle.telegesis/src/test/java/com/zsmartsystems/zigbee/dongle/telegesis/internal/TelegesisEventFactoryTest.java index af18ab685..42125356c 100644 --- a/com.zsmartsystems.zigbee.dongle.telegesis/src/test/java/com/zsmartsystems/zigbee/dongle/telegesis/internal/TelegesisEventFactoryTest.java +++ b/com.zsmartsystems.zigbee.dongle.telegesis/src/test/java/com/zsmartsystems/zigbee/dongle/telegesis/internal/TelegesisEventFactoryTest.java @@ -7,10 +7,10 @@ */ package com.zsmartsystems.zigbee.dongle.telegesis.internal; -import static org.junit.Assert.assertNull; -import static org.junit.Assert.assertTrue; +import static org.junit.jupiter.api.Assertions.assertNull; +import static org.junit.jupiter.api.Assertions.assertTrue; -import org.junit.Test; +import org.junit.jupiter.api.Test; import com.zsmartsystems.zigbee.dongle.telegesis.internal.protocol.TelegesisDeviceLeftNetworkEvent; import com.zsmartsystems.zigbee.dongle.telegesis.internal.protocol.TelegesisEvent; diff --git a/com.zsmartsystems.zigbee.dongle.telegesis/src/test/java/com/zsmartsystems/zigbee/dongle/telegesis/internal/TelegesisFirmwareUpdateHandlerTest.java b/com.zsmartsystems.zigbee.dongle.telegesis/src/test/java/com/zsmartsystems/zigbee/dongle/telegesis/internal/TelegesisFirmwareUpdateHandlerTest.java index b7c5901f6..526215beb 100644 --- a/com.zsmartsystems.zigbee.dongle.telegesis/src/test/java/com/zsmartsystems/zigbee/dongle/telegesis/internal/TelegesisFirmwareUpdateHandlerTest.java +++ b/com.zsmartsystems.zigbee.dongle.telegesis/src/test/java/com/zsmartsystems/zigbee/dongle/telegesis/internal/TelegesisFirmwareUpdateHandlerTest.java @@ -7,9 +7,9 @@ */ package com.zsmartsystems.zigbee.dongle.telegesis.internal; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertNotNull; -import static org.junit.Assert.assertTrue; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertNotNull; +import static org.junit.jupiter.api.Assertions.assertTrue; import java.io.ByteArrayInputStream; import java.io.File; @@ -21,7 +21,7 @@ import java.lang.reflect.Method; import java.util.Arrays; -import org.junit.Test; +import org.junit.jupiter.api.Test; import com.zsmartsystems.zigbee.transport.ZigBeePort; @@ -170,7 +170,7 @@ public void write(int value) { @Override public void write(int[] bytes) { - for(int val : bytes) { + for (int val : bytes) { output[cnt++] = (byte) val; } } diff --git a/com.zsmartsystems.zigbee.dongle.telegesis/src/test/java/com/zsmartsystems/zigbee/dongle/telegesis/internal/TelegesisFrameHandlerTest.java b/com.zsmartsystems.zigbee.dongle.telegesis/src/test/java/com/zsmartsystems/zigbee/dongle/telegesis/internal/TelegesisFrameHandlerTest.java index 096010828..f83a4c0e9 100644 --- a/com.zsmartsystems.zigbee.dongle.telegesis/src/test/java/com/zsmartsystems/zigbee/dongle/telegesis/internal/TelegesisFrameHandlerTest.java +++ b/com.zsmartsystems.zigbee.dongle.telegesis/src/test/java/com/zsmartsystems/zigbee/dongle/telegesis/internal/TelegesisFrameHandlerTest.java @@ -7,10 +7,10 @@ */ package com.zsmartsystems.zigbee.dongle.telegesis.internal; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertFalse; -import static org.junit.Assert.assertNotNull; -import static org.junit.Assert.assertTrue; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertFalse; +import static org.junit.jupiter.api.Assertions.assertNotNull; +import static org.junit.jupiter.api.Assertions.assertTrue; import java.io.ByteArrayInputStream; import java.io.IOException; @@ -19,18 +19,12 @@ import java.lang.reflect.Field; import java.lang.reflect.InvocationTargetException; import java.lang.reflect.Method; -import java.util.ArrayList; -import java.util.List; -import org.junit.Ignore; -import org.junit.Test; +import org.junit.jupiter.api.Test; import org.mockito.Mockito; import com.zsmartsystems.zigbee.dongle.telegesis.ZigBeeDongleTelegesis; -import com.zsmartsystems.zigbee.dongle.telegesis.internal.protocol.TelegesisEvent; -import com.zsmartsystems.zigbee.dongle.telegesis.internal.protocol.TelegesisNetworkLostEvent; import com.zsmartsystems.zigbee.dongle.telegesis.internal.protocol.TelegesisSetRegisterBitCommand; -import com.zsmartsystems.zigbee.dongle.telegesis.internal.protocol.TelegesisSleepyDeviceAnnounceEvent; import com.zsmartsystems.zigbee.transport.ZigBeePort; /** @@ -117,47 +111,6 @@ public void testRunning() { assertFalse(frameHandler.isAlive()); } - @Ignore - @Test - public void testRetriesReset() { - // Initialise mock - ZigBeeDongleTelegesis dongle = Mockito.mock(ZigBeeDongleTelegesis.class); - TelegesisFrameHandler frameHandler = new TelegesisFrameHandler(dongle); - frameHandler.setCommandTimeout(500); - - // Accept calls and monitor the time, when the call has been made - ZigBeePort serialPort = Mockito.mock(ZigBeePort.class); - - // Repeat whenever processed[0] == false, only give response if respond[0] == true - boolean[] processed = new boolean[] { false }; - boolean[] respond = new boolean[] { false }; - int[] call = new int[] { 0 }; - String response = "OK" + CRLF; - Mockito.when(serialPort.read()).thenAnswer(invocationCall -> { - if (!respond[0] || processed[0]) { - return -1; - } - processed[0] |= call[0] % response.length() == response.length() - 1; - return (int) response.getBytes()[call[0]++ % response.length()]; - }); - - frameHandler.start(serialPort); - - // Repeat the task four times, with timeouts after every second. Retries should be reset after each round - for (int i = 0; i < 3; i++) { - respond[0] = false; - sendCommandAndWait(frameHandler, processed, respond); - respond[0] = true; - sendCommandAndWait(frameHandler, processed, respond); - } - - Mockito.verify(dongle, Mockito.times(0)).notifyStateUpdate(false); - - assertTrue(frameHandler.isAlive()); - frameHandler.close(); - assertFalse(frameHandler.isAlive()); - } - @Test public void testRetriesExceeded() { // Initialise mock @@ -195,52 +148,6 @@ public void testReceivePacket_SReg_Binary_Issue() { assertEquals('A', response[0]); } - @Ignore - @Test - public void testEventWait() { - final TelegesisFrameHandler frameHandler = new TelegesisFrameHandler(null); - - final List eventCapture = new ArrayList(); - - Thread waitThread = new Thread() { - @Override - public void run() { - // Send the transaction and wait for the response - eventCapture.add(frameHandler.eventWait(TelegesisSleepyDeviceAnnounceEvent.class)); - synchronized (eventCapture) { - eventCapture.notify(); - } - } - }; - - waitThread.start(); - - TelegesisEvent eventOk = new TelegesisSleepyDeviceAnnounceEvent(); - TelegesisEvent eventNOk = new TelegesisNetworkLostEvent(); - try { - Method privateMethod; - try { - privateMethod = TelegesisFrameHandler.class.getDeclaredMethod("notifyEventReceived", - new Class[] { TelegesisEvent.class }); - privateMethod.setAccessible(true); - - privateMethod.invoke(frameHandler, eventNOk); - privateMethod.invoke(frameHandler, eventOk); - } catch (NoSuchMethodException | SecurityException | IllegalArgumentException | IllegalAccessException - | InvocationTargetException e) { - e.printStackTrace(); - } - - synchronized (eventCapture) { - eventCapture.wait(1000); - } - } catch (InterruptedException e) { - e.printStackTrace(); - } - - assertEquals(1, eventCapture.size()); - } - /** * Helper Method to send a command to the frameHandler and wait, till the getPacket() method may have read it * diff --git a/com.zsmartsystems.zigbee.dongle.telegesis/src/test/java/com/zsmartsystems/zigbee/dongle/telegesis/internal/protocol/TelegesisAckMessageEventTest.java b/com.zsmartsystems.zigbee.dongle.telegesis/src/test/java/com/zsmartsystems/zigbee/dongle/telegesis/internal/protocol/TelegesisAckMessageEventTest.java index 74f40f7d0..768f14a84 100644 --- a/com.zsmartsystems.zigbee.dongle.telegesis/src/test/java/com/zsmartsystems/zigbee/dongle/telegesis/internal/protocol/TelegesisAckMessageEventTest.java +++ b/com.zsmartsystems.zigbee.dongle.telegesis/src/test/java/com/zsmartsystems/zigbee/dongle/telegesis/internal/protocol/TelegesisAckMessageEventTest.java @@ -7,9 +7,9 @@ */ package com.zsmartsystems.zigbee.dongle.telegesis.internal.protocol; -import static org.junit.Assert.assertEquals; +import static org.junit.jupiter.api.Assertions.assertEquals; -import org.junit.Test; +import org.junit.jupiter.api.Test; /** * diff --git a/com.zsmartsystems.zigbee.dongle.telegesis/src/test/java/com/zsmartsystems/zigbee/dongle/telegesis/internal/protocol/TelegesisActiveScanCommandTest.java b/com.zsmartsystems.zigbee.dongle.telegesis/src/test/java/com/zsmartsystems/zigbee/dongle/telegesis/internal/protocol/TelegesisActiveScanCommandTest.java index 886aeb40d..c5c4690fb 100644 --- a/com.zsmartsystems.zigbee.dongle.telegesis/src/test/java/com/zsmartsystems/zigbee/dongle/telegesis/internal/protocol/TelegesisActiveScanCommandTest.java +++ b/com.zsmartsystems.zigbee.dongle.telegesis/src/test/java/com/zsmartsystems/zigbee/dongle/telegesis/internal/protocol/TelegesisActiveScanCommandTest.java @@ -7,11 +7,11 @@ */ package com.zsmartsystems.zigbee.dongle.telegesis.internal.protocol; -import static org.junit.Assert.assertEquals; +import static org.junit.jupiter.api.Assertions.assertEquals; import java.util.Iterator; -import org.junit.Test; +import org.junit.jupiter.api.Test; import com.zsmartsystems.zigbee.ExtendedPanId; import com.zsmartsystems.zigbee.dongle.telegesis.internal.protocol.TelegesisActiveScanCommand.ScanResult; diff --git a/com.zsmartsystems.zigbee.dongle.telegesis/src/test/java/com/zsmartsystems/zigbee/dongle/telegesis/internal/protocol/TelegesisBootloadCommandTest.java b/com.zsmartsystems.zigbee.dongle.telegesis/src/test/java/com/zsmartsystems/zigbee/dongle/telegesis/internal/protocol/TelegesisBootloadCommandTest.java index b941be1fc..e2848983e 100644 --- a/com.zsmartsystems.zigbee.dongle.telegesis/src/test/java/com/zsmartsystems/zigbee/dongle/telegesis/internal/protocol/TelegesisBootloadCommandTest.java +++ b/com.zsmartsystems.zigbee.dongle.telegesis/src/test/java/com/zsmartsystems/zigbee/dongle/telegesis/internal/protocol/TelegesisBootloadCommandTest.java @@ -7,10 +7,10 @@ */ package com.zsmartsystems.zigbee.dongle.telegesis.internal.protocol; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertTrue; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertTrue; -import org.junit.Test; +import org.junit.jupiter.api.Test; /** * diff --git a/com.zsmartsystems.zigbee.dongle.telegesis/src/test/java/com/zsmartsystems/zigbee/dongle/telegesis/internal/protocol/TelegesisChangeChannelCommandTest.java b/com.zsmartsystems.zigbee.dongle.telegesis/src/test/java/com/zsmartsystems/zigbee/dongle/telegesis/internal/protocol/TelegesisChangeChannelCommandTest.java index ff08d61b9..9e64a66bc 100644 --- a/com.zsmartsystems.zigbee.dongle.telegesis/src/test/java/com/zsmartsystems/zigbee/dongle/telegesis/internal/protocol/TelegesisChangeChannelCommandTest.java +++ b/com.zsmartsystems.zigbee.dongle.telegesis/src/test/java/com/zsmartsystems/zigbee/dongle/telegesis/internal/protocol/TelegesisChangeChannelCommandTest.java @@ -7,9 +7,10 @@ */ package com.zsmartsystems.zigbee.dongle.telegesis.internal.protocol; -import static org.junit.Assert.assertEquals; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertThrows; -import org.junit.Test; +import org.junit.jupiter.api.Test; /** * @@ -17,16 +18,20 @@ * */ public class TelegesisChangeChannelCommandTest extends TelegesisFrameBaseTest { - @Test(expected = IllegalArgumentException.class) + @Test public void testChannelLow() { TelegesisChangeChannelCommand command = new TelegesisChangeChannelCommand(); - command.setChannel(10); + assertThrows(IllegalArgumentException.class, () -> { + command.setChannel(10); + }); } - @Test(expected = IllegalArgumentException.class) + @Test public void testChannelHigh() { TelegesisChangeChannelCommand command = new TelegesisChangeChannelCommand(); - command.setChannel(27); + assertThrows(IllegalArgumentException.class, () -> { + command.setChannel(27); + }); } @Test diff --git a/com.zsmartsystems.zigbee.dongle.telegesis/src/test/java/com/zsmartsystems/zigbee/dongle/telegesis/internal/protocol/TelegesisCreatePanCommandTest.java b/com.zsmartsystems.zigbee.dongle.telegesis/src/test/java/com/zsmartsystems/zigbee/dongle/telegesis/internal/protocol/TelegesisCreatePanCommandTest.java index f5a156298..8153356b3 100644 --- a/com.zsmartsystems.zigbee.dongle.telegesis/src/test/java/com/zsmartsystems/zigbee/dongle/telegesis/internal/protocol/TelegesisCreatePanCommandTest.java +++ b/com.zsmartsystems.zigbee.dongle.telegesis/src/test/java/com/zsmartsystems/zigbee/dongle/telegesis/internal/protocol/TelegesisCreatePanCommandTest.java @@ -7,9 +7,9 @@ */ package com.zsmartsystems.zigbee.dongle.telegesis.internal.protocol; -import static org.junit.Assert.assertEquals; +import static org.junit.jupiter.api.Assertions.assertEquals; -import org.junit.Test; +import org.junit.jupiter.api.Test; /** * diff --git a/com.zsmartsystems.zigbee.dongle.telegesis/src/test/java/com/zsmartsystems/zigbee/dongle/telegesis/internal/protocol/TelegesisDeviceJoinedNetworkEventTest.java b/com.zsmartsystems.zigbee.dongle.telegesis/src/test/java/com/zsmartsystems/zigbee/dongle/telegesis/internal/protocol/TelegesisDeviceJoinedNetworkEventTest.java index 5afd45455..642287c5a 100644 --- a/com.zsmartsystems.zigbee.dongle.telegesis/src/test/java/com/zsmartsystems/zigbee/dongle/telegesis/internal/protocol/TelegesisDeviceJoinedNetworkEventTest.java +++ b/com.zsmartsystems.zigbee.dongle.telegesis/src/test/java/com/zsmartsystems/zigbee/dongle/telegesis/internal/protocol/TelegesisDeviceJoinedNetworkEventTest.java @@ -7,9 +7,9 @@ */ package com.zsmartsystems.zigbee.dongle.telegesis.internal.protocol; -import static org.junit.Assert.assertEquals; +import static org.junit.jupiter.api.Assertions.assertEquals; -import org.junit.Test; +import org.junit.jupiter.api.Test; import com.zsmartsystems.zigbee.IeeeAddress; diff --git a/com.zsmartsystems.zigbee.dongle.telegesis/src/test/java/com/zsmartsystems/zigbee/dongle/telegesis/internal/protocol/TelegesisDeviceLeftNetworkEventTest.java b/com.zsmartsystems.zigbee.dongle.telegesis/src/test/java/com/zsmartsystems/zigbee/dongle/telegesis/internal/protocol/TelegesisDeviceLeftNetworkEventTest.java index eb7977769..c86c3fcd5 100644 --- a/com.zsmartsystems.zigbee.dongle.telegesis/src/test/java/com/zsmartsystems/zigbee/dongle/telegesis/internal/protocol/TelegesisDeviceLeftNetworkEventTest.java +++ b/com.zsmartsystems.zigbee.dongle.telegesis/src/test/java/com/zsmartsystems/zigbee/dongle/telegesis/internal/protocol/TelegesisDeviceLeftNetworkEventTest.java @@ -7,9 +7,9 @@ */ package com.zsmartsystems.zigbee.dongle.telegesis.internal.protocol; -import static org.junit.Assert.assertEquals; +import static org.junit.jupiter.api.Assertions.assertEquals; -import org.junit.Test; +import org.junit.jupiter.api.Test; import com.zsmartsystems.zigbee.IeeeAddress; diff --git a/com.zsmartsystems.zigbee.dongle.telegesis/src/test/java/com/zsmartsystems/zigbee/dongle/telegesis/internal/protocol/TelegesisDisallowTcJoinCommandTest.java b/com.zsmartsystems.zigbee.dongle.telegesis/src/test/java/com/zsmartsystems/zigbee/dongle/telegesis/internal/protocol/TelegesisDisallowTcJoinCommandTest.java index 8aae42d0b..56940a893 100644 --- a/com.zsmartsystems.zigbee.dongle.telegesis/src/test/java/com/zsmartsystems/zigbee/dongle/telegesis/internal/protocol/TelegesisDisallowTcJoinCommandTest.java +++ b/com.zsmartsystems.zigbee.dongle.telegesis/src/test/java/com/zsmartsystems/zigbee/dongle/telegesis/internal/protocol/TelegesisDisallowTcJoinCommandTest.java @@ -7,9 +7,9 @@ */ package com.zsmartsystems.zigbee.dongle.telegesis.internal.protocol; -import static org.junit.Assert.assertEquals; +import static org.junit.jupiter.api.Assertions.assertEquals; -import org.junit.Test; +import org.junit.jupiter.api.Test; /** * diff --git a/com.zsmartsystems.zigbee.dongle.telegesis/src/test/java/com/zsmartsystems/zigbee/dongle/telegesis/internal/protocol/TelegesisDisallowUnsecuredRejoinCommandTest.java b/com.zsmartsystems.zigbee.dongle.telegesis/src/test/java/com/zsmartsystems/zigbee/dongle/telegesis/internal/protocol/TelegesisDisallowUnsecuredRejoinCommandTest.java index cc45963f7..f44f1fd5b 100644 --- a/com.zsmartsystems.zigbee.dongle.telegesis/src/test/java/com/zsmartsystems/zigbee/dongle/telegesis/internal/protocol/TelegesisDisallowUnsecuredRejoinCommandTest.java +++ b/com.zsmartsystems.zigbee.dongle.telegesis/src/test/java/com/zsmartsystems/zigbee/dongle/telegesis/internal/protocol/TelegesisDisallowUnsecuredRejoinCommandTest.java @@ -7,9 +7,9 @@ */ package com.zsmartsystems.zigbee.dongle.telegesis.internal.protocol; -import static org.junit.Assert.assertEquals; +import static org.junit.jupiter.api.Assertions.assertEquals; -import org.junit.Test; +import org.junit.jupiter.api.Test; /** * diff --git a/com.zsmartsystems.zigbee.dongle.telegesis/src/test/java/com/zsmartsystems/zigbee/dongle/telegesis/internal/protocol/TelegesisDisplayNetworkInformationCommandTest.java b/com.zsmartsystems.zigbee.dongle.telegesis/src/test/java/com/zsmartsystems/zigbee/dongle/telegesis/internal/protocol/TelegesisDisplayNetworkInformationCommandTest.java index 79d8e3d04..143750d96 100644 --- a/com.zsmartsystems.zigbee.dongle.telegesis/src/test/java/com/zsmartsystems/zigbee/dongle/telegesis/internal/protocol/TelegesisDisplayNetworkInformationCommandTest.java +++ b/com.zsmartsystems.zigbee.dongle.telegesis/src/test/java/com/zsmartsystems/zigbee/dongle/telegesis/internal/protocol/TelegesisDisplayNetworkInformationCommandTest.java @@ -7,9 +7,9 @@ */ package com.zsmartsystems.zigbee.dongle.telegesis.internal.protocol; -import static org.junit.Assert.assertEquals; +import static org.junit.jupiter.api.Assertions.assertEquals; -import org.junit.Test; +import org.junit.jupiter.api.Test; import com.zsmartsystems.zigbee.ExtendedPanId; diff --git a/com.zsmartsystems.zigbee.dongle.telegesis/src/test/java/com/zsmartsystems/zigbee/dongle/telegesis/internal/protocol/TelegesisDisplayProductIdentificationCommandTest.java b/com.zsmartsystems.zigbee.dongle.telegesis/src/test/java/com/zsmartsystems/zigbee/dongle/telegesis/internal/protocol/TelegesisDisplayProductIdentificationCommandTest.java index cfba8910c..06a5898a2 100644 --- a/com.zsmartsystems.zigbee.dongle.telegesis/src/test/java/com/zsmartsystems/zigbee/dongle/telegesis/internal/protocol/TelegesisDisplayProductIdentificationCommandTest.java +++ b/com.zsmartsystems.zigbee.dongle.telegesis/src/test/java/com/zsmartsystems/zigbee/dongle/telegesis/internal/protocol/TelegesisDisplayProductIdentificationCommandTest.java @@ -7,11 +7,11 @@ */ package com.zsmartsystems.zigbee.dongle.telegesis.internal.protocol; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertFalse; -import static org.junit.Assert.assertTrue; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertFalse; +import static org.junit.jupiter.api.Assertions.assertTrue; -import org.junit.Test; +import org.junit.jupiter.api.Test; import com.zsmartsystems.zigbee.IeeeAddress; diff --git a/com.zsmartsystems.zigbee.dongle.telegesis/src/test/java/com/zsmartsystems/zigbee/dongle/telegesis/internal/protocol/TelegesisEndDeviceAnnounceEventTest.java b/com.zsmartsystems.zigbee.dongle.telegesis/src/test/java/com/zsmartsystems/zigbee/dongle/telegesis/internal/protocol/TelegesisEndDeviceAnnounceEventTest.java index 01d2dfaf8..b7d48acd5 100644 --- a/com.zsmartsystems.zigbee.dongle.telegesis/src/test/java/com/zsmartsystems/zigbee/dongle/telegesis/internal/protocol/TelegesisEndDeviceAnnounceEventTest.java +++ b/com.zsmartsystems.zigbee.dongle.telegesis/src/test/java/com/zsmartsystems/zigbee/dongle/telegesis/internal/protocol/TelegesisEndDeviceAnnounceEventTest.java @@ -7,10 +7,10 @@ */ package com.zsmartsystems.zigbee.dongle.telegesis.internal.protocol; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertNull; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertNull; -import org.junit.Test; +import org.junit.jupiter.api.Test; import com.zsmartsystems.zigbee.IeeeAddress; diff --git a/com.zsmartsystems.zigbee.dongle.telegesis/src/test/java/com/zsmartsystems/zigbee/dongle/telegesis/internal/protocol/TelegesisEnergyScanCommandTest.java b/com.zsmartsystems.zigbee.dongle.telegesis/src/test/java/com/zsmartsystems/zigbee/dongle/telegesis/internal/protocol/TelegesisEnergyScanCommandTest.java index 9f9ce701d..12823c3a6 100644 --- a/com.zsmartsystems.zigbee.dongle.telegesis/src/test/java/com/zsmartsystems/zigbee/dongle/telegesis/internal/protocol/TelegesisEnergyScanCommandTest.java +++ b/com.zsmartsystems.zigbee.dongle.telegesis/src/test/java/com/zsmartsystems/zigbee/dongle/telegesis/internal/protocol/TelegesisEnergyScanCommandTest.java @@ -7,11 +7,11 @@ */ package com.zsmartsystems.zigbee.dongle.telegesis.internal.protocol; -import static org.junit.Assert.assertEquals; +import static org.junit.jupiter.api.Assertions.assertEquals; import java.util.Iterator; -import org.junit.Test; +import org.junit.jupiter.api.Test; import com.zsmartsystems.zigbee.dongle.telegesis.internal.protocol.TelegesisEnergyScanCommand.ScanResult; diff --git a/com.zsmartsystems.zigbee.dongle.telegesis/src/test/java/com/zsmartsystems/zigbee/dongle/telegesis/internal/protocol/TelegesisFrameTest.java b/com.zsmartsystems.zigbee.dongle.telegesis/src/test/java/com/zsmartsystems/zigbee/dongle/telegesis/internal/protocol/TelegesisFrameTest.java index c629c0946..bf0fb9346 100644 --- a/com.zsmartsystems.zigbee.dongle.telegesis/src/test/java/com/zsmartsystems/zigbee/dongle/telegesis/internal/protocol/TelegesisFrameTest.java +++ b/com.zsmartsystems.zigbee.dongle.telegesis/src/test/java/com/zsmartsystems/zigbee/dongle/telegesis/internal/protocol/TelegesisFrameTest.java @@ -7,15 +7,15 @@ */ package com.zsmartsystems.zigbee.dongle.telegesis.internal.protocol; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertTrue; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertTrue; import java.lang.reflect.InvocationTargetException; import java.lang.reflect.Method; import java.util.Arrays; import java.util.List; -import org.junit.Test; +import org.junit.jupiter.api.Test; /** * diff --git a/com.zsmartsystems.zigbee.dongle.telegesis/src/test/java/com/zsmartsystems/zigbee/dongle/telegesis/internal/protocol/TelegesisGetChannelMaskCommandTest.java b/com.zsmartsystems.zigbee.dongle.telegesis/src/test/java/com/zsmartsystems/zigbee/dongle/telegesis/internal/protocol/TelegesisGetChannelMaskCommandTest.java index 47c79c8c0..b23396634 100644 --- a/com.zsmartsystems.zigbee.dongle.telegesis/src/test/java/com/zsmartsystems/zigbee/dongle/telegesis/internal/protocol/TelegesisGetChannelMaskCommandTest.java +++ b/com.zsmartsystems.zigbee.dongle.telegesis/src/test/java/com/zsmartsystems/zigbee/dongle/telegesis/internal/protocol/TelegesisGetChannelMaskCommandTest.java @@ -7,11 +7,11 @@ */ package com.zsmartsystems.zigbee.dongle.telegesis.internal.protocol; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertFalse; -import static org.junit.Assert.assertTrue; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertFalse; +import static org.junit.jupiter.api.Assertions.assertTrue; -import org.junit.Test; +import org.junit.jupiter.api.Test; /** * diff --git a/com.zsmartsystems.zigbee.dongle.telegesis/src/test/java/com/zsmartsystems/zigbee/dongle/telegesis/internal/protocol/TelegesisGetEpanIdCommandTest.java b/com.zsmartsystems.zigbee.dongle.telegesis/src/test/java/com/zsmartsystems/zigbee/dongle/telegesis/internal/protocol/TelegesisGetEpanIdCommandTest.java index 6d11d24a3..3dc98b538 100644 --- a/com.zsmartsystems.zigbee.dongle.telegesis/src/test/java/com/zsmartsystems/zigbee/dongle/telegesis/internal/protocol/TelegesisGetEpanIdCommandTest.java +++ b/com.zsmartsystems.zigbee.dongle.telegesis/src/test/java/com/zsmartsystems/zigbee/dongle/telegesis/internal/protocol/TelegesisGetEpanIdCommandTest.java @@ -7,11 +7,11 @@ */ package com.zsmartsystems.zigbee.dongle.telegesis.internal.protocol; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertFalse; -import static org.junit.Assert.assertTrue; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertFalse; +import static org.junit.jupiter.api.Assertions.assertTrue; -import org.junit.Test; +import org.junit.jupiter.api.Test; import com.zsmartsystems.zigbee.ExtendedPanId; diff --git a/com.zsmartsystems.zigbee.dongle.telegesis/src/test/java/com/zsmartsystems/zigbee/dongle/telegesis/internal/protocol/TelegesisGetExtendedFunctionCommandTest.java b/com.zsmartsystems.zigbee.dongle.telegesis/src/test/java/com/zsmartsystems/zigbee/dongle/telegesis/internal/protocol/TelegesisGetExtendedFunctionCommandTest.java index 2541937e2..2f1ebf250 100644 --- a/com.zsmartsystems.zigbee.dongle.telegesis/src/test/java/com/zsmartsystems/zigbee/dongle/telegesis/internal/protocol/TelegesisGetExtendedFunctionCommandTest.java +++ b/com.zsmartsystems.zigbee.dongle.telegesis/src/test/java/com/zsmartsystems/zigbee/dongle/telegesis/internal/protocol/TelegesisGetExtendedFunctionCommandTest.java @@ -7,11 +7,11 @@ */ package com.zsmartsystems.zigbee.dongle.telegesis.internal.protocol; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertFalse; -import static org.junit.Assert.assertTrue; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertFalse; +import static org.junit.jupiter.api.Assertions.assertTrue; -import org.junit.Test; +import org.junit.jupiter.api.Test; /** * diff --git a/com.zsmartsystems.zigbee.dongle.telegesis/src/test/java/com/zsmartsystems/zigbee/dongle/telegesis/internal/protocol/TelegesisGetIeeeAddressCommandTest.java b/com.zsmartsystems.zigbee.dongle.telegesis/src/test/java/com/zsmartsystems/zigbee/dongle/telegesis/internal/protocol/TelegesisGetIeeeAddressCommandTest.java index 6a345bbbe..4247cd4b0 100644 --- a/com.zsmartsystems.zigbee.dongle.telegesis/src/test/java/com/zsmartsystems/zigbee/dongle/telegesis/internal/protocol/TelegesisGetIeeeAddressCommandTest.java +++ b/com.zsmartsystems.zigbee.dongle.telegesis/src/test/java/com/zsmartsystems/zigbee/dongle/telegesis/internal/protocol/TelegesisGetIeeeAddressCommandTest.java @@ -7,11 +7,11 @@ */ package com.zsmartsystems.zigbee.dongle.telegesis.internal.protocol; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertFalse; -import static org.junit.Assert.assertTrue; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertFalse; +import static org.junit.jupiter.api.Assertions.assertTrue; -import org.junit.Test; +import org.junit.jupiter.api.Test; import com.zsmartsystems.zigbee.IeeeAddress; diff --git a/com.zsmartsystems.zigbee.dongle.telegesis/src/test/java/com/zsmartsystems/zigbee/dongle/telegesis/internal/protocol/TelegesisGetMainFunctionCommandTest.java b/com.zsmartsystems.zigbee.dongle.telegesis/src/test/java/com/zsmartsystems/zigbee/dongle/telegesis/internal/protocol/TelegesisGetMainFunctionCommandTest.java index 1480da908..483770171 100644 --- a/com.zsmartsystems.zigbee.dongle.telegesis/src/test/java/com/zsmartsystems/zigbee/dongle/telegesis/internal/protocol/TelegesisGetMainFunctionCommandTest.java +++ b/com.zsmartsystems.zigbee.dongle.telegesis/src/test/java/com/zsmartsystems/zigbee/dongle/telegesis/internal/protocol/TelegesisGetMainFunctionCommandTest.java @@ -7,11 +7,11 @@ */ package com.zsmartsystems.zigbee.dongle.telegesis.internal.protocol; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertFalse; -import static org.junit.Assert.assertTrue; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertFalse; +import static org.junit.jupiter.api.Assertions.assertTrue; -import org.junit.Test; +import org.junit.jupiter.api.Test; /** * diff --git a/com.zsmartsystems.zigbee.dongle.telegesis/src/test/java/com/zsmartsystems/zigbee/dongle/telegesis/internal/protocol/TelegesisGetNetworkKeyCommandTest.java b/com.zsmartsystems.zigbee.dongle.telegesis/src/test/java/com/zsmartsystems/zigbee/dongle/telegesis/internal/protocol/TelegesisGetNetworkKeyCommandTest.java index 6efe1133c..ae3f4cb67 100644 --- a/com.zsmartsystems.zigbee.dongle.telegesis/src/test/java/com/zsmartsystems/zigbee/dongle/telegesis/internal/protocol/TelegesisGetNetworkKeyCommandTest.java +++ b/com.zsmartsystems.zigbee.dongle.telegesis/src/test/java/com/zsmartsystems/zigbee/dongle/telegesis/internal/protocol/TelegesisGetNetworkKeyCommandTest.java @@ -7,11 +7,11 @@ */ package com.zsmartsystems.zigbee.dongle.telegesis.internal.protocol; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertFalse; -import static org.junit.Assert.assertTrue; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertFalse; +import static org.junit.jupiter.api.Assertions.assertTrue; -import org.junit.Test; +import org.junit.jupiter.api.Test; import com.zsmartsystems.zigbee.security.ZigBeeKey; diff --git a/com.zsmartsystems.zigbee.dongle.telegesis/src/test/java/com/zsmartsystems/zigbee/dongle/telegesis/internal/protocol/TelegesisGetPanIdCommandTest.java b/com.zsmartsystems.zigbee.dongle.telegesis/src/test/java/com/zsmartsystems/zigbee/dongle/telegesis/internal/protocol/TelegesisGetPanIdCommandTest.java index 5b8cbd13f..7e7d98e45 100644 --- a/com.zsmartsystems.zigbee.dongle.telegesis/src/test/java/com/zsmartsystems/zigbee/dongle/telegesis/internal/protocol/TelegesisGetPanIdCommandTest.java +++ b/com.zsmartsystems.zigbee.dongle.telegesis/src/test/java/com/zsmartsystems/zigbee/dongle/telegesis/internal/protocol/TelegesisGetPanIdCommandTest.java @@ -7,11 +7,11 @@ */ package com.zsmartsystems.zigbee.dongle.telegesis.internal.protocol; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertFalse; -import static org.junit.Assert.assertTrue; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertFalse; +import static org.junit.jupiter.api.Assertions.assertTrue; -import org.junit.Test; +import org.junit.jupiter.api.Test; /** * diff --git a/com.zsmartsystems.zigbee.dongle.telegesis/src/test/java/com/zsmartsystems/zigbee/dongle/telegesis/internal/protocol/TelegesisGetPromptEnable1CommandTest.java b/com.zsmartsystems.zigbee.dongle.telegesis/src/test/java/com/zsmartsystems/zigbee/dongle/telegesis/internal/protocol/TelegesisGetPromptEnable1CommandTest.java index e24029893..7a59a3339 100644 --- a/com.zsmartsystems.zigbee.dongle.telegesis/src/test/java/com/zsmartsystems/zigbee/dongle/telegesis/internal/protocol/TelegesisGetPromptEnable1CommandTest.java +++ b/com.zsmartsystems.zigbee.dongle.telegesis/src/test/java/com/zsmartsystems/zigbee/dongle/telegesis/internal/protocol/TelegesisGetPromptEnable1CommandTest.java @@ -7,11 +7,11 @@ */ package com.zsmartsystems.zigbee.dongle.telegesis.internal.protocol; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertFalse; -import static org.junit.Assert.assertTrue; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertFalse; +import static org.junit.jupiter.api.Assertions.assertTrue; -import org.junit.Test; +import org.junit.jupiter.api.Test; /** * diff --git a/com.zsmartsystems.zigbee.dongle.telegesis/src/test/java/com/zsmartsystems/zigbee/dongle/telegesis/internal/protocol/TelegesisGetPromptEnable2CommandTest.java b/com.zsmartsystems.zigbee.dongle.telegesis/src/test/java/com/zsmartsystems/zigbee/dongle/telegesis/internal/protocol/TelegesisGetPromptEnable2CommandTest.java index 7bd1f236f..1cc86b9b1 100644 --- a/com.zsmartsystems.zigbee.dongle.telegesis/src/test/java/com/zsmartsystems/zigbee/dongle/telegesis/internal/protocol/TelegesisGetPromptEnable2CommandTest.java +++ b/com.zsmartsystems.zigbee.dongle.telegesis/src/test/java/com/zsmartsystems/zigbee/dongle/telegesis/internal/protocol/TelegesisGetPromptEnable2CommandTest.java @@ -7,11 +7,11 @@ */ package com.zsmartsystems.zigbee.dongle.telegesis.internal.protocol; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertFalse; -import static org.junit.Assert.assertTrue; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertFalse; +import static org.junit.jupiter.api.Assertions.assertTrue; -import org.junit.Test; +import org.junit.jupiter.api.Test; /** * diff --git a/com.zsmartsystems.zigbee.dongle.telegesis/src/test/java/com/zsmartsystems/zigbee/dongle/telegesis/internal/protocol/TelegesisGetTrustCentreLinkKeyCommandTest.java b/com.zsmartsystems.zigbee.dongle.telegesis/src/test/java/com/zsmartsystems/zigbee/dongle/telegesis/internal/protocol/TelegesisGetTrustCentreLinkKeyCommandTest.java index 701919929..8cc58b2d5 100644 --- a/com.zsmartsystems.zigbee.dongle.telegesis/src/test/java/com/zsmartsystems/zigbee/dongle/telegesis/internal/protocol/TelegesisGetTrustCentreLinkKeyCommandTest.java +++ b/com.zsmartsystems.zigbee.dongle.telegesis/src/test/java/com/zsmartsystems/zigbee/dongle/telegesis/internal/protocol/TelegesisGetTrustCentreLinkKeyCommandTest.java @@ -7,11 +7,11 @@ */ package com.zsmartsystems.zigbee.dongle.telegesis.internal.protocol; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertFalse; -import static org.junit.Assert.assertTrue; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertFalse; +import static org.junit.jupiter.api.Assertions.assertTrue; -import org.junit.Test; +import org.junit.jupiter.api.Test; import com.zsmartsystems.zigbee.security.ZigBeeKey; diff --git a/com.zsmartsystems.zigbee.dongle.telegesis/src/test/java/com/zsmartsystems/zigbee/dongle/telegesis/internal/protocol/TelegesisJoinNetworkCommandTest.java b/com.zsmartsystems.zigbee.dongle.telegesis/src/test/java/com/zsmartsystems/zigbee/dongle/telegesis/internal/protocol/TelegesisJoinNetworkCommandTest.java index 14826c567..7e2262551 100644 --- a/com.zsmartsystems.zigbee.dongle.telegesis/src/test/java/com/zsmartsystems/zigbee/dongle/telegesis/internal/protocol/TelegesisJoinNetworkCommandTest.java +++ b/com.zsmartsystems.zigbee.dongle.telegesis/src/test/java/com/zsmartsystems/zigbee/dongle/telegesis/internal/protocol/TelegesisJoinNetworkCommandTest.java @@ -7,10 +7,10 @@ */ package com.zsmartsystems.zigbee.dongle.telegesis.internal.protocol; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertTrue; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertTrue; -import org.junit.Test; +import org.junit.jupiter.api.Test; /** * diff --git a/com.zsmartsystems.zigbee.dongle.telegesis/src/test/java/com/zsmartsystems/zigbee/dongle/telegesis/internal/protocol/TelegesisLeaveNetworkCommandTest.java b/com.zsmartsystems.zigbee.dongle.telegesis/src/test/java/com/zsmartsystems/zigbee/dongle/telegesis/internal/protocol/TelegesisLeaveNetworkCommandTest.java index 603bdf075..4e78cf835 100644 --- a/com.zsmartsystems.zigbee.dongle.telegesis/src/test/java/com/zsmartsystems/zigbee/dongle/telegesis/internal/protocol/TelegesisLeaveNetworkCommandTest.java +++ b/com.zsmartsystems.zigbee.dongle.telegesis/src/test/java/com/zsmartsystems/zigbee/dongle/telegesis/internal/protocol/TelegesisLeaveNetworkCommandTest.java @@ -7,10 +7,10 @@ */ package com.zsmartsystems.zigbee.dongle.telegesis.internal.protocol; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertTrue; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertTrue; -import org.junit.Test; +import org.junit.jupiter.api.Test; /** * diff --git a/com.zsmartsystems.zigbee.dongle.telegesis/src/test/java/com/zsmartsystems/zigbee/dongle/telegesis/internal/protocol/TelegesisMobileDeviceAnnounceEventTest.java b/com.zsmartsystems.zigbee.dongle.telegesis/src/test/java/com/zsmartsystems/zigbee/dongle/telegesis/internal/protocol/TelegesisMobileDeviceAnnounceEventTest.java index 5d05e48bf..ec2ef7678 100644 --- a/com.zsmartsystems.zigbee.dongle.telegesis/src/test/java/com/zsmartsystems/zigbee/dongle/telegesis/internal/protocol/TelegesisMobileDeviceAnnounceEventTest.java +++ b/com.zsmartsystems.zigbee.dongle.telegesis/src/test/java/com/zsmartsystems/zigbee/dongle/telegesis/internal/protocol/TelegesisMobileDeviceAnnounceEventTest.java @@ -7,10 +7,10 @@ */ package com.zsmartsystems.zigbee.dongle.telegesis.internal.protocol; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertNull; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertNull; -import org.junit.Test; +import org.junit.jupiter.api.Test; import com.zsmartsystems.zigbee.IeeeAddress; diff --git a/com.zsmartsystems.zigbee.dongle.telegesis/src/test/java/com/zsmartsystems/zigbee/dongle/telegesis/internal/protocol/TelegesisNackMessageEventTest.java b/com.zsmartsystems.zigbee.dongle.telegesis/src/test/java/com/zsmartsystems/zigbee/dongle/telegesis/internal/protocol/TelegesisNackMessageEventTest.java index c040d18a2..c225f63d0 100644 --- a/com.zsmartsystems.zigbee.dongle.telegesis/src/test/java/com/zsmartsystems/zigbee/dongle/telegesis/internal/protocol/TelegesisNackMessageEventTest.java +++ b/com.zsmartsystems.zigbee.dongle.telegesis/src/test/java/com/zsmartsystems/zigbee/dongle/telegesis/internal/protocol/TelegesisNackMessageEventTest.java @@ -7,9 +7,9 @@ */ package com.zsmartsystems.zigbee.dongle.telegesis.internal.protocol; -import static org.junit.Assert.assertEquals; +import static org.junit.jupiter.api.Assertions.assertEquals; -import org.junit.Test; +import org.junit.jupiter.api.Test; /** * diff --git a/com.zsmartsystems.zigbee.dongle.telegesis/src/test/java/com/zsmartsystems/zigbee/dongle/telegesis/internal/protocol/TelegesisNetworkJoinedEventTest.java b/com.zsmartsystems.zigbee.dongle.telegesis/src/test/java/com/zsmartsystems/zigbee/dongle/telegesis/internal/protocol/TelegesisNetworkJoinedEventTest.java index 58ffba98e..8638c9d20 100644 --- a/com.zsmartsystems.zigbee.dongle.telegesis/src/test/java/com/zsmartsystems/zigbee/dongle/telegesis/internal/protocol/TelegesisNetworkJoinedEventTest.java +++ b/com.zsmartsystems.zigbee.dongle.telegesis/src/test/java/com/zsmartsystems/zigbee/dongle/telegesis/internal/protocol/TelegesisNetworkJoinedEventTest.java @@ -7,9 +7,9 @@ */ package com.zsmartsystems.zigbee.dongle.telegesis.internal.protocol; -import static org.junit.Assert.assertEquals; +import static org.junit.jupiter.api.Assertions.assertEquals; -import org.junit.Test; +import org.junit.jupiter.api.Test; import com.zsmartsystems.zigbee.ExtendedPanId; diff --git a/com.zsmartsystems.zigbee.dongle.telegesis/src/test/java/com/zsmartsystems/zigbee/dongle/telegesis/internal/protocol/TelegesisReceiveBroadcastEventTest.java b/com.zsmartsystems.zigbee.dongle.telegesis/src/test/java/com/zsmartsystems/zigbee/dongle/telegesis/internal/protocol/TelegesisReceiveBroadcastEventTest.java index 0794b65af..1867f9f87 100644 --- a/com.zsmartsystems.zigbee.dongle.telegesis/src/test/java/com/zsmartsystems/zigbee/dongle/telegesis/internal/protocol/TelegesisReceiveBroadcastEventTest.java +++ b/com.zsmartsystems.zigbee.dongle.telegesis/src/test/java/com/zsmartsystems/zigbee/dongle/telegesis/internal/protocol/TelegesisReceiveBroadcastEventTest.java @@ -7,12 +7,12 @@ */ package com.zsmartsystems.zigbee.dongle.telegesis.internal.protocol; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertTrue; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertTrue; import java.util.Arrays; -import org.junit.Test; +import org.junit.jupiter.api.Test; import com.zsmartsystems.zigbee.IeeeAddress; diff --git a/com.zsmartsystems.zigbee.dongle.telegesis/src/test/java/com/zsmartsystems/zigbee/dongle/telegesis/internal/protocol/TelegesisReceiveMessageEventTest.java b/com.zsmartsystems.zigbee.dongle.telegesis/src/test/java/com/zsmartsystems/zigbee/dongle/telegesis/internal/protocol/TelegesisReceiveMessageEventTest.java index b8996c829..050a97db6 100644 --- a/com.zsmartsystems.zigbee.dongle.telegesis/src/test/java/com/zsmartsystems/zigbee/dongle/telegesis/internal/protocol/TelegesisReceiveMessageEventTest.java +++ b/com.zsmartsystems.zigbee.dongle.telegesis/src/test/java/com/zsmartsystems/zigbee/dongle/telegesis/internal/protocol/TelegesisReceiveMessageEventTest.java @@ -7,9 +7,9 @@ */ package com.zsmartsystems.zigbee.dongle.telegesis.internal.protocol; -import static org.junit.Assert.assertEquals; +import static org.junit.jupiter.api.Assertions.assertEquals; -import org.junit.Test; +import org.junit.jupiter.api.Test; /** * diff --git a/com.zsmartsystems.zigbee.dongle.telegesis/src/test/java/com/zsmartsystems/zigbee/dongle/telegesis/internal/protocol/TelegesisReceiveMulticastEventTest.java b/com.zsmartsystems.zigbee.dongle.telegesis/src/test/java/com/zsmartsystems/zigbee/dongle/telegesis/internal/protocol/TelegesisReceiveMulticastEventTest.java index c5dae4a1b..8a55389ee 100644 --- a/com.zsmartsystems.zigbee.dongle.telegesis/src/test/java/com/zsmartsystems/zigbee/dongle/telegesis/internal/protocol/TelegesisReceiveMulticastEventTest.java +++ b/com.zsmartsystems.zigbee.dongle.telegesis/src/test/java/com/zsmartsystems/zigbee/dongle/telegesis/internal/protocol/TelegesisReceiveMulticastEventTest.java @@ -7,12 +7,12 @@ */ package com.zsmartsystems.zigbee.dongle.telegesis.internal.protocol; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertTrue; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertTrue; import java.util.Arrays; -import org.junit.Test; +import org.junit.jupiter.api.Test; import com.zsmartsystems.zigbee.IeeeAddress; diff --git a/com.zsmartsystems.zigbee.dongle.telegesis/src/test/java/com/zsmartsystems/zigbee/dongle/telegesis/internal/protocol/TelegesisReceiveUnicastEventTest.java b/com.zsmartsystems.zigbee.dongle.telegesis/src/test/java/com/zsmartsystems/zigbee/dongle/telegesis/internal/protocol/TelegesisReceiveUnicastEventTest.java index 88d529413..3c1c808de 100644 --- a/com.zsmartsystems.zigbee.dongle.telegesis/src/test/java/com/zsmartsystems/zigbee/dongle/telegesis/internal/protocol/TelegesisReceiveUnicastEventTest.java +++ b/com.zsmartsystems.zigbee.dongle.telegesis/src/test/java/com/zsmartsystems/zigbee/dongle/telegesis/internal/protocol/TelegesisReceiveUnicastEventTest.java @@ -7,12 +7,12 @@ */ package com.zsmartsystems.zigbee.dongle.telegesis.internal.protocol; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertTrue; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertTrue; import java.util.Arrays; -import org.junit.Test; +import org.junit.jupiter.api.Test; import com.zsmartsystems.zigbee.IeeeAddress; diff --git a/com.zsmartsystems.zigbee.dongle.telegesis/src/test/java/com/zsmartsystems/zigbee/dongle/telegesis/internal/protocol/TelegesisRouteRecordMessageEventTest.java b/com.zsmartsystems.zigbee.dongle.telegesis/src/test/java/com/zsmartsystems/zigbee/dongle/telegesis/internal/protocol/TelegesisRouteRecordMessageEventTest.java index b48707d74..5a29f3f0c 100644 --- a/com.zsmartsystems.zigbee.dongle.telegesis/src/test/java/com/zsmartsystems/zigbee/dongle/telegesis/internal/protocol/TelegesisRouteRecordMessageEventTest.java +++ b/com.zsmartsystems.zigbee.dongle.telegesis/src/test/java/com/zsmartsystems/zigbee/dongle/telegesis/internal/protocol/TelegesisRouteRecordMessageEventTest.java @@ -7,9 +7,9 @@ */ package com.zsmartsystems.zigbee.dongle.telegesis.internal.protocol; -import static org.junit.Assert.assertEquals; +import static org.junit.jupiter.api.Assertions.assertEquals; -import org.junit.Test; +import org.junit.jupiter.api.Test; import com.zsmartsystems.zigbee.IeeeAddress; diff --git a/com.zsmartsystems.zigbee.dongle.telegesis/src/test/java/com/zsmartsystems/zigbee/dongle/telegesis/internal/protocol/TelegesisRouterAnnounceEventTest.java b/com.zsmartsystems.zigbee.dongle.telegesis/src/test/java/com/zsmartsystems/zigbee/dongle/telegesis/internal/protocol/TelegesisRouterAnnounceEventTest.java index 4b1944c61..9ca678b28 100644 --- a/com.zsmartsystems.zigbee.dongle.telegesis/src/test/java/com/zsmartsystems/zigbee/dongle/telegesis/internal/protocol/TelegesisRouterAnnounceEventTest.java +++ b/com.zsmartsystems.zigbee.dongle.telegesis/src/test/java/com/zsmartsystems/zigbee/dongle/telegesis/internal/protocol/TelegesisRouterAnnounceEventTest.java @@ -7,10 +7,10 @@ */ package com.zsmartsystems.zigbee.dongle.telegesis.internal.protocol; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertNull; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertNull; -import org.junit.Test; +import org.junit.jupiter.api.Test; import com.zsmartsystems.zigbee.IeeeAddress; diff --git a/com.zsmartsystems.zigbee.dongle.telegesis/src/test/java/com/zsmartsystems/zigbee/dongle/telegesis/internal/protocol/TelegesisSendMulticastCommandTest.java b/com.zsmartsystems.zigbee.dongle.telegesis/src/test/java/com/zsmartsystems/zigbee/dongle/telegesis/internal/protocol/TelegesisSendMulticastCommandTest.java index 4d4ab80c0..f34642aeb 100644 --- a/com.zsmartsystems.zigbee.dongle.telegesis/src/test/java/com/zsmartsystems/zigbee/dongle/telegesis/internal/protocol/TelegesisSendMulticastCommandTest.java +++ b/com.zsmartsystems.zigbee.dongle.telegesis/src/test/java/com/zsmartsystems/zigbee/dongle/telegesis/internal/protocol/TelegesisSendMulticastCommandTest.java @@ -7,9 +7,9 @@ */ package com.zsmartsystems.zigbee.dongle.telegesis.internal.protocol; -import static org.junit.Assert.assertEquals; +import static org.junit.jupiter.api.Assertions.assertEquals; -import org.junit.Test; +import org.junit.jupiter.api.Test; /** * diff --git a/com.zsmartsystems.zigbee.dongle.telegesis/src/test/java/com/zsmartsystems/zigbee/dongle/telegesis/internal/protocol/TelegesisSendUnicastCommandTest.java b/com.zsmartsystems.zigbee.dongle.telegesis/src/test/java/com/zsmartsystems/zigbee/dongle/telegesis/internal/protocol/TelegesisSendUnicastCommandTest.java index 4b679e556..1a8244a70 100644 --- a/com.zsmartsystems.zigbee.dongle.telegesis/src/test/java/com/zsmartsystems/zigbee/dongle/telegesis/internal/protocol/TelegesisSendUnicastCommandTest.java +++ b/com.zsmartsystems.zigbee.dongle.telegesis/src/test/java/com/zsmartsystems/zigbee/dongle/telegesis/internal/protocol/TelegesisSendUnicastCommandTest.java @@ -7,9 +7,9 @@ */ package com.zsmartsystems.zigbee.dongle.telegesis.internal.protocol; -import static org.junit.Assert.assertEquals; +import static org.junit.jupiter.api.Assertions.assertEquals; -import org.junit.Test; +import org.junit.jupiter.api.Test; /** * diff --git a/com.zsmartsystems.zigbee.dongle.telegesis/src/test/java/com/zsmartsystems/zigbee/dongle/telegesis/internal/protocol/TelegesisSetChannelMaskCommandTest.java b/com.zsmartsystems.zigbee.dongle.telegesis/src/test/java/com/zsmartsystems/zigbee/dongle/telegesis/internal/protocol/TelegesisSetChannelMaskCommandTest.java index f8121a927..0eee2062e 100644 --- a/com.zsmartsystems.zigbee.dongle.telegesis/src/test/java/com/zsmartsystems/zigbee/dongle/telegesis/internal/protocol/TelegesisSetChannelMaskCommandTest.java +++ b/com.zsmartsystems.zigbee.dongle.telegesis/src/test/java/com/zsmartsystems/zigbee/dongle/telegesis/internal/protocol/TelegesisSetChannelMaskCommandTest.java @@ -7,9 +7,9 @@ */ package com.zsmartsystems.zigbee.dongle.telegesis.internal.protocol; -import static org.junit.Assert.assertEquals; +import static org.junit.jupiter.api.Assertions.assertEquals; -import org.junit.Test; +import org.junit.jupiter.api.Test; /** * diff --git a/com.zsmartsystems.zigbee.dongle.telegesis/src/test/java/com/zsmartsystems/zigbee/dongle/telegesis/internal/protocol/TelegesisSetEpanIdCommandTest.java b/com.zsmartsystems.zigbee.dongle.telegesis/src/test/java/com/zsmartsystems/zigbee/dongle/telegesis/internal/protocol/TelegesisSetEpanIdCommandTest.java index 0e7a7d53e..70feaee3f 100644 --- a/com.zsmartsystems.zigbee.dongle.telegesis/src/test/java/com/zsmartsystems/zigbee/dongle/telegesis/internal/protocol/TelegesisSetEpanIdCommandTest.java +++ b/com.zsmartsystems.zigbee.dongle.telegesis/src/test/java/com/zsmartsystems/zigbee/dongle/telegesis/internal/protocol/TelegesisSetEpanIdCommandTest.java @@ -7,9 +7,9 @@ */ package com.zsmartsystems.zigbee.dongle.telegesis.internal.protocol; -import static org.junit.Assert.assertEquals; +import static org.junit.jupiter.api.Assertions.assertEquals; -import org.junit.Test; +import org.junit.jupiter.api.Test; import com.zsmartsystems.zigbee.ExtendedPanId; diff --git a/com.zsmartsystems.zigbee.dongle.telegesis/src/test/java/com/zsmartsystems/zigbee/dongle/telegesis/internal/protocol/TelegesisSetExtendedFunctionCommandTest.java b/com.zsmartsystems.zigbee.dongle.telegesis/src/test/java/com/zsmartsystems/zigbee/dongle/telegesis/internal/protocol/TelegesisSetExtendedFunctionCommandTest.java index d0eefbae3..8d6af42f0 100644 --- a/com.zsmartsystems.zigbee.dongle.telegesis/src/test/java/com/zsmartsystems/zigbee/dongle/telegesis/internal/protocol/TelegesisSetExtendedFunctionCommandTest.java +++ b/com.zsmartsystems.zigbee.dongle.telegesis/src/test/java/com/zsmartsystems/zigbee/dongle/telegesis/internal/protocol/TelegesisSetExtendedFunctionCommandTest.java @@ -7,9 +7,9 @@ */ package com.zsmartsystems.zigbee.dongle.telegesis.internal.protocol; -import static org.junit.Assert.assertEquals; +import static org.junit.jupiter.api.Assertions.assertEquals; -import org.junit.Test; +import org.junit.jupiter.api.Test; /** * diff --git a/com.zsmartsystems.zigbee.dongle.telegesis/src/test/java/com/zsmartsystems/zigbee/dongle/telegesis/internal/protocol/TelegesisSetIeeeAddressCommandTest.java b/com.zsmartsystems.zigbee.dongle.telegesis/src/test/java/com/zsmartsystems/zigbee/dongle/telegesis/internal/protocol/TelegesisSetIeeeAddressCommandTest.java index ec77b80ee..46c4de812 100644 --- a/com.zsmartsystems.zigbee.dongle.telegesis/src/test/java/com/zsmartsystems/zigbee/dongle/telegesis/internal/protocol/TelegesisSetIeeeAddressCommandTest.java +++ b/com.zsmartsystems.zigbee.dongle.telegesis/src/test/java/com/zsmartsystems/zigbee/dongle/telegesis/internal/protocol/TelegesisSetIeeeAddressCommandTest.java @@ -7,9 +7,9 @@ */ package com.zsmartsystems.zigbee.dongle.telegesis.internal.protocol; -import static org.junit.Assert.assertEquals; +import static org.junit.jupiter.api.Assertions.assertEquals; -import org.junit.Test; +import org.junit.jupiter.api.Test; import com.zsmartsystems.zigbee.IeeeAddress; diff --git a/com.zsmartsystems.zigbee.dongle.telegesis/src/test/java/com/zsmartsystems/zigbee/dongle/telegesis/internal/protocol/TelegesisSetInputClustersCommandTest.java b/com.zsmartsystems.zigbee.dongle.telegesis/src/test/java/com/zsmartsystems/zigbee/dongle/telegesis/internal/protocol/TelegesisSetInputClustersCommandTest.java index 9ad4f5293..155bbce70 100644 --- a/com.zsmartsystems.zigbee.dongle.telegesis/src/test/java/com/zsmartsystems/zigbee/dongle/telegesis/internal/protocol/TelegesisSetInputClustersCommandTest.java +++ b/com.zsmartsystems.zigbee.dongle.telegesis/src/test/java/com/zsmartsystems/zigbee/dongle/telegesis/internal/protocol/TelegesisSetInputClustersCommandTest.java @@ -7,12 +7,12 @@ */ package com.zsmartsystems.zigbee.dongle.telegesis.internal.protocol; -import static org.junit.Assert.assertEquals; +import static org.junit.jupiter.api.Assertions.assertEquals; import java.util.ArrayList; import java.util.List; -import org.junit.Test; +import org.junit.jupiter.api.Test; /** * diff --git a/com.zsmartsystems.zigbee.dongle.telegesis/src/test/java/com/zsmartsystems/zigbee/dongle/telegesis/internal/protocol/TelegesisSetMainFunctionCommandTest.java b/com.zsmartsystems.zigbee.dongle.telegesis/src/test/java/com/zsmartsystems/zigbee/dongle/telegesis/internal/protocol/TelegesisSetMainFunctionCommandTest.java index 6b66ff816..ed0964adc 100644 --- a/com.zsmartsystems.zigbee.dongle.telegesis/src/test/java/com/zsmartsystems/zigbee/dongle/telegesis/internal/protocol/TelegesisSetMainFunctionCommandTest.java +++ b/com.zsmartsystems.zigbee.dongle.telegesis/src/test/java/com/zsmartsystems/zigbee/dongle/telegesis/internal/protocol/TelegesisSetMainFunctionCommandTest.java @@ -7,9 +7,9 @@ */ package com.zsmartsystems.zigbee.dongle.telegesis.internal.protocol; -import static org.junit.Assert.assertEquals; +import static org.junit.jupiter.api.Assertions.assertEquals; -import org.junit.Test; +import org.junit.jupiter.api.Test; /** * diff --git a/com.zsmartsystems.zigbee.dongle.telegesis/src/test/java/com/zsmartsystems/zigbee/dongle/telegesis/internal/protocol/TelegesisSetNetworkKeyCommandTest.java b/com.zsmartsystems.zigbee.dongle.telegesis/src/test/java/com/zsmartsystems/zigbee/dongle/telegesis/internal/protocol/TelegesisSetNetworkKeyCommandTest.java index cecae5253..832885399 100644 --- a/com.zsmartsystems.zigbee.dongle.telegesis/src/test/java/com/zsmartsystems/zigbee/dongle/telegesis/internal/protocol/TelegesisSetNetworkKeyCommandTest.java +++ b/com.zsmartsystems.zigbee.dongle.telegesis/src/test/java/com/zsmartsystems/zigbee/dongle/telegesis/internal/protocol/TelegesisSetNetworkKeyCommandTest.java @@ -7,9 +7,9 @@ */ package com.zsmartsystems.zigbee.dongle.telegesis.internal.protocol; -import static org.junit.Assert.assertEquals; +import static org.junit.jupiter.api.Assertions.assertEquals; -import org.junit.Test; +import org.junit.jupiter.api.Test; import com.zsmartsystems.zigbee.security.ZigBeeKey; diff --git a/com.zsmartsystems.zigbee.dongle.telegesis/src/test/java/com/zsmartsystems/zigbee/dongle/telegesis/internal/protocol/TelegesisSetOutputClustersCommandTest.java b/com.zsmartsystems.zigbee.dongle.telegesis/src/test/java/com/zsmartsystems/zigbee/dongle/telegesis/internal/protocol/TelegesisSetOutputClustersCommandTest.java index bf8723421..f6a5e151f 100644 --- a/com.zsmartsystems.zigbee.dongle.telegesis/src/test/java/com/zsmartsystems/zigbee/dongle/telegesis/internal/protocol/TelegesisSetOutputClustersCommandTest.java +++ b/com.zsmartsystems.zigbee.dongle.telegesis/src/test/java/com/zsmartsystems/zigbee/dongle/telegesis/internal/protocol/TelegesisSetOutputClustersCommandTest.java @@ -7,12 +7,12 @@ */ package com.zsmartsystems.zigbee.dongle.telegesis.internal.protocol; -import static org.junit.Assert.assertEquals; +import static org.junit.jupiter.api.Assertions.assertEquals; import java.util.ArrayList; import java.util.List; -import org.junit.Test; +import org.junit.jupiter.api.Test; /** * diff --git a/com.zsmartsystems.zigbee.dongle.telegesis/src/test/java/com/zsmartsystems/zigbee/dongle/telegesis/internal/protocol/TelegesisSetPanIdCommandTest.java b/com.zsmartsystems.zigbee.dongle.telegesis/src/test/java/com/zsmartsystems/zigbee/dongle/telegesis/internal/protocol/TelegesisSetPanIdCommandTest.java index cd0c8a41e..3499dbae1 100644 --- a/com.zsmartsystems.zigbee.dongle.telegesis/src/test/java/com/zsmartsystems/zigbee/dongle/telegesis/internal/protocol/TelegesisSetPanIdCommandTest.java +++ b/com.zsmartsystems.zigbee.dongle.telegesis/src/test/java/com/zsmartsystems/zigbee/dongle/telegesis/internal/protocol/TelegesisSetPanIdCommandTest.java @@ -7,9 +7,9 @@ */ package com.zsmartsystems.zigbee.dongle.telegesis.internal.protocol; -import static org.junit.Assert.assertEquals; +import static org.junit.jupiter.api.Assertions.assertEquals; -import org.junit.Test; +import org.junit.jupiter.api.Test; /** * diff --git a/com.zsmartsystems.zigbee.dongle.telegesis/src/test/java/com/zsmartsystems/zigbee/dongle/telegesis/internal/protocol/TelegesisSetPromptEnable1CommandTest.java b/com.zsmartsystems.zigbee.dongle.telegesis/src/test/java/com/zsmartsystems/zigbee/dongle/telegesis/internal/protocol/TelegesisSetPromptEnable1CommandTest.java index 0a3c7acf7..7444e0589 100644 --- a/com.zsmartsystems.zigbee.dongle.telegesis/src/test/java/com/zsmartsystems/zigbee/dongle/telegesis/internal/protocol/TelegesisSetPromptEnable1CommandTest.java +++ b/com.zsmartsystems.zigbee.dongle.telegesis/src/test/java/com/zsmartsystems/zigbee/dongle/telegesis/internal/protocol/TelegesisSetPromptEnable1CommandTest.java @@ -7,9 +7,9 @@ */ package com.zsmartsystems.zigbee.dongle.telegesis.internal.protocol; -import static org.junit.Assert.assertEquals; +import static org.junit.jupiter.api.Assertions.assertEquals; -import org.junit.Test; +import org.junit.jupiter.api.Test; /** * diff --git a/com.zsmartsystems.zigbee.dongle.telegesis/src/test/java/com/zsmartsystems/zigbee/dongle/telegesis/internal/protocol/TelegesisSetPromptEnable2CommandTest.java b/com.zsmartsystems.zigbee.dongle.telegesis/src/test/java/com/zsmartsystems/zigbee/dongle/telegesis/internal/protocol/TelegesisSetPromptEnable2CommandTest.java index 3ab2d1148..d8e82e15b 100644 --- a/com.zsmartsystems.zigbee.dongle.telegesis/src/test/java/com/zsmartsystems/zigbee/dongle/telegesis/internal/protocol/TelegesisSetPromptEnable2CommandTest.java +++ b/com.zsmartsystems.zigbee.dongle.telegesis/src/test/java/com/zsmartsystems/zigbee/dongle/telegesis/internal/protocol/TelegesisSetPromptEnable2CommandTest.java @@ -7,9 +7,9 @@ */ package com.zsmartsystems.zigbee.dongle.telegesis.internal.protocol; -import static org.junit.Assert.assertEquals; +import static org.junit.jupiter.api.Assertions.assertEquals; -import org.junit.Test; +import org.junit.jupiter.api.Test; /** * diff --git a/com.zsmartsystems.zigbee.dongle.telegesis/src/test/java/com/zsmartsystems/zigbee/dongle/telegesis/internal/protocol/TelegesisSetRegisterBitCommandTest.java b/com.zsmartsystems.zigbee.dongle.telegesis/src/test/java/com/zsmartsystems/zigbee/dongle/telegesis/internal/protocol/TelegesisSetRegisterBitCommandTest.java index c15b45ba3..5c9b74c46 100644 --- a/com.zsmartsystems.zigbee.dongle.telegesis/src/test/java/com/zsmartsystems/zigbee/dongle/telegesis/internal/protocol/TelegesisSetRegisterBitCommandTest.java +++ b/com.zsmartsystems.zigbee.dongle.telegesis/src/test/java/com/zsmartsystems/zigbee/dongle/telegesis/internal/protocol/TelegesisSetRegisterBitCommandTest.java @@ -7,9 +7,9 @@ */ package com.zsmartsystems.zigbee.dongle.telegesis.internal.protocol; -import static org.junit.Assert.assertEquals; +import static org.junit.jupiter.api.Assertions.assertEquals; -import org.junit.Test; +import org.junit.jupiter.api.Test; /** * diff --git a/com.zsmartsystems.zigbee.dongle.telegesis/src/test/java/com/zsmartsystems/zigbee/dongle/telegesis/internal/protocol/TelegesisSetTrustCentreLinkKeyCommandTest.java b/com.zsmartsystems.zigbee.dongle.telegesis/src/test/java/com/zsmartsystems/zigbee/dongle/telegesis/internal/protocol/TelegesisSetTrustCentreLinkKeyCommandTest.java index 71c79ea12..bd010ab6f 100644 --- a/com.zsmartsystems.zigbee.dongle.telegesis/src/test/java/com/zsmartsystems/zigbee/dongle/telegesis/internal/protocol/TelegesisSetTrustCentreLinkKeyCommandTest.java +++ b/com.zsmartsystems.zigbee.dongle.telegesis/src/test/java/com/zsmartsystems/zigbee/dongle/telegesis/internal/protocol/TelegesisSetTrustCentreLinkKeyCommandTest.java @@ -7,9 +7,9 @@ */ package com.zsmartsystems.zigbee.dongle.telegesis.internal.protocol; -import static org.junit.Assert.assertEquals; +import static org.junit.jupiter.api.Assertions.assertEquals; -import org.junit.Test; +import org.junit.jupiter.api.Test; import com.zsmartsystems.zigbee.security.ZigBeeKey; diff --git a/com.zsmartsystems.zigbee.dongle.telegesis/src/test/java/com/zsmartsystems/zigbee/dongle/telegesis/internal/protocol/TelegesisSleepyDeviceAnnounceEventTest.java b/com.zsmartsystems.zigbee.dongle.telegesis/src/test/java/com/zsmartsystems/zigbee/dongle/telegesis/internal/protocol/TelegesisSleepyDeviceAnnounceEventTest.java index 2d8716185..ede268c0b 100644 --- a/com.zsmartsystems.zigbee.dongle.telegesis/src/test/java/com/zsmartsystems/zigbee/dongle/telegesis/internal/protocol/TelegesisSleepyDeviceAnnounceEventTest.java +++ b/com.zsmartsystems.zigbee.dongle.telegesis/src/test/java/com/zsmartsystems/zigbee/dongle/telegesis/internal/protocol/TelegesisSleepyDeviceAnnounceEventTest.java @@ -7,10 +7,10 @@ */ package com.zsmartsystems.zigbee.dongle.telegesis.internal.protocol; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertNull; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertNull; -import org.junit.Test; +import org.junit.jupiter.api.Test; import com.zsmartsystems.zigbee.IeeeAddress; diff --git a/com.zsmartsystems.zigbee.dongle.telegesis/src/test/java/com/zsmartsystems/zigbee/dongle/telegesis/internal/protocol/TelegesisSoftwareResetCommandTest.java b/com.zsmartsystems.zigbee.dongle.telegesis/src/test/java/com/zsmartsystems/zigbee/dongle/telegesis/internal/protocol/TelegesisSoftwareResetCommandTest.java index 7f64fcc2b..fbcad6ab5 100644 --- a/com.zsmartsystems.zigbee.dongle.telegesis/src/test/java/com/zsmartsystems/zigbee/dongle/telegesis/internal/protocol/TelegesisSoftwareResetCommandTest.java +++ b/com.zsmartsystems.zigbee.dongle.telegesis/src/test/java/com/zsmartsystems/zigbee/dongle/telegesis/internal/protocol/TelegesisSoftwareResetCommandTest.java @@ -7,10 +7,10 @@ */ package com.zsmartsystems.zigbee.dongle.telegesis.internal.protocol; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertTrue; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertTrue; -import org.junit.Test; +import org.junit.jupiter.api.Test; /** * diff --git a/com.zsmartsystems.zigbee.dongle.telegesis/src/test/java/com/zsmartsystems/zigbee/dongle/telegesis/internal/protocol/TelegesisUseTcLinkKeyCommandTest.java b/com.zsmartsystems.zigbee.dongle.telegesis/src/test/java/com/zsmartsystems/zigbee/dongle/telegesis/internal/protocol/TelegesisUseTcLinkKeyCommandTest.java index 0e6920176..115f64545 100644 --- a/com.zsmartsystems.zigbee.dongle.telegesis/src/test/java/com/zsmartsystems/zigbee/dongle/telegesis/internal/protocol/TelegesisUseTcLinkKeyCommandTest.java +++ b/com.zsmartsystems.zigbee.dongle.telegesis/src/test/java/com/zsmartsystems/zigbee/dongle/telegesis/internal/protocol/TelegesisUseTcLinkKeyCommandTest.java @@ -7,9 +7,9 @@ */ package com.zsmartsystems.zigbee.dongle.telegesis.internal.protocol; -import static org.junit.Assert.assertEquals; +import static org.junit.jupiter.api.Assertions.assertEquals; -import org.junit.Test; +import org.junit.jupiter.api.Test; /** * diff --git a/com.zsmartsystems.zigbee.dongle.xbee/src/test/java/com/zsmartsystems/zigbee/dongle/xbee/ZigBeeDongleXBeeTest.java b/com.zsmartsystems.zigbee.dongle.xbee/src/test/java/com/zsmartsystems/zigbee/dongle/xbee/ZigBeeDongleXBeeTest.java index e0d0e4cbf..1906a04b8 100644 --- a/com.zsmartsystems.zigbee.dongle.xbee/src/test/java/com/zsmartsystems/zigbee/dongle/xbee/ZigBeeDongleXBeeTest.java +++ b/com.zsmartsystems.zigbee.dongle.xbee/src/test/java/com/zsmartsystems/zigbee/dongle/xbee/ZigBeeDongleXBeeTest.java @@ -7,15 +7,15 @@ */ package com.zsmartsystems.zigbee.dongle.xbee; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertTrue; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertTrue; import java.lang.reflect.Field; import java.util.ArrayList; import java.util.Arrays; import java.util.List; -import org.junit.Test; +import org.junit.jupiter.api.Test; import org.mockito.ArgumentCaptor; import org.mockito.Mockito; diff --git a/com.zsmartsystems.zigbee.dongle.xbee/src/test/java/com/zsmartsystems/zigbee/dongle/xbee/internal/XBeeEventFactoryTest.java b/com.zsmartsystems.zigbee.dongle.xbee/src/test/java/com/zsmartsystems/zigbee/dongle/xbee/internal/XBeeEventFactoryTest.java index 6e6c7aa67..f86bc755d 100644 --- a/com.zsmartsystems.zigbee.dongle.xbee/src/test/java/com/zsmartsystems/zigbee/dongle/xbee/internal/XBeeEventFactoryTest.java +++ b/com.zsmartsystems.zigbee.dongle.xbee/src/test/java/com/zsmartsystems/zigbee/dongle/xbee/internal/XBeeEventFactoryTest.java @@ -7,10 +7,10 @@ */ package com.zsmartsystems.zigbee.dongle.xbee.internal; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertTrue; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertTrue; -import org.junit.Test; +import org.junit.jupiter.api.Test; import com.zsmartsystems.zigbee.IeeeAddress; import com.zsmartsystems.zigbee.dongle.xbee.internal.protocol.XBeeEvent; diff --git a/com.zsmartsystems.zigbee.dongle.xbee/src/test/java/com/zsmartsystems/zigbee/dongle/xbee/internal/XBeeFrameHandlerTest.java b/com.zsmartsystems.zigbee.dongle.xbee/src/test/java/com/zsmartsystems/zigbee/dongle/xbee/internal/XBeeFrameHandlerTest.java index d4f80b50c..0b985cfb2 100644 --- a/com.zsmartsystems.zigbee.dongle.xbee/src/test/java/com/zsmartsystems/zigbee/dongle/xbee/internal/XBeeFrameHandlerTest.java +++ b/com.zsmartsystems.zigbee.dongle.xbee/src/test/java/com/zsmartsystems/zigbee/dongle/xbee/internal/XBeeFrameHandlerTest.java @@ -7,9 +7,9 @@ */ package com.zsmartsystems.zigbee.dongle.xbee.internal; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertNotNull; -import static org.junit.Assert.assertNull; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertNotNull; +import static org.junit.jupiter.api.Assertions.assertNull; import java.io.ByteArrayInputStream; import java.io.IOException; @@ -19,7 +19,7 @@ import java.lang.reflect.InvocationTargetException; import java.lang.reflect.Method; -import org.junit.Test; +import org.junit.jupiter.api.Test; import com.zsmartsystems.zigbee.transport.ZigBeePort; diff --git a/com.zsmartsystems.zigbee.dongle.xbee/src/test/java/com/zsmartsystems/zigbee/dongle/xbee/internal/XBeeResponseFactoryTest.java b/com.zsmartsystems.zigbee.dongle.xbee/src/test/java/com/zsmartsystems/zigbee/dongle/xbee/internal/XBeeResponseFactoryTest.java index f30e1f64b..702e4c374 100644 --- a/com.zsmartsystems.zigbee.dongle.xbee/src/test/java/com/zsmartsystems/zigbee/dongle/xbee/internal/XBeeResponseFactoryTest.java +++ b/com.zsmartsystems.zigbee.dongle.xbee/src/test/java/com/zsmartsystems/zigbee/dongle/xbee/internal/XBeeResponseFactoryTest.java @@ -7,10 +7,10 @@ */ package com.zsmartsystems.zigbee.dongle.xbee.internal; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertTrue; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertTrue; -import org.junit.Test; +import org.junit.jupiter.api.Test; import com.zsmartsystems.zigbee.dongle.xbee.internal.protocol.CommandStatus; import com.zsmartsystems.zigbee.dongle.xbee.internal.protocol.DeliveryStatus; diff --git a/com.zsmartsystems.zigbee.dongle.xbee/src/test/java/com/zsmartsystems/zigbee/dongle/xbee/internal/protocol/XBeeAtCommandTest.java b/com.zsmartsystems.zigbee.dongle.xbee/src/test/java/com/zsmartsystems/zigbee/dongle/xbee/internal/protocol/XBeeAtCommandTest.java index 40741214e..5354f96dc 100644 --- a/com.zsmartsystems.zigbee.dongle.xbee/src/test/java/com/zsmartsystems/zigbee/dongle/xbee/internal/protocol/XBeeAtCommandTest.java +++ b/com.zsmartsystems.zigbee.dongle.xbee/src/test/java/com/zsmartsystems/zigbee/dongle/xbee/internal/protocol/XBeeAtCommandTest.java @@ -7,11 +7,11 @@ */ package com.zsmartsystems.zigbee.dongle.xbee.internal.protocol; -import static org.junit.Assert.assertTrue; +import static org.junit.jupiter.api.Assertions.assertTrue; import java.util.Arrays; -import org.junit.Test; +import org.junit.jupiter.api.Test; /** * diff --git a/com.zsmartsystems.zigbee.dongle.xbee/src/test/java/com/zsmartsystems/zigbee/dongle/xbee/internal/protocol/XBeeAtResponseTest.java b/com.zsmartsystems.zigbee.dongle.xbee/src/test/java/com/zsmartsystems/zigbee/dongle/xbee/internal/protocol/XBeeAtResponseTest.java index 8da2c3415..85df0d3b8 100644 --- a/com.zsmartsystems.zigbee.dongle.xbee/src/test/java/com/zsmartsystems/zigbee/dongle/xbee/internal/protocol/XBeeAtResponseTest.java +++ b/com.zsmartsystems.zigbee.dongle.xbee/src/test/java/com/zsmartsystems/zigbee/dongle/xbee/internal/protocol/XBeeAtResponseTest.java @@ -7,11 +7,11 @@ */ package com.zsmartsystems.zigbee.dongle.xbee.internal.protocol; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertNotNull; -import static org.junit.Assert.assertNull; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertNotNull; +import static org.junit.jupiter.api.Assertions.assertNull; -import org.junit.Test; +import org.junit.jupiter.api.Test; /** * diff --git a/com.zsmartsystems.zigbee.dongle.xbee/src/test/java/com/zsmartsystems/zigbee/dongle/xbee/internal/protocol/XBeeCreateSourceRouteCommandTest.java b/com.zsmartsystems.zigbee.dongle.xbee/src/test/java/com/zsmartsystems/zigbee/dongle/xbee/internal/protocol/XBeeCreateSourceRouteCommandTest.java index 395071d3a..c506a314d 100644 --- a/com.zsmartsystems.zigbee.dongle.xbee/src/test/java/com/zsmartsystems/zigbee/dongle/xbee/internal/protocol/XBeeCreateSourceRouteCommandTest.java +++ b/com.zsmartsystems.zigbee.dongle.xbee/src/test/java/com/zsmartsystems/zigbee/dongle/xbee/internal/protocol/XBeeCreateSourceRouteCommandTest.java @@ -7,11 +7,11 @@ */ package com.zsmartsystems.zigbee.dongle.xbee.internal.protocol; -import static org.junit.Assert.assertTrue; +import static org.junit.jupiter.api.Assertions.assertTrue; import java.util.Arrays; -import org.junit.Test; +import org.junit.jupiter.api.Test; import com.zsmartsystems.zigbee.IeeeAddress; diff --git a/com.zsmartsystems.zigbee.dongle.xbee/src/test/java/com/zsmartsystems/zigbee/dongle/xbee/internal/protocol/XBeeDetailedVersionResponseTest.java b/com.zsmartsystems.zigbee.dongle.xbee/src/test/java/com/zsmartsystems/zigbee/dongle/xbee/internal/protocol/XBeeDetailedVersionResponseTest.java index e3ff2875c..3ab8c4d99 100644 --- a/com.zsmartsystems.zigbee.dongle.xbee/src/test/java/com/zsmartsystems/zigbee/dongle/xbee/internal/protocol/XBeeDetailedVersionResponseTest.java +++ b/com.zsmartsystems.zigbee.dongle.xbee/src/test/java/com/zsmartsystems/zigbee/dongle/xbee/internal/protocol/XBeeDetailedVersionResponseTest.java @@ -7,12 +7,12 @@ */ package com.zsmartsystems.zigbee.dongle.xbee.internal.protocol; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertTrue; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertTrue; import java.util.Arrays; -import org.junit.Test; +import org.junit.jupiter.api.Test; /** * diff --git a/com.zsmartsystems.zigbee.dongle.xbee/src/test/java/com/zsmartsystems/zigbee/dongle/xbee/internal/protocol/XBeeEncryptionOptionsResponseTest.java b/com.zsmartsystems.zigbee.dongle.xbee/src/test/java/com/zsmartsystems/zigbee/dongle/xbee/internal/protocol/XBeeEncryptionOptionsResponseTest.java index db3f424e7..29fc6c4ae 100644 --- a/com.zsmartsystems.zigbee.dongle.xbee/src/test/java/com/zsmartsystems/zigbee/dongle/xbee/internal/protocol/XBeeEncryptionOptionsResponseTest.java +++ b/com.zsmartsystems.zigbee.dongle.xbee/src/test/java/com/zsmartsystems/zigbee/dongle/xbee/internal/protocol/XBeeEncryptionOptionsResponseTest.java @@ -7,9 +7,9 @@ */ package com.zsmartsystems.zigbee.dongle.xbee.internal.protocol; -import static org.junit.Assert.assertEquals; +import static org.junit.jupiter.api.Assertions.assertEquals; -import org.junit.Test; +import org.junit.jupiter.api.Test; /** * diff --git a/com.zsmartsystems.zigbee.dongle.xbee/src/test/java/com/zsmartsystems/zigbee/dongle/xbee/internal/protocol/XBeeFirmwareVersionResponseTest.java b/com.zsmartsystems.zigbee.dongle.xbee/src/test/java/com/zsmartsystems/zigbee/dongle/xbee/internal/protocol/XBeeFirmwareVersionResponseTest.java index f3052f366..f5d2e20fa 100644 --- a/com.zsmartsystems.zigbee.dongle.xbee/src/test/java/com/zsmartsystems/zigbee/dongle/xbee/internal/protocol/XBeeFirmwareVersionResponseTest.java +++ b/com.zsmartsystems.zigbee.dongle.xbee/src/test/java/com/zsmartsystems/zigbee/dongle/xbee/internal/protocol/XBeeFirmwareVersionResponseTest.java @@ -7,12 +7,12 @@ */ package com.zsmartsystems.zigbee.dongle.xbee.internal.protocol; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertTrue; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertTrue; import java.util.Arrays; -import org.junit.Test; +import org.junit.jupiter.api.Test; /** * diff --git a/com.zsmartsystems.zigbee.dongle.xbee/src/test/java/com/zsmartsystems/zigbee/dongle/xbee/internal/protocol/XBeeGetDetailedVersionCommandTest.java b/com.zsmartsystems.zigbee.dongle.xbee/src/test/java/com/zsmartsystems/zigbee/dongle/xbee/internal/protocol/XBeeGetDetailedVersionCommandTest.java index 358757cc9..975ff6dab 100644 --- a/com.zsmartsystems.zigbee.dongle.xbee/src/test/java/com/zsmartsystems/zigbee/dongle/xbee/internal/protocol/XBeeGetDetailedVersionCommandTest.java +++ b/com.zsmartsystems.zigbee.dongle.xbee/src/test/java/com/zsmartsystems/zigbee/dongle/xbee/internal/protocol/XBeeGetDetailedVersionCommandTest.java @@ -7,11 +7,11 @@ */ package com.zsmartsystems.zigbee.dongle.xbee.internal.protocol; -import static org.junit.Assert.assertTrue; +import static org.junit.jupiter.api.Assertions.assertTrue; import java.util.Arrays; -import org.junit.Test; +import org.junit.jupiter.api.Test; /** * diff --git a/com.zsmartsystems.zigbee.dongle.xbee/src/test/java/com/zsmartsystems/zigbee/dongle/xbee/internal/protocol/XBeeGetFirmwareVersionCommandTest.java b/com.zsmartsystems.zigbee.dongle.xbee/src/test/java/com/zsmartsystems/zigbee/dongle/xbee/internal/protocol/XBeeGetFirmwareVersionCommandTest.java index 1f752cc15..185e35ded 100644 --- a/com.zsmartsystems.zigbee.dongle.xbee/src/test/java/com/zsmartsystems/zigbee/dongle/xbee/internal/protocol/XBeeGetFirmwareVersionCommandTest.java +++ b/com.zsmartsystems.zigbee.dongle.xbee/src/test/java/com/zsmartsystems/zigbee/dongle/xbee/internal/protocol/XBeeGetFirmwareVersionCommandTest.java @@ -7,11 +7,11 @@ */ package com.zsmartsystems.zigbee.dongle.xbee.internal.protocol; -import static org.junit.Assert.assertTrue; +import static org.junit.jupiter.api.Assertions.assertTrue; import java.util.Arrays; -import org.junit.Test; +import org.junit.jupiter.api.Test; /** * diff --git a/com.zsmartsystems.zigbee.dongle.xbee/src/test/java/com/zsmartsystems/zigbee/dongle/xbee/internal/protocol/XBeeGetHardwareVersionCommandTest.java b/com.zsmartsystems.zigbee.dongle.xbee/src/test/java/com/zsmartsystems/zigbee/dongle/xbee/internal/protocol/XBeeGetHardwareVersionCommandTest.java index 99f5b09b2..3f95387ae 100644 --- a/com.zsmartsystems.zigbee.dongle.xbee/src/test/java/com/zsmartsystems/zigbee/dongle/xbee/internal/protocol/XBeeGetHardwareVersionCommandTest.java +++ b/com.zsmartsystems.zigbee.dongle.xbee/src/test/java/com/zsmartsystems/zigbee/dongle/xbee/internal/protocol/XBeeGetHardwareVersionCommandTest.java @@ -7,11 +7,11 @@ */ package com.zsmartsystems.zigbee.dongle.xbee.internal.protocol; -import static org.junit.Assert.assertTrue; +import static org.junit.jupiter.api.Assertions.assertTrue; import java.util.Arrays; -import org.junit.Test; +import org.junit.jupiter.api.Test; /** * diff --git a/com.zsmartsystems.zigbee.dongle.xbee/src/test/java/com/zsmartsystems/zigbee/dongle/xbee/internal/protocol/XBeeHardwareVersionResponseTest.java b/com.zsmartsystems.zigbee.dongle.xbee/src/test/java/com/zsmartsystems/zigbee/dongle/xbee/internal/protocol/XBeeHardwareVersionResponseTest.java index e6f54a96f..c29078575 100644 --- a/com.zsmartsystems.zigbee.dongle.xbee/src/test/java/com/zsmartsystems/zigbee/dongle/xbee/internal/protocol/XBeeHardwareVersionResponseTest.java +++ b/com.zsmartsystems.zigbee.dongle.xbee/src/test/java/com/zsmartsystems/zigbee/dongle/xbee/internal/protocol/XBeeHardwareVersionResponseTest.java @@ -7,9 +7,9 @@ */ package com.zsmartsystems.zigbee.dongle.xbee.internal.protocol; -import static org.junit.Assert.assertEquals; +import static org.junit.jupiter.api.Assertions.assertEquals; -import org.junit.Test; +import org.junit.jupiter.api.Test; /** * diff --git a/com.zsmartsystems.zigbee.dongle.xbee/src/test/java/com/zsmartsystems/zigbee/dongle/xbee/internal/protocol/XBeeLinkKeyResponseTest.java b/com.zsmartsystems.zigbee.dongle.xbee/src/test/java/com/zsmartsystems/zigbee/dongle/xbee/internal/protocol/XBeeLinkKeyResponseTest.java index 06d540325..8b324ac55 100644 --- a/com.zsmartsystems.zigbee.dongle.xbee/src/test/java/com/zsmartsystems/zigbee/dongle/xbee/internal/protocol/XBeeLinkKeyResponseTest.java +++ b/com.zsmartsystems.zigbee.dongle.xbee/src/test/java/com/zsmartsystems/zigbee/dongle/xbee/internal/protocol/XBeeLinkKeyResponseTest.java @@ -7,9 +7,9 @@ */ package com.zsmartsystems.zigbee.dongle.xbee.internal.protocol; -import static org.junit.Assert.assertEquals; +import static org.junit.jupiter.api.Assertions.assertEquals; -import org.junit.Test; +import org.junit.jupiter.api.Test; /** * diff --git a/com.zsmartsystems.zigbee.dongle.xbee/src/test/java/com/zsmartsystems/zigbee/dongle/xbee/internal/protocol/XBeeModemStatusEventTest.java b/com.zsmartsystems.zigbee.dongle.xbee/src/test/java/com/zsmartsystems/zigbee/dongle/xbee/internal/protocol/XBeeModemStatusEventTest.java index 85d80f506..b47fd8a45 100644 --- a/com.zsmartsystems.zigbee.dongle.xbee/src/test/java/com/zsmartsystems/zigbee/dongle/xbee/internal/protocol/XBeeModemStatusEventTest.java +++ b/com.zsmartsystems.zigbee.dongle.xbee/src/test/java/com/zsmartsystems/zigbee/dongle/xbee/internal/protocol/XBeeModemStatusEventTest.java @@ -7,9 +7,9 @@ */ package com.zsmartsystems.zigbee.dongle.xbee.internal.protocol; -import static org.junit.Assert.assertEquals; +import static org.junit.jupiter.api.Assertions.assertEquals; -import org.junit.Test; +import org.junit.jupiter.api.Test; /** * diff --git a/com.zsmartsystems.zigbee.dongle.xbee/src/test/java/com/zsmartsystems/zigbee/dongle/xbee/internal/protocol/XBeeNetworkKeyResponseTest.java b/com.zsmartsystems.zigbee.dongle.xbee/src/test/java/com/zsmartsystems/zigbee/dongle/xbee/internal/protocol/XBeeNetworkKeyResponseTest.java index 992f92c2d..1503ae701 100644 --- a/com.zsmartsystems.zigbee.dongle.xbee/src/test/java/com/zsmartsystems/zigbee/dongle/xbee/internal/protocol/XBeeNetworkKeyResponseTest.java +++ b/com.zsmartsystems.zigbee.dongle.xbee/src/test/java/com/zsmartsystems/zigbee/dongle/xbee/internal/protocol/XBeeNetworkKeyResponseTest.java @@ -7,9 +7,9 @@ */ package com.zsmartsystems.zigbee.dongle.xbee.internal.protocol; -import static org.junit.Assert.assertEquals; +import static org.junit.jupiter.api.Assertions.assertEquals; -import org.junit.Test; +import org.junit.jupiter.api.Test; /** * diff --git a/com.zsmartsystems.zigbee.dongle.xbee/src/test/java/com/zsmartsystems/zigbee/dongle/xbee/internal/protocol/XBeeReceivePacketEventTest.java b/com.zsmartsystems.zigbee.dongle.xbee/src/test/java/com/zsmartsystems/zigbee/dongle/xbee/internal/protocol/XBeeReceivePacketEventTest.java index 4b3f95149..2929f05e6 100644 --- a/com.zsmartsystems.zigbee.dongle.xbee/src/test/java/com/zsmartsystems/zigbee/dongle/xbee/internal/protocol/XBeeReceivePacketEventTest.java +++ b/com.zsmartsystems.zigbee.dongle.xbee/src/test/java/com/zsmartsystems/zigbee/dongle/xbee/internal/protocol/XBeeReceivePacketEventTest.java @@ -7,12 +7,12 @@ */ package com.zsmartsystems.zigbee.dongle.xbee.internal.protocol; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertTrue; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertTrue; import java.util.Arrays; -import org.junit.Test; +import org.junit.jupiter.api.Test; import com.zsmartsystems.zigbee.IeeeAddress; diff --git a/com.zsmartsystems.zigbee.dongle.xbee/src/test/java/com/zsmartsystems/zigbee/dongle/xbee/internal/protocol/XBeeReceivePacketExplicitEventTest.java b/com.zsmartsystems.zigbee.dongle.xbee/src/test/java/com/zsmartsystems/zigbee/dongle/xbee/internal/protocol/XBeeReceivePacketExplicitEventTest.java index 853895cd3..6ca51cfe0 100644 --- a/com.zsmartsystems.zigbee.dongle.xbee/src/test/java/com/zsmartsystems/zigbee/dongle/xbee/internal/protocol/XBeeReceivePacketExplicitEventTest.java +++ b/com.zsmartsystems.zigbee.dongle.xbee/src/test/java/com/zsmartsystems/zigbee/dongle/xbee/internal/protocol/XBeeReceivePacketExplicitEventTest.java @@ -7,12 +7,12 @@ */ package com.zsmartsystems.zigbee.dongle.xbee.internal.protocol; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertTrue; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertTrue; import java.util.Arrays; -import org.junit.Test; +import org.junit.jupiter.api.Test; import com.zsmartsystems.zigbee.IeeeAddress; diff --git a/com.zsmartsystems.zigbee.dongle.xbee/src/test/java/com/zsmartsystems/zigbee/dongle/xbee/internal/protocol/XBeeRouteRecordEventTest.java b/com.zsmartsystems.zigbee.dongle.xbee/src/test/java/com/zsmartsystems/zigbee/dongle/xbee/internal/protocol/XBeeRouteRecordEventTest.java index d7beb102a..a9a66265f 100644 --- a/com.zsmartsystems.zigbee.dongle.xbee/src/test/java/com/zsmartsystems/zigbee/dongle/xbee/internal/protocol/XBeeRouteRecordEventTest.java +++ b/com.zsmartsystems.zigbee.dongle.xbee/src/test/java/com/zsmartsystems/zigbee/dongle/xbee/internal/protocol/XBeeRouteRecordEventTest.java @@ -7,9 +7,9 @@ */ package com.zsmartsystems.zigbee.dongle.xbee.internal.protocol; -import static org.junit.Assert.assertEquals; +import static org.junit.jupiter.api.Assertions.assertEquals; -import org.junit.Test; +import org.junit.jupiter.api.Test; import com.zsmartsystems.zigbee.IeeeAddress; diff --git a/com.zsmartsystems.zigbee.dongle.xbee/src/test/java/com/zsmartsystems/zigbee/dongle/xbee/internal/protocol/XBeeScanChannelsResponseTest.java b/com.zsmartsystems.zigbee.dongle.xbee/src/test/java/com/zsmartsystems/zigbee/dongle/xbee/internal/protocol/XBeeScanChannelsResponseTest.java index 363c8d64f..f7f73aa1b 100644 --- a/com.zsmartsystems.zigbee.dongle.xbee/src/test/java/com/zsmartsystems/zigbee/dongle/xbee/internal/protocol/XBeeScanChannelsResponseTest.java +++ b/com.zsmartsystems.zigbee.dongle.xbee/src/test/java/com/zsmartsystems/zigbee/dongle/xbee/internal/protocol/XBeeScanChannelsResponseTest.java @@ -7,9 +7,9 @@ */ package com.zsmartsystems.zigbee.dongle.xbee.internal.protocol; -import static org.junit.Assert.assertEquals; +import static org.junit.jupiter.api.Assertions.assertEquals; -import org.junit.Test; +import org.junit.jupiter.api.Test; /** * diff --git a/com.zsmartsystems.zigbee/src/test/java/com/zsmartsystems/zigbee/CommandResultTest.java b/com.zsmartsystems.zigbee/src/test/java/com/zsmartsystems/zigbee/CommandResultTest.java index d8977a713..cddb34d89 100644 --- a/com.zsmartsystems.zigbee/src/test/java/com/zsmartsystems/zigbee/CommandResultTest.java +++ b/com.zsmartsystems.zigbee/src/test/java/com/zsmartsystems/zigbee/CommandResultTest.java @@ -7,11 +7,11 @@ */ package com.zsmartsystems.zigbee; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertFalse; -import static org.junit.Assert.assertTrue; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertFalse; +import static org.junit.jupiter.api.Assertions.assertTrue; -import org.junit.Test; +import org.junit.jupiter.api.Test; import com.zsmartsystems.zigbee.zcl.ZclStatus; import com.zsmartsystems.zigbee.zcl.clusters.general.DefaultResponse; diff --git a/com.zsmartsystems.zigbee/src/test/java/com/zsmartsystems/zigbee/ExtendedPanIdTest.java b/com.zsmartsystems.zigbee/src/test/java/com/zsmartsystems/zigbee/ExtendedPanIdTest.java index cbae598d4..e4b6a7bcc 100644 --- a/com.zsmartsystems.zigbee/src/test/java/com/zsmartsystems/zigbee/ExtendedPanIdTest.java +++ b/com.zsmartsystems.zigbee/src/test/java/com/zsmartsystems/zigbee/ExtendedPanIdTest.java @@ -7,14 +7,15 @@ */ package com.zsmartsystems.zigbee; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertFalse; -import static org.junit.Assert.assertNotEquals; -import static org.junit.Assert.assertTrue; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertFalse; +import static org.junit.jupiter.api.Assertions.assertNotEquals; +import static org.junit.jupiter.api.Assertions.assertThrows; +import static org.junit.jupiter.api.Assertions.assertTrue; import java.math.BigInteger; -import org.junit.Test; +import org.junit.jupiter.api.Test; /** * @@ -35,9 +36,11 @@ public void testConstructorArray() { assertEquals("0017880100DC880B", address.toString()); } - @Test(expected = IllegalArgumentException.class) + @Test public void testConstructorArrayShort() { - new ExtendedPanId(new int[] { 0x0b, 0x88, 0xdc, 0x00, 0x01, 0x88, 0x17 }); + assertThrows(IllegalArgumentException.class, () -> { + new ExtendedPanId(new int[] { 0x0b, 0x88, 0xdc, 0x00, 0x01, 0x88, 0x17 }); + }); } @Test diff --git a/com.zsmartsystems.zigbee/src/test/java/com/zsmartsystems/zigbee/IeeeAddressTest.java b/com.zsmartsystems.zigbee/src/test/java/com/zsmartsystems/zigbee/IeeeAddressTest.java index 2c567862d..2cd2cd654 100644 --- a/com.zsmartsystems.zigbee/src/test/java/com/zsmartsystems/zigbee/IeeeAddressTest.java +++ b/com.zsmartsystems.zigbee/src/test/java/com/zsmartsystems/zigbee/IeeeAddressTest.java @@ -7,10 +7,11 @@ */ package com.zsmartsystems.zigbee; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertTrue; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertThrows; +import static org.junit.jupiter.api.Assertions.assertTrue; -import org.junit.Test; +import org.junit.jupiter.api.Test; /** * @@ -34,14 +35,18 @@ public void testConstructorString() { assertEquals("8418260000D9959B", address.toString()); } - @Test(expected = IllegalArgumentException.class) + @Test public void testConstructorStringError() { - new IeeeAddress("ABCDEFGH"); + assertThrows(IllegalArgumentException.class, () -> { + new IeeeAddress("ABCDEFGH"); + }); } - @Test(expected = IllegalArgumentException.class) + @Test public void testConstructorArrayError() { - new IeeeAddress(new int[4]); + assertThrows(IllegalArgumentException.class, () -> { + new IeeeAddress(new int[4]); + }); } @Test diff --git a/com.zsmartsystems.zigbee/src/test/java/com/zsmartsystems/zigbee/ZigBeeBroadcastDestinationTest.java b/com.zsmartsystems.zigbee/src/test/java/com/zsmartsystems/zigbee/ZigBeeBroadcastDestinationTest.java index f3a8d15a7..d14d4ddd4 100644 --- a/com.zsmartsystems.zigbee/src/test/java/com/zsmartsystems/zigbee/ZigBeeBroadcastDestinationTest.java +++ b/com.zsmartsystems.zigbee/src/test/java/com/zsmartsystems/zigbee/ZigBeeBroadcastDestinationTest.java @@ -7,11 +7,11 @@ */ package com.zsmartsystems.zigbee; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertFalse; -import static org.junit.Assert.assertTrue; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertFalse; +import static org.junit.jupiter.api.Assertions.assertTrue; -import org.junit.Test; +import org.junit.jupiter.api.Test; /** * diff --git a/com.zsmartsystems.zigbee/src/test/java/com/zsmartsystems/zigbee/ZigBeeChannelMaskTest.java b/com.zsmartsystems.zigbee/src/test/java/com/zsmartsystems/zigbee/ZigBeeChannelMaskTest.java index 0c6507344..b0cbae699 100644 --- a/com.zsmartsystems.zigbee/src/test/java/com/zsmartsystems/zigbee/ZigBeeChannelMaskTest.java +++ b/com.zsmartsystems.zigbee/src/test/java/com/zsmartsystems/zigbee/ZigBeeChannelMaskTest.java @@ -7,11 +7,11 @@ */ package com.zsmartsystems.zigbee; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertFalse; -import static org.junit.Assert.assertTrue; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertFalse; +import static org.junit.jupiter.api.Assertions.assertTrue; -import org.junit.Test; +import org.junit.jupiter.api.Test; /** * diff --git a/com.zsmartsystems.zigbee/src/test/java/com/zsmartsystems/zigbee/ZigBeeChannelTest.java b/com.zsmartsystems.zigbee/src/test/java/com/zsmartsystems/zigbee/ZigBeeChannelTest.java index 189a92971..3c276301f 100644 --- a/com.zsmartsystems.zigbee/src/test/java/com/zsmartsystems/zigbee/ZigBeeChannelTest.java +++ b/com.zsmartsystems.zigbee/src/test/java/com/zsmartsystems/zigbee/ZigBeeChannelTest.java @@ -7,9 +7,9 @@ */ package com.zsmartsystems.zigbee; -import static org.junit.Assert.assertEquals; +import static org.junit.jupiter.api.Assertions.assertEquals; -import org.junit.Test; +import org.junit.jupiter.api.Test; /** * diff --git a/com.zsmartsystems.zigbee/src/test/java/com/zsmartsystems/zigbee/ZigBeeDeviceTypeTest.java b/com.zsmartsystems.zigbee/src/test/java/com/zsmartsystems/zigbee/ZigBeeDeviceTypeTest.java index 55064ac46..a39645613 100644 --- a/com.zsmartsystems.zigbee/src/test/java/com/zsmartsystems/zigbee/ZigBeeDeviceTypeTest.java +++ b/com.zsmartsystems.zigbee/src/test/java/com/zsmartsystems/zigbee/ZigBeeDeviceTypeTest.java @@ -7,10 +7,10 @@ */ package com.zsmartsystems.zigbee; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertNull; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertNull; -import org.junit.Test; +import org.junit.jupiter.api.Test; /** * diff --git a/com.zsmartsystems.zigbee/src/test/java/com/zsmartsystems/zigbee/ZigBeeEndpointAddressTest.java b/com.zsmartsystems.zigbee/src/test/java/com/zsmartsystems/zigbee/ZigBeeEndpointAddressTest.java index 85fe88677..c765531cb 100644 --- a/com.zsmartsystems.zigbee/src/test/java/com/zsmartsystems/zigbee/ZigBeeEndpointAddressTest.java +++ b/com.zsmartsystems.zigbee/src/test/java/com/zsmartsystems/zigbee/ZigBeeEndpointAddressTest.java @@ -7,14 +7,14 @@ */ package com.zsmartsystems.zigbee; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertFalse; -import static org.junit.Assert.assertTrue; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertFalse; +import static org.junit.jupiter.api.Assertions.assertTrue; import java.util.HashSet; import java.util.Set; -import org.junit.Test; +import org.junit.jupiter.api.Test; /** * diff --git a/com.zsmartsystems.zigbee/src/test/java/com/zsmartsystems/zigbee/ZigBeeEndpointTest.java b/com.zsmartsystems.zigbee/src/test/java/com/zsmartsystems/zigbee/ZigBeeEndpointTest.java index 73d4e16dd..60805d5e8 100644 --- a/com.zsmartsystems.zigbee/src/test/java/com/zsmartsystems/zigbee/ZigBeeEndpointTest.java +++ b/com.zsmartsystems.zigbee/src/test/java/com/zsmartsystems/zigbee/ZigBeeEndpointTest.java @@ -7,16 +7,16 @@ */ package com.zsmartsystems.zigbee; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertFalse; -import static org.junit.Assert.assertNotNull; -import static org.junit.Assert.assertNull; -import static org.junit.Assert.assertTrue; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertFalse; +import static org.junit.jupiter.api.Assertions.assertNotNull; +import static org.junit.jupiter.api.Assertions.assertNull; +import static org.junit.jupiter.api.Assertions.assertTrue; import java.util.ArrayList; import java.util.List; -import org.junit.Test; +import org.junit.jupiter.api.Test; import org.mockito.ArgumentCaptor; import org.mockito.ArgumentMatchers; import org.mockito.Mockito; diff --git a/com.zsmartsystems.zigbee/src/test/java/com/zsmartsystems/zigbee/ZigBeeNetworkManagerTest.java b/com.zsmartsystems.zigbee/src/test/java/com/zsmartsystems/zigbee/ZigBeeNetworkManagerTest.java index 4de0e61bc..df60673cd 100644 --- a/com.zsmartsystems.zigbee/src/test/java/com/zsmartsystems/zigbee/ZigBeeNetworkManagerTest.java +++ b/com.zsmartsystems.zigbee/src/test/java/com/zsmartsystems/zigbee/ZigBeeNetworkManagerTest.java @@ -7,11 +7,11 @@ */ package com.zsmartsystems.zigbee; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertFalse; -import static org.junit.Assert.assertNotNull; -import static org.junit.Assert.assertNull; -import static org.junit.Assert.assertTrue; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertFalse; +import static org.junit.jupiter.api.Assertions.assertNotNull; +import static org.junit.jupiter.api.Assertions.assertNull; +import static org.junit.jupiter.api.Assertions.assertTrue; import java.io.BufferedReader; import java.io.File; @@ -32,7 +32,7 @@ import java.util.concurrent.TimeUnit; import org.awaitility.Awaitility; -import org.junit.Test; +import org.junit.jupiter.api.Test; import org.mockito.ArgumentCaptor; import org.mockito.ArgumentMatchers; import org.mockito.Mockito; @@ -375,7 +375,7 @@ public void testReceiveZclCommand() throws Exception { TestUtilities.setField(ZigBeeNetworkManager.class, networkManager, "networkState", ZigBeeNetworkState.ONLINE); networkManager.receiveCommand(apsFrame); - Awaitility.await().until(() -> commandListenerUpdated()); + Awaitility.await().until(() -> commandListenerCapture.size() > 0); ReadAttributesCommand response = (ReadAttributesCommand) commandListenerCapture.get(0); @@ -597,7 +597,7 @@ public void nodeAdded(ZigBeeNode node) { TestUtilities.setField(ZigBeeNetworkManager.class, networkManager, "networkState", ZigBeeNetworkState.ONLINE); networkManager.receiveCommand(apsFrame); - Awaitility.await().until(() -> commandListenerUpdated()); + Awaitility.await().until(() -> commandListenerCapture.size() > 0); ReadAttributesCommand response = (ReadAttributesCommand) commandListenerCapture.get(0); @@ -660,7 +660,7 @@ public void nodeAdded(ZigBeeNode node) { TestUtilities.setField(ZigBeeNetworkManager.class, networkManager, "networkState", ZigBeeNetworkState.ONLINE); networkManager.receiveCommand(apsFrame); - Awaitility.await().until(() -> commandListenerUpdated()); + Awaitility.await().until(() -> commandListenerCapture.size() > 0); ReadAttributesCommand response = (ReadAttributesCommand) commandListenerCapture.get(0); @@ -996,7 +996,7 @@ private ZigBeeCommand getZigBeeCommand(ZigBeeApsFrame apsFrame) throws Exception Mockito.verify(node, Mockito.timeout(TIMEOUT).times(1)) .commandReceived(ArgumentMatchers.any(ZigBeeCommand.class), ArgumentMatchers.any(), ArgumentMatchers.any()); - Awaitility.await().until(() -> commandListenerUpdated()); + Awaitility.await().until(() -> commandListenerCapture.size() > 0); if (commandListenerCapture.size() == 0) { return null; } diff --git a/com.zsmartsystems.zigbee/src/test/java/com/zsmartsystems/zigbee/ZigBeeNodeTest.java b/com.zsmartsystems.zigbee/src/test/java/com/zsmartsystems/zigbee/ZigBeeNodeTest.java index f8632366f..c30c0125b 100644 --- a/com.zsmartsystems.zigbee/src/test/java/com/zsmartsystems/zigbee/ZigBeeNodeTest.java +++ b/com.zsmartsystems.zigbee/src/test/java/com/zsmartsystems/zigbee/ZigBeeNodeTest.java @@ -7,12 +7,12 @@ */ package com.zsmartsystems.zigbee; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertFalse; -import static org.junit.Assert.assertNotEquals; -import static org.junit.Assert.assertNotNull; -import static org.junit.Assert.assertNull; -import static org.junit.Assert.assertTrue; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertFalse; +import static org.junit.jupiter.api.Assertions.assertNotEquals; +import static org.junit.jupiter.api.Assertions.assertNotNull; +import static org.junit.jupiter.api.Assertions.assertNull; +import static org.junit.jupiter.api.Assertions.assertTrue; import java.lang.reflect.Field; import java.util.HashMap; @@ -22,7 +22,7 @@ import java.util.concurrent.ExecutionException; import java.util.concurrent.Future; -import org.junit.Test; +import org.junit.jupiter.api.Test; import org.mockito.ArgumentCaptor; import org.mockito.ArgumentMatchers; import org.mockito.Mockito; diff --git a/com.zsmartsystems.zigbee/src/test/java/com/zsmartsystems/zigbee/ZigBeeProfileTypeTest.java b/com.zsmartsystems.zigbee/src/test/java/com/zsmartsystems/zigbee/ZigBeeProfileTypeTest.java index 706c76c41..ee0233da7 100644 --- a/com.zsmartsystems.zigbee/src/test/java/com/zsmartsystems/zigbee/ZigBeeProfileTypeTest.java +++ b/com.zsmartsystems.zigbee/src/test/java/com/zsmartsystems/zigbee/ZigBeeProfileTypeTest.java @@ -7,10 +7,10 @@ */ package com.zsmartsystems.zigbee; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertNull; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertNull; -import org.junit.Test; +import org.junit.jupiter.api.Test; /** * diff --git a/com.zsmartsystems.zigbee/src/test/java/com/zsmartsystems/zigbee/ZigBeeStackTypeTest.java b/com.zsmartsystems.zigbee/src/test/java/com/zsmartsystems/zigbee/ZigBeeStackTypeTest.java index dae2c104a..5e09f8272 100644 --- a/com.zsmartsystems.zigbee/src/test/java/com/zsmartsystems/zigbee/ZigBeeStackTypeTest.java +++ b/com.zsmartsystems.zigbee/src/test/java/com/zsmartsystems/zigbee/ZigBeeStackTypeTest.java @@ -7,9 +7,9 @@ */ package com.zsmartsystems.zigbee; -import static org.junit.Assert.assertEquals; +import static org.junit.jupiter.api.Assertions.assertEquals; -import org.junit.Test; +import org.junit.jupiter.api.Test; /** * diff --git a/com.zsmartsystems.zigbee/src/test/java/com/zsmartsystems/zigbee/app/basic/ZigBeeBasicServerExtensionTest.java b/com.zsmartsystems.zigbee/src/test/java/com/zsmartsystems/zigbee/app/basic/ZigBeeBasicServerExtensionTest.java index 4c2a73cfa..c74676715 100644 --- a/com.zsmartsystems.zigbee/src/test/java/com/zsmartsystems/zigbee/app/basic/ZigBeeBasicServerExtensionTest.java +++ b/com.zsmartsystems.zigbee/src/test/java/com/zsmartsystems/zigbee/app/basic/ZigBeeBasicServerExtensionTest.java @@ -7,14 +7,14 @@ */ package com.zsmartsystems.zigbee.app.basic; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertFalse; -import static org.junit.Assert.assertTrue; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertFalse; +import static org.junit.jupiter.api.Assertions.assertTrue; import java.util.HashSet; import java.util.Set; -import org.junit.Test; +import org.junit.jupiter.api.Test; import org.mockito.ArgumentCaptor; import org.mockito.Mockito; diff --git a/com.zsmartsystems.zigbee/src/test/java/com/zsmartsystems/zigbee/app/discovery/ZigBeeDiscoveryExtensionTest.java b/com.zsmartsystems.zigbee/src/test/java/com/zsmartsystems/zigbee/app/discovery/ZigBeeDiscoveryExtensionTest.java index a8e58fce2..268762a5f 100644 --- a/com.zsmartsystems.zigbee/src/test/java/com/zsmartsystems/zigbee/app/discovery/ZigBeeDiscoveryExtensionTest.java +++ b/com.zsmartsystems.zigbee/src/test/java/com/zsmartsystems/zigbee/app/discovery/ZigBeeDiscoveryExtensionTest.java @@ -7,7 +7,7 @@ */ package com.zsmartsystems.zigbee.app.discovery; -import static org.junit.Assert.assertEquals; +import static org.junit.jupiter.api.Assertions.assertEquals; import java.util.Arrays; import java.util.Map; @@ -15,7 +15,7 @@ import java.util.concurrent.ExecutionException; import java.util.concurrent.Future; -import org.junit.Test; +import org.junit.jupiter.api.Test; import org.mockito.ArgumentMatchers; import org.mockito.Mockito; import org.mockito.invocation.InvocationOnMock; diff --git a/com.zsmartsystems.zigbee/src/test/java/com/zsmartsystems/zigbee/app/discovery/ZigBeeNetworkDiscovererTest.java b/com.zsmartsystems.zigbee/src/test/java/com/zsmartsystems/zigbee/app/discovery/ZigBeeNetworkDiscovererTest.java index 1a6cc114a..2e6352a39 100644 --- a/com.zsmartsystems.zigbee/src/test/java/com/zsmartsystems/zigbee/app/discovery/ZigBeeNetworkDiscovererTest.java +++ b/com.zsmartsystems.zigbee/src/test/java/com/zsmartsystems/zigbee/app/discovery/ZigBeeNetworkDiscovererTest.java @@ -7,8 +7,8 @@ */ package com.zsmartsystems.zigbee.app.discovery; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertNotNull; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertNotNull; import java.util.ArrayList; import java.util.HashMap; @@ -16,8 +16,8 @@ import java.util.Map; import java.util.concurrent.Future; -import org.junit.Before; -import org.junit.Test; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Test; import org.mockito.ArgumentCaptor; import org.mockito.ArgumentMatchers; import org.mockito.Mockito; @@ -55,7 +55,7 @@ public class ZigBeeNetworkDiscovererTest { private ArgumentCaptor nodeCapture; private Map responses = new HashMap<>(); - @Before + @BeforeEach public void setupTest() { networkManager = Mockito.mock(ZigBeeNetworkManager.class); nodeCapture = ArgumentCaptor.forClass(ZigBeeNode.class); diff --git a/com.zsmartsystems.zigbee/src/test/java/com/zsmartsystems/zigbee/app/discovery/ZigBeeNodeServiceDiscovererTest.java b/com.zsmartsystems.zigbee/src/test/java/com/zsmartsystems/zigbee/app/discovery/ZigBeeNodeServiceDiscovererTest.java index c43053627..6d2b91fab 100644 --- a/com.zsmartsystems.zigbee/src/test/java/com/zsmartsystems/zigbee/app/discovery/ZigBeeNodeServiceDiscovererTest.java +++ b/com.zsmartsystems.zigbee/src/test/java/com/zsmartsystems/zigbee/app/discovery/ZigBeeNodeServiceDiscovererTest.java @@ -7,10 +7,10 @@ */ package com.zsmartsystems.zigbee.app.discovery; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertFalse; -import static org.junit.Assert.assertNotNull; -import static org.junit.Assert.assertTrue; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertFalse; +import static org.junit.jupiter.api.Assertions.assertNotNull; +import static org.junit.jupiter.api.Assertions.assertTrue; import java.util.ArrayList; import java.util.Arrays; @@ -23,8 +23,8 @@ import java.util.concurrent.Future; import java.util.concurrent.ScheduledFuture; -import org.junit.Before; -import org.junit.Test; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Test; import org.mockito.ArgumentCaptor; import org.mockito.ArgumentMatchers; import org.mockito.Mockito; @@ -72,7 +72,7 @@ public class ZigBeeNodeServiceDiscovererTest { ArgumentCaptor nodeCapture; Map responses = new HashMap(); - @Before + @BeforeEach public void setupTest() { networkManager = Mockito.mock(ZigBeeNetworkManager.class); nodeCapture = ArgumentCaptor.forClass(ZigBeeNode.class); diff --git a/com.zsmartsystems.zigbee/src/test/java/com/zsmartsystems/zigbee/app/iasclient/ZclIasZoneClientTest.java b/com.zsmartsystems.zigbee/src/test/java/com/zsmartsystems/zigbee/app/iasclient/ZclIasZoneClientTest.java index 92d7dc1bc..7dac643ea 100644 --- a/com.zsmartsystems.zigbee/src/test/java/com/zsmartsystems/zigbee/app/iasclient/ZclIasZoneClientTest.java +++ b/com.zsmartsystems.zigbee/src/test/java/com/zsmartsystems/zigbee/app/iasclient/ZclIasZoneClientTest.java @@ -7,15 +7,16 @@ */ package com.zsmartsystems.zigbee.app.iasclient; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertNull; -import static org.junit.Assert.assertTrue; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertNull; +import static org.junit.jupiter.api.Assertions.assertTrue; import static org.mockito.ArgumentMatchers.eq; -import org.junit.Test; +import org.junit.jupiter.api.Test; import org.mockito.ArgumentCaptor; import org.mockito.ArgumentMatchers; import org.mockito.Mockito; +import org.mockito.stubbing.Answer; import com.zsmartsystems.zigbee.IeeeAddress; import com.zsmartsystems.zigbee.TestUtilities; @@ -29,7 +30,6 @@ import com.zsmartsystems.zigbee.zcl.clusters.iaszone.ZoneEnrollResponse; import com.zsmartsystems.zigbee.zcl.clusters.iaszone.ZoneStateEnum; import com.zsmartsystems.zigbee.zcl.clusters.iaszone.ZoneTypeEnum; -import org.mockito.stubbing.Answer; /** * diff --git a/com.zsmartsystems.zigbee/src/test/java/com/zsmartsystems/zigbee/app/otaupgrade/ZclOtaUpgradeServerTest.java b/com.zsmartsystems.zigbee/src/test/java/com/zsmartsystems/zigbee/app/otaupgrade/ZclOtaUpgradeServerTest.java index 7533cacaa..dadf03683 100644 --- a/com.zsmartsystems.zigbee/src/test/java/com/zsmartsystems/zigbee/app/otaupgrade/ZclOtaUpgradeServerTest.java +++ b/com.zsmartsystems.zigbee/src/test/java/com/zsmartsystems/zigbee/app/otaupgrade/ZclOtaUpgradeServerTest.java @@ -9,20 +9,19 @@ import static java.util.concurrent.TimeUnit.SECONDS; import static org.awaitility.Awaitility.await; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertTrue; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertTrue; import static org.mockito.Mockito.timeout; import java.util.ArrayList; import java.util.HashSet; import java.util.List; import java.util.Set; -import java.util.concurrent.Callable; import java.util.concurrent.Future; import java.util.concurrent.TimeUnit; import org.awaitility.Awaitility; -import org.junit.Test; +import org.junit.jupiter.api.Test; import org.mockito.ArgumentCaptor; import org.mockito.ArgumentMatchers; import org.mockito.Mockito; @@ -85,7 +84,7 @@ public void testNotify() throws Exception { Set devices = new HashSet(); devices.add(endpoint); - Mockito.when(mockedNetworkManager.getNode((IeeeAddress) ArgumentMatchers.anyObject())).thenReturn(node); + Mockito.when(mockedNetworkManager.getNode((IeeeAddress) ArgumentMatchers.any())).thenReturn(node); // Mockito.when(mockedNetworkManager.getDevice((ZigBeeAddress) Matchers.anyObject())).thenReturn(endpoint); // Mockito.when(mockedNetworkManager.getNodeDevices((IeeeAddress) Matchers.anyObject())).thenReturn(devices); @@ -120,7 +119,7 @@ public Integer answer(InvocationOnMock invocation) { server.setFirmware(otaFile); Mockito.verify(cluster, Mockito.times(1)).sendCommand(ArgumentMatchers.any(ImageNotifyCommand.class)); - Awaitility.await().atMost(1000, TimeUnit.MILLISECONDS).until(() -> otaListenerUpdated()); + Awaitility.await().atMost(1000, TimeUnit.MILLISECONDS).until(() -> otaStatusCapture.size() > 0); assertEquals(1, otaStatusCapture.size()); ZigBeeOtaServerStatus status = otaStatusCapture.get(0); @@ -161,7 +160,8 @@ public void cancelUpgrade() throws Exception { server.setTransferTimeoutPeriod(Integer.MAX_VALUE); server.cancelUpgrade(); - await().atMost(1, SECONDS).until(() -> assertEquals(0, otaStatusCapture.size())); + await().atMost(1, SECONDS).until(() -> otaStatusCapture.size() == 0); + assertEquals(0, otaStatusCapture.size()); ZigBeeOtaFile otaFile = Mockito.mock(ZigBeeOtaFile.class); Mockito.when(otaFile.getManufacturerCode()).thenReturn(123); @@ -169,18 +169,20 @@ public void cancelUpgrade() throws Exception { server.setFirmware(otaFile); await().atMost(1, SECONDS) - .until(() -> assertTrue(otaStatusCapture.contains(ZigBeeOtaServerStatus.OTA_WAITING))); + .until(() -> otaStatusCapture.contains(ZigBeeOtaServerStatus.OTA_WAITING)); + assertTrue(otaStatusCapture.contains(ZigBeeOtaServerStatus.OTA_WAITING)); QueryNextImageCommand query = new QueryNextImageCommand(0, 123, 987, 0, 0); query.setApsSecurity(true); server.commandReceived(query); await().atMost(1, SECONDS) - .until(() -> assertTrue(otaStatusCapture.contains(ZigBeeOtaServerStatus.OTA_TRANSFER_IN_PROGRESS))); + .until(() -> otaStatusCapture.contains(ZigBeeOtaServerStatus.OTA_TRANSFER_IN_PROGRESS)); + assertTrue(otaStatusCapture.contains(ZigBeeOtaServerStatus.OTA_TRANSFER_IN_PROGRESS)); otaStatusCapture.clear(); server.cancelUpgrade(); - await().atMost(1, SECONDS).until(() -> otaListenerUpdated()); + await().atMost(1, SECONDS).until(() -> otaStatusCapture.size() > 0); assertTrue(otaStatusCapture.contains(ZigBeeOtaServerStatus.OTA_CANCELLED)); @@ -227,7 +229,8 @@ public void queryNextImageCommand() { Mockito.verify(callback2, Mockito.times(1)).otaIncomingRequest(query); await().atMost(1, SECONDS) - .until(() -> assertTrue(otaStatusCapture.contains(ZigBeeOtaServerStatus.OTA_WAITING))); + .until(() -> otaStatusCapture.contains(ZigBeeOtaServerStatus.OTA_WAITING)); + assertTrue(otaStatusCapture.contains(ZigBeeOtaServerStatus.OTA_WAITING)); server.addListener(callback2); @@ -236,7 +239,8 @@ public void queryNextImageCommand() { Mockito.verify(callback2, Mockito.times(1)).otaIncomingRequest(query); await().atMost(1, SECONDS) - .until(() -> assertTrue(otaStatusCapture.contains(ZigBeeOtaServerStatus.OTA_WAITING))); + .until(() -> otaStatusCapture.contains(ZigBeeOtaServerStatus.OTA_WAITING)); + assertTrue(otaStatusCapture.contains(ZigBeeOtaServerStatus.OTA_WAITING)); // Transfer is now in progress so we shouldn't notify the listener this time server.commandReceived(query); @@ -252,7 +256,8 @@ public void queryNextImageCommand() { Mockito.verify(callback3, Mockito.times(1)).otaIncomingRequest(query); await().atMost(1, SECONDS) - .until(() -> assertTrue(otaStatusCapture.contains(ZigBeeOtaServerStatus.OTA_WAITING))); + .until(() -> otaStatusCapture.contains(ZigBeeOtaServerStatus.OTA_WAITING)); + assertTrue(otaStatusCapture.contains(ZigBeeOtaServerStatus.OTA_WAITING)); } @Test @@ -352,13 +357,4 @@ public void otaStatusUpdate(ZigBeeOtaServerStatus status, int percent) { otaStatusCapture.add(status); } - private Callable otaListenerUpdated() { - return new Callable() { - @Override - public Integer call() throws Exception { - return otaStatusCapture.size(); // The condition that must be fulfilled - } - }; - } - } diff --git a/com.zsmartsystems.zigbee/src/test/java/com/zsmartsystems/zigbee/app/otaupgrade/ZigBeeOtaFileTest.java b/com.zsmartsystems.zigbee/src/test/java/com/zsmartsystems/zigbee/app/otaupgrade/ZigBeeOtaFileTest.java index 3c0807ef7..c19d754db 100644 --- a/com.zsmartsystems.zigbee/src/test/java/com/zsmartsystems/zigbee/app/otaupgrade/ZigBeeOtaFileTest.java +++ b/com.zsmartsystems.zigbee/src/test/java/com/zsmartsystems/zigbee/app/otaupgrade/ZigBeeOtaFileTest.java @@ -7,14 +7,14 @@ */ package com.zsmartsystems.zigbee.app.otaupgrade; -import static org.junit.Assert.assertEquals; +import static org.junit.jupiter.api.Assertions.assertEquals; import java.io.IOException; import java.nio.file.FileSystems; import java.nio.file.Files; import java.nio.file.Path; -import org.junit.Test; +import org.junit.jupiter.api.Test; import com.zsmartsystems.zigbee.ZigBeeStackType; import com.zsmartsystems.zigbee.app.otaserver.ZigBeeOtaFile; diff --git a/com.zsmartsystems.zigbee/src/test/java/com/zsmartsystems/zigbee/app/otaupgrade/ZigBeeOtaUpgradeExtensionTest.java b/com.zsmartsystems.zigbee/src/test/java/com/zsmartsystems/zigbee/app/otaupgrade/ZigBeeOtaUpgradeExtensionTest.java index 2181bd96d..0777b6bdc 100644 --- a/com.zsmartsystems.zigbee/src/test/java/com/zsmartsystems/zigbee/app/otaupgrade/ZigBeeOtaUpgradeExtensionTest.java +++ b/com.zsmartsystems.zigbee/src/test/java/com/zsmartsystems/zigbee/app/otaupgrade/ZigBeeOtaUpgradeExtensionTest.java @@ -7,13 +7,13 @@ */ package com.zsmartsystems.zigbee.app.otaupgrade; -import static org.junit.Assert.assertEquals; +import static org.junit.jupiter.api.Assertions.assertEquals; import java.util.ArrayList; import java.util.Collection; import java.util.Collections; -import org.junit.Test; +import org.junit.jupiter.api.Test; import org.mockito.ArgumentMatchers; import org.mockito.Mockito; diff --git a/com.zsmartsystems.zigbee/src/test/java/com/zsmartsystems/zigbee/app/seclient/SmartEnergyClientTest.java b/com.zsmartsystems.zigbee/src/test/java/com/zsmartsystems/zigbee/app/seclient/SmartEnergyClientTest.java index 7b38ef013..5888102aa 100644 --- a/com.zsmartsystems.zigbee/src/test/java/com/zsmartsystems/zigbee/app/seclient/SmartEnergyClientTest.java +++ b/com.zsmartsystems.zigbee/src/test/java/com/zsmartsystems/zigbee/app/seclient/SmartEnergyClientTest.java @@ -7,8 +7,8 @@ */ package com.zsmartsystems.zigbee.app.seclient; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertTrue; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertTrue; import java.util.Arrays; import java.util.Collection; @@ -18,8 +18,8 @@ import java.util.Map; import java.util.concurrent.ScheduledFuture; -import org.junit.Assert; -import org.junit.Test; +import org.junit.jupiter.api.Assertions; +import org.junit.jupiter.api.Test; import org.mockito.ArgumentCaptor; import org.mockito.ArgumentMatcher; import org.mockito.ArgumentMatchers; @@ -39,8 +39,8 @@ import com.zsmartsystems.zigbee.ZigBeeNetworkStateListener; import com.zsmartsystems.zigbee.ZigBeeNode; import com.zsmartsystems.zigbee.ZigBeeNode.ZigBeeNodeState; -import com.zsmartsystems.zigbee.internal.NotificationService; import com.zsmartsystems.zigbee.ZigBeeStatus; +import com.zsmartsystems.zigbee.internal.NotificationService; import com.zsmartsystems.zigbee.security.ZigBeeCbkeProvider; import com.zsmartsystems.zigbee.security.ZigBeeCryptoSuites; import com.zsmartsystems.zigbee.zcl.clusters.ZclKeyEstablishmentCluster; @@ -206,7 +206,7 @@ public boolean matches(Runnable argument) { runnable.run(); } catch (Exception e) { e.printStackTrace(); - Assert.fail(); + Assertions.fail(); } return true; } @@ -258,7 +258,7 @@ public boolean matches(Runnable argument) { runnable.run(); } catch (Exception e) { e.printStackTrace(); - Assert.fail(); + Assertions.fail(); } return true; } diff --git a/com.zsmartsystems.zigbee/src/test/java/com/zsmartsystems/zigbee/app/seclient/ZclKeyEstablishmentClientTest.java b/com.zsmartsystems.zigbee/src/test/java/com/zsmartsystems/zigbee/app/seclient/ZclKeyEstablishmentClientTest.java index fc6ca8e91..88a0974a9 100644 --- a/com.zsmartsystems.zigbee/src/test/java/com/zsmartsystems/zigbee/app/seclient/ZclKeyEstablishmentClientTest.java +++ b/com.zsmartsystems.zigbee/src/test/java/com/zsmartsystems/zigbee/app/seclient/ZclKeyEstablishmentClientTest.java @@ -7,11 +7,11 @@ */ package com.zsmartsystems.zigbee.app.seclient; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertFalse; -import static org.junit.Assert.assertTrue; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertFalse; +import static org.junit.jupiter.api.Assertions.assertTrue; -import org.junit.Test; +import org.junit.jupiter.api.Test; import org.mockito.ArgumentCaptor; import org.mockito.ArgumentMatchers; import org.mockito.Mockito; diff --git a/com.zsmartsystems.zigbee/src/test/java/com/zsmartsystems/zigbee/app/seclient/ZclKeyEstablishmentServerTest.java b/com.zsmartsystems.zigbee/src/test/java/com/zsmartsystems/zigbee/app/seclient/ZclKeyEstablishmentServerTest.java index 82799da17..80daa363f 100644 --- a/com.zsmartsystems.zigbee/src/test/java/com/zsmartsystems/zigbee/app/seclient/ZclKeyEstablishmentServerTest.java +++ b/com.zsmartsystems.zigbee/src/test/java/com/zsmartsystems/zigbee/app/seclient/ZclKeyEstablishmentServerTest.java @@ -7,15 +7,15 @@ */ package com.zsmartsystems.zigbee.app.seclient; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertFalse; -import static org.junit.Assert.assertNull; -import static org.junit.Assert.assertTrue; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertFalse; +import static org.junit.jupiter.api.Assertions.assertNull; +import static org.junit.jupiter.api.Assertions.assertTrue; import java.util.HashSet; import java.util.Set; -import org.junit.Test; +import org.junit.jupiter.api.Test; import org.mockito.ArgumentCaptor; import org.mockito.ArgumentMatchers; import org.mockito.Mockito; diff --git a/com.zsmartsystems.zigbee/src/test/java/com/zsmartsystems/zigbee/aps/ApsDataEntityTest.java b/com.zsmartsystems.zigbee/src/test/java/com/zsmartsystems/zigbee/aps/ApsDataEntityTest.java index e861c5418..7bb83b20d 100644 --- a/com.zsmartsystems.zigbee/src/test/java/com/zsmartsystems/zigbee/aps/ApsDataEntityTest.java +++ b/com.zsmartsystems.zigbee/src/test/java/com/zsmartsystems/zigbee/aps/ApsDataEntityTest.java @@ -7,13 +7,13 @@ */ package com.zsmartsystems.zigbee.aps; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertFalse; -import static org.junit.Assert.assertNotNull; -import static org.junit.Assert.assertNull; -import static org.junit.Assert.assertTrue; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertFalse; +import static org.junit.jupiter.api.Assertions.assertNotNull; +import static org.junit.jupiter.api.Assertions.assertNull; +import static org.junit.jupiter.api.Assertions.assertTrue; -import org.junit.Test; +import org.junit.jupiter.api.Test; import org.mockito.ArgumentCaptor; import org.mockito.ArgumentMatchers; import org.mockito.Mockito; @@ -241,7 +241,7 @@ public void shouldExpectOneFrameReceivedForPayloadShorterThanFragmentationLength ZigBeeApsFrame apsFrame = new ZigBeeApsFrame(); apsFrame.setApsCounter(1); apsFrame.setAckRequest(true); - apsFrame.setPayload(createData(0, FRAGMENTATION_LENGTH-1)); + apsFrame.setPayload(createData(0, FRAGMENTATION_LENGTH - 1)); aps.send(0, apsFrame); @@ -277,7 +277,7 @@ public void shouldExpectTwoFramesReceivedForPayloadFittingInTwoFragments() { ZigBeeApsFrame apsFrame = new ZigBeeApsFrame(); apsFrame.setApsCounter(1); apsFrame.setAckRequest(true); - apsFrame.setPayload(createData(0, FRAGMENTATION_LENGTH+1)); + apsFrame.setPayload(createData(0, FRAGMENTATION_LENGTH + 1)); aps.send(0, apsFrame); @@ -298,7 +298,7 @@ public void shouldExpectThreeFramesReceivedForPayloadFittingInThreeFragments() { ZigBeeApsFrame apsFrame = new ZigBeeApsFrame(); apsFrame.setApsCounter(1); apsFrame.setAckRequest(true); - apsFrame.setPayload(createData(0, FRAGMENTATION_LENGTH*2+1)); + apsFrame.setPayload(createData(0, FRAGMENTATION_LENGTH * 2 + 1)); aps.send(0, apsFrame); @@ -322,7 +322,7 @@ public void shouldExpectTwoFramesTransmittedForPayloadFittingInTwoFragmentsWithN ZigBeeApsFrame apsFrame = new ZigBeeApsFrame(); apsFrame.setApsCounter(1); apsFrame.setAckRequest(false); - apsFrame.setPayload(createData(0, FRAGMENTATION_LENGTH+1)); + apsFrame.setPayload(createData(0, FRAGMENTATION_LENGTH + 1)); aps.send(0, apsFrame); @@ -341,7 +341,7 @@ public void shouldExpectTwoFramesTransmittedForPayloadFittingInTwoFragmentsWithN ZigBeeApsFrame apsFrame = new ZigBeeApsFrame(); apsFrame.setApsCounter(1); apsFrame.setAckRequest(false); - apsFrame.setPayload(createData(0, FRAGMENTATION_LENGTH+1)); + apsFrame.setPayload(createData(0, FRAGMENTATION_LENGTH + 1)); aps.send(0, apsFrame); diff --git a/com.zsmartsystems.zigbee/src/test/java/com/zsmartsystems/zigbee/aps/ZigBeeApsFrameTest.java b/com.zsmartsystems.zigbee/src/test/java/com/zsmartsystems/zigbee/aps/ZigBeeApsFrameTest.java index 91b2da760..889e8c863 100644 --- a/com.zsmartsystems.zigbee/src/test/java/com/zsmartsystems/zigbee/aps/ZigBeeApsFrameTest.java +++ b/com.zsmartsystems.zigbee/src/test/java/com/zsmartsystems/zigbee/aps/ZigBeeApsFrameTest.java @@ -7,12 +7,12 @@ */ package com.zsmartsystems.zigbee.aps; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertFalse; -import static org.junit.Assert.assertNotNull; -import static org.junit.Assert.assertTrue; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertFalse; +import static org.junit.jupiter.api.Assertions.assertNotNull; +import static org.junit.jupiter.api.Assertions.assertTrue; -import org.junit.Test; +import org.junit.jupiter.api.Test; /** * diff --git a/com.zsmartsystems.zigbee/src/test/java/com/zsmartsystems/zigbee/database/ZigBeeNetworkDatabaseManagerTest.java b/com.zsmartsystems.zigbee/src/test/java/com/zsmartsystems/zigbee/database/ZigBeeNetworkDatabaseManagerTest.java index 54c42e813..f42a38b1f 100644 --- a/com.zsmartsystems.zigbee/src/test/java/com/zsmartsystems/zigbee/database/ZigBeeNetworkDatabaseManagerTest.java +++ b/com.zsmartsystems.zigbee/src/test/java/com/zsmartsystems/zigbee/database/ZigBeeNetworkDatabaseManagerTest.java @@ -7,7 +7,7 @@ */ package com.zsmartsystems.zigbee.database; -import static org.junit.Assert.assertEquals; +import static org.junit.jupiter.api.Assertions.assertEquals; import java.util.ArrayList; import java.util.HashSet; @@ -19,8 +19,8 @@ import java.util.concurrent.ScheduledFuture; import java.util.concurrent.TimeUnit; -import org.junit.Assert; -import org.junit.Test; +import org.junit.jupiter.api.Assertions; +import org.junit.jupiter.api.Test; import org.mockito.ArgumentMatcher; import org.mockito.ArgumentMatchers; import org.mockito.Mockito; @@ -54,7 +54,7 @@ public boolean matches(Runnable argument) { runnable.run(); } catch (Exception e) { e.printStackTrace(); - Assert.fail(); + Assertions.fail(); } return true; } diff --git a/com.zsmartsystems.zigbee/src/test/java/com/zsmartsystems/zigbee/database/ZigBeeNodeDaoTest.java b/com.zsmartsystems.zigbee/src/test/java/com/zsmartsystems/zigbee/database/ZigBeeNodeDaoTest.java index b806670e5..68b456ea6 100644 --- a/com.zsmartsystems.zigbee/src/test/java/com/zsmartsystems/zigbee/database/ZigBeeNodeDaoTest.java +++ b/com.zsmartsystems.zigbee/src/test/java/com/zsmartsystems/zigbee/database/ZigBeeNodeDaoTest.java @@ -7,7 +7,7 @@ */ package com.zsmartsystems.zigbee.database; -import org.junit.Test; +import org.junit.jupiter.api.Test; import org.mockito.Mockito; import com.zsmartsystems.zigbee.IeeeAddress; diff --git a/com.zsmartsystems.zigbee/src/test/java/com/zsmartsystems/zigbee/groups/ZigBeeGroupTest.java b/com.zsmartsystems.zigbee/src/test/java/com/zsmartsystems/zigbee/groups/ZigBeeGroupTest.java index daa827f50..dece629aa 100644 --- a/com.zsmartsystems.zigbee/src/test/java/com/zsmartsystems/zigbee/groups/ZigBeeGroupTest.java +++ b/com.zsmartsystems.zigbee/src/test/java/com/zsmartsystems/zigbee/groups/ZigBeeGroupTest.java @@ -7,14 +7,15 @@ */ package com.zsmartsystems.zigbee.groups; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertFalse; -import static org.junit.Assert.assertTrue; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertFalse; +import static org.junit.jupiter.api.Assertions.assertThrows; +import static org.junit.jupiter.api.Assertions.assertTrue; import java.util.concurrent.ExecutionException; import java.util.concurrent.Future; -import org.junit.Test; +import org.junit.jupiter.api.Test; import org.mockito.ArgumentMatchers; import org.mockito.Mockito; @@ -67,18 +68,22 @@ public void testGroupAddress() { System.out.println(group2); } - @Test(expected = IllegalArgumentException.class) + @Test public void testGroupIdTooLow() { ZigBeeGroup group = new ZigBeeGroup(Mockito.mock(ZigBeeNetworkManager.class), 1); - group.setGroupId(-2); + assertThrows(IllegalArgumentException.class, () -> { + group.setGroupId(-2); + }); } - @Test(expected = IllegalArgumentException.class) + @Test public void testGroupIdTooHigh() { ZigBeeGroup group = new ZigBeeGroup(Mockito.mock(ZigBeeNetworkManager.class), 1); - group.setGroupId(0xfff8); + assertThrows(IllegalArgumentException.class, () -> { + group.setGroupId(0xfff8); + }); } @Test diff --git a/com.zsmartsystems.zigbee/src/test/java/com/zsmartsystems/zigbee/groups/ZigBeeNetworkGroupManagerTest.java b/com.zsmartsystems.zigbee/src/test/java/com/zsmartsystems/zigbee/groups/ZigBeeNetworkGroupManagerTest.java index 29d177747..5e0615e37 100644 --- a/com.zsmartsystems.zigbee/src/test/java/com/zsmartsystems/zigbee/groups/ZigBeeNetworkGroupManagerTest.java +++ b/com.zsmartsystems.zigbee/src/test/java/com/zsmartsystems/zigbee/groups/ZigBeeNetworkGroupManagerTest.java @@ -7,14 +7,14 @@ */ package com.zsmartsystems.zigbee.groups; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertTrue; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertTrue; import static org.mockito.ArgumentMatchers.any; import java.util.HashSet; import java.util.Set; -import org.junit.Test; +import org.junit.jupiter.api.Test; import org.mockito.Mockito; import com.zsmartsystems.zigbee.ZigBeeNetworkManager; diff --git a/com.zsmartsystems.zigbee/src/test/java/com/zsmartsystems/zigbee/internal/ClusterMatcherTest.java b/com.zsmartsystems.zigbee/src/test/java/com/zsmartsystems/zigbee/internal/ClusterMatcherTest.java index c45169a35..5913e0101 100644 --- a/com.zsmartsystems.zigbee/src/test/java/com/zsmartsystems/zigbee/internal/ClusterMatcherTest.java +++ b/com.zsmartsystems.zigbee/src/test/java/com/zsmartsystems/zigbee/internal/ClusterMatcherTest.java @@ -7,14 +7,14 @@ */ package com.zsmartsystems.zigbee.internal; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertFalse; -import static org.junit.Assert.assertTrue; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertFalse; +import static org.junit.jupiter.api.Assertions.assertTrue; import java.util.ArrayList; import java.util.List; -import org.junit.Test; +import org.junit.jupiter.api.Test; import org.mockito.ArgumentCaptor; import org.mockito.Mockito; import org.mockito.invocation.InvocationOnMock; diff --git a/com.zsmartsystems.zigbee/src/test/java/com/zsmartsystems/zigbee/internal/ZigBeeCommandNotifierTest.java b/com.zsmartsystems.zigbee/src/test/java/com/zsmartsystems/zigbee/internal/ZigBeeCommandNotifierTest.java index 2976e4bdc..21d826e57 100644 --- a/com.zsmartsystems.zigbee/src/test/java/com/zsmartsystems/zigbee/internal/ZigBeeCommandNotifierTest.java +++ b/com.zsmartsystems.zigbee/src/test/java/com/zsmartsystems/zigbee/internal/ZigBeeCommandNotifierTest.java @@ -7,11 +7,11 @@ */ package com.zsmartsystems.zigbee.internal; -import static org.junit.Assert.assertEquals; +import static org.junit.jupiter.api.Assertions.assertEquals; import java.util.Set; -import org.junit.Test; +import org.junit.jupiter.api.Test; import org.mockito.Mockito; import com.zsmartsystems.zigbee.TestUtilities; diff --git a/com.zsmartsystems.zigbee/src/test/java/com/zsmartsystems/zigbee/security/CerticomCbkeCertificateTest.java b/com.zsmartsystems.zigbee/src/test/java/com/zsmartsystems/zigbee/security/CerticomCbkeCertificateTest.java index 658f58ce5..cdac62c27 100644 --- a/com.zsmartsystems.zigbee/src/test/java/com/zsmartsystems/zigbee/security/CerticomCbkeCertificateTest.java +++ b/com.zsmartsystems.zigbee/src/test/java/com/zsmartsystems/zigbee/security/CerticomCbkeCertificateTest.java @@ -7,13 +7,13 @@ */ package com.zsmartsystems.zigbee.security; -import static org.junit.Assert.assertEquals; +import static org.junit.jupiter.api.Assertions.assertEquals; -import org.junit.Test; +import org.junit.jupiter.api.Test; /** * Tests to check creation of CBKE certificates from a Certicom string (cut and paste from website). - * + * * @author Chris Jackson * */ diff --git a/com.zsmartsystems.zigbee/src/test/java/com/zsmartsystems/zigbee/security/MmoHashTest.java b/com.zsmartsystems.zigbee/src/test/java/com/zsmartsystems/zigbee/security/MmoHashTest.java index 35efe4186..c485d4e28 100644 --- a/com.zsmartsystems.zigbee/src/test/java/com/zsmartsystems/zigbee/security/MmoHashTest.java +++ b/com.zsmartsystems.zigbee/src/test/java/com/zsmartsystems/zigbee/security/MmoHashTest.java @@ -7,9 +7,9 @@ */ package com.zsmartsystems.zigbee.security; -import static org.junit.Assert.assertEquals; +import static org.junit.jupiter.api.Assertions.assertEquals; -import org.junit.Test; +import org.junit.jupiter.api.Test; /** * Tests for MMO Hash function used for generating link keys from install codes for ZigBee 3 and Smart Energy. diff --git a/com.zsmartsystems.zigbee/src/test/java/com/zsmartsystems/zigbee/security/ZigBeeCbkeCertificateTest.java b/com.zsmartsystems.zigbee/src/test/java/com/zsmartsystems/zigbee/security/ZigBeeCbkeCertificateTest.java index c3db5ffbb..b654e8d1d 100644 --- a/com.zsmartsystems.zigbee/src/test/java/com/zsmartsystems/zigbee/security/ZigBeeCbkeCertificateTest.java +++ b/com.zsmartsystems.zigbee/src/test/java/com/zsmartsystems/zigbee/security/ZigBeeCbkeCertificateTest.java @@ -7,11 +7,11 @@ */ package com.zsmartsystems.zigbee.security; -import static org.junit.Assert.assertTrue; +import static org.junit.jupiter.api.Assertions.assertTrue; import java.util.Arrays; -import org.junit.Test; +import org.junit.jupiter.api.Test; import org.mockito.Mockito; /** diff --git a/com.zsmartsystems.zigbee/src/test/java/com/zsmartsystems/zigbee/security/ZigBeeCryptoSuite1CertificateTest.java b/com.zsmartsystems.zigbee/src/test/java/com/zsmartsystems/zigbee/security/ZigBeeCryptoSuite1CertificateTest.java index 3b168c890..bbce91724 100644 --- a/com.zsmartsystems.zigbee/src/test/java/com/zsmartsystems/zigbee/security/ZigBeeCryptoSuite1CertificateTest.java +++ b/com.zsmartsystems.zigbee/src/test/java/com/zsmartsystems/zigbee/security/ZigBeeCryptoSuite1CertificateTest.java @@ -7,12 +7,13 @@ */ package com.zsmartsystems.zigbee.security; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertTrue; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertThrows; +import static org.junit.jupiter.api.Assertions.assertTrue; import java.util.Arrays; -import org.junit.Test; +import org.junit.jupiter.api.Test; import com.zsmartsystems.zigbee.IeeeAddress; import com.zsmartsystems.zigbee.zcl.field.ByteArray; @@ -43,23 +44,27 @@ public void test() { certificate.getAttributeData())); } - @Test(expected = IllegalArgumentException.class) + @Test public void testShort() { ByteArray data = new ByteArray(new int[] { 0x02, 0x07, 0x5F, 0xDC, 0x7B, 0x30, 0x19, 0xF8, 0xDB, 0x9D, 0x7D, 0x55, 0x34, 0x23, 0x4D, 0x38, 0x11, 0xC4, 0xD8, 0xB4, 0x3E, 0xF1, 0x00, 0x0D, 0x6F, 0x00, 0x00, 0x61, 0x4E, 0xDF, 0x01, 0x02, 0x03, 0x04, 0x05, 0x06, 0x07, 0x08, 0x01, 0x09, 0x00, 0x01, 0x00, 0x00, 0x11, 0x22, 0x33 }); - new ZigBeeCryptoSuite1Certificate(data); + assertThrows(IllegalArgumentException.class, () -> { + new ZigBeeCryptoSuite1Certificate(data); + }); } - @Test(expected = IllegalArgumentException.class) + @Test public void testLong() { ByteArray data = new ByteArray(new int[] { 0x02, 0x07, 0x5F, 0xDC, 0x7B, 0x30, 0x19, 0xF8, 0xDB, 0x9D, 0x7D, 0x55, 0x34, 0x23, 0x4D, 0x38, 0x11, 0xC4, 0xD8, 0xB4, 0x3E, 0xF1, 0x00, 0x0D, 0x6F, 0x00, 0x00, 0x61, 0x4E, 0xDF, 0x01, 0x02, 0x03, 0x04, 0x05, 0x06, 0x07, 0x08, 0x01, 0x09, 0x00, 0x01, 0x00, 0x00, 0x11, 0x22, 0x33, 0x44, 0x55 }); - new ZigBeeCryptoSuite1Certificate(data); + assertThrows(IllegalArgumentException.class, () -> { + new ZigBeeCryptoSuite1Certificate(data); + }); } } diff --git a/com.zsmartsystems.zigbee/src/test/java/com/zsmartsystems/zigbee/security/ZigBeeKeyTest.java b/com.zsmartsystems.zigbee/src/test/java/com/zsmartsystems/zigbee/security/ZigBeeKeyTest.java index 0186c037b..b7bf0283e 100644 --- a/com.zsmartsystems.zigbee/src/test/java/com/zsmartsystems/zigbee/security/ZigBeeKeyTest.java +++ b/com.zsmartsystems.zigbee/src/test/java/com/zsmartsystems/zigbee/security/ZigBeeKeyTest.java @@ -7,12 +7,13 @@ */ package com.zsmartsystems.zigbee.security; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertFalse; -import static org.junit.Assert.assertNull; -import static org.junit.Assert.assertTrue; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertFalse; +import static org.junit.jupiter.api.Assertions.assertNull; +import static org.junit.jupiter.api.Assertions.assertThrows; +import static org.junit.jupiter.api.Assertions.assertTrue; -import org.junit.Test; +import org.junit.jupiter.api.Test; import com.zsmartsystems.zigbee.IeeeAddress; @@ -30,10 +31,13 @@ public void testConstructorArray() { assertEquals("11223344556677889900AABBCCDDEEFF", key.toString()); } - @Test(expected = IllegalArgumentException.class) + @Test public void testConstructorArrayShort() { - new ZigBeeKey( - new int[] { 0x11, 0x22, 0x33, 0x44, 0x55, 0x66, 0x77, 0x88, 0x99, 0x00, 0xAA, 0xBB, 0xCC, 0xDD, 0xEE }); + assertThrows(IllegalArgumentException.class, () -> { + new ZigBeeKey( + new int[] { 0x11, 0x22, 0x33, 0x44, 0x55, 0x66, 0x77, 0x88, 0x99, 0x00, 0xAA, 0xBB, 0xCC, 0xDD, + 0xEE }); + }); } @Test @@ -60,9 +64,11 @@ public void testConstructorString() { assertEquals("11223344556677889900AABBCCDDEEFF", key.toString()); } - @Test(expected = IllegalArgumentException.class) + @Test public void testConstructorStringShort() { - new ZigBeeKey("11223344556677889900AABBCCDDEE"); + assertThrows(IllegalArgumentException.class, () -> { + new ZigBeeKey("11223344556677889900AABBCCDDEE"); + }); } @Test diff --git a/com.zsmartsystems.zigbee/src/test/java/com/zsmartsystems/zigbee/serialization/DefaultDeserializerTest.java b/com.zsmartsystems.zigbee/src/test/java/com/zsmartsystems/zigbee/serialization/DefaultDeserializerTest.java index 150a77cf4..d3c2f4828 100644 --- a/com.zsmartsystems.zigbee/src/test/java/com/zsmartsystems/zigbee/serialization/DefaultDeserializerTest.java +++ b/com.zsmartsystems.zigbee/src/test/java/com/zsmartsystems/zigbee/serialization/DefaultDeserializerTest.java @@ -7,9 +7,9 @@ */ package com.zsmartsystems.zigbee.serialization; -import static org.junit.Assert.assertEquals; +import static org.junit.jupiter.api.Assertions.assertEquals; -import org.junit.Test; +import org.junit.jupiter.api.Test; import com.zsmartsystems.zigbee.ExtendedPanId; import com.zsmartsystems.zigbee.IeeeAddress; diff --git a/com.zsmartsystems.zigbee/src/test/java/com/zsmartsystems/zigbee/serialization/DefaultSerializerTest.java b/com.zsmartsystems.zigbee/src/test/java/com/zsmartsystems/zigbee/serialization/DefaultSerializerTest.java index 267e12d06..7d9b5bd13 100644 --- a/com.zsmartsystems.zigbee/src/test/java/com/zsmartsystems/zigbee/serialization/DefaultSerializerTest.java +++ b/com.zsmartsystems.zigbee/src/test/java/com/zsmartsystems/zigbee/serialization/DefaultSerializerTest.java @@ -7,13 +7,13 @@ */ package com.zsmartsystems.zigbee.serialization; -import static org.junit.Assert.assertTrue; +import static org.junit.jupiter.api.Assertions.assertTrue; import java.util.ArrayList; import java.util.Arrays; import java.util.List; -import org.junit.Test; +import org.junit.jupiter.api.Test; import com.zsmartsystems.zigbee.ExtendedPanId; import com.zsmartsystems.zigbee.IeeeAddress; diff --git a/com.zsmartsystems.zigbee/src/test/java/com/zsmartsystems/zigbee/serialization/SerializerIntegrationTest.java b/com.zsmartsystems.zigbee/src/test/java/com/zsmartsystems/zigbee/serialization/SerializerIntegrationTest.java index ef1c3ed9f..4a609d24c 100644 --- a/com.zsmartsystems.zigbee/src/test/java/com/zsmartsystems/zigbee/serialization/SerializerIntegrationTest.java +++ b/com.zsmartsystems.zigbee/src/test/java/com/zsmartsystems/zigbee/serialization/SerializerIntegrationTest.java @@ -7,14 +7,14 @@ */ package com.zsmartsystems.zigbee.serialization; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertTrue; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertTrue; import java.util.ArrayList; import java.util.Arrays; import java.util.List; -import org.junit.Test; +import org.junit.jupiter.api.Test; import com.zsmartsystems.zigbee.ExtendedPanId; import com.zsmartsystems.zigbee.IeeeAddress; diff --git a/com.zsmartsystems.zigbee/src/test/java/com/zsmartsystems/zigbee/transaction/ZigBeeTransactionFutureTest.java b/com.zsmartsystems.zigbee/src/test/java/com/zsmartsystems/zigbee/transaction/ZigBeeTransactionFutureTest.java index 36f3bd9e0..2655decea 100644 --- a/com.zsmartsystems.zigbee/src/test/java/com/zsmartsystems/zigbee/transaction/ZigBeeTransactionFutureTest.java +++ b/com.zsmartsystems.zigbee/src/test/java/com/zsmartsystems/zigbee/transaction/ZigBeeTransactionFutureTest.java @@ -7,18 +7,18 @@ */ package com.zsmartsystems.zigbee.transaction; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertFalse; -import static org.junit.Assert.assertNotNull; -import static org.junit.Assert.assertNull; -import static org.junit.Assert.assertTrue; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertFalse; +import static org.junit.jupiter.api.Assertions.assertNotNull; +import static org.junit.jupiter.api.Assertions.assertNull; +import static org.junit.jupiter.api.Assertions.assertTrue; import java.util.concurrent.CountDownLatch; import java.util.concurrent.ExecutionException; import java.util.concurrent.TimeUnit; import java.util.concurrent.TimeoutException; -import org.junit.Test; +import org.junit.jupiter.api.Test; import org.mockito.Mockito; import com.zsmartsystems.zigbee.CommandResult; diff --git a/com.zsmartsystems.zigbee/src/test/java/com/zsmartsystems/zigbee/transaction/ZigBeeTransactionManagerTest.java b/com.zsmartsystems.zigbee/src/test/java/com/zsmartsystems/zigbee/transaction/ZigBeeTransactionManagerTest.java index 79c97779c..5419220e8 100644 --- a/com.zsmartsystems.zigbee/src/test/java/com/zsmartsystems/zigbee/transaction/ZigBeeTransactionManagerTest.java +++ b/com.zsmartsystems.zigbee/src/test/java/com/zsmartsystems/zigbee/transaction/ZigBeeTransactionManagerTest.java @@ -8,11 +8,11 @@ package com.zsmartsystems.zigbee.transaction; import static org.awaitility.Awaitility.await; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertFalse; -import static org.junit.Assert.assertNotNull; -import static org.junit.Assert.assertNull; -import static org.junit.Assert.assertTrue; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertFalse; +import static org.junit.jupiter.api.Assertions.assertNotNull; +import static org.junit.jupiter.api.Assertions.assertNull; +import static org.junit.jupiter.api.Assertions.assertTrue; import java.util.ArrayList; import java.util.HashSet; @@ -27,7 +27,7 @@ import java.util.concurrent.ScheduledFuture; import java.util.concurrent.TimeUnit; -import org.junit.Test; +import org.junit.jupiter.api.Test; import org.mockito.ArgumentMatchers; import org.mockito.Mockito; @@ -194,7 +194,8 @@ public void shutdown() throws Exception { // Mockito.verify(transactionManager, Mockito.timeout(TIMEOUT).times(1)) // .getQueue(new IeeeAddress("1111111111111111")); await().atMost(TIMEOUT, TimeUnit.MILLISECONDS) - .until(() -> assertNull(transactionManager.getQueue(new IeeeAddress("1111111111111111")))); + .until(() -> transactionManager.getQueue(new IeeeAddress("1111111111111111")) == null); + assertNull(transactionManager.getQueue(new IeeeAddress("1111111111111111"))); System.out.println(cmdResult); assertTrue(cmdResult.isCancelled()); } diff --git a/com.zsmartsystems.zigbee/src/test/java/com/zsmartsystems/zigbee/transaction/ZigBeeTransactionProfileTest.java b/com.zsmartsystems.zigbee/src/test/java/com/zsmartsystems/zigbee/transaction/ZigBeeTransactionProfileTest.java index 4099a1f12..f6e6d5f80 100644 --- a/com.zsmartsystems.zigbee/src/test/java/com/zsmartsystems/zigbee/transaction/ZigBeeTransactionProfileTest.java +++ b/com.zsmartsystems.zigbee/src/test/java/com/zsmartsystems/zigbee/transaction/ZigBeeTransactionProfileTest.java @@ -7,9 +7,9 @@ */ package com.zsmartsystems.zigbee.transaction; -import static org.junit.Assert.assertEquals; +import static org.junit.jupiter.api.Assertions.assertEquals; -import org.junit.Test; +import org.junit.jupiter.api.Test; /** * diff --git a/com.zsmartsystems.zigbee/src/test/java/com/zsmartsystems/zigbee/transaction/ZigBeeTransactionQueueTest.java b/com.zsmartsystems.zigbee/src/test/java/com/zsmartsystems/zigbee/transaction/ZigBeeTransactionQueueTest.java index cc0b2ec86..b04a8816c 100644 --- a/com.zsmartsystems.zigbee/src/test/java/com/zsmartsystems/zigbee/transaction/ZigBeeTransactionQueueTest.java +++ b/com.zsmartsystems.zigbee/src/test/java/com/zsmartsystems/zigbee/transaction/ZigBeeTransactionQueueTest.java @@ -7,16 +7,16 @@ */ package com.zsmartsystems.zigbee.transaction; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertFalse; -import static org.junit.Assert.assertNotNull; -import static org.junit.Assert.assertNull; -import static org.junit.Assert.assertTrue; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertFalse; +import static org.junit.jupiter.api.Assertions.assertNotNull; +import static org.junit.jupiter.api.Assertions.assertNull; +import static org.junit.jupiter.api.Assertions.assertTrue; import static org.mockito.Mockito.mock; import java.util.concurrent.Future; -import org.junit.Test; +import org.junit.jupiter.api.Test; import org.mockito.Mockito; import com.zsmartsystems.zigbee.CommandResult; diff --git a/com.zsmartsystems.zigbee/src/test/java/com/zsmartsystems/zigbee/transaction/ZigBeeTransactionTest.java b/com.zsmartsystems.zigbee/src/test/java/com/zsmartsystems/zigbee/transaction/ZigBeeTransactionTest.java index eb929518a..330e8471f 100644 --- a/com.zsmartsystems.zigbee/src/test/java/com/zsmartsystems/zigbee/transaction/ZigBeeTransactionTest.java +++ b/com.zsmartsystems.zigbee/src/test/java/com/zsmartsystems/zigbee/transaction/ZigBeeTransactionTest.java @@ -7,15 +7,15 @@ */ package com.zsmartsystems.zigbee.transaction; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertFalse; -import static org.junit.Assert.assertNotNull; -import static org.junit.Assert.assertNull; -import static org.junit.Assert.assertTrue; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertFalse; +import static org.junit.jupiter.api.Assertions.assertNotNull; +import static org.junit.jupiter.api.Assertions.assertNull; +import static org.junit.jupiter.api.Assertions.assertTrue; import java.util.concurrent.ScheduledFuture; -import org.junit.Test; +import org.junit.jupiter.api.Test; import org.mockito.ArgumentCaptor; import org.mockito.ArgumentMatchers; import org.mockito.Mockito; diff --git a/com.zsmartsystems.zigbee/src/test/java/com/zsmartsystems/zigbee/transport/TransportConfigTest.java b/com.zsmartsystems.zigbee/src/test/java/com/zsmartsystems/zigbee/transport/TransportConfigTest.java index 475a8afa5..9f516e3af 100644 --- a/com.zsmartsystems.zigbee/src/test/java/com/zsmartsystems/zigbee/transport/TransportConfigTest.java +++ b/com.zsmartsystems.zigbee/src/test/java/com/zsmartsystems/zigbee/transport/TransportConfigTest.java @@ -7,12 +7,12 @@ */ package com.zsmartsystems.zigbee.transport; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertFalse; -import static org.junit.Assert.assertNull; -import static org.junit.Assert.assertTrue; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertFalse; +import static org.junit.jupiter.api.Assertions.assertNull; +import static org.junit.jupiter.api.Assertions.assertTrue; -import org.junit.Test; +import org.junit.jupiter.api.Test; import com.zsmartsystems.zigbee.ZigBeeStatus; diff --git a/com.zsmartsystems.zigbee/src/test/java/com/zsmartsystems/zigbee/transport/ZigBeeTransportTransmitAbstractTest.java b/com.zsmartsystems.zigbee/src/test/java/com/zsmartsystems/zigbee/transport/ZigBeeTransportTransmitAbstractTest.java index 1a6f9a196..704e1f2f6 100644 --- a/com.zsmartsystems.zigbee/src/test/java/com/zsmartsystems/zigbee/transport/ZigBeeTransportTransmitAbstractTest.java +++ b/com.zsmartsystems.zigbee/src/test/java/com/zsmartsystems/zigbee/transport/ZigBeeTransportTransmitAbstractTest.java @@ -7,10 +7,10 @@ */ package com.zsmartsystems.zigbee.transport; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertNotNull; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertNotNull; -import org.junit.Test; +import org.junit.jupiter.api.Test; import org.mockito.Mockito; import com.zsmartsystems.zigbee.ZigBeeStatus; diff --git a/com.zsmartsystems.zigbee/src/test/java/com/zsmartsystems/zigbee/zcl/ZclAttributeNormalizerTest.java b/com.zsmartsystems.zigbee/src/test/java/com/zsmartsystems/zigbee/zcl/ZclAttributeNormalizerTest.java index 5dcf303f4..9f1a845fe 100644 --- a/com.zsmartsystems.zigbee/src/test/java/com/zsmartsystems/zigbee/zcl/ZclAttributeNormalizerTest.java +++ b/com.zsmartsystems.zigbee/src/test/java/com/zsmartsystems/zigbee/zcl/ZclAttributeNormalizerTest.java @@ -7,9 +7,9 @@ */ package com.zsmartsystems.zigbee.zcl; -import static org.junit.Assert.assertEquals; +import static org.junit.jupiter.api.Assertions.assertEquals; -import org.junit.Test; +import org.junit.jupiter.api.Test; import com.zsmartsystems.zigbee.zcl.protocol.ZclDataType; diff --git a/com.zsmartsystems.zigbee/src/test/java/com/zsmartsystems/zigbee/zcl/ZclAttributeTest.java b/com.zsmartsystems.zigbee/src/test/java/com/zsmartsystems/zigbee/zcl/ZclAttributeTest.java index d5bcfbfa6..7351a2690 100644 --- a/com.zsmartsystems.zigbee/src/test/java/com/zsmartsystems/zigbee/zcl/ZclAttributeTest.java +++ b/com.zsmartsystems.zigbee/src/test/java/com/zsmartsystems/zigbee/zcl/ZclAttributeTest.java @@ -7,13 +7,13 @@ */ package com.zsmartsystems.zigbee.zcl; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertFalse; -import static org.junit.Assert.assertTrue; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertFalse; +import static org.junit.jupiter.api.Assertions.assertTrue; import java.util.Calendar; -import org.junit.Test; +import org.junit.jupiter.api.Test; import org.mockito.Mockito; import com.zsmartsystems.zigbee.TestUtilities; diff --git a/com.zsmartsystems.zigbee/src/test/java/com/zsmartsystems/zigbee/zcl/ZclClusterTest.java b/com.zsmartsystems.zigbee/src/test/java/com/zsmartsystems/zigbee/zcl/ZclClusterTest.java index 814eb6e1c..b0f1867cc 100644 --- a/com.zsmartsystems.zigbee/src/test/java/com/zsmartsystems/zigbee/zcl/ZclClusterTest.java +++ b/com.zsmartsystems.zigbee/src/test/java/com/zsmartsystems/zigbee/zcl/ZclClusterTest.java @@ -10,11 +10,11 @@ import static com.zsmartsystems.zigbee.zcl.clusters.ZclOnOffCluster.ATTR_ONOFF; import static java.lang.Boolean.TRUE; import static java.util.stream.Collectors.toSet; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertFalse; -import static org.junit.Assert.assertNotNull; -import static org.junit.Assert.assertNull; -import static org.junit.Assert.assertTrue; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertFalse; +import static org.junit.jupiter.api.Assertions.assertNotNull; +import static org.junit.jupiter.api.Assertions.assertNull; +import static org.junit.jupiter.api.Assertions.assertTrue; import java.util.ArrayList; import java.util.Collections; @@ -24,7 +24,7 @@ import java.util.Set; import java.util.concurrent.Future; -import org.junit.Test; +import org.junit.jupiter.api.Test; import org.mockito.ArgumentCaptor; import org.mockito.MockSettings; import org.mockito.Mockito; @@ -257,7 +257,8 @@ public void handleAttributeReport() throws Exception { createEndpoint(); ZclCluster cluster = new ZclOnOffCluster(endpoint); - Set attributeListeners = TestUtilities.getField(ZclCluster.class, cluster, "attributeListeners"); + Set attributeListeners = TestUtilities.getField(ZclCluster.class, cluster, + "attributeListeners"); assertEquals(0, attributeListeners.size()); // This reports an incorrect type which is changed through the normalisation @@ -388,7 +389,8 @@ public void handleCommand() throws Exception { ZclCluster cluster = new ZclOnOffCluster(endpoint); - Set commandListeners = TestUtilities.getField(ZclCluster.class, cluster, "commandListeners"); + Set commandListeners = TestUtilities.getField(ZclCluster.class, cluster, + "commandListeners"); assertEquals(0, commandListeners.size()); int tid = 123; ZclCommand command = Mockito.mock(ZclCommand.class); diff --git a/com.zsmartsystems.zigbee/src/test/java/com/zsmartsystems/zigbee/zcl/ZclHeaderTest.java b/com.zsmartsystems.zigbee/src/test/java/com/zsmartsystems/zigbee/zcl/ZclHeaderTest.java index 0d5056460..10a5f9100 100644 --- a/com.zsmartsystems.zigbee/src/test/java/com/zsmartsystems/zigbee/zcl/ZclHeaderTest.java +++ b/com.zsmartsystems.zigbee/src/test/java/com/zsmartsystems/zigbee/zcl/ZclHeaderTest.java @@ -7,12 +7,12 @@ */ package com.zsmartsystems.zigbee.zcl; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertTrue; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertTrue; import java.util.Arrays; -import org.junit.Test; +import org.junit.jupiter.api.Test; import com.zsmartsystems.zigbee.CommandTest; import com.zsmartsystems.zigbee.serialization.DefaultDeserializer; diff --git a/com.zsmartsystems.zigbee/src/test/java/com/zsmartsystems/zigbee/zcl/ZclResponseMatcherTest.java b/com.zsmartsystems.zigbee/src/test/java/com/zsmartsystems/zigbee/zcl/ZclResponseMatcherTest.java index 968a0053c..da4804348 100644 --- a/com.zsmartsystems.zigbee/src/test/java/com/zsmartsystems/zigbee/zcl/ZclResponseMatcherTest.java +++ b/com.zsmartsystems.zigbee/src/test/java/com/zsmartsystems/zigbee/zcl/ZclResponseMatcherTest.java @@ -7,13 +7,13 @@ */ package com.zsmartsystems.zigbee.zcl; -import static org.junit.Assert.assertFalse; -import static org.junit.Assert.assertTrue; +import static org.junit.jupiter.api.Assertions.assertFalse; +import static org.junit.jupiter.api.Assertions.assertTrue; -import com.zsmartsystems.zigbee.IeeeAddress; -import org.junit.Before; -import org.junit.Test; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Test; +import com.zsmartsystems.zigbee.IeeeAddress; import com.zsmartsystems.zigbee.ZigBeeAddress; import com.zsmartsystems.zigbee.ZigBeeEndpointAddress; import com.zsmartsystems.zigbee.zcl.clusters.general.DefaultResponse; @@ -27,62 +27,67 @@ * */ public class ZclResponseMatcherTest { - + private ZclTransactionMatcher matcher; - - @Before + + @BeforeEach public void setup() { matcher = new ZclTransactionMatcher(); } - + @Test public void testMatch() { - ZclCommand request = createOnCommand(new ZigBeeEndpointAddress(0,1), new ZigBeeEndpointAddress(1234,5), 5); - ZclCommand response = createDefaultResponse(request.getDestinationAddress(), request.getSourceAddress(), request.getClusterId(), 5); - + ZclCommand request = createOnCommand(new ZigBeeEndpointAddress(0, 1), new ZigBeeEndpointAddress(1234, 5), 5); + ZclCommand response = createDefaultResponse(request.getDestinationAddress(), request.getSourceAddress(), + request.getClusterId(), 5); + assertTrue(matcher.isTransactionMatch(request, response)); } - + @Test public void testNoTransactionIDs() { - ZclCommand request = createOnCommand(new ZigBeeEndpointAddress(0,1), new ZigBeeEndpointAddress(1234,5), null); - ZclCommand response = createDefaultResponse(request.getDestinationAddress(), request.getSourceAddress(), request.getClusterId(), null); - + ZclCommand request = createOnCommand(new ZigBeeEndpointAddress(0, 1), new ZigBeeEndpointAddress(1234, 5), null); + ZclCommand response = createDefaultResponse(request.getDestinationAddress(), request.getSourceAddress(), + request.getClusterId(), null); + assertFalse(matcher.isTransactionMatch(request, response)); } - + @Test public void testNonMatchingTransactionIds() { - ZclCommand request = createOnCommand(new ZigBeeEndpointAddress(0,1), new ZigBeeEndpointAddress(1234,5), 5); - ZclCommand response = createDefaultResponse(request.getDestinationAddress(), request.getSourceAddress(), request.getClusterId(), 6); - + ZclCommand request = createOnCommand(new ZigBeeEndpointAddress(0, 1), new ZigBeeEndpointAddress(1234, 5), 5); + ZclCommand response = createDefaultResponse(request.getDestinationAddress(), request.getSourceAddress(), + request.getClusterId(), 6); + assertFalse(matcher.isTransactionMatch(request, response)); } - + @Test public void testZdoResponse() { - ZclCommand request = createOnCommand(new ZigBeeEndpointAddress(0,1), new ZigBeeEndpointAddress(1234,5), 5); + ZclCommand request = createOnCommand(new ZigBeeEndpointAddress(0, 1), new ZigBeeEndpointAddress(1234, 5), 5); ZdoCommand response = new DeviceAnnounce(123, new IeeeAddress("0123456789123456"), null); - + assertFalse(matcher.isTransactionMatch(request, response)); } - + @Test public void testNonMatchingAddresses() { - ZclCommand request = createOnCommand(new ZigBeeEndpointAddress(0,1), new ZigBeeEndpointAddress(1234,5), 5); - ZclCommand response = createDefaultResponse(new ZigBeeEndpointAddress(1234,6), request.getSourceAddress(), request.getClusterId(), 5); - + ZclCommand request = createOnCommand(new ZigBeeEndpointAddress(0, 1), new ZigBeeEndpointAddress(1234, 5), 5); + ZclCommand response = createDefaultResponse(new ZigBeeEndpointAddress(1234, 6), request.getSourceAddress(), + request.getClusterId(), 5); + assertFalse(matcher.isTransactionMatch(request, response)); } - + @Test public void testNonMatchingClusters() { - ZclCommand request = createOnCommand(new ZigBeeEndpointAddress(0,1), new ZigBeeEndpointAddress(1234,5), 5); - ZclCommand response = createDefaultResponse(request.getDestinationAddress(), request.getSourceAddress(), request.getClusterId(), 6); - + ZclCommand request = createOnCommand(new ZigBeeEndpointAddress(0, 1), new ZigBeeEndpointAddress(1234, 5), 5); + ZclCommand response = createDefaultResponse(request.getDestinationAddress(), request.getSourceAddress(), + request.getClusterId(), 6); + assertFalse(matcher.isTransactionMatch(request, response)); } - + private ZclCommand createOnCommand(ZigBeeAddress source, ZigBeeAddress dest, Integer transactionId) { ZclCommand zclCommand = new OnCommand(); zclCommand.setSourceAddress(source); @@ -92,8 +97,9 @@ private ZclCommand createOnCommand(ZigBeeAddress source, ZigBeeAddress dest, Int } return zclCommand; } - - private ZclCommand createDefaultResponse(ZigBeeAddress source, ZigBeeAddress dest, Integer clusterId, Integer transactionId) { + + private ZclCommand createDefaultResponse(ZigBeeAddress source, ZigBeeAddress dest, Integer clusterId, + Integer transactionId) { ZclCommand zclResponse = new DefaultResponse(DefaultResponse.COMMAND_ID, ZclStatus.SUCCESS); zclResponse.setSourceAddress(source); zclResponse.setDestinationAddress(dest); @@ -101,6 +107,6 @@ private ZclCommand createDefaultResponse(ZigBeeAddress source, ZigBeeAddress des if (transactionId != null) { zclResponse.setTransactionId(transactionId); } - return zclResponse; + return zclResponse; } } diff --git a/com.zsmartsystems.zigbee/src/test/java/com/zsmartsystems/zigbee/zcl/ZclStatusTest.java b/com.zsmartsystems.zigbee/src/test/java/com/zsmartsystems/zigbee/zcl/ZclStatusTest.java index 67376de26..16e7a5955 100644 --- a/com.zsmartsystems.zigbee/src/test/java/com/zsmartsystems/zigbee/zcl/ZclStatusTest.java +++ b/com.zsmartsystems.zigbee/src/test/java/com/zsmartsystems/zigbee/zcl/ZclStatusTest.java @@ -7,9 +7,9 @@ */ package com.zsmartsystems.zigbee.zcl; -import static org.junit.Assert.assertEquals; +import static org.junit.jupiter.api.Assertions.assertEquals; -import org.junit.Test; +import org.junit.jupiter.api.Test; /** * diff --git a/com.zsmartsystems.zigbee/src/test/java/com/zsmartsystems/zigbee/zcl/cluster/ZclAlarmsClusterTest.java b/com.zsmartsystems.zigbee/src/test/java/com/zsmartsystems/zigbee/zcl/cluster/ZclAlarmsClusterTest.java index a3c2a6dad..30168a9d9 100644 --- a/com.zsmartsystems.zigbee/src/test/java/com/zsmartsystems/zigbee/zcl/cluster/ZclAlarmsClusterTest.java +++ b/com.zsmartsystems.zigbee/src/test/java/com/zsmartsystems/zigbee/zcl/cluster/ZclAlarmsClusterTest.java @@ -7,9 +7,9 @@ */ package com.zsmartsystems.zigbee.zcl.cluster; -import static org.junit.Assert.assertTrue; +import static org.junit.jupiter.api.Assertions.assertTrue; -import org.junit.Test; +import org.junit.jupiter.api.Test; import org.mockito.Mockito; import com.zsmartsystems.zigbee.ZigBeeEndpoint; diff --git a/com.zsmartsystems.zigbee/src/test/java/com/zsmartsystems/zigbee/zcl/cluster/ZclOnOffClusterTest.java b/com.zsmartsystems.zigbee/src/test/java/com/zsmartsystems/zigbee/zcl/cluster/ZclOnOffClusterTest.java index 7c6c19d21..9a201094f 100644 --- a/com.zsmartsystems.zigbee/src/test/java/com/zsmartsystems/zigbee/zcl/cluster/ZclOnOffClusterTest.java +++ b/com.zsmartsystems.zigbee/src/test/java/com/zsmartsystems/zigbee/zcl/cluster/ZclOnOffClusterTest.java @@ -7,12 +7,12 @@ */ package com.zsmartsystems.zigbee.zcl.cluster; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertNotNull; -import static org.junit.Assert.assertNull; -import static org.junit.Assert.assertTrue; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertNotNull; +import static org.junit.jupiter.api.Assertions.assertNull; +import static org.junit.jupiter.api.Assertions.assertTrue; -import org.junit.Test; +import org.junit.jupiter.api.Test; import org.mockito.Mockito; import com.zsmartsystems.zigbee.ZigBeeEndpoint; diff --git a/com.zsmartsystems.zigbee/src/test/java/com/zsmartsystems/zigbee/zcl/clusters/ZclColorControlClusterTest.java b/com.zsmartsystems.zigbee/src/test/java/com/zsmartsystems/zigbee/zcl/clusters/ZclColorControlClusterTest.java index dfca208fd..4255d77f3 100644 --- a/com.zsmartsystems.zigbee/src/test/java/com/zsmartsystems/zigbee/zcl/clusters/ZclColorControlClusterTest.java +++ b/com.zsmartsystems.zigbee/src/test/java/com/zsmartsystems/zigbee/zcl/clusters/ZclColorControlClusterTest.java @@ -7,9 +7,9 @@ */ package com.zsmartsystems.zigbee.zcl.clusters; -import static org.junit.Assert.assertTrue; +import static org.junit.jupiter.api.Assertions.assertTrue; -import org.junit.Test; +import org.junit.jupiter.api.Test; import org.mockito.Mockito; import com.zsmartsystems.zigbee.ZigBeeEndpoint; diff --git a/com.zsmartsystems.zigbee/src/test/java/com/zsmartsystems/zigbee/zcl/clusters/ZclDiagnosticsClusterTest.java b/com.zsmartsystems.zigbee/src/test/java/com/zsmartsystems/zigbee/zcl/clusters/ZclDiagnosticsClusterTest.java index b84f16cb9..27f25a25b 100644 --- a/com.zsmartsystems.zigbee/src/test/java/com/zsmartsystems/zigbee/zcl/clusters/ZclDiagnosticsClusterTest.java +++ b/com.zsmartsystems.zigbee/src/test/java/com/zsmartsystems/zigbee/zcl/clusters/ZclDiagnosticsClusterTest.java @@ -7,7 +7,7 @@ */ package com.zsmartsystems.zigbee.zcl.clusters; -import org.junit.Test; +import org.junit.jupiter.api.Test; import org.mockito.Mockito; import com.zsmartsystems.zigbee.ZigBeeEndpoint; diff --git a/com.zsmartsystems.zigbee/src/test/java/com/zsmartsystems/zigbee/zcl/clusters/ZclDoorLockClusterTest.java b/com.zsmartsystems.zigbee/src/test/java/com/zsmartsystems/zigbee/zcl/clusters/ZclDoorLockClusterTest.java index 011409be9..83b5452fc 100644 --- a/com.zsmartsystems.zigbee/src/test/java/com/zsmartsystems/zigbee/zcl/clusters/ZclDoorLockClusterTest.java +++ b/com.zsmartsystems.zigbee/src/test/java/com/zsmartsystems/zigbee/zcl/clusters/ZclDoorLockClusterTest.java @@ -7,9 +7,9 @@ */ package com.zsmartsystems.zigbee.zcl.clusters; -import static org.junit.Assert.assertTrue; +import static org.junit.jupiter.api.Assertions.assertTrue; -import org.junit.Test; +import org.junit.jupiter.api.Test; import org.mockito.Mockito; import com.zsmartsystems.zigbee.ZigBeeEndpoint; diff --git a/com.zsmartsystems.zigbee/src/test/java/com/zsmartsystems/zigbee/zcl/clusters/ZclElectricalMeasurementClusterTest.java b/com.zsmartsystems.zigbee/src/test/java/com/zsmartsystems/zigbee/zcl/clusters/ZclElectricalMeasurementClusterTest.java index 4d2de4dd5..c78d1f528 100644 --- a/com.zsmartsystems.zigbee/src/test/java/com/zsmartsystems/zigbee/zcl/clusters/ZclElectricalMeasurementClusterTest.java +++ b/com.zsmartsystems.zigbee/src/test/java/com/zsmartsystems/zigbee/zcl/clusters/ZclElectricalMeasurementClusterTest.java @@ -7,7 +7,7 @@ */ package com.zsmartsystems.zigbee.zcl.clusters; -import org.junit.Test; +import org.junit.jupiter.api.Test; import org.mockito.Mockito; import com.zsmartsystems.zigbee.ZigBeeEndpoint; diff --git a/com.zsmartsystems.zigbee/src/test/java/com/zsmartsystems/zigbee/zcl/clusters/ZclMultistateValueBasicClusterTest.java b/com.zsmartsystems.zigbee/src/test/java/com/zsmartsystems/zigbee/zcl/clusters/ZclMultistateValueBasicClusterTest.java index 6c79248d9..d7f47564a 100644 --- a/com.zsmartsystems.zigbee/src/test/java/com/zsmartsystems/zigbee/zcl/clusters/ZclMultistateValueBasicClusterTest.java +++ b/com.zsmartsystems.zigbee/src/test/java/com/zsmartsystems/zigbee/zcl/clusters/ZclMultistateValueBasicClusterTest.java @@ -7,7 +7,7 @@ */ package com.zsmartsystems.zigbee.zcl.clusters; -import org.junit.Test; +import org.junit.jupiter.api.Test; import org.mockito.Mockito; import com.zsmartsystems.zigbee.ZigBeeEndpoint; diff --git a/com.zsmartsystems.zigbee/src/test/java/com/zsmartsystems/zigbee/zcl/clusters/ZclOccupancySensingClusterTest.java b/com.zsmartsystems.zigbee/src/test/java/com/zsmartsystems/zigbee/zcl/clusters/ZclOccupancySensingClusterTest.java index 285b41f2d..6c8d86dc2 100644 --- a/com.zsmartsystems.zigbee/src/test/java/com/zsmartsystems/zigbee/zcl/clusters/ZclOccupancySensingClusterTest.java +++ b/com.zsmartsystems.zigbee/src/test/java/com/zsmartsystems/zigbee/zcl/clusters/ZclOccupancySensingClusterTest.java @@ -7,7 +7,7 @@ */ package com.zsmartsystems.zigbee.zcl.clusters; -import org.junit.Test; +import org.junit.jupiter.api.Test; import org.mockito.Mockito; import com.zsmartsystems.zigbee.ZigBeeEndpoint; diff --git a/com.zsmartsystems.zigbee/src/test/java/com/zsmartsystems/zigbee/zcl/clusters/ZclPollControlClusterTest.java b/com.zsmartsystems.zigbee/src/test/java/com/zsmartsystems/zigbee/zcl/clusters/ZclPollControlClusterTest.java index 800eabcd0..297745705 100644 --- a/com.zsmartsystems.zigbee/src/test/java/com/zsmartsystems/zigbee/zcl/clusters/ZclPollControlClusterTest.java +++ b/com.zsmartsystems.zigbee/src/test/java/com/zsmartsystems/zigbee/zcl/clusters/ZclPollControlClusterTest.java @@ -7,9 +7,9 @@ */ package com.zsmartsystems.zigbee.zcl.clusters; -import static org.junit.Assert.assertTrue; +import static org.junit.jupiter.api.Assertions.assertTrue; -import org.junit.Test; +import org.junit.jupiter.api.Test; import org.mockito.Mockito; import com.zsmartsystems.zigbee.ZigBeeEndpoint; diff --git a/com.zsmartsystems.zigbee/src/test/java/com/zsmartsystems/zigbee/zcl/clusters/ZclPowerConfigurationClusterTest.java b/com.zsmartsystems.zigbee/src/test/java/com/zsmartsystems/zigbee/zcl/clusters/ZclPowerConfigurationClusterTest.java index afd574fd9..0d43b5cba 100644 --- a/com.zsmartsystems.zigbee/src/test/java/com/zsmartsystems/zigbee/zcl/clusters/ZclPowerConfigurationClusterTest.java +++ b/com.zsmartsystems.zigbee/src/test/java/com/zsmartsystems/zigbee/zcl/clusters/ZclPowerConfigurationClusterTest.java @@ -7,7 +7,7 @@ */ package com.zsmartsystems.zigbee.zcl.clusters; -import org.junit.Test; +import org.junit.jupiter.api.Test; import org.mockito.Mockito; import com.zsmartsystems.zigbee.ZigBeeEndpoint; diff --git a/com.zsmartsystems.zigbee/src/test/java/com/zsmartsystems/zigbee/zcl/clusters/ZclRssiLocationClusterTest.java b/com.zsmartsystems.zigbee/src/test/java/com/zsmartsystems/zigbee/zcl/clusters/ZclRssiLocationClusterTest.java index 1fb9c6314..6f3d6cd3b 100644 --- a/com.zsmartsystems.zigbee/src/test/java/com/zsmartsystems/zigbee/zcl/clusters/ZclRssiLocationClusterTest.java +++ b/com.zsmartsystems.zigbee/src/test/java/com/zsmartsystems/zigbee/zcl/clusters/ZclRssiLocationClusterTest.java @@ -7,7 +7,7 @@ */ package com.zsmartsystems.zigbee.zcl.clusters; -import org.junit.Test; +import org.junit.jupiter.api.Test; import org.mockito.Mockito; import com.zsmartsystems.zigbee.ZigBeeEndpoint; diff --git a/com.zsmartsystems.zigbee/src/test/java/com/zsmartsystems/zigbee/zcl/clusters/ZclThermostatClusterTest.java b/com.zsmartsystems.zigbee/src/test/java/com/zsmartsystems/zigbee/zcl/clusters/ZclThermostatClusterTest.java index 4c23e74ed..bbca5483b 100644 --- a/com.zsmartsystems.zigbee/src/test/java/com/zsmartsystems/zigbee/zcl/clusters/ZclThermostatClusterTest.java +++ b/com.zsmartsystems.zigbee/src/test/java/com/zsmartsystems/zigbee/zcl/clusters/ZclThermostatClusterTest.java @@ -7,7 +7,7 @@ */ package com.zsmartsystems.zigbee.zcl.clusters; -import org.junit.Test; +import org.junit.jupiter.api.Test; import org.mockito.Mockito; import com.zsmartsystems.zigbee.ZigBeeEndpoint; diff --git a/com.zsmartsystems.zigbee/src/test/java/com/zsmartsystems/zigbee/zcl/clusters/basic/GenericDeviceTypeEnumTest.java b/com.zsmartsystems.zigbee/src/test/java/com/zsmartsystems/zigbee/zcl/clusters/basic/GenericDeviceTypeEnumTest.java index 0ea730d3d..0f695a42e 100644 --- a/com.zsmartsystems.zigbee/src/test/java/com/zsmartsystems/zigbee/zcl/clusters/basic/GenericDeviceTypeEnumTest.java +++ b/com.zsmartsystems.zigbee/src/test/java/com/zsmartsystems/zigbee/zcl/clusters/basic/GenericDeviceTypeEnumTest.java @@ -7,9 +7,9 @@ */ package com.zsmartsystems.zigbee.zcl.clusters.basic; -import static org.junit.Assert.assertEquals; +import static org.junit.jupiter.api.Assertions.assertEquals; -import org.junit.Test; +import org.junit.jupiter.api.Test; /** * diff --git a/com.zsmartsystems.zigbee/src/test/java/com/zsmartsystems/zigbee/zcl/clusters/general/ConfigureReportingCommandTest.java b/com.zsmartsystems.zigbee/src/test/java/com/zsmartsystems/zigbee/zcl/clusters/general/ConfigureReportingCommandTest.java index 132a1b9c7..ede81d072 100644 --- a/com.zsmartsystems.zigbee/src/test/java/com/zsmartsystems/zigbee/zcl/clusters/general/ConfigureReportingCommandTest.java +++ b/com.zsmartsystems.zigbee/src/test/java/com/zsmartsystems/zigbee/zcl/clusters/general/ConfigureReportingCommandTest.java @@ -7,12 +7,12 @@ */ package com.zsmartsystems.zigbee.zcl.clusters.general; -import static org.junit.Assert.assertTrue; +import static org.junit.jupiter.api.Assertions.assertTrue; import java.util.Arrays; import java.util.Collections; -import org.junit.Test; +import org.junit.jupiter.api.Test; import com.zsmartsystems.zigbee.CommandTest; import com.zsmartsystems.zigbee.ZigBeeEndpointAddress; diff --git a/com.zsmartsystems.zigbee/src/test/java/com/zsmartsystems/zigbee/zcl/clusters/general/ConfigureReportingResponseTest.java b/com.zsmartsystems.zigbee/src/test/java/com/zsmartsystems/zigbee/zcl/clusters/general/ConfigureReportingResponseTest.java index 76262a23a..c5ca9cfba 100644 --- a/com.zsmartsystems.zigbee/src/test/java/com/zsmartsystems/zigbee/zcl/clusters/general/ConfigureReportingResponseTest.java +++ b/com.zsmartsystems.zigbee/src/test/java/com/zsmartsystems/zigbee/zcl/clusters/general/ConfigureReportingResponseTest.java @@ -7,10 +7,10 @@ */ package com.zsmartsystems.zigbee.zcl.clusters.general; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertNull; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertNull; -import org.junit.Test; +import org.junit.jupiter.api.Test; import com.zsmartsystems.zigbee.CommandTest; import com.zsmartsystems.zigbee.serialization.DefaultDeserializer; diff --git a/com.zsmartsystems.zigbee/src/test/java/com/zsmartsystems/zigbee/zcl/clusters/general/DiscoverAttributesResponseTest.java b/com.zsmartsystems.zigbee/src/test/java/com/zsmartsystems/zigbee/zcl/clusters/general/DiscoverAttributesResponseTest.java index 270d125c0..4c323b5db 100644 --- a/com.zsmartsystems.zigbee/src/test/java/com/zsmartsystems/zigbee/zcl/clusters/general/DiscoverAttributesResponseTest.java +++ b/com.zsmartsystems.zigbee/src/test/java/com/zsmartsystems/zigbee/zcl/clusters/general/DiscoverAttributesResponseTest.java @@ -7,11 +7,11 @@ */ package com.zsmartsystems.zigbee.zcl.clusters.general; -import static org.junit.Assert.assertEquals; +import static org.junit.jupiter.api.Assertions.assertEquals; import java.util.List; -import org.junit.Test; +import org.junit.jupiter.api.Test; import com.zsmartsystems.zigbee.CommandTest; import com.zsmartsystems.zigbee.serialization.DefaultDeserializer; diff --git a/com.zsmartsystems.zigbee/src/test/java/com/zsmartsystems/zigbee/zcl/clusters/general/DiscoverCommandsGeneratedResponseTest.java b/com.zsmartsystems.zigbee/src/test/java/com/zsmartsystems/zigbee/zcl/clusters/general/DiscoverCommandsGeneratedResponseTest.java index 7e079aa6f..6508786a9 100644 --- a/com.zsmartsystems.zigbee/src/test/java/com/zsmartsystems/zigbee/zcl/clusters/general/DiscoverCommandsGeneratedResponseTest.java +++ b/com.zsmartsystems.zigbee/src/test/java/com/zsmartsystems/zigbee/zcl/clusters/general/DiscoverCommandsGeneratedResponseTest.java @@ -7,9 +7,9 @@ */ package com.zsmartsystems.zigbee.zcl.clusters.general; -import static org.junit.Assert.assertNull; +import static org.junit.jupiter.api.Assertions.assertNull; -import org.junit.Test; +import org.junit.jupiter.api.Test; import com.zsmartsystems.zigbee.CommandTest; import com.zsmartsystems.zigbee.serialization.DefaultDeserializer; diff --git a/com.zsmartsystems.zigbee/src/test/java/com/zsmartsystems/zigbee/zcl/clusters/general/ReadAttributesCommandTest.java b/com.zsmartsystems.zigbee/src/test/java/com/zsmartsystems/zigbee/zcl/clusters/general/ReadAttributesCommandTest.java index e9d5e5def..ec82ba8b1 100644 --- a/com.zsmartsystems.zigbee/src/test/java/com/zsmartsystems/zigbee/zcl/clusters/general/ReadAttributesCommandTest.java +++ b/com.zsmartsystems.zigbee/src/test/java/com/zsmartsystems/zigbee/zcl/clusters/general/ReadAttributesCommandTest.java @@ -7,12 +7,12 @@ */ package com.zsmartsystems.zigbee.zcl.clusters.general; -import static org.junit.Assert.assertTrue; +import static org.junit.jupiter.api.Assertions.assertTrue; import java.util.Arrays; import java.util.Collections; -import org.junit.Test; +import org.junit.jupiter.api.Test; import com.zsmartsystems.zigbee.CommandTest; import com.zsmartsystems.zigbee.ZigBeeEndpointAddress; diff --git a/com.zsmartsystems.zigbee/src/test/java/com/zsmartsystems/zigbee/zcl/clusters/general/ReadAttributesResponseTest.java b/com.zsmartsystems.zigbee/src/test/java/com/zsmartsystems/zigbee/zcl/clusters/general/ReadAttributesResponseTest.java index 2ed09896d..37c48e476 100644 --- a/com.zsmartsystems.zigbee/src/test/java/com/zsmartsystems/zigbee/zcl/clusters/general/ReadAttributesResponseTest.java +++ b/com.zsmartsystems.zigbee/src/test/java/com/zsmartsystems/zigbee/zcl/clusters/general/ReadAttributesResponseTest.java @@ -7,11 +7,11 @@ */ package com.zsmartsystems.zigbee.zcl.clusters.general; -import static org.junit.Assert.assertEquals; +import static org.junit.jupiter.api.Assertions.assertEquals; import java.util.List; -import org.junit.Test; +import org.junit.jupiter.api.Test; import com.zsmartsystems.zigbee.CommandTest; import com.zsmartsystems.zigbee.serialization.DefaultDeserializer; diff --git a/com.zsmartsystems.zigbee/src/test/java/com/zsmartsystems/zigbee/zcl/clusters/general/ReadReportingConfigurationResponseTest.java b/com.zsmartsystems.zigbee/src/test/java/com/zsmartsystems/zigbee/zcl/clusters/general/ReadReportingConfigurationResponseTest.java index 46a9f28ab..c5e1cec4b 100644 --- a/com.zsmartsystems.zigbee/src/test/java/com/zsmartsystems/zigbee/zcl/clusters/general/ReadReportingConfigurationResponseTest.java +++ b/com.zsmartsystems.zigbee/src/test/java/com/zsmartsystems/zigbee/zcl/clusters/general/ReadReportingConfigurationResponseTest.java @@ -7,11 +7,11 @@ */ package com.zsmartsystems.zigbee.zcl.clusters.general; -import static org.junit.Assert.assertEquals; +import static org.junit.jupiter.api.Assertions.assertEquals; import java.util.List; -import org.junit.Test; +import org.junit.jupiter.api.Test; import com.zsmartsystems.zigbee.CommandTest; import com.zsmartsystems.zigbee.serialization.DefaultDeserializer; diff --git a/com.zsmartsystems.zigbee/src/test/java/com/zsmartsystems/zigbee/zcl/clusters/general/ReportAttributesCommandTest.java b/com.zsmartsystems.zigbee/src/test/java/com/zsmartsystems/zigbee/zcl/clusters/general/ReportAttributesCommandTest.java index e4504f723..63740d459 100644 --- a/com.zsmartsystems.zigbee/src/test/java/com/zsmartsystems/zigbee/zcl/clusters/general/ReportAttributesCommandTest.java +++ b/com.zsmartsystems.zigbee/src/test/java/com/zsmartsystems/zigbee/zcl/clusters/general/ReportAttributesCommandTest.java @@ -7,12 +7,12 @@ */ package com.zsmartsystems.zigbee.zcl.clusters.general; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertTrue; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertTrue; import java.util.List; -import org.junit.Test; +import org.junit.jupiter.api.Test; import com.zsmartsystems.zigbee.CommandTest; import com.zsmartsystems.zigbee.serialization.DefaultDeserializer; diff --git a/com.zsmartsystems.zigbee/src/test/java/com/zsmartsystems/zigbee/zcl/clusters/iaszone/ZoneEnrollRequestCommandTest.java b/com.zsmartsystems.zigbee/src/test/java/com/zsmartsystems/zigbee/zcl/clusters/iaszone/ZoneEnrollRequestCommandTest.java index a5dacb762..0f1c2cd82 100644 --- a/com.zsmartsystems.zigbee/src/test/java/com/zsmartsystems/zigbee/zcl/clusters/iaszone/ZoneEnrollRequestCommandTest.java +++ b/com.zsmartsystems.zigbee/src/test/java/com/zsmartsystems/zigbee/zcl/clusters/iaszone/ZoneEnrollRequestCommandTest.java @@ -7,9 +7,9 @@ */ package com.zsmartsystems.zigbee.zcl.clusters.iaszone; -import static org.junit.Assert.assertEquals; +import static org.junit.jupiter.api.Assertions.assertEquals; -import org.junit.Test; +import org.junit.jupiter.api.Test; import com.zsmartsystems.zigbee.CommandTest; import com.zsmartsystems.zigbee.serialization.DefaultDeserializer; diff --git a/com.zsmartsystems.zigbee/src/test/java/com/zsmartsystems/zigbee/zcl/clusters/iaszone/ZoneStatusChangeNotificationCommandTest.java b/com.zsmartsystems.zigbee/src/test/java/com/zsmartsystems/zigbee/zcl/clusters/iaszone/ZoneStatusChangeNotificationCommandTest.java index d5eb54f9e..aacf9127f 100644 --- a/com.zsmartsystems.zigbee/src/test/java/com/zsmartsystems/zigbee/zcl/clusters/iaszone/ZoneStatusChangeNotificationCommandTest.java +++ b/com.zsmartsystems.zigbee/src/test/java/com/zsmartsystems/zigbee/zcl/clusters/iaszone/ZoneStatusChangeNotificationCommandTest.java @@ -7,9 +7,9 @@ */ package com.zsmartsystems.zigbee.zcl.clusters.iaszone; -import static org.junit.Assert.assertEquals; +import static org.junit.jupiter.api.Assertions.assertEquals; -import org.junit.Test; +import org.junit.jupiter.api.Test; import com.zsmartsystems.zigbee.CommandTest; import com.zsmartsystems.zigbee.serialization.DefaultDeserializer; diff --git a/com.zsmartsystems.zigbee/src/test/java/com/zsmartsystems/zigbee/zcl/clusters/onoff/OffWithEffectCommandTest.java b/com.zsmartsystems.zigbee/src/test/java/com/zsmartsystems/zigbee/zcl/clusters/onoff/OffWithEffectCommandTest.java index 3bcc4d053..748a233b6 100644 --- a/com.zsmartsystems.zigbee/src/test/java/com/zsmartsystems/zigbee/zcl/clusters/onoff/OffWithEffectCommandTest.java +++ b/com.zsmartsystems.zigbee/src/test/java/com/zsmartsystems/zigbee/zcl/clusters/onoff/OffWithEffectCommandTest.java @@ -7,9 +7,9 @@ */ package com.zsmartsystems.zigbee.zcl.clusters.onoff; -import static org.junit.Assert.assertEquals; +import static org.junit.jupiter.api.Assertions.assertEquals; -import org.junit.Test; +import org.junit.jupiter.api.Test; import com.zsmartsystems.zigbee.CommandTest; import com.zsmartsystems.zigbee.serialization.DefaultDeserializer; diff --git a/com.zsmartsystems.zigbee/src/test/java/com/zsmartsystems/zigbee/zcl/clusters/otaupgrade/ImageNotifyCommandTest.java b/com.zsmartsystems.zigbee/src/test/java/com/zsmartsystems/zigbee/zcl/clusters/otaupgrade/ImageNotifyCommandTest.java index 2bee86e4f..404a311bf 100644 --- a/com.zsmartsystems.zigbee/src/test/java/com/zsmartsystems/zigbee/zcl/clusters/otaupgrade/ImageNotifyCommandTest.java +++ b/com.zsmartsystems.zigbee/src/test/java/com/zsmartsystems/zigbee/zcl/clusters/otaupgrade/ImageNotifyCommandTest.java @@ -7,11 +7,11 @@ */ package com.zsmartsystems.zigbee.zcl.clusters.otaupgrade; -import static org.junit.Assert.assertTrue; +import static org.junit.jupiter.api.Assertions.assertTrue; import java.util.Arrays; -import org.junit.Test; +import org.junit.jupiter.api.Test; import com.zsmartsystems.zigbee.CommandTest; import com.zsmartsystems.zigbee.ZigBeeEndpointAddress; diff --git a/com.zsmartsystems.zigbee/src/test/java/com/zsmartsystems/zigbee/zcl/clusters/otaupgrade/QueryNextImageCommandTest.java b/com.zsmartsystems.zigbee/src/test/java/com/zsmartsystems/zigbee/zcl/clusters/otaupgrade/QueryNextImageCommandTest.java index 289aea933..33631f772 100644 --- a/com.zsmartsystems.zigbee/src/test/java/com/zsmartsystems/zigbee/zcl/clusters/otaupgrade/QueryNextImageCommandTest.java +++ b/com.zsmartsystems.zigbee/src/test/java/com/zsmartsystems/zigbee/zcl/clusters/otaupgrade/QueryNextImageCommandTest.java @@ -7,10 +7,10 @@ */ package com.zsmartsystems.zigbee.zcl.clusters.otaupgrade; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertNull; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertNull; -import org.junit.Test; +import org.junit.jupiter.api.Test; import com.zsmartsystems.zigbee.CommandTest; import com.zsmartsystems.zigbee.serialization.DefaultDeserializer; diff --git a/com.zsmartsystems.zigbee/src/test/java/com/zsmartsystems/zigbee/zcl/clusters/scenes/AddScenesCommandTest.java b/com.zsmartsystems.zigbee/src/test/java/com/zsmartsystems/zigbee/zcl/clusters/scenes/AddScenesCommandTest.java index f9590b02f..68017f22c 100644 --- a/com.zsmartsystems.zigbee/src/test/java/com/zsmartsystems/zigbee/zcl/clusters/scenes/AddScenesCommandTest.java +++ b/com.zsmartsystems.zigbee/src/test/java/com/zsmartsystems/zigbee/zcl/clusters/scenes/AddScenesCommandTest.java @@ -7,13 +7,13 @@ */ package com.zsmartsystems.zigbee.zcl.clusters.scenes; -import static org.junit.Assert.assertTrue; +import static org.junit.jupiter.api.Assertions.assertTrue; import java.util.ArrayList; import java.util.Arrays; import java.util.List; -import org.junit.Test; +import org.junit.jupiter.api.Test; import com.zsmartsystems.zigbee.CommandTest; import com.zsmartsystems.zigbee.serialization.DefaultSerializer; diff --git a/com.zsmartsystems.zigbee/src/test/java/com/zsmartsystems/zigbee/zcl/field/AttributeInformationTest.java b/com.zsmartsystems.zigbee/src/test/java/com/zsmartsystems/zigbee/zcl/field/AttributeInformationTest.java index ae689b908..57e2555a3 100644 --- a/com.zsmartsystems.zigbee/src/test/java/com/zsmartsystems/zigbee/zcl/field/AttributeInformationTest.java +++ b/com.zsmartsystems.zigbee/src/test/java/com/zsmartsystems/zigbee/zcl/field/AttributeInformationTest.java @@ -7,13 +7,13 @@ */ package com.zsmartsystems.zigbee.zcl.field; -import static org.junit.Assert.assertEquals; +import static org.junit.jupiter.api.Assertions.assertEquals; import java.util.Collections; import java.util.HashSet; import java.util.Set; -import org.junit.Test; +import org.junit.jupiter.api.Test; /** * diff --git a/com.zsmartsystems.zigbee/src/test/java/com/zsmartsystems/zigbee/zcl/field/ByteArrayTest.java b/com.zsmartsystems.zigbee/src/test/java/com/zsmartsystems/zigbee/zcl/field/ByteArrayTest.java index abf5e475e..6816c1368 100644 --- a/com.zsmartsystems.zigbee/src/test/java/com/zsmartsystems/zigbee/zcl/field/ByteArrayTest.java +++ b/com.zsmartsystems.zigbee/src/test/java/com/zsmartsystems/zigbee/zcl/field/ByteArrayTest.java @@ -7,12 +7,12 @@ */ package com.zsmartsystems.zigbee.zcl.field; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertTrue; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertTrue; import java.util.Arrays; -import org.junit.Test; +import org.junit.jupiter.api.Test; /** * diff --git a/com.zsmartsystems.zigbee/src/test/java/com/zsmartsystems/zigbee/zcl/field/ReadAttributeStatusRecordTest.java b/com.zsmartsystems.zigbee/src/test/java/com/zsmartsystems/zigbee/zcl/field/ReadAttributeStatusRecordTest.java index f6808d5dc..55a6d0ba2 100644 --- a/com.zsmartsystems.zigbee/src/test/java/com/zsmartsystems/zigbee/zcl/field/ReadAttributeStatusRecordTest.java +++ b/com.zsmartsystems.zigbee/src/test/java/com/zsmartsystems/zigbee/zcl/field/ReadAttributeStatusRecordTest.java @@ -7,9 +7,9 @@ */ package com.zsmartsystems.zigbee.zcl.field; -import static org.junit.Assert.assertEquals; +import static org.junit.jupiter.api.Assertions.assertEquals; -import org.junit.Test; +import org.junit.jupiter.api.Test; import org.mockito.ArgumentCaptor; import org.mockito.Mockito; diff --git a/com.zsmartsystems.zigbee/src/test/java/com/zsmartsystems/zigbee/zcl/protocol/ZclCommandDirectionTest.java b/com.zsmartsystems.zigbee/src/test/java/com/zsmartsystems/zigbee/zcl/protocol/ZclCommandDirectionTest.java index c84971b7d..58edbb7f8 100644 --- a/com.zsmartsystems.zigbee/src/test/java/com/zsmartsystems/zigbee/zcl/protocol/ZclCommandDirectionTest.java +++ b/com.zsmartsystems.zigbee/src/test/java/com/zsmartsystems/zigbee/zcl/protocol/ZclCommandDirectionTest.java @@ -7,9 +7,9 @@ */ package com.zsmartsystems.zigbee.zcl.protocol; -import static org.junit.Assert.assertEquals; +import static org.junit.jupiter.api.Assertions.assertEquals; -import org.junit.Test; +import org.junit.jupiter.api.Test; /** * diff --git a/com.zsmartsystems.zigbee/src/test/java/com/zsmartsystems/zigbee/zcl/protocol/ZclDataTypeTest.java b/com.zsmartsystems.zigbee/src/test/java/com/zsmartsystems/zigbee/zcl/protocol/ZclDataTypeTest.java index 7ffeb4737..dbf79b50e 100644 --- a/com.zsmartsystems.zigbee/src/test/java/com/zsmartsystems/zigbee/zcl/protocol/ZclDataTypeTest.java +++ b/com.zsmartsystems.zigbee/src/test/java/com/zsmartsystems/zigbee/zcl/protocol/ZclDataTypeTest.java @@ -7,11 +7,11 @@ */ package com.zsmartsystems.zigbee.zcl.protocol; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertFalse; -import static org.junit.Assert.assertTrue; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertFalse; +import static org.junit.jupiter.api.Assertions.assertTrue; -import org.junit.Test; +import org.junit.jupiter.api.Test; /** * diff --git a/com.zsmartsystems.zigbee/src/test/java/com/zsmartsystems/zigbee/zdo/ZdoResponseMatcherTest.java b/com.zsmartsystems.zigbee/src/test/java/com/zsmartsystems/zigbee/zdo/ZdoResponseMatcherTest.java index 00f38b12c..21f7f4d95 100644 --- a/com.zsmartsystems.zigbee/src/test/java/com/zsmartsystems/zigbee/zdo/ZdoResponseMatcherTest.java +++ b/com.zsmartsystems.zigbee/src/test/java/com/zsmartsystems/zigbee/zdo/ZdoResponseMatcherTest.java @@ -7,10 +7,10 @@ */ package com.zsmartsystems.zigbee.zdo; -import static org.junit.Assert.assertFalse; -import static org.junit.Assert.assertTrue; +import static org.junit.jupiter.api.Assertions.assertFalse; +import static org.junit.jupiter.api.Assertions.assertTrue; -import org.junit.Test; +import org.junit.jupiter.api.Test; import com.zsmartsystems.zigbee.ZigBeeEndpointAddress; import com.zsmartsystems.zigbee.zcl.ZclCommand; diff --git a/com.zsmartsystems.zigbee/src/test/java/com/zsmartsystems/zigbee/zdo/command/ActiveEndpointsResponseTest.java b/com.zsmartsystems.zigbee/src/test/java/com/zsmartsystems/zigbee/zdo/command/ActiveEndpointsResponseTest.java index adea38dd9..6ee9b5149 100644 --- a/com.zsmartsystems.zigbee/src/test/java/com/zsmartsystems/zigbee/zdo/command/ActiveEndpointsResponseTest.java +++ b/com.zsmartsystems.zigbee/src/test/java/com/zsmartsystems/zigbee/zdo/command/ActiveEndpointsResponseTest.java @@ -7,9 +7,9 @@ */ package com.zsmartsystems.zigbee.zdo.command; -import static org.junit.Assert.assertEquals; +import static org.junit.jupiter.api.Assertions.assertEquals; -import org.junit.Test; +import org.junit.jupiter.api.Test; import com.zsmartsystems.zigbee.CommandTest; import com.zsmartsystems.zigbee.serialization.DefaultDeserializer; diff --git a/com.zsmartsystems.zigbee/src/test/java/com/zsmartsystems/zigbee/zdo/command/IeeeAddressResponseTest.java b/com.zsmartsystems.zigbee/src/test/java/com/zsmartsystems/zigbee/zdo/command/IeeeAddressResponseTest.java index 2aa467be3..9803e2df6 100644 --- a/com.zsmartsystems.zigbee/src/test/java/com/zsmartsystems/zigbee/zdo/command/IeeeAddressResponseTest.java +++ b/com.zsmartsystems.zigbee/src/test/java/com/zsmartsystems/zigbee/zdo/command/IeeeAddressResponseTest.java @@ -7,10 +7,10 @@ */ package com.zsmartsystems.zigbee.zdo.command; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertNull; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertNull; -import org.junit.Test; +import org.junit.jupiter.api.Test; import com.zsmartsystems.zigbee.CommandTest; import com.zsmartsystems.zigbee.IeeeAddress; diff --git a/com.zsmartsystems.zigbee/src/test/java/com/zsmartsystems/zigbee/zdo/command/ManagementBindResponseTest.java b/com.zsmartsystems.zigbee/src/test/java/com/zsmartsystems/zigbee/zdo/command/ManagementBindResponseTest.java index 8db642593..f53a0e316 100644 --- a/com.zsmartsystems.zigbee/src/test/java/com/zsmartsystems/zigbee/zdo/command/ManagementBindResponseTest.java +++ b/com.zsmartsystems.zigbee/src/test/java/com/zsmartsystems/zigbee/zdo/command/ManagementBindResponseTest.java @@ -7,11 +7,11 @@ */ package com.zsmartsystems.zigbee.zdo.command; -import static org.junit.Assert.assertEquals; +import static org.junit.jupiter.api.Assertions.assertEquals; import java.util.List; -import org.junit.Test; +import org.junit.jupiter.api.Test; import com.zsmartsystems.zigbee.CommandTest; import com.zsmartsystems.zigbee.IeeeAddress; diff --git a/com.zsmartsystems.zigbee/src/test/java/com/zsmartsystems/zigbee/zdo/command/ManagementLqiResponseTest.java b/com.zsmartsystems.zigbee/src/test/java/com/zsmartsystems/zigbee/zdo/command/ManagementLqiResponseTest.java index 969192163..953ced84e 100644 --- a/com.zsmartsystems.zigbee/src/test/java/com/zsmartsystems/zigbee/zdo/command/ManagementLqiResponseTest.java +++ b/com.zsmartsystems.zigbee/src/test/java/com/zsmartsystems/zigbee/zdo/command/ManagementLqiResponseTest.java @@ -7,11 +7,11 @@ */ package com.zsmartsystems.zigbee.zdo.command; -import static org.junit.Assert.assertEquals; +import static org.junit.jupiter.api.Assertions.assertEquals; import java.util.List; -import org.junit.Test; +import org.junit.jupiter.api.Test; import com.zsmartsystems.zigbee.CommandTest; import com.zsmartsystems.zigbee.IeeeAddress; diff --git a/com.zsmartsystems.zigbee/src/test/java/com/zsmartsystems/zigbee/zdo/command/ManagementPermitJoiningRequestTest.java b/com.zsmartsystems.zigbee/src/test/java/com/zsmartsystems/zigbee/zdo/command/ManagementPermitJoiningRequestTest.java index 49078dd58..a0632187f 100644 --- a/com.zsmartsystems.zigbee/src/test/java/com/zsmartsystems/zigbee/zdo/command/ManagementPermitJoiningRequestTest.java +++ b/com.zsmartsystems.zigbee/src/test/java/com/zsmartsystems/zigbee/zdo/command/ManagementPermitJoiningRequestTest.java @@ -7,11 +7,11 @@ */ package com.zsmartsystems.zigbee.zdo.command; -import static org.junit.Assert.assertTrue; +import static org.junit.jupiter.api.Assertions.assertTrue; import java.util.Arrays; -import org.junit.Test; +import org.junit.jupiter.api.Test; import com.zsmartsystems.zigbee.CommandTest; import com.zsmartsystems.zigbee.ZigBeeEndpointAddress; diff --git a/com.zsmartsystems.zigbee/src/test/java/com/zsmartsystems/zigbee/zdo/command/ManagementRoutingResponseTest.java b/com.zsmartsystems.zigbee/src/test/java/com/zsmartsystems/zigbee/zdo/command/ManagementRoutingResponseTest.java index cbd144209..3203f25fb 100644 --- a/com.zsmartsystems.zigbee/src/test/java/com/zsmartsystems/zigbee/zdo/command/ManagementRoutingResponseTest.java +++ b/com.zsmartsystems.zigbee/src/test/java/com/zsmartsystems/zigbee/zdo/command/ManagementRoutingResponseTest.java @@ -7,11 +7,11 @@ */ package com.zsmartsystems.zigbee.zdo.command; -import static org.junit.Assert.assertEquals; +import static org.junit.jupiter.api.Assertions.assertEquals; import java.util.List; -import org.junit.Test; +import org.junit.jupiter.api.Test; import com.zsmartsystems.zigbee.CommandTest; import com.zsmartsystems.zigbee.serialization.DefaultDeserializer; diff --git a/com.zsmartsystems.zigbee/src/test/java/com/zsmartsystems/zigbee/zdo/command/MatchDescriptorRequestTest.java b/com.zsmartsystems.zigbee/src/test/java/com/zsmartsystems/zigbee/zdo/command/MatchDescriptorRequestTest.java index 370440dd7..79e077ac3 100644 --- a/com.zsmartsystems.zigbee/src/test/java/com/zsmartsystems/zigbee/zdo/command/MatchDescriptorRequestTest.java +++ b/com.zsmartsystems.zigbee/src/test/java/com/zsmartsystems/zigbee/zdo/command/MatchDescriptorRequestTest.java @@ -7,9 +7,9 @@ */ package com.zsmartsystems.zigbee.zdo.command; -import static org.junit.Assert.assertEquals; +import static org.junit.jupiter.api.Assertions.assertEquals; -import org.junit.Test; +import org.junit.jupiter.api.Test; import com.zsmartsystems.zigbee.CommandTest; import com.zsmartsystems.zigbee.serialization.DefaultDeserializer; diff --git a/com.zsmartsystems.zigbee/src/test/java/com/zsmartsystems/zigbee/zdo/command/MatchDescriptorResponseTest.java b/com.zsmartsystems.zigbee/src/test/java/com/zsmartsystems/zigbee/zdo/command/MatchDescriptorResponseTest.java index 14fa5b1c8..7e2d97201 100644 --- a/com.zsmartsystems.zigbee/src/test/java/com/zsmartsystems/zigbee/zdo/command/MatchDescriptorResponseTest.java +++ b/com.zsmartsystems.zigbee/src/test/java/com/zsmartsystems/zigbee/zdo/command/MatchDescriptorResponseTest.java @@ -7,13 +7,13 @@ */ package com.zsmartsystems.zigbee.zdo.command; -import static org.junit.Assert.assertTrue; +import static org.junit.jupiter.api.Assertions.assertTrue; import java.util.ArrayList; import java.util.Arrays; import java.util.List; -import org.junit.Test; +import org.junit.jupiter.api.Test; import com.zsmartsystems.zigbee.CommandTest; import com.zsmartsystems.zigbee.ZigBeeEndpointAddress; diff --git a/com.zsmartsystems.zigbee/src/test/java/com/zsmartsystems/zigbee/zdo/command/NetworkAddressResponseTest.java b/com.zsmartsystems.zigbee/src/test/java/com/zsmartsystems/zigbee/zdo/command/NetworkAddressResponseTest.java index 9d1e26d7a..fed9584d6 100644 --- a/com.zsmartsystems.zigbee/src/test/java/com/zsmartsystems/zigbee/zdo/command/NetworkAddressResponseTest.java +++ b/com.zsmartsystems.zigbee/src/test/java/com/zsmartsystems/zigbee/zdo/command/NetworkAddressResponseTest.java @@ -7,9 +7,9 @@ */ package com.zsmartsystems.zigbee.zdo.command; -import static org.junit.Assert.assertEquals; +import static org.junit.jupiter.api.Assertions.assertEquals; -import org.junit.Test; +import org.junit.jupiter.api.Test; import com.zsmartsystems.zigbee.CommandTest; import com.zsmartsystems.zigbee.IeeeAddress; diff --git a/com.zsmartsystems.zigbee/src/test/java/com/zsmartsystems/zigbee/zdo/command/NodeDescriptorResponseTest.java b/com.zsmartsystems.zigbee/src/test/java/com/zsmartsystems/zigbee/zdo/command/NodeDescriptorResponseTest.java index 0e91f78cd..1028a3ebf 100644 --- a/com.zsmartsystems.zigbee/src/test/java/com/zsmartsystems/zigbee/zdo/command/NodeDescriptorResponseTest.java +++ b/com.zsmartsystems.zigbee/src/test/java/com/zsmartsystems/zigbee/zdo/command/NodeDescriptorResponseTest.java @@ -7,9 +7,9 @@ */ package com.zsmartsystems.zigbee.zdo.command; -import static org.junit.Assert.assertEquals; +import static org.junit.jupiter.api.Assertions.assertEquals; -import org.junit.Test; +import org.junit.jupiter.api.Test; import com.zsmartsystems.zigbee.CommandTest; import com.zsmartsystems.zigbee.serialization.DefaultDeserializer; diff --git a/com.zsmartsystems.zigbee/src/test/java/com/zsmartsystems/zigbee/zdo/command/PowerDescriptorResponseTest.java b/com.zsmartsystems.zigbee/src/test/java/com/zsmartsystems/zigbee/zdo/command/PowerDescriptorResponseTest.java index 9edf0b3ca..50541f3fc 100644 --- a/com.zsmartsystems.zigbee/src/test/java/com/zsmartsystems/zigbee/zdo/command/PowerDescriptorResponseTest.java +++ b/com.zsmartsystems.zigbee/src/test/java/com/zsmartsystems/zigbee/zdo/command/PowerDescriptorResponseTest.java @@ -7,9 +7,9 @@ */ package com.zsmartsystems.zigbee.zdo.command; -import static org.junit.Assert.assertEquals; +import static org.junit.jupiter.api.Assertions.assertEquals; -import org.junit.Test; +import org.junit.jupiter.api.Test; import com.zsmartsystems.zigbee.CommandTest; import com.zsmartsystems.zigbee.serialization.DefaultDeserializer; diff --git a/com.zsmartsystems.zigbee/src/test/java/com/zsmartsystems/zigbee/zdo/command/SimpleDescriptorResponseTest.java b/com.zsmartsystems.zigbee/src/test/java/com/zsmartsystems/zigbee/zdo/command/SimpleDescriptorResponseTest.java index b3b3240b9..60da31bc3 100644 --- a/com.zsmartsystems.zigbee/src/test/java/com/zsmartsystems/zigbee/zdo/command/SimpleDescriptorResponseTest.java +++ b/com.zsmartsystems.zigbee/src/test/java/com/zsmartsystems/zigbee/zdo/command/SimpleDescriptorResponseTest.java @@ -7,11 +7,11 @@ */ package com.zsmartsystems.zigbee.zdo.command; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertNull; -import static org.junit.Assert.assertTrue; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertNull; +import static org.junit.jupiter.api.Assertions.assertTrue; -import org.junit.Test; +import org.junit.jupiter.api.Test; import com.zsmartsystems.zigbee.CommandTest; import com.zsmartsystems.zigbee.serialization.DefaultDeserializer; diff --git a/com.zsmartsystems.zigbee/src/test/java/com/zsmartsystems/zigbee/zdo/field/BindingTableTest.java b/com.zsmartsystems.zigbee/src/test/java/com/zsmartsystems/zigbee/zdo/field/BindingTableTest.java index 6574a090c..d6842f782 100644 --- a/com.zsmartsystems.zigbee/src/test/java/com/zsmartsystems/zigbee/zdo/field/BindingTableTest.java +++ b/com.zsmartsystems.zigbee/src/test/java/com/zsmartsystems/zigbee/zdo/field/BindingTableTest.java @@ -7,7 +7,7 @@ */ package com.zsmartsystems.zigbee.zdo.field; -import org.junit.Test; +import org.junit.jupiter.api.Test; /** * diff --git a/com.zsmartsystems.zigbee/src/test/java/com/zsmartsystems/zigbee/zdo/field/NeighborTableTest.java b/com.zsmartsystems.zigbee/src/test/java/com/zsmartsystems/zigbee/zdo/field/NeighborTableTest.java index da8e22681..49060ae4e 100644 --- a/com.zsmartsystems.zigbee/src/test/java/com/zsmartsystems/zigbee/zdo/field/NeighborTableTest.java +++ b/com.zsmartsystems.zigbee/src/test/java/com/zsmartsystems/zigbee/zdo/field/NeighborTableTest.java @@ -7,14 +7,14 @@ */ package com.zsmartsystems.zigbee.zdo.field; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertFalse; -import static org.junit.Assert.assertNotEquals; -import static org.junit.Assert.assertTrue; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertFalse; +import static org.junit.jupiter.api.Assertions.assertNotEquals; +import static org.junit.jupiter.api.Assertions.assertTrue; import java.lang.reflect.Field; -import org.junit.Test; +import org.junit.jupiter.api.Test; import com.zsmartsystems.zigbee.CommandTest; import com.zsmartsystems.zigbee.ExtendedPanId; diff --git a/com.zsmartsystems.zigbee/src/test/java/com/zsmartsystems/zigbee/zdo/field/NodeDescriptorTest.java b/com.zsmartsystems.zigbee/src/test/java/com/zsmartsystems/zigbee/zdo/field/NodeDescriptorTest.java index 99e0d9889..109177c70 100644 --- a/com.zsmartsystems.zigbee/src/test/java/com/zsmartsystems/zigbee/zdo/field/NodeDescriptorTest.java +++ b/com.zsmartsystems.zigbee/src/test/java/com/zsmartsystems/zigbee/zdo/field/NodeDescriptorTest.java @@ -7,10 +7,10 @@ */ package com.zsmartsystems.zigbee.zdo.field; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertTrue; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertTrue; -import org.junit.Test; +import org.junit.jupiter.api.Test; import com.zsmartsystems.zigbee.CommandTest; import com.zsmartsystems.zigbee.serialization.DefaultDeserializer; diff --git a/com.zsmartsystems.zigbee/src/test/java/com/zsmartsystems/zigbee/zdo/field/SimpleDescriptorTest.java b/com.zsmartsystems.zigbee/src/test/java/com/zsmartsystems/zigbee/zdo/field/SimpleDescriptorTest.java index ec88bafc1..bd56f343d 100644 --- a/com.zsmartsystems.zigbee/src/test/java/com/zsmartsystems/zigbee/zdo/field/SimpleDescriptorTest.java +++ b/com.zsmartsystems.zigbee/src/test/java/com/zsmartsystems/zigbee/zdo/field/SimpleDescriptorTest.java @@ -7,13 +7,13 @@ */ package com.zsmartsystems.zigbee.zdo.field; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertTrue; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertTrue; import java.util.Arrays; import java.util.Collections; -import org.junit.Test; +import org.junit.jupiter.api.Test; import com.zsmartsystems.zigbee.CommandTest; diff --git a/pom.xml b/pom.xml index 4843f7aad..5527cb66a 100644 --- a/pom.xml +++ b/pom.xml @@ -1,5 +1,7 @@ - + 4.0.0 com.zsmartsystems @@ -51,8 +53,10 @@ https://github.com/zsmartsystems/com.zsmartsystems.zigbee.git - scm:git:https://github.com/zsmartsystems/com.zsmartsystems.zigbee.git - scm:git:https://github.com/zsmartsystems/com.zsmartsystems.zigbee.git + + scm:git:https://github.com/zsmartsystems/com.zsmartsystems.zigbee.git + + scm:git:https://github.com/zsmartsystems/com.zsmartsystems.zigbee.git zigbee-1.1.3 @@ -245,7 +249,8 @@ 3.2.0 - ${project.build.outputDirectory}/META-INF/MANIFEST.MF + + ${project.build.outputDirectory}/META-INF/MANIFEST.MF @@ -296,24 +301,24 @@ ${slf4j.version} - - junit - junit - 4.13.1 - test - + + org.junit.jupiter + junit-jupiter-engine + 5.11.0-M2 + test + org.mockito mockito-core - 3.2.4 + 5.16.1 test org.awaitility awaitility - 2.0.0 + 4.2.0 test @@ -357,11 +362,13 @@ This profile can either be selected explicitly: mvn -P error-prone-check clean compile or implicitly by injecting a JDK in the version range [11,16) - JAVA_HOME=/Library/Java/JavaVirtualMachines/adoptopenjdk-11.jdk/Contents/Home mvn clean compile + JAVA_HOME=/Library/Java/JavaVirtualMachines/adoptopenjdk-11.jdk/Contents/Home + mvn clean compile --> error-prone-check - [11,16)