public/openhab-addons
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Migrate tests to JUnit 5 (#8519)

Browse Source 
Signed-off-by: Wouter Born <github@maindrain.net>
This commit is contained in:
Wouter Born
2020-09-21 18:21:26 +02:00
committed by GitHub
parent 6df6783b60
commit bd82ca82df
478 changed files with 3996 additions and 4419 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
bundles/org.openhab.binding.mqtt.homie/src/test/java/org/openhab/binding/mqtt/homie/generic/internal/mapping/HomieChildMapTests.java
View File

@@ -13,18 +13,20 @@
package org.openhab.binding.mqtt.homie.generic.internal.mapping;
import static org.hamcrest.CoreMatchers.is;
import static org.junit.Assert.assertThat;
import static org.hamcrest.MatcherAssert.assertThat;
import static org.mockito.ArgumentMatchers.*;
import static org.mockito.Mockito.*;
import static org.mockito.MockitoAnnotations.initMocks;
import java.util.concurrent.CompletableFuture;
import java.util.function.Function;
import org.eclipse.jdt.annotation.Nullable;
import org.junit.Before;
import org.junit.Test;
import org.junit.jupiter.api.Test;
import org.junit.jupiter.api.extension.ExtendWith;
import org.mockito.Mock;
import org.mockito.junit.jupiter.MockitoExtension;
import org.mockito.junit.jupiter.MockitoSettings;
import org.mockito.quality.Strictness;
import org.openhab.binding.mqtt.generic.tools.ChildMap;
import org.openhab.binding.mqtt.homie.internal.handler.ThingChannelConstants;
import org.openhab.binding.mqtt.homie.internal.homie300.DeviceCallback;
@@ -36,6 +38,8 @@ import org.openhab.binding.mqtt.homie.internal.homie300.NodeAttributes;
*
* @author David Graeff - Initial contribution
*/
@ExtendWith(MockitoExtension.class)
@MockitoSettings(strictness = Strictness.WARN)
public class HomieChildMapTests {
private @Mock DeviceCallback callback;
@@ -59,11 +63,6 @@ public class HomieChildMapTests {
callback.nodeRemoved(node);
}
@Before
public void setUp() {
initMocks(this);
}
public static class AddedAction implements Function<Node, CompletableFuture<Void>> {
@Override
public CompletableFuture<Void> apply(Node t) {

42
bundles/org.openhab.binding.mqtt.homie/src/test/java/org/openhab/binding/mqtt/homie/internal/handler/HomieThingHandlerTests.java
View File

@@ -13,7 +13,8 @@
package org.openhab.binding.mqtt.homie.internal.handler;
import static org.hamcrest.CoreMatchers.is;
import static org.junit.Assert.*;
import static org.hamcrest.MatcherAssert.assertThat;
import static org.junit.jupiter.api.Assertions.*;
import static org.mockito.ArgumentMatchers.*;
import static org.mockito.Mockito.*;
import static org.openhab.binding.mqtt.homie.internal.handler.ThingChannelConstants.TEST_HOMIE_THING;
@@ -30,11 +31,14 @@ import java.util.concurrent.TimeUnit;
import org.eclipse.jdt.annotation.NonNull;
import org.eclipse.jdt.annotation.Nullable;
import org.junit.Before;
import org.junit.Test;
import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Test;
import org.junit.jupiter.api.extension.ExtendWith;
import org.mockito.Mock;
import org.mockito.MockitoAnnotations;
import org.mockito.invocation.InvocationOnMock;
import org.mockito.junit.jupiter.MockitoExtension;
import org.mockito.junit.jupiter.MockitoSettings;
import org.mockito.quality.Strictness;
import org.openhab.binding.mqtt.generic.ChannelState;
import org.openhab.binding.mqtt.generic.MqttChannelTypeProvider;
import org.openhab.binding.mqtt.generic.mapping.AbstractMqttAttributeClass;
@@ -75,26 +79,18 @@ import org.openhab.core.types.TypeParser;
*
* @author David Graeff - Initial contribution
*/
@ExtendWith(MockitoExtension.class)
@MockitoSettings(strictness = Strictness.WARN)
public class HomieThingHandlerTests {
@Mock
private ThingHandlerCallback callback;
private Thing thing;
@Mock
private AbstractBrokerHandler bridgeHandler;
@Mock
private MqttBrokerConnection connection;
@Mock
private ScheduledExecutorService scheduler;
@Mock
private ScheduledFuture<?> scheduledFuture;
@Mock
private ThingTypeRegistry thingTypeRegistry;
private @Mock AbstractBrokerHandler bridgeHandler;
private @Mock ThingHandlerCallback callback;
private @Mock MqttBrokerConnection connection;
private @Mock ScheduledExecutorService scheduler;
private @Mock ScheduledFuture<?> scheduledFuture;
private @Mock ThingTypeRegistry thingTypeRegistry;
private HomieThingHandler thingHandler;
@@ -104,14 +100,12 @@ public class HomieThingHandlerTests {
private final String deviceTopic = "homie/" + deviceID;
// A completed future is returned for a subscribe call to the attributes
CompletableFuture<@Nullable Void> future = CompletableFuture.completedFuture(null);
private CompletableFuture<@Nullable Void> future = CompletableFuture.completedFuture(null);
@Before
@BeforeEach
public void setUp() {
final ThingStatusInfo thingStatus = new ThingStatusInfo(ThingStatus.ONLINE, ThingStatusDetail.NONE, null);
MockitoAnnotations.initMocks(this);
final Configuration config = new Configuration();
config.put("basetopic", "homie");
config.put("deviceid", deviceID);