From a9fd3f23c4fc395bc96fbd7dcad48701d7daed1a Mon Sep 17 00:00:00 2001 From: Wouter Born Date: Sun, 24 Oct 2021 10:36:47 +0200 Subject: [PATCH] Update imports to use JUnit 5 instead of JUnit 4 (#11425) * Update imports to use JUnit 5 instead of JUnit 4 * Add commonly used JUnit 4 classes to forbidden packages Related to: https://github.com/openhab/openhab-core/pull/2534 Signed-off-by: Wouter Born --- .../binding/fmiweather/AbstractWeatherHandlerTest.java | 1 - .../mqtt/homeassistant/internal/component/LockTests.java | 8 +------- .../binding/senechome/internal/SenecHomeHandlerTest.java | 6 +++--- tools/static-code-analysis/checkstyle/ruleset.properties | 2 +- 4 files changed, 5 insertions(+), 12 deletions(-) diff --git a/bundles/org.openhab.binding.fmiweather/src/test/java/org/openhab/binding/fmiweather/AbstractWeatherHandlerTest.java b/bundles/org.openhab.binding.fmiweather/src/test/java/org/openhab/binding/fmiweather/AbstractWeatherHandlerTest.java index 38f50d646..b9e28e943 100644 --- a/bundles/org.openhab.binding.fmiweather/src/test/java/org/openhab/binding/fmiweather/AbstractWeatherHandlerTest.java +++ b/bundles/org.openhab.binding.fmiweather/src/test/java/org/openhab/binding/fmiweather/AbstractWeatherHandlerTest.java @@ -12,7 +12,6 @@ */ package org.openhab.binding.fmiweather; -import static org.junit.Assert.assertNotNull; import static org.junit.jupiter.api.Assertions.*; import java.lang.reflect.InvocationTargetException; diff --git a/bundles/org.openhab.binding.mqtt.homeassistant/src/test/java/org/openhab/binding/mqtt/homeassistant/internal/component/LockTests.java b/bundles/org.openhab.binding.mqtt.homeassistant/src/test/java/org/openhab/binding/mqtt/homeassistant/internal/component/LockTests.java index 8b9ef9f29..af70489d7 100644 --- a/bundles/org.openhab.binding.mqtt.homeassistant/src/test/java/org/openhab/binding/mqtt/homeassistant/internal/component/LockTests.java +++ b/bundles/org.openhab.binding.mqtt.homeassistant/src/test/java/org/openhab/binding/mqtt/homeassistant/internal/component/LockTests.java @@ -17,9 +17,7 @@ import static org.hamcrest.MatcherAssert.assertThat; import java.util.Set; -import org.junit.Rule; import org.junit.jupiter.api.Test; -import org.junit.rules.ExpectedException; import org.openhab.binding.mqtt.generic.values.OnOffValue; import org.openhab.core.library.types.OnOffType; @@ -32,9 +30,6 @@ import org.openhab.core.library.types.OnOffType; public class LockTests extends AbstractComponentTests { public static final String CONFIG_TOPIC = "lock/0x0000000000000000_lock_zigbee2mqtt"; - @Rule - public ExpectedException exceptionGrabber = ExpectedException.none(); - @Test public void test() throws InterruptedException { // @formatter:off @@ -85,8 +80,6 @@ public class LockTests extends AbstractComponentTests { @Test public void forceOptimisticIsNotSupported() { - exceptionGrabber.expect(UnsupportedOperationException.class); - // @formatter:off publishMessage(configTopicToMqtt(CONFIG_TOPIC), "{ " + @@ -114,6 +107,7 @@ public class LockTests extends AbstractComponentTests { // @formatter:on } + @Override protected Set getConfigTopics() { return Set.of(CONFIG_TOPIC); } diff --git a/bundles/org.openhab.binding.senechome/src/test/java/org/openhab/binding/senechome/internal/SenecHomeHandlerTest.java b/bundles/org.openhab.binding.senechome/src/test/java/org/openhab/binding/senechome/internal/SenecHomeHandlerTest.java index d338f5e99..619a3a02a 100644 --- a/bundles/org.openhab.binding.senechome/src/test/java/org/openhab/binding/senechome/internal/SenecHomeHandlerTest.java +++ b/bundles/org.openhab.binding.senechome/src/test/java/org/openhab/binding/senechome/internal/SenecHomeHandlerTest.java @@ -17,11 +17,11 @@ import java.math.RoundingMode; import org.eclipse.jetty.client.HttpClient; import org.junit.jupiter.api.Assertions; +import org.junit.jupiter.api.extension.ExtendWith; import org.junit.jupiter.params.ParameterizedTest; import org.junit.jupiter.params.provider.MethodSource; -import org.junit.runner.RunWith; import org.mockito.Mock; -import org.mockito.junit.MockitoJUnitRunner; +import org.mockito.junit.jupiter.MockitoExtension; import org.openhab.core.thing.Thing; /** @@ -29,7 +29,7 @@ import org.openhab.core.thing.Thing; * * @author Erwin Guib - Initial Contribution */ -@RunWith(MockitoJUnitRunner.class) +@ExtendWith(MockitoExtension.class) class SenecHomeHandlerTest { protected static Object[][] data() { diff --git a/tools/static-code-analysis/checkstyle/ruleset.properties b/tools/static-code-analysis/checkstyle/ruleset.properties index 9bb30ab9d..195bd2327 100644 --- a/tools/static-code-analysis/checkstyle/ruleset.properties +++ b/tools/static-code-analysis/checkstyle/ruleset.properties @@ -1,6 +1,6 @@ checkstyle.headerCheck.content=^/\\*\\*$\\n^ \\* Copyright \\(c\\) {0}-{1} Contributors to the openHAB project$\\n^ \\*$\\n^ \\* See the NOTICE file\\(s\\) distributed with this work for additional$\\n^ \\* information.$\\n^ \\*$\\n^ \\* This program and the accompanying materials are made available under the$\\n^ \\* terms of the Eclipse Public License 2\\.0 which is available at$\\n^ \\* http://www.eclipse.org/legal/epl\\-2\\.0$\\n^ \\*$\\n^ \\* SPDX-License-Identifier: EPL-2.0$ checkstyle.headerCheck.values=2010,2021 -checkstyle.forbiddenPackageUsageCheck.forbiddenPackages=com.google.common,gnu.io,javax.comm,org.apache.commons,org.joda.time,si.uom,tech.units +checkstyle.forbiddenPackageUsageCheck.forbiddenPackages=com.google.common,gnu.io,javax.comm,org.apache.commons,org.joda.time,org.junit.Assert,org.junit.Test,si.uom,tech.units checkstyle.forbiddenPackageUsageCheck.exceptions= checkstyle.requiredFilesCheck.files=pom.xml checkstyle.karafAddonFeatureCheck.featureNameMappings=-transform-:-transformation-,-io-:-misc-