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

13
bundles/org.openhab.binding.lcn/src/test/java/org/openhab/binding/lcn/internal/ModuleActionsTest.java
View File

@@ -12,19 +12,20 @@
*/
package org.openhab.binding.lcn.internal;
import static org.hamcrest.MatcherAssert.assertThat;
import static org.hamcrest.Matchers.*;
import static org.junit.Assert.assertThat;
import static org.mockito.ArgumentMatchers.anyString;
import static org.mockito.Mockito.*;
import java.nio.ByteBuffer;
import org.eclipse.jdt.annotation.NonNullByDefault;
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.ArgumentCaptor;
import org.mockito.Captor;
import org.mockito.MockitoAnnotations;
import org.mockito.junit.jupiter.MockitoExtension;
import org.openhab.binding.lcn.internal.common.LcnDefs;
import org.openhab.binding.lcn.internal.common.LcnException;
@@ -33,6 +34,7 @@ import org.openhab.binding.lcn.internal.common.LcnException;
*
* @author Fabian Wolter - Initial contribution
*/
@ExtendWith(MockitoExtension.class)
@NonNullByDefault
public class ModuleActionsTest {
private LcnModuleActions a = new LcnModuleActions();
@@ -40,9 +42,8 @@ public class ModuleActionsTest {
@Captor
private @NonNullByDefault({}) ArgumentCaptor<byte[]> byteBufferCaptor;
@Before
@BeforeEach
public void setUp() {
MockitoAnnotations.initMocks(this);
a = new LcnModuleActions();
a.setThingHandler(handler);
}

8
bundles/org.openhab.binding.lcn/src/test/java/org/openhab/binding/lcn/internal/pchkdiscovery/LcnPchkDiscoveryServiceTest.java
View File

@@ -12,12 +12,12 @@
*/
package org.openhab.binding.lcn.internal.pchkdiscovery;
import static org.hamcrest.MatcherAssert.assertThat;
import static org.hamcrest.Matchers.is;
import static org.junit.Assert.assertThat;
import org.eclipse.jdt.annotation.NonNullByDefault;
import org.junit.Before;
import org.junit.Test;
import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Test;
/**
* Test class for {@link LcnPchkDiscoveryService}.
@@ -30,7 +30,7 @@ public class LcnPchkDiscoveryServiceTest {
private ServicesResponse r = s.xmlToServiceResponse(RESPONSE);
private static final String RESPONSE = "<?xml version=\"1.0\" encoding=\"UTF-8\" ?><ServicesResponse xmlns:xsi=\"http://www.w3.org/2001/XMLSchema-instance\" xsi:noNamespaceSchemaLocation=\"servicesresponse.xsd\"><Version major=\"1\" minor=\"0\" /><Server requestId=\"1548\" machineId=\"b8:27:eb:fe:a4:bb\" machineName=\"raspberrypi\" osShort=\"Unix/Linux\" osLong=\"Unix/Linux\">LCN-PCHK 3.2.2 running on Unix/Linux</Server><Services /><ExtServices><ExtService name=\"LcnPchkBus\" major=\"1\" minor=\"0\" prot=\"TCP\" localPort=\"4114\">PCHK 3.2.2 bus</ExtService></ExtServices></ServicesResponse>";
@Before
@BeforeEach
public void setUp() {
s = new LcnPchkDiscoveryService();
r = s.xmlToServiceResponse(RESPONSE);

17
bundles/org.openhab.binding.lcn/src/test/java/org/openhab/binding/lcn/internal/subhandler/AbstractTestLcnModuleSubHandler.java
View File

@@ -15,8 +15,11 @@ package org.openhab.binding.lcn.internal.subhandler;
import static org.mockito.Mockito.when;
import org.eclipse.jdt.annotation.NonNullByDefault;
import org.junit.jupiter.api.extension.ExtendWith;
import org.mockito.Mock;
import org.mockito.MockitoAnnotations;
import org.mockito.junit.jupiter.MockitoExtension;
import org.mockito.junit.jupiter.MockitoSettings;
import org.mockito.quality.Strictness;
import org.openhab.binding.lcn.internal.LcnModuleHandler;
import org.openhab.binding.lcn.internal.connection.ModInfo;
@@ -25,19 +28,15 @@ import org.openhab.binding.lcn.internal.connection.ModInfo;
*
* @author Fabian Wolter - Initial contribution
*/
@ExtendWith(MockitoExtension.class)
@MockitoSettings(strictness = Strictness.WARN)
@NonNullByDefault
public class AbstractTestLcnModuleSubHandler {
@Mock
protected @NonNullByDefault({}) LcnModuleHandler handler;
@Mock
protected @NonNullByDefault({}) ModInfo info;
public AbstractTestLcnModuleSubHandler() {
setUp();
}
protected @Mock @NonNullByDefault({}) LcnModuleHandler handler;
protected @Mock @NonNullByDefault({}) ModInfo info;
public void setUp() {
MockitoAnnotations.initMocks(this);
when(handler.isMyAddress("000", "005")).thenReturn(true);
}
}

6
bundles/org.openhab.binding.lcn/src/test/java/org/openhab/binding/lcn/internal/subhandler/LcnModuleBinarySensorSubHandlerTest.java
View File

@@ -15,8 +15,8 @@ package org.openhab.binding.lcn.internal.subhandler;
import static org.mockito.Mockito.verify;
import org.eclipse.jdt.annotation.NonNullByDefault;
import org.junit.Before;
import org.junit.Test;
import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Test;
import org.openhab.binding.lcn.internal.common.LcnChannelGroup;
import org.openhab.core.library.types.OpenClosedType;
@@ -30,7 +30,7 @@ public class LcnModuleBinarySensorSubHandlerTest extends AbstractTestLcnModuleSu
private @NonNullByDefault({}) LcnModuleBinarySensorSubHandler l;
@Override
@Before
@BeforeEach
public void setUp() {
super.setUp();

6
bundles/org.openhab.binding.lcn/src/test/java/org/openhab/binding/lcn/internal/subhandler/LcnModuleHostCommandSubHandlerTest.java
View File

@@ -15,8 +15,8 @@ package org.openhab.binding.lcn.internal.subhandler;
import static org.mockito.Mockito.verify;
import org.eclipse.jdt.annotation.NonNullByDefault;
import org.junit.Before;
import org.junit.Test;
import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Test;
import org.openhab.binding.lcn.internal.common.LcnChannelGroup;
/**
@@ -29,7 +29,7 @@ public class LcnModuleHostCommandSubHandlerTest extends AbstractTestLcnModuleSub
private @NonNullByDefault({}) LcnModuleHostCommandSubHandler subHandler;
@Override
@Before
@BeforeEach
public void setUp() {
super.setUp();

6
bundles/org.openhab.binding.lcn/src/test/java/org/openhab/binding/lcn/internal/subhandler/LcnModuleKeyLockTableSubHandlerTest.java
View File

@@ -15,8 +15,8 @@ package org.openhab.binding.lcn.internal.subhandler;
import static org.mockito.Mockito.verify;
import org.eclipse.jdt.annotation.NonNullByDefault;
import org.junit.Before;
import org.junit.Test;
import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Test;
import org.openhab.binding.lcn.internal.common.LcnChannelGroup;
import org.openhab.binding.lcn.internal.common.LcnException;
import org.openhab.core.library.types.OnOffType;
@@ -31,7 +31,7 @@ public class LcnModuleKeyLockTableSubHandlerTest extends AbstractTestLcnModuleSu
private @NonNullByDefault({}) LcnModuleKeyLockTableSubHandler l;
@Override
@Before
@BeforeEach
public void setUp() {
super.setUp();

6
bundles/org.openhab.binding.lcn/src/test/java/org/openhab/binding/lcn/internal/subhandler/LcnModuleLedSubHandlerTest.java
View File

@@ -15,8 +15,8 @@ package org.openhab.binding.lcn.internal.subhandler;
import static org.mockito.Mockito.verify;
import org.eclipse.jdt.annotation.NonNullByDefault;
import org.junit.Before;
import org.junit.Test;
import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Test;
import org.openhab.binding.lcn.internal.common.LcnChannelGroup;
import org.openhab.binding.lcn.internal.common.LcnDefs;
import org.openhab.binding.lcn.internal.common.LcnException;
@@ -33,7 +33,7 @@ public class LcnModuleLedSubHandlerTest extends AbstractTestLcnModuleSubHandler
private @NonNullByDefault({}) LcnModuleLedSubHandler l;
@Override
@Before
@BeforeEach
public void setUp() {
super.setUp();

6
bundles/org.openhab.binding.lcn/src/test/java/org/openhab/binding/lcn/internal/subhandler/LcnModuleLogicSubHandlerTest.java
View File

@@ -15,8 +15,8 @@ package org.openhab.binding.lcn.internal.subhandler;
import static org.mockito.Mockito.verify;
import org.eclipse.jdt.annotation.NonNullByDefault;
import org.junit.Before;
import org.junit.Test;
import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Test;
import org.openhab.binding.lcn.internal.common.LcnChannelGroup;
import org.openhab.core.library.types.StringType;
@@ -37,7 +37,7 @@ public class LcnModuleLogicSubHandlerTest extends AbstractTestLcnModuleSubHandle
private @NonNullByDefault({}) LcnModuleLogicSubHandler l;
@Override
@Before
@BeforeEach
public void setUp() {
super.setUp();

6
bundles/org.openhab.binding.lcn/src/test/java/org/openhab/binding/lcn/internal/subhandler/LcnModuleOutputSubHandlerTest.java
View File

@@ -17,8 +17,8 @@ import static org.mockito.Mockito.verify;
import java.math.BigDecimal;
import org.eclipse.jdt.annotation.NonNullByDefault;
import org.junit.Before;
import org.junit.Test;
import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Test;
import org.openhab.binding.lcn.internal.common.DimmerOutputCommand;
import org.openhab.binding.lcn.internal.common.LcnChannelGroup;
import org.openhab.binding.lcn.internal.common.LcnDefs;
@@ -36,7 +36,7 @@ public class LcnModuleOutputSubHandlerTest extends AbstractTestLcnModuleSubHandl
private @NonNullByDefault({}) LcnModuleOutputSubHandler l;
@Override
@Before
@BeforeEach
public void setUp() {
super.setUp();

6
bundles/org.openhab.binding.lcn/src/test/java/org/openhab/binding/lcn/internal/subhandler/LcnModuleRelaySubHandlerTest.java
View File

@@ -15,8 +15,8 @@ package org.openhab.binding.lcn.internal.subhandler;
import static org.mockito.Mockito.verify;
import org.eclipse.jdt.annotation.NonNullByDefault;
import org.junit.Before;
import org.junit.Test;
import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Test;
import org.openhab.binding.lcn.internal.common.LcnChannelGroup;
import org.openhab.binding.lcn.internal.common.LcnException;
import org.openhab.core.library.types.OnOffType;
@@ -32,7 +32,7 @@ public class LcnModuleRelaySubHandlerTest extends AbstractTestLcnModuleSubHandle
private @NonNullByDefault({}) LcnModuleRelaySubHandler l;
@Override
@Before
@BeforeEach
public void setUp() {
super.setUp();

6
bundles/org.openhab.binding.lcn/src/test/java/org/openhab/binding/lcn/internal/subhandler/LcnModuleRollershutterOutputSubHandlerTest.java
View File

@@ -15,8 +15,8 @@ package org.openhab.binding.lcn.internal.subhandler;
import static org.mockito.Mockito.verify;
import org.eclipse.jdt.annotation.NonNullByDefault;
import org.junit.Before;
import org.junit.Test;
import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Test;
import org.openhab.binding.lcn.internal.common.LcnChannelGroup;
import org.openhab.binding.lcn.internal.common.LcnException;
import org.openhab.core.library.types.StopMoveType;
@@ -32,7 +32,7 @@ public class LcnModuleRollershutterOutputSubHandlerTest extends AbstractTestLcnM
private @NonNullByDefault({}) LcnModuleRollershutterOutputSubHandler l;
@Override
@Before
@BeforeEach
public void setUp() {
super.setUp();

6
bundles/org.openhab.binding.lcn/src/test/java/org/openhab/binding/lcn/internal/subhandler/LcnModuleRollershutterRelaySubHandlerTest.java
View File

@@ -15,8 +15,8 @@ package org.openhab.binding.lcn.internal.subhandler;
import static org.mockito.Mockito.verify;
import org.eclipse.jdt.annotation.NonNullByDefault;
import org.junit.Before;
import org.junit.Test;
import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Test;
import org.openhab.binding.lcn.internal.common.LcnChannelGroup;
import org.openhab.binding.lcn.internal.common.LcnException;
import org.openhab.core.library.types.StopMoveType;
@@ -32,7 +32,7 @@ public class LcnModuleRollershutterRelaySubHandlerTest extends AbstractTestLcnMo
private @NonNullByDefault({}) LcnModuleRollershutterRelaySubHandler l;
@Override
@Before
@BeforeEach
public void setUp() {
super.setUp();

6
bundles/org.openhab.binding.lcn/src/test/java/org/openhab/binding/lcn/internal/subhandler/LcnModuleRvarLockSubHandlerTest.java
View File

@@ -15,8 +15,8 @@ package org.openhab.binding.lcn.internal.subhandler;
import static org.mockito.Mockito.verify;
import org.eclipse.jdt.annotation.NonNullByDefault;
import org.junit.Before;
import org.junit.Test;
import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Test;
import org.openhab.binding.lcn.internal.common.LcnChannelGroup;
import org.openhab.binding.lcn.internal.common.LcnException;
import org.openhab.core.library.types.OnOffType;
@@ -31,7 +31,7 @@ public class LcnModuleRvarLockSubHandlerTest extends AbstractTestLcnModuleSubHan
private @NonNullByDefault({}) LcnModuleRvarLockSubHandler l;
@Override
@Before
@BeforeEach
public void setUp() {
super.setUp();

6
bundles/org.openhab.binding.lcn/src/test/java/org/openhab/binding/lcn/internal/subhandler/LcnModuleRvarSetpointSubHandlerTest.java
View File

@@ -15,8 +15,8 @@ package org.openhab.binding.lcn.internal.subhandler;
import static org.mockito.Mockito.*;
import org.eclipse.jdt.annotation.NonNullByDefault;
import org.junit.Before;
import org.junit.Test;
import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Test;
import org.openhab.binding.lcn.internal.common.LcnChannelGroup;
import org.openhab.binding.lcn.internal.common.LcnException;
import org.openhab.binding.lcn.internal.common.Variable;
@@ -34,7 +34,7 @@ public class LcnModuleRvarSetpointSubHandlerTest extends AbstractTestLcnModuleSu
private @NonNullByDefault({}) LcnModuleRvarSetpointSubHandler l;
@Override
@Before
@BeforeEach
public void setUp() {
super.setUp();

6
bundles/org.openhab.binding.lcn/src/test/java/org/openhab/binding/lcn/internal/subhandler/LcnModuleS0CounterSubHandlerTest.java
View File

@@ -15,8 +15,8 @@ package org.openhab.binding.lcn.internal.subhandler;
import static org.mockito.Mockito.verify;
import org.eclipse.jdt.annotation.NonNullByDefault;
import org.junit.Before;
import org.junit.Test;
import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Test;
import org.openhab.binding.lcn.internal.common.LcnChannelGroup;
import org.openhab.core.library.types.DecimalType;
@@ -30,7 +30,7 @@ public class LcnModuleS0CounterSubHandlerTest extends AbstractTestLcnModuleSubHa
private @NonNullByDefault({}) LcnModuleS0CounterSubHandler l;
@Override
@Before
@BeforeEach
public void setUp() {
super.setUp();

6
bundles/org.openhab.binding.lcn/src/test/java/org/openhab/binding/lcn/internal/subhandler/LcnModuleThresholdSubHandlerTest.java
View File

@@ -15,8 +15,8 @@ package org.openhab.binding.lcn.internal.subhandler;
import static org.mockito.Mockito.*;
import org.eclipse.jdt.annotation.NonNullByDefault;
import org.junit.Before;
import org.junit.Test;
import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Test;
import org.openhab.binding.lcn.internal.common.LcnChannelGroup;
import org.openhab.binding.lcn.internal.common.LcnException;
import org.openhab.binding.lcn.internal.common.Variable;
@@ -32,7 +32,7 @@ public class LcnModuleThresholdSubHandlerTest extends AbstractTestLcnModuleSubHa
private @NonNullByDefault({}) LcnModuleThresholdSubHandler l;
@Override
@Before
@BeforeEach
public void setUp() {
super.setUp();

6
bundles/org.openhab.binding.lcn/src/test/java/org/openhab/binding/lcn/internal/subhandler/LcnModuleVariableSubHandlerTest.java
View File

@@ -15,8 +15,8 @@ package org.openhab.binding.lcn.internal.subhandler;
import static org.mockito.Mockito.*;
import org.eclipse.jdt.annotation.NonNullByDefault;
import org.junit.Before;
import org.junit.Test;
import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Test;
import org.openhab.binding.lcn.internal.common.LcnChannelGroup;
import org.openhab.binding.lcn.internal.common.LcnException;
import org.openhab.binding.lcn.internal.common.Variable;
@@ -33,7 +33,7 @@ public class LcnModuleVariableSubHandlerTest extends AbstractTestLcnModuleSubHan
private @NonNullByDefault({}) LcnModuleVariableSubHandler l;
@Override
@Before
@BeforeEach
public void setUp() {
super.setUp();