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

21
itests/org.openhab.binding.nest.tests/itest.bndrun
View File

@@ -39,7 +39,6 @@ Fragment-Host: org.openhab.binding.nest
org.eclipse.jetty.websocket.client;version='[9.4.20,9.4.21)',\
org.eclipse.jetty.websocket.common;version='[9.4.20,9.4.21)',\
org.eclipse.jetty.xml;version='[9.4.20,9.4.21)',\
org.objenesis;version='[2.6.0,2.6.1)',\
org.ops4j.pax.swissbox.optional.jcl;version='[1.8.3,1.8.4)',\
org.osgi.service.event;version='[1.4.0,1.4.1)',\
org.osgi.service.jaxrs;version='[1.0.0,1.0.1)',\
@@ -49,15 +48,7 @@ Fragment-Host: org.openhab.binding.nest
tec.uom.lib.uom-lib-common;version='[1.0.3,1.0.4)',\
tec.uom.se;version='[1.0.10,1.0.11)',\
biz.aQute.tester.junit-platform;version='[5.1.2,5.1.3)',\
junit-jupiter-api;version='[5.6.2,5.6.3)',\
junit-jupiter-engine;version='[5.6.2,5.6.3)',\
junit-platform-commons;version='[1.6.2,1.6.3)',\
junit-platform-engine;version='[1.6.2,1.6.3)',\
junit-platform-launcher;version='[1.6.2,1.6.3)',\
net.bytebuddy.byte-buddy;version='[1.10.13,1.10.14)',\
net.bytebuddy.byte-buddy-agent;version='[1.10.13,1.10.14)',\
org.hamcrest;version='[2.2.0,2.2.1)',\
org.mockito.mockito-core;version='[3.4.6,3.4.7)',\
org.opentest4j;version='[1.2.0,1.2.1)',\
jakarta.xml.bind-api;version='[2.3.3,2.3.4)',\
org.apache.aries.jax.rs.whiteboard;version='[1.0.9,1.0.10)',\
@@ -86,4 +77,14 @@ Fragment-Host: org.openhab.binding.nest
org.openhab.core.test;version='[3.1.0,3.1.1)',\
org.openhab.core.thing;version='[3.1.0,3.1.1)',\
org.openhab.core.thing.xml;version='[3.1.0,3.1.1)',\
xstream;version='[1.4.15,1.4.16)'
xstream;version='[1.4.15,1.4.16)',\
junit-jupiter-api;version='[5.7.0,5.7.1)',\
junit-jupiter-engine;version='[5.7.0,5.7.1)',\
junit-platform-commons;version='[1.7.0,1.7.1)',\
junit-platform-engine;version='[1.7.0,1.7.1)',\
junit-platform-launcher;version='[1.7.0,1.7.1)',\
net.bytebuddy.byte-buddy;version='[1.10.19,1.10.20)',\
net.bytebuddy.byte-buddy-agent;version='[1.10.19,1.10.20)',\
org.mockito.junit-jupiter;version='[3.7.0,3.7.1)',\
org.mockito.mockito-core;version='[3.7.0,3.7.1)',\
org.objenesis;version='[3.1.0,3.1.1)'

2
itests/org.openhab.binding.nest.tests/logback.xml
View File

@@ -10,7 +10,7 @@
<appender-ref ref="STDOUT" />
</logger>
<root level="debug">
<root level="info">
<appender-ref ref="STDOUT" />
</root>
</configuration>

13
itests/org.openhab.binding.nest.tests/src/main/java/org/openhab/binding/nest/handler/NestBridgeHandlerTest.java
View File

@@ -16,15 +16,15 @@ import static org.hamcrest.CoreMatchers.*;
import static org.hamcrest.MatcherAssert.assertThat;
import static org.mockito.ArgumentMatchers.eq;
import static org.mockito.Mockito.*;
import static org.mockito.MockitoAnnotations.openMocks;
import javax.ws.rs.client.ClientBuilder;
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.ArgumentCaptor;
import org.mockito.Mock;
import org.mockito.junit.jupiter.MockitoExtension;
import org.openhab.binding.nest.internal.config.NestBridgeConfiguration;
import org.openhab.binding.nest.internal.handler.NestBridgeHandler;
import org.openhab.binding.nest.internal.handler.NestRedirectUrlSupplier;
@@ -42,12 +42,11 @@ import org.osgi.service.jaxrs.client.SseEventSourceFactory;
*
* @author David Bennett - Initial contribution
*/
@ExtendWith(MockitoExtension.class)
public class NestBridgeHandlerTest {
private ThingHandler handler;
private AutoCloseable mocksCloseable;
private @Mock Bridge bridge;
private @Mock ThingHandlerCallback callback;
private @Mock ClientBuilder clientBuilder;
@@ -57,16 +56,10 @@ public class NestBridgeHandlerTest {
@BeforeEach
public void beforeEach() {
mocksCloseable = openMocks(this);
handler = new NestTestBridgeHandler(bridge, clientBuilder, eventSourceFactory, "http://localhost");
handler.setCallback(callback);
}
@AfterEach
public void afterEach() throws Exception {
mocksCloseable.close();
}
@SuppressWarnings("null")
@Test
public void initializeShouldCallTheCallback() {