From 569dddd046d127bbf1f40d64c7687abb70db4d74 Mon Sep 17 00:00:00 2001 From: Wouter Born Date: Sun, 24 Oct 2021 10:35:28 +0200 Subject: [PATCH] Exclude JUnit 4 from Whiteboard and update imports to JUnit 5 (#2534) * Exclude JUnit 4 from Whiteboard and update imports to JUnit 5 Excludes the transitive JUnit 4 dependency from the Aries JAX-RS Whiteboard. The Whiteboard should not have a compile scope dependency on JUnit so I've created https://github.com/apache/aries-jax-rs-whiteboard/pull/135 to fix this. The wrong scope has resulted in some tests using JUnit 4 imports which is also fixed in this PR. Signed-off-by: Wouter Born * Add commonly used JUnit 4 classes to forbidden packages Signed-off-by: Wouter Born --- bom/runtime/pom.xml | 4 ++++ bom/test/pom.xml | 4 ++++ .../openhab/core/storage/json/internal/JsonStorageTest.java | 1 - .../binding/BaseDynamicCommandDescriptionProviderTest.java | 2 +- .../binding/BaseDynamicStateDescriptionProviderTest.java | 2 +- .../openhab/core/thing/link/events/LinkEventFactoryTest.java | 2 +- .../java/org/openhab/core/library/types/DecimalTypeTest.java | 1 - .../java/org/openhab/core/library/types/QuantityTypeTest.java | 1 - tools/static-code-analysis/checkstyle/ruleset.properties | 2 +- 9 files changed, 12 insertions(+), 7 deletions(-) diff --git a/bom/runtime/pom.xml b/bom/runtime/pom.xml index 99d77f72a..469e97928 100644 --- a/bom/runtime/pom.xml +++ b/bom/runtime/pom.xml @@ -137,6 +137,10 @@ 2.0.0 compile + + junit + junit + org.apache.geronimo.specs geronimo-annotation_1.3_spec diff --git a/bom/test/pom.xml b/bom/test/pom.xml index be01749f1..9adcc759c 100644 --- a/bom/test/pom.xml +++ b/bom/test/pom.xml @@ -66,6 +66,10 @@ org.apache.aries.jax.rs.whiteboard 2.0.0 + + junit + junit + org.apache.geronimo.specs geronimo-annotation_1.3_spec diff --git a/bundles/org.openhab.core.storage.json/src/test/java/org/openhab/core/storage/json/internal/JsonStorageTest.java b/bundles/org.openhab.core.storage.json/src/test/java/org/openhab/core/storage/json/internal/JsonStorageTest.java index 8deb7ac5d..2cb2a4bb8 100644 --- a/bundles/org.openhab.core.storage.json/src/test/java/org/openhab/core/storage/json/internal/JsonStorageTest.java +++ b/bundles/org.openhab.core.storage.json/src/test/java/org/openhab/core/storage/json/internal/JsonStorageTest.java @@ -12,7 +12,6 @@ */ package org.openhab.core.storage.json.internal; -import static org.junit.Assert.assertTrue; import static org.junit.jupiter.api.Assertions.*; import java.io.File; diff --git a/bundles/org.openhab.core.thing/src/test/java/org/openhab/core/thing/binding/BaseDynamicCommandDescriptionProviderTest.java b/bundles/org.openhab.core.thing/src/test/java/org/openhab/core/thing/binding/BaseDynamicCommandDescriptionProviderTest.java index 305a67444..d3c3156b3 100644 --- a/bundles/org.openhab.core.thing/src/test/java/org/openhab/core/thing/binding/BaseDynamicCommandDescriptionProviderTest.java +++ b/bundles/org.openhab.core.thing/src/test/java/org/openhab/core/thing/binding/BaseDynamicCommandDescriptionProviderTest.java @@ -12,7 +12,7 @@ */ package org.openhab.core.thing.binding; -import static org.junit.Assert.*; +import static org.junit.jupiter.api.Assertions.*; import static org.mockito.Mockito.*; import java.util.List; diff --git a/bundles/org.openhab.core.thing/src/test/java/org/openhab/core/thing/binding/BaseDynamicStateDescriptionProviderTest.java b/bundles/org.openhab.core.thing/src/test/java/org/openhab/core/thing/binding/BaseDynamicStateDescriptionProviderTest.java index faf062c44..c5c9eff7b 100644 --- a/bundles/org.openhab.core.thing/src/test/java/org/openhab/core/thing/binding/BaseDynamicStateDescriptionProviderTest.java +++ b/bundles/org.openhab.core.thing/src/test/java/org/openhab/core/thing/binding/BaseDynamicStateDescriptionProviderTest.java @@ -12,7 +12,7 @@ */ package org.openhab.core.thing.binding; -import static org.junit.Assert.*; +import static org.junit.jupiter.api.Assertions.*; import static org.mockito.Mockito.*; import java.util.List; diff --git a/bundles/org.openhab.core.thing/src/test/java/org/openhab/core/thing/link/events/LinkEventFactoryTest.java b/bundles/org.openhab.core.thing/src/test/java/org/openhab/core/thing/link/events/LinkEventFactoryTest.java index 0e4347c50..907821bc3 100644 --- a/bundles/org.openhab.core.thing/src/test/java/org/openhab/core/thing/link/events/LinkEventFactoryTest.java +++ b/bundles/org.openhab.core.thing/src/test/java/org/openhab/core/thing/link/events/LinkEventFactoryTest.java @@ -17,7 +17,7 @@ import static org.hamcrest.MatcherAssert.assertThat; import static org.junit.jupiter.api.Assertions.assertEquals; import org.eclipse.jdt.annotation.NonNullByDefault; -import org.junit.Test; +import org.junit.jupiter.api.Test; import org.openhab.core.events.Event; import org.openhab.core.thing.ChannelUID; import org.openhab.core.thing.link.ItemChannelLink; diff --git a/bundles/org.openhab.core/src/test/java/org/openhab/core/library/types/DecimalTypeTest.java b/bundles/org.openhab.core/src/test/java/org/openhab/core/library/types/DecimalTypeTest.java index 5ffbfa176..7c94b9be9 100644 --- a/bundles/org.openhab.core/src/test/java/org/openhab/core/library/types/DecimalTypeTest.java +++ b/bundles/org.openhab.core/src/test/java/org/openhab/core/library/types/DecimalTypeTest.java @@ -12,7 +12,6 @@ */ package org.openhab.core.library.types; -import static org.junit.Assert.assertThrows; import static org.junit.jupiter.api.Assertions.*; import java.text.DecimalFormatSymbols; diff --git a/bundles/org.openhab.core/src/test/java/org/openhab/core/library/types/QuantityTypeTest.java b/bundles/org.openhab.core/src/test/java/org/openhab/core/library/types/QuantityTypeTest.java index 91f266ad5..c6ea4f7d2 100644 --- a/bundles/org.openhab.core/src/test/java/org/openhab/core/library/types/QuantityTypeTest.java +++ b/bundles/org.openhab.core/src/test/java/org/openhab/core/library/types/QuantityTypeTest.java @@ -14,7 +14,6 @@ package org.openhab.core.library.types; import static org.hamcrest.CoreMatchers.is; import static org.hamcrest.MatcherAssert.assertThat; -import static org.junit.Assert.assertThrows; import static org.junit.jupiter.api.Assertions.*; import static org.openhab.core.library.unit.MetricPrefix.CENTI; diff --git a/tools/static-code-analysis/checkstyle/ruleset.properties b/tools/static-code-analysis/checkstyle/ruleset.properties index 8b6d7f977..4aaff3f07 100644 --- a/tools/static-code-analysis/checkstyle/ruleset.properties +++ b/tools/static-code-analysis/checkstyle/ruleset.properties @@ -1,6 +1,6 @@ checkstyle.beforeExecutionExclusionFileFilter.fileNamePattern=.+org.openhab.core.internal.i18n.I18nProviderImpl\.java$|.+org.openhab.core.i18n.TranslationProvider\.java$ checkstyle.forbiddenPackageUsageCheck.exceptions= -checkstyle.forbiddenPackageUsageCheck.forbiddenPackages=com.google.common +checkstyle.forbiddenPackageUsageCheck.forbiddenPackages=com.google.common,org.junit.Assert,org.junit.Test 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.pomXmlCheck.currentVersionRegex=^3\.0\.0