Resolve runbundles and fix tests (#14588)
Related to: * openhab/openhab-core#3433 * openhab/openhab-core#3446 * openhab/openhab-core#3450 Some tests were updated because private lifecycle methods (annotated with @BeforeAll, @AfterAll, @BeforeEach, or @AfterEach) now lead to an exception. See: https://junit.org/junit5/docs/current/release-notes/index.html#deprecations-and-breaking-changes-3 Signed-off-by: Wouter Born <github@maindrain.net>
This commit is contained in:
@@ -57,7 +57,7 @@ public class AutomationChannelBuilderTest {
|
||||
private List<SceneCollection> sceneCollections = new ArrayList<>();
|
||||
|
||||
@BeforeEach
|
||||
private void setUp() {
|
||||
public void setUp() {
|
||||
final Logger logger = (Logger) LoggerFactory.getLogger(AutomationChannelBuilder.class);
|
||||
logger.setLevel(Level.OFF);
|
||||
builder = AutomationChannelBuilder.create(TRANSLATION_PROVIDER, CHANNEL_GROUP_UID);
|
||||
|
||||
@@ -50,7 +50,7 @@ public class SceneChannelBuilderTest {
|
||||
private SceneChannelBuilder builder = SceneChannelBuilder.create(TRANSLATION_PROVIDER, CHANNEL_GROUP_UID);
|
||||
|
||||
@BeforeEach
|
||||
private void setUp() {
|
||||
public void setUp() {
|
||||
builder = SceneChannelBuilder.create(TRANSLATION_PROVIDER, CHANNEL_GROUP_UID);
|
||||
}
|
||||
|
||||
|
||||
@@ -50,7 +50,7 @@ public class SceneGroupChannelBuilderTest {
|
||||
private SceneGroupChannelBuilder builder = SceneGroupChannelBuilder.create(TRANSLATION_PROVIDER, CHANNEL_GROUP_UID);
|
||||
|
||||
@BeforeEach
|
||||
private void setUp() {
|
||||
public void setUp() {
|
||||
builder = SceneGroupChannelBuilder.create(TRANSLATION_PROVIDER, CHANNEL_GROUP_UID);
|
||||
}
|
||||
|
||||
|
||||
@@ -48,7 +48,7 @@ public class TestICloud {
|
||||
private final Logger logger = LoggerFactory.getLogger(TestICloud.class);
|
||||
|
||||
@BeforeEach
|
||||
private void setUp() {
|
||||
public void setUp() {
|
||||
final Logger logger = LoggerFactory.getLogger(Logger.ROOT_LOGGER_NAME);
|
||||
if (logger instanceof ch.qos.logback.classic.Logger) {
|
||||
((ch.qos.logback.classic.Logger) logger).setLevel(ch.qos.logback.classic.Level.DEBUG);
|
||||
|
||||
@@ -54,12 +54,12 @@ public class TestStoreMixedTypesTest extends BaseIntegrationTest {
|
||||
}
|
||||
|
||||
@BeforeEach
|
||||
private void generateUniqueItemId() {
|
||||
public void generateUniqueItemId() {
|
||||
uniqueId = testCounter.getAndIncrement();
|
||||
}
|
||||
|
||||
@AfterEach
|
||||
private void tearDownLocalItems() {
|
||||
public void tearDownLocalItems() {
|
||||
ITEMS.remove(getItemName());
|
||||
}
|
||||
|
||||
|
||||
Reference in New Issue
Block a user