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

Update Mockito, JUnit and use MockitoExtensions in itests (#9702)

Browse Source 
* Updates Mockito to 3.7.0
* Updates JUnit to 5.7.0
* Use MockitoExtensions where possible

Signed-off-by: Wouter Born <github@maindrain.net>
This commit is contained in:
Wouter Born
2021-01-06 14:30:40 +01:00
committed by GitHub
parent 8f84646ed1
commit 0816045a59
20 changed files with 148 additions and 165 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
itests/org.openhab.binding.mqtt.homie.tests/src/main/java/org/openhab/binding/mqtt/HomieImplementationTest.java
View File

@@ -17,7 +17,6 @@ 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.mockito.MockitoAnnotations.openMocks;
import java.nio.charset.StandardCharsets;
import java.util.ArrayList;
@@ -35,8 +34,12 @@ import org.eclipse.jdt.annotation.NonNullByDefault;
import org.junit.jupiter.api.AfterEach;
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.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.tools.ChildMap;
import org.openhab.binding.mqtt.generic.tools.WaitForTopicValue;
@@ -66,6 +69,8 @@ import org.osgi.service.cm.ConfigurationAdmin;
*
* @author David Graeff - Initial contribution
*/
@ExtendWith(MockitoExtension.class)
@MockitoSettings(strictness = Strictness.WARN)
@NonNullByDefault
public class HomieImplementationTest extends JavaOSGiTest {
private static final String BASE_TOPIC = "homie";
@@ -78,8 +83,6 @@ public class HomieImplementationTest extends JavaOSGiTest {
private @NonNullByDefault({}) MqttBrokerConnection connection;
private int registeredTopics = 100;
private @NonNullByDefault({}) AutoCloseable mocksCloseable;
// The handler is not tested here, so just mock the callback
private @Mock @NonNullByDefault({}) DeviceCallback callback;
@@ -100,7 +103,6 @@ public class HomieImplementationTest extends JavaOSGiTest {
@BeforeEach
public void beforeEach() throws Exception {
registerVolatileStorageService();
mocksCloseable = openMocks(this);
configurationAdmin = getService(ConfigurationAdmin.class);
mqttService = getService(MqttService.class);
@@ -168,7 +170,6 @@ public class HomieImplementationTest extends JavaOSGiTest {
if (scheduler != null) {
scheduler.shutdownNow();
}
mocksCloseable.close();
}
@Test