demus/openhab-core
1
0
Fork 0
mirror of https://github.com/danieldemus/openhab-core.git synced 2026-07-29 12:34:22 +02:00
Code Issues 1 Packages Projects Releases Wiki Activity

Upgrade Mockito to 5.19, junit-jupiter to 5.13.4 (#4991)

Browse Source 
* Upgrade Mockito from 4.11 to 5.19.
  Changelog: https://github.com/mockito/mockito/releases
* Upgrade junit-jupiter from 5.11.4 to 5.13.4
  Changelog: https://docs.junit.org/5.13.4/release-notes
* Add workaround to allow junit-jupiter>=5.12 with OSGI

* Activate javaagent for tests to avoid JDK warnings

Signed-off-by: Holger Friedrich <mail@holger-friedrich.de>
This commit is contained in:
Holger Friedrich
2025-09-09 18:58:31 +02:00
committed by GitHub
parent 49b48e1812
commit b535d22d4d
106 changed files with 271 additions and 266 deletions
Download Patch File Download Diff File Expand all files Collapse all files
itests/itest-include.bndrun
+4 -1
View File
@@ -38,8 +38,11 @@ Export-Package:
bnd.identity;id='biz.aQute.tester.junit-platform',\
bnd.identity;id='junit-jupiter-engine'
# Defining the proprerty bootdelegation is a necessary workaround for junit-jupiter>=5.12
# on OSGI, otherwise itests would not run.
-runproperties: \
org.ops4j.pax.logging.DefaultServiceLog.level=WARN
org.ops4j.pax.logging.DefaultServiceLog.level=WARN,\
org.osgi.framework.bootdelegation=org.mockito.internal.creation.bytebuddy.inject
-runvm.java9plus: \
--add-opens=java.base/java.io=ALL-UNNAMED,\
itests/org.openhab.core.addon.tests/itest.bndrun
+5 -5
View File
@@ -37,11 +37,11 @@ Fragment-Host: org.openhab.core.addon
org.osgi.service.event;version='[1.4.1,1.4.2)',\
org.osgi.util.promise;version='[1.3.0,1.3.1)',\
com.google.gson;version='[2.13.1,2.13.2)',\
junit-jupiter-api;version='[5.11.4,5.11.5)',\
junit-jupiter-engine;version='[5.11.4,5.11.5)',\
junit-platform-commons;version='[1.11.4,1.11.5)',\
junit-platform-engine;version='[1.11.4,1.11.5)',\
junit-platform-launcher;version='[1.11.4,1.11.5)',\
junit-jupiter-api;version='[5.13.4,5.13.5)',\
junit-jupiter-engine;version='[5.13.4,5.13.5)',\
junit-platform-commons;version='[1.13.4,1.13.5)',\
junit-platform-engine;version='[1.13.4,1.13.5)',\
junit-platform-launcher;version='[1.13.4,1.13.5)',\
org.opentest4j;version='[1.3.0,1.3.1)',\
ch.qos.logback.classic;version='[1.5.18,1.5.19)',\
ch.qos.logback.core;version='[1.5.18,1.5.19)',\
itests/org.openhab.core.auth.oauth2client.tests/itest.bndrun
+8 -8
View File
@@ -22,9 +22,9 @@ Fragment-Host: org.openhab.core.auth.oauth2client
org.apache.felix.configadmin;version='[1.9.26,1.9.27)',\
org.apache.felix.http.servlet-api;version='[1.2.0,1.2.1)',\
org.osgi.service.component;version='[1.5.1,1.5.2)',\
net.bytebuddy.byte-buddy;version='[1.12.19,1.12.20)',\
net.bytebuddy.byte-buddy-agent;version='[1.12.19,1.12.20)',\
org.mockito.mockito-core;version='[4.11.0,4.11.1)',\
net.bytebuddy.byte-buddy;version='[1.17.6,1.17.7)',\
net.bytebuddy.byte-buddy-agent;version='[1.17.6,1.17.7)',\
org.mockito.mockito-core;version='[5.19.0,5.19.1)',\
org.objenesis;version='[3.3.0,3.3.1)',\
javax.measure.unit-api;version='[2.2.0,2.2.1)',\
tech.units.indriya;version='[2.2.3,2.2.4)',\
@@ -36,11 +36,11 @@ Fragment-Host: org.openhab.core.auth.oauth2client
org.osgi.service.event;version='[1.4.1,1.4.2)',\
org.osgi.util.promise;version='[1.3.0,1.3.1)',\
com.google.gson;version='[2.13.1,2.13.2)',\
junit-jupiter-api;version='[5.11.4,5.11.5)',\
junit-jupiter-engine;version='[5.11.4,5.11.5)',\
junit-platform-commons;version='[1.11.4,1.11.5)',\
junit-platform-engine;version='[1.11.4,1.11.5)',\
junit-platform-launcher;version='[1.11.4,1.11.5)',\
junit-jupiter-api;version='[5.13.4,5.13.5)',\
junit-jupiter-engine;version='[5.13.4,5.13.5)',\
junit-platform-commons;version='[1.13.4,1.13.5)',\
junit-platform-engine;version='[1.13.4,1.13.5)',\
junit-platform-launcher;version='[1.13.4,1.13.5)',\
org.opentest4j;version='[1.3.0,1.3.1)',\
ch.qos.logback.classic;version='[1.5.18,1.5.19)',\
ch.qos.logback.core;version='[1.5.18,1.5.19)',\
itests/org.openhab.core.auth.oauth2client.tests/src/main/java/org/openhab/core/auth/oauth2client/test/internal/cipher/CipherTest.java
+2 -1
View File
@@ -14,7 +14,8 @@ package org.openhab.core.auth.oauth2client.test.internal.cipher;
import static org.junit.jupiter.api.Assertions.*;
import static org.mockito.ArgumentMatchers.anyString;
import static org.mockito.Mockito.*;
import static org.mockito.Mockito.mock;
import static org.mockito.Mockito.when;
import java.io.IOException;
import java.security.GeneralSecurityException;
itests/org.openhab.core.automation.integration.tests/itest.bndrun
+8 -8
View File
@@ -23,9 +23,9 @@ Fragment-Host: org.openhab.core.automation
org.apache.felix.http.servlet-api;version='[1.2.0,1.2.1)',\
org.osgi.service.component;version='[1.5.1,1.5.2)',\
xstream;version='[1.4.21,1.4.22)',\
net.bytebuddy.byte-buddy;version='[1.12.19,1.12.20)',\
net.bytebuddy.byte-buddy-agent;version='[1.12.19,1.12.20)',\
org.mockito.mockito-core;version='[4.11.0,4.11.1)',\
net.bytebuddy.byte-buddy;version='[1.17.6,1.17.7)',\
net.bytebuddy.byte-buddy-agent;version='[1.17.6,1.17.7)',\
org.mockito.mockito-core;version='[5.19.0,5.19.1)',\
org.objenesis;version='[3.3.0,3.3.1)',\
javax.measure.unit-api;version='[2.2.0,2.2.1)',\
tech.units.indriya;version='[2.2.3,2.2.4)',\
@@ -37,11 +37,11 @@ Fragment-Host: org.openhab.core.automation
org.osgi.service.event;version='[1.4.1,1.4.2)',\
org.osgi.util.promise;version='[1.3.0,1.3.1)',\
com.google.gson;version='[2.13.1,2.13.2)',\
junit-jupiter-api;version='[5.11.4,5.11.5)',\
junit-jupiter-engine;version='[5.11.4,5.11.5)',\
junit-platform-commons;version='[1.11.4,1.11.5)',\
junit-platform-engine;version='[1.11.4,1.11.5)',\
junit-platform-launcher;version='[1.11.4,1.11.5)',\
junit-jupiter-api;version='[5.13.4,5.13.5)',\
junit-jupiter-engine;version='[5.13.4,5.13.5)',\
junit-platform-commons;version='[1.13.4,1.13.5)',\
junit-platform-engine;version='[1.13.4,1.13.5)',\
junit-platform-launcher;version='[1.13.4,1.13.5)',\
org.opentest4j;version='[1.3.0,1.3.1)',\
ch.qos.logback.classic;version='[1.5.18,1.5.19)',\
ch.qos.logback.core;version='[1.5.18,1.5.19)',\
itests/org.openhab.core.automation.integration.tests/src/main/java/org/openhab/core/automation/integration/test/RuleSimulationTest.java
+2 -1
View File
@@ -15,7 +15,8 @@ package org.openhab.core.automation.integration.test;
import static org.hamcrest.CoreMatchers.*;
import static org.hamcrest.MatcherAssert.assertThat;
import static org.junit.jupiter.api.Assertions.*;
import static org.mockito.Mockito.*;
import static org.mockito.Mockito.mock;
import static org.mockito.Mockito.when;
import java.time.ZoneId;
import java.time.ZonedDateTime;
itests/org.openhab.core.automation.module.core.tests/itest.bndrun
+8 -8
View File
@@ -23,9 +23,9 @@ Fragment-Host: org.openhab.core.automation
org.apache.felix.http.servlet-api;version='[1.2.0,1.2.1)',\
org.osgi.service.component;version='[1.5.1,1.5.2)',\
xstream;version='[1.4.21,1.4.22)',\
net.bytebuddy.byte-buddy;version='[1.12.19,1.12.20)',\
net.bytebuddy.byte-buddy-agent;version='[1.12.19,1.12.20)',\
org.mockito.mockito-core;version='[4.11.0,4.11.1)',\
net.bytebuddy.byte-buddy;version='[1.17.6,1.17.7)',\
net.bytebuddy.byte-buddy-agent;version='[1.17.6,1.17.7)',\
org.mockito.mockito-core;version='[5.19.0,5.19.1)',\
org.objenesis;version='[3.3.0,3.3.1)',\
javax.measure.unit-api;version='[2.2.0,2.2.1)',\
tech.units.indriya;version='[2.2.3,2.2.4)',\
@@ -37,11 +37,11 @@ Fragment-Host: org.openhab.core.automation
org.osgi.service.event;version='[1.4.1,1.4.2)',\
org.osgi.util.promise;version='[1.3.0,1.3.1)',\
com.google.gson;version='[2.13.1,2.13.2)',\
junit-jupiter-api;version='[5.11.4,5.11.5)',\
junit-jupiter-engine;version='[5.11.4,5.11.5)',\
junit-platform-commons;version='[1.11.4,1.11.5)',\
junit-platform-engine;version='[1.11.4,1.11.5)',\
junit-platform-launcher;version='[1.11.4,1.11.5)',\
junit-jupiter-api;version='[5.13.4,5.13.5)',\
junit-jupiter-engine;version='[5.13.4,5.13.5)',\
junit-platform-commons;version='[1.13.4,1.13.5)',\
junit-platform-engine;version='[1.13.4,1.13.5)',\
junit-platform-launcher;version='[1.13.4,1.13.5)',\
org.opentest4j;version='[1.3.0,1.3.1)',\
ch.qos.logback.classic;version='[1.5.18,1.5.19)',\
ch.qos.logback.core;version='[1.5.18,1.5.19)',\
itests/org.openhab.core.automation.module.core.tests/src/main/java/org/openhab/core/automation/internal/module/RunRuleModuleTest.java
+2 -1
View File
@@ -14,7 +14,8 @@ package org.openhab.core.automation.internal.module;
import static java.util.Map.entry;
import static org.junit.jupiter.api.Assertions.*;
import static org.mockito.Mockito.*;
import static org.mockito.Mockito.mock;
import static org.mockito.Mockito.when;
import java.util.Collection;
import java.util.LinkedList;
itests/org.openhab.core.automation.module.core.tests/src/main/java/org/openhab/core/automation/internal/module/RuntimeRuleTest.java
+2 -1
View File
@@ -14,7 +14,8 @@ package org.openhab.core.automation.internal.module;
import static java.util.Map.entry;
import static org.junit.jupiter.api.Assertions.*;
import static org.mockito.Mockito.*;
import static org.mockito.Mockito.mock;
import static org.mockito.Mockito.when;
import java.util.Collection;
import java.util.Collections;
itests/org.openhab.core.automation.module.script.tests/itest.bndrun
+5 -5
View File
@@ -33,11 +33,11 @@ Fragment-Host: org.openhab.core.automation.module.script
org.osgi.service.event;version='[1.4.1,1.4.2)',\
org.osgi.util.promise;version='[1.3.0,1.3.1)',\
com.google.gson;version='[2.13.1,2.13.2)',\
junit-jupiter-api;version='[5.11.4,5.11.5)',\
junit-jupiter-engine;version='[5.11.4,5.11.5)',\
junit-platform-commons;version='[1.11.4,1.11.5)',\
junit-platform-engine;version='[1.11.4,1.11.5)',\
junit-platform-launcher;version='[1.11.4,1.11.5)',\
junit-jupiter-api;version='[5.13.4,5.13.5)',\
junit-jupiter-engine;version='[5.13.4,5.13.5)',\
junit-platform-commons;version='[1.13.4,1.13.5)',\
junit-platform-engine;version='[1.13.4,1.13.5)',\
junit-platform-launcher;version='[1.13.4,1.13.5)',\
org.opentest4j;version='[1.3.0,1.3.1)',\
ch.qos.logback.classic;version='[1.5.18,1.5.19)',\
ch.qos.logback.core;version='[1.5.18,1.5.19)',\
itests/org.openhab.core.automation.module.timer.tests/itest.bndrun
+8 -8
View File
@@ -23,9 +23,9 @@ Fragment-Host: org.openhab.core.automation
org.apache.felix.http.servlet-api;version='[1.2.0,1.2.1)',\
org.osgi.service.component;version='[1.5.1,1.5.2)',\
xstream;version='[1.4.21,1.4.22)',\
net.bytebuddy.byte-buddy;version='[1.12.19,1.12.20)',\
net.bytebuddy.byte-buddy-agent;version='[1.12.19,1.12.20)',\
org.mockito.mockito-core;version='[4.11.0,4.11.1)',\
net.bytebuddy.byte-buddy;version='[1.17.6,1.17.7)',\
net.bytebuddy.byte-buddy-agent;version='[1.17.6,1.17.7)',\
org.mockito.mockito-core;version='[5.19.0,5.19.1)',\
org.objenesis;version='[3.3.0,3.3.1)',\
javax.measure.unit-api;version='[2.2.0,2.2.1)',\
tech.units.indriya;version='[2.2.3,2.2.4)',\
@@ -37,11 +37,11 @@ Fragment-Host: org.openhab.core.automation
org.osgi.service.event;version='[1.4.1,1.4.2)',\
org.osgi.util.promise;version='[1.3.0,1.3.1)',\
com.google.gson;version='[2.13.1,2.13.2)',\
junit-jupiter-api;version='[5.11.4,5.11.5)',\
junit-jupiter-engine;version='[5.11.4,5.11.5)',\
junit-platform-commons;version='[1.11.4,1.11.5)',\
junit-platform-engine;version='[1.11.4,1.11.5)',\
junit-platform-launcher;version='[1.11.4,1.11.5)',\
junit-jupiter-api;version='[5.13.4,5.13.5)',\
junit-jupiter-engine;version='[5.13.4,5.13.5)',\
junit-platform-commons;version='[1.13.4,1.13.5)',\
junit-platform-engine;version='[1.13.4,1.13.5)',\
junit-platform-launcher;version='[1.13.4,1.13.5)',\
org.opentest4j;version='[1.3.0,1.3.1)',\
ch.qos.logback.classic;version='[1.5.18,1.5.19)',\
ch.qos.logback.core;version='[1.5.18,1.5.19)',\
itests/org.openhab.core.automation.module.timer.tests/src/main/java/org/openhab/core/automation/module/timer/internal/BasicConditionHandlerTest.java
+2 -1
View File
@@ -15,7 +15,8 @@ package org.openhab.core.automation.module.timer.internal;
import static org.hamcrest.CoreMatchers.*;
import static org.hamcrest.MatcherAssert.assertThat;
import static org.junit.jupiter.api.Assertions.assertTrue;
import static org.mockito.Mockito.*;
import static org.mockito.Mockito.mock;
import static org.mockito.Mockito.when;
import java.util.Collection;
import java.util.HashMap;
itests/org.openhab.core.automation.module.timer.tests/src/main/java/org/openhab/core/automation/module/timer/internal/IntervalConditionHandlerTest.java
-1
View File
@@ -15,7 +15,6 @@ package org.openhab.core.automation.module.timer.internal;
import static org.hamcrest.MatcherAssert.assertThat;
import static org.hamcrest.Matchers.*;
import static org.junit.jupiter.api.Assertions.assertTrue;
import static org.mockito.Mockito.*;
import java.math.BigDecimal;
import java.util.HashMap;
itests/org.openhab.core.automation.module.timer.tests/src/main/java/org/openhab/core/automation/module/timer/internal/RuntimeRuleTest.java
+2 -1
View File
@@ -15,7 +15,8 @@ package org.openhab.core.automation.module.timer.internal;
import static org.hamcrest.CoreMatchers.*;
import static org.hamcrest.MatcherAssert.assertThat;
import static org.junit.jupiter.api.Assertions.assertTrue;
import static org.mockito.Mockito.*;
import static org.mockito.Mockito.mock;
import static org.mockito.Mockito.when;
import java.util.Collection;
import java.util.HashMap;
itests/org.openhab.core.automation.tests/itest.bndrun
+8 -8
View File
@@ -23,9 +23,9 @@ Fragment-Host: org.openhab.core.automation
org.apache.felix.http.servlet-api;version='[1.2.0,1.2.1)',\
org.osgi.service.component;version='[1.5.1,1.5.2)',\
xstream;version='[1.4.21,1.4.22)',\
net.bytebuddy.byte-buddy;version='[1.12.19,1.12.20)',\
net.bytebuddy.byte-buddy-agent;version='[1.12.19,1.12.20)',\
org.mockito.mockito-core;version='[4.11.0,4.11.1)',\
net.bytebuddy.byte-buddy;version='[1.17.6,1.17.7)',\
net.bytebuddy.byte-buddy-agent;version='[1.17.6,1.17.7)',\
org.mockito.mockito-core;version='[5.19.0,5.19.1)',\
org.objenesis;version='[3.3.0,3.3.1)',\
javax.measure.unit-api;version='[2.2.0,2.2.1)',\
tech.units.indriya;version='[2.2.3,2.2.4)',\
@@ -37,11 +37,11 @@ Fragment-Host: org.openhab.core.automation
org.osgi.service.event;version='[1.4.1,1.4.2)',\
org.osgi.util.promise;version='[1.3.0,1.3.1)',\
com.google.gson;version='[2.13.1,2.13.2)',\
junit-jupiter-api;version='[5.11.4,5.11.5)',\
junit-jupiter-engine;version='[5.11.4,5.11.5)',\
junit-platform-commons;version='[1.11.4,1.11.5)',\
junit-platform-engine;version='[1.11.4,1.11.5)',\
junit-platform-launcher;version='[1.11.4,1.11.5)',\
junit-jupiter-api;version='[5.13.4,5.13.5)',\
junit-jupiter-engine;version='[5.13.4,5.13.5)',\
junit-platform-commons;version='[1.13.4,1.13.5)',\
junit-platform-engine;version='[1.13.4,1.13.5)',\
junit-platform-launcher;version='[1.13.4,1.13.5)',\
org.opentest4j;version='[1.3.0,1.3.1)',\
ch.qos.logback.classic;version='[1.5.18,1.5.19)',\
ch.qos.logback.core;version='[1.5.18,1.5.19)',\
itests/org.openhab.core.automation.tests/src/main/java/org/openhab/core/automation/event/RuleEventTest.java
+2 -1
View File
@@ -16,7 +16,8 @@ import static java.util.Map.entry;
import static org.hamcrest.CoreMatchers.*;
import static org.hamcrest.MatcherAssert.assertThat;
import static org.junit.jupiter.api.Assertions.*;
import static org.mockito.Mockito.*;
import static org.mockito.Mockito.mock;
import static org.mockito.Mockito.when;
import java.util.ArrayList;
import java.util.Collection;
itests/org.openhab.core.config.core.tests/itest.bndrun
+9 -9
View File
@@ -24,10 +24,10 @@ Fragment-Host: org.openhab.core.config.core
org.apache.felix.http.servlet-api;version='[1.2.0,1.2.1)',\
org.osgi.service.component;version='[1.5.1,1.5.2)',\
xstream;version='[1.4.21,1.4.22)',\
net.bytebuddy.byte-buddy;version='[1.12.19,1.12.20)',\
net.bytebuddy.byte-buddy-agent;version='[1.12.19,1.12.20)',\
org.mockito.junit-jupiter;version='[4.11.0,4.11.1)',\
org.mockito.mockito-core;version='[4.11.0,4.11.1)',\
net.bytebuddy.byte-buddy;version='[1.17.6,1.17.7)',\
net.bytebuddy.byte-buddy-agent;version='[1.17.6,1.17.7)',\
org.mockito.junit-jupiter;version='[5.19.0,5.19.1)',\
org.mockito.mockito-core;version='[5.19.0,5.19.1)',\
org.objenesis;version='[3.3.0,3.3.1)',\
javax.measure.unit-api;version='[2.2.0,2.2.1)',\
tech.units.indriya;version='[2.2.3,2.2.4)',\
@@ -39,11 +39,11 @@ Fragment-Host: org.openhab.core.config.core
org.osgi.service.event;version='[1.4.1,1.4.2)',\
org.osgi.util.promise;version='[1.3.0,1.3.1)',\
com.google.gson;version='[2.13.1,2.13.2)',\
junit-jupiter-api;version='[5.11.4,5.11.5)',\
junit-jupiter-engine;version='[5.11.4,5.11.5)',\
junit-platform-commons;version='[1.11.4,1.11.5)',\
junit-platform-engine;version='[1.11.4,1.11.5)',\
junit-platform-launcher;version='[1.11.4,1.11.5)',\
junit-jupiter-api;version='[5.13.4,5.13.5)',\
junit-jupiter-engine;version='[5.13.4,5.13.5)',\
junit-platform-commons;version='[1.13.4,1.13.5)',\
junit-platform-engine;version='[1.13.4,1.13.5)',\
junit-platform-launcher;version='[1.13.4,1.13.5)',\
org.opentest4j;version='[1.3.0,1.3.1)',\
ch.qos.logback.classic;version='[1.5.18,1.5.19)',\
ch.qos.logback.core;version='[1.5.18,1.5.19)',\
itests/org.openhab.core.config.discovery.mdns.tests/itest.bndrun
+8 -8
View File
@@ -24,9 +24,9 @@ Fragment-Host: org.openhab.core.config.discovery.mdns
org.apache.felix.http.servlet-api;version='[1.2.0,1.2.1)',\
org.osgi.service.component;version='[1.5.1,1.5.2)',\
xstream;version='[1.4.21,1.4.22)',\
net.bytebuddy.byte-buddy;version='[1.12.19,1.12.20)',\
net.bytebuddy.byte-buddy-agent;version='[1.12.19,1.12.20)',\
org.mockito.mockito-core;version='[4.11.0,4.11.1)',\
net.bytebuddy.byte-buddy;version='[1.17.6,1.17.7)',\
net.bytebuddy.byte-buddy-agent;version='[1.17.6,1.17.7)',\
org.mockito.mockito-core;version='[5.19.0,5.19.1)',\
org.objenesis;version='[3.3.0,3.3.1)',\
javax.measure.unit-api;version='[2.2.0,2.2.1)',\
tech.units.indriya;version='[2.2.3,2.2.4)',\
@@ -38,11 +38,11 @@ Fragment-Host: org.openhab.core.config.discovery.mdns
org.osgi.service.event;version='[1.4.1,1.4.2)',\
org.osgi.util.promise;version='[1.3.0,1.3.1)',\
com.google.gson;version='[2.13.1,2.13.2)',\
junit-jupiter-api;version='[5.11.4,5.11.5)',\
junit-jupiter-engine;version='[5.11.4,5.11.5)',\
junit-platform-commons;version='[1.11.4,1.11.5)',\
junit-platform-engine;version='[1.11.4,1.11.5)',\
junit-platform-launcher;version='[1.11.4,1.11.5)',\
junit-jupiter-api;version='[5.13.4,5.13.5)',\
junit-jupiter-engine;version='[5.13.4,5.13.5)',\
junit-platform-commons;version='[1.13.4,1.13.5)',\
junit-platform-engine;version='[1.13.4,1.13.5)',\
junit-platform-launcher;version='[1.13.4,1.13.5)',\
org.opentest4j;version='[1.3.0,1.3.1)',\
ch.qos.logback.classic;version='[1.5.18,1.5.19)',\
ch.qos.logback.core;version='[1.5.18,1.5.19)',\
itests/org.openhab.core.config.discovery.tests/itest.bndrun
+9 -9
View File
@@ -24,10 +24,10 @@ Fragment-Host: org.openhab.core.config.discovery
org.apache.felix.http.servlet-api;version='[1.2.0,1.2.1)',\
org.osgi.service.component;version='[1.5.1,1.5.2)',\
xstream;version='[1.4.21,1.4.22)',\
net.bytebuddy.byte-buddy;version='[1.12.19,1.12.20)',\
net.bytebuddy.byte-buddy-agent;version='[1.12.19,1.12.20)',\
org.mockito.junit-jupiter;version='[4.11.0,4.11.1)',\
org.mockito.mockito-core;version='[4.11.0,4.11.1)',\
net.bytebuddy.byte-buddy;version='[1.17.6,1.17.7)',\
net.bytebuddy.byte-buddy-agent;version='[1.17.6,1.17.7)',\
org.mockito.junit-jupiter;version='[5.19.0,5.19.1)',\
org.mockito.mockito-core;version='[5.19.0,5.19.1)',\
org.objenesis;version='[3.3.0,3.3.1)',\
javax.measure.unit-api;version='[2.2.0,2.2.1)',\
tech.units.indriya;version='[2.2.3,2.2.4)',\
@@ -39,11 +39,11 @@ Fragment-Host: org.openhab.core.config.discovery
org.osgi.service.event;version='[1.4.1,1.4.2)',\
org.osgi.util.promise;version='[1.3.0,1.3.1)',\
com.google.gson;version='[2.13.1,2.13.2)',\
junit-jupiter-api;version='[5.11.4,5.11.5)',\
junit-jupiter-engine;version='[5.11.4,5.11.5)',\
junit-platform-commons;version='[1.11.4,1.11.5)',\
junit-platform-engine;version='[1.11.4,1.11.5)',\
junit-platform-launcher;version='[1.11.4,1.11.5)',\
junit-jupiter-api;version='[5.13.4,5.13.5)',\
junit-jupiter-engine;version='[5.13.4,5.13.5)',\
junit-platform-commons;version='[1.13.4,1.13.5)',\
junit-platform-engine;version='[1.13.4,1.13.5)',\
junit-platform-launcher;version='[1.13.4,1.13.5)',\
org.opentest4j;version='[1.3.0,1.3.1)',\
ch.qos.logback.classic;version='[1.5.18,1.5.19)',\
ch.qos.logback.core;version='[1.5.18,1.5.19)',\
itests/org.openhab.core.config.discovery.tests/src/main/java/org/openhab/core/config/discovery/DiscoveryServiceRegistryOSGiTest.java
-1
View File
@@ -15,7 +15,6 @@ package org.openhab.core.config.discovery;
import static org.hamcrest.CoreMatchers.is;
import static org.hamcrest.MatcherAssert.assertThat;
import static org.junit.jupiter.api.Assertions.*;
import static org.mockito.ArgumentMatchers.*;
import static org.mockito.Mockito.*;
import java.time.Instant;
itests/org.openhab.core.config.discovery.tests/src/main/java/org/openhab/core/config/discovery/inbox/DynamicThingUpdateOSGiTest.java
-1
View File
@@ -13,7 +13,6 @@
package org.openhab.core.config.discovery.inbox;
import static org.junit.jupiter.api.Assertions.*;
import static org.mockito.ArgumentMatchers.*;
import static org.mockito.Mockito.*;
import java.util.Map;
itests/org.openhab.core.config.discovery.tests/src/main/java/org/openhab/core/config/discovery/internal/InboxOSGiTest.java
+2 -1
View File
@@ -15,7 +15,8 @@ package org.openhab.core.config.discovery.internal;
import static org.hamcrest.CoreMatchers.*;
import static org.hamcrest.MatcherAssert.assertThat;
import static org.junit.jupiter.api.Assertions.*;
import static org.mockito.Mockito.*;
import static org.mockito.Mockito.mock;
import static org.mockito.Mockito.when;
import static org.openhab.core.config.discovery.inbox.InboxPredicates.*;
import java.math.BigDecimal;
itests/org.openhab.core.config.discovery.usbserial.linuxsysfs.tests/itest.bndrun
+9 -9
View File
@@ -23,10 +23,10 @@ Fragment-Host: org.openhab.core.config.discovery.usbserial.linuxsysfs
org.apache.felix.http.servlet-api;version='[1.2.0,1.2.1)',\
org.osgi.service.component;version='[1.5.1,1.5.2)',\
xstream;version='[1.4.21,1.4.22)',\
net.bytebuddy.byte-buddy;version='[1.12.19,1.12.20)',\
net.bytebuddy.byte-buddy-agent;version='[1.12.19,1.12.20)',\
org.mockito.junit-jupiter;version='[4.11.0,4.11.1)',\
org.mockito.mockito-core;version='[4.11.0,4.11.1)',\
net.bytebuddy.byte-buddy;version='[1.17.6,1.17.7)',\
net.bytebuddy.byte-buddy-agent;version='[1.17.6,1.17.7)',\
org.mockito.junit-jupiter;version='[5.19.0,5.19.1)',\
org.mockito.mockito-core;version='[5.19.0,5.19.1)',\
org.objenesis;version='[3.3.0,3.3.1)',\
javax.measure.unit-api;version='[2.2.0,2.2.1)',\
tech.units.indriya;version='[2.2.3,2.2.4)',\
@@ -38,11 +38,11 @@ Fragment-Host: org.openhab.core.config.discovery.usbserial.linuxsysfs
org.osgi.service.event;version='[1.4.1,1.4.2)',\
org.osgi.util.promise;version='[1.3.0,1.3.1)',\
com.google.gson;version='[2.13.1,2.13.2)',\
junit-jupiter-api;version='[5.11.4,5.11.5)',\
junit-jupiter-engine;version='[5.11.4,5.11.5)',\
junit-platform-commons;version='[1.11.4,1.11.5)',\
junit-platform-engine;version='[1.11.4,1.11.5)',\
junit-platform-launcher;version='[1.11.4,1.11.5)',\
junit-jupiter-api;version='[5.13.4,5.13.5)',\
junit-jupiter-engine;version='[5.13.4,5.13.5)',\
junit-platform-commons;version='[1.13.4,1.13.5)',\
junit-platform-engine;version='[1.13.4,1.13.5)',\
junit-platform-launcher;version='[1.13.4,1.13.5)',\
org.opentest4j;version='[1.3.0,1.3.1)',\
ch.qos.logback.classic;version='[1.5.18,1.5.19)',\
ch.qos.logback.core;version='[1.5.18,1.5.19)',\
itests/org.openhab.core.config.discovery.usbserial.tests/itest.bndrun
+8 -8
View File
@@ -33,9 +33,9 @@ Provide-Capability: \
org.apache.felix.http.servlet-api;version='[1.2.0,1.2.1)',\
org.osgi.service.component;version='[1.5.1,1.5.2)',\
xstream;version='[1.4.21,1.4.22)',\
net.bytebuddy.byte-buddy;version='[1.12.19,1.12.20)',\
net.bytebuddy.byte-buddy-agent;version='[1.12.19,1.12.20)',\
org.mockito.mockito-core;version='[4.11.0,4.11.1)',\
net.bytebuddy.byte-buddy;version='[1.17.6,1.17.7)',\
net.bytebuddy.byte-buddy-agent;version='[1.17.6,1.17.7)',\
org.mockito.mockito-core;version='[5.19.0,5.19.1)',\
org.objenesis;version='[3.3.0,3.3.1)',\
javax.measure.unit-api;version='[2.2.0,2.2.1)',\
tech.units.indriya;version='[2.2.3,2.2.4)',\
@@ -47,11 +47,11 @@ Provide-Capability: \
org.osgi.service.event;version='[1.4.1,1.4.2)',\
org.osgi.util.promise;version='[1.3.0,1.3.1)',\
com.google.gson;version='[2.13.1,2.13.2)',\
junit-jupiter-api;version='[5.11.4,5.11.5)',\
junit-jupiter-engine;version='[5.11.4,5.11.5)',\
junit-platform-commons;version='[1.11.4,1.11.5)',\
junit-platform-engine;version='[1.11.4,1.11.5)',\
junit-platform-launcher;version='[1.11.4,1.11.5)',\
junit-jupiter-api;version='[5.13.4,5.13.5)',\
junit-jupiter-engine;version='[5.13.4,5.13.5)',\
junit-platform-commons;version='[1.13.4,1.13.5)',\
junit-platform-engine;version='[1.13.4,1.13.5)',\
junit-platform-launcher;version='[1.13.4,1.13.5)',\
org.opentest4j;version='[1.3.0,1.3.1)',\
ch.qos.logback.classic;version='[1.5.18,1.5.19)',\
ch.qos.logback.core;version='[1.5.18,1.5.19)',\
itests/org.openhab.core.config.discovery.usbserial.tests/src/main/java/org/openhab/core/config/discovery/usbserial/internal/UsbSerialDiscoveryServiceTest.java
-1
View File
@@ -16,7 +16,6 @@ import static org.hamcrest.CoreMatchers.is;
import static org.hamcrest.MatcherAssert.assertThat;
import static org.hamcrest.collection.IsEmptyCollection.empty;
import static org.hamcrest.collection.IsIterableContainingInAnyOrder.containsInAnyOrder;
import static org.mockito.ArgumentMatchers.*;
import static org.mockito.Mockito.*;
import static org.openhab.core.config.discovery.DiscoveryService.CONFIG_PROPERTY_BACKGROUND_DISCOVERY;
itests/org.openhab.core.config.dispatch.tests/itest.bndrun
+5 -5
View File
@@ -32,11 +32,11 @@ Fragment-Host: org.openhab.core.config.dispatch
org.osgi.service.event;version='[1.4.1,1.4.2)',\
org.osgi.util.promise;version='[1.3.0,1.3.1)',\
com.google.gson;version='[2.13.1,2.13.2)',\
junit-jupiter-api;version='[5.11.4,5.11.5)',\
junit-jupiter-engine;version='[5.11.4,5.11.5)',\
junit-platform-commons;version='[1.11.4,1.11.5)',\
junit-platform-engine;version='[1.11.4,1.11.5)',\
junit-platform-launcher;version='[1.11.4,1.11.5)',\
junit-jupiter-api;version='[5.13.4,5.13.5)',\
junit-jupiter-engine;version='[5.13.4,5.13.5)',\
junit-platform-commons;version='[1.13.4,1.13.5)',\
junit-platform-engine;version='[1.13.4,1.13.5)',\
junit-platform-launcher;version='[1.13.4,1.13.5)',\
org.opentest4j;version='[1.3.0,1.3.1)',\
ch.qos.logback.classic;version='[1.5.18,1.5.19)',\
ch.qos.logback.core;version='[1.5.18,1.5.19)',\
itests/org.openhab.core.ephemeris.tests/itest.bndrun
+5 -5
View File
@@ -38,11 +38,11 @@ feature.openhab-config: \
org.osgi.service.event;version='[1.4.1,1.4.2)',\
org.osgi.util.promise;version='[1.3.0,1.3.1)',\
com.google.gson;version='[2.13.1,2.13.2)',\
junit-jupiter-api;version='[5.11.4,5.11.5)',\
junit-jupiter-engine;version='[5.11.4,5.11.5)',\
junit-platform-commons;version='[1.11.4,1.11.5)',\
junit-platform-engine;version='[1.11.4,1.11.5)',\
junit-platform-launcher;version='[1.11.4,1.11.5)',\
junit-jupiter-api;version='[5.13.4,5.13.5)',\
junit-jupiter-engine;version='[5.13.4,5.13.5)',\
junit-platform-commons;version='[1.13.4,1.13.5)',\
junit-platform-engine;version='[1.13.4,1.13.5)',\
junit-platform-launcher;version='[1.13.4,1.13.5)',\
org.opentest4j;version='[1.3.0,1.3.1)',\
ch.qos.logback.classic;version='[1.5.18,1.5.19)',\
ch.qos.logback.core;version='[1.5.18,1.5.19)',\
itests/org.openhab.core.io.net.tests/itest.bndrun
+5 -5
View File
@@ -33,11 +33,11 @@ Fragment-Host: org.openhab.core.io.net
org.osgi.service.event;version='[1.4.1,1.4.2)',\
org.osgi.util.promise;version='[1.3.0,1.3.1)',\
com.google.gson;version='[2.13.1,2.13.2)',\
junit-jupiter-api;version='[5.11.4,5.11.5)',\
junit-jupiter-engine;version='[5.11.4,5.11.5)',\
junit-platform-commons;version='[1.11.4,1.11.5)',\
junit-platform-engine;version='[1.11.4,1.11.5)',\
junit-platform-launcher;version='[1.11.4,1.11.5)',\
junit-jupiter-api;version='[5.13.4,5.13.5)',\
junit-jupiter-engine;version='[5.13.4,5.13.5)',\
junit-platform-commons;version='[1.13.4,1.13.5)',\
junit-platform-engine;version='[1.13.4,1.13.5)',\
junit-platform-launcher;version='[1.13.4,1.13.5)',\
org.opentest4j;version='[1.3.0,1.3.1)',\
ch.qos.logback.classic;version='[1.5.18,1.5.19)',\
ch.qos.logback.core;version='[1.5.18,1.5.19)',\
itests/org.openhab.core.io.rest.core.tests/itest.bndrun
+10 -10
View File
@@ -30,10 +30,10 @@ Fragment-Host: org.openhab.core.io.rest.core
org.apache.felix.http.servlet-api;version='[1.2.0,1.2.1)',\
org.osgi.service.component;version='[1.5.1,1.5.2)',\
xstream;version='[1.4.21,1.4.22)',\
net.bytebuddy.byte-buddy;version='[1.12.19,1.12.20)',\
net.bytebuddy.byte-buddy-agent;version='[1.12.19,1.12.20)',\
org.mockito.junit-jupiter;version='[4.11.0,4.11.1)',\
org.mockito.mockito-core;version='[4.11.0,4.11.1)',\
net.bytebuddy.byte-buddy;version='[1.17.6,1.17.7)',\
net.bytebuddy.byte-buddy-agent;version='[1.17.6,1.17.7)',\
org.mockito.junit-jupiter;version='[5.19.0,5.19.1)',\
org.mockito.mockito-core;version='[5.19.0,5.19.1)',\
org.objenesis;version='[3.3.0,3.3.1)',\
javax.measure.unit-api;version='[2.2.0,2.2.1)',\
tech.units.indriya;version='[2.2.3,2.2.4)',\
@@ -53,12 +53,12 @@ Fragment-Host: org.openhab.core.io.rest.core
org.apache.cxf.cxf-rt-security;version='[3.6.8,3.6.9)',\
org.apache.cxf.cxf-rt-transports-http;version='[3.6.8,3.6.9)',\
org.apache.ws.xmlschema.core;version='[2.3.1,2.3.2)',\
junit-jupiter-api;version='[5.11.4,5.11.5)',\
junit-jupiter-engine;version='[5.11.4,5.11.5)',\
junit-jupiter-params;version='[5.11.4,5.11.5)',\
junit-platform-commons;version='[1.11.4,1.11.5)',\
junit-platform-engine;version='[1.11.4,1.11.5)',\
junit-platform-launcher;version='[1.11.4,1.11.5)',\
junit-jupiter-api;version='[5.13.4,5.13.5)',\
junit-jupiter-engine;version='[5.13.4,5.13.5)',\
junit-jupiter-params;version='[5.13.4,5.13.5)',\
junit-platform-commons;version='[1.13.4,1.13.5)',\
junit-platform-engine;version='[1.13.4,1.13.5)',\
junit-platform-launcher;version='[1.13.4,1.13.5)',\
org.opentest4j;version='[1.3.0,1.3.1)',\
ch.qos.logback.classic;version='[1.5.18,1.5.19)',\
ch.qos.logback.core;version='[1.5.18,1.5.19)',\
itests/org.openhab.core.io.rest.core.tests/src/main/java/org/openhab/core/io/rest/core/internal/item/ItemResourceOSGiTest.java
-1
View File
@@ -17,7 +17,6 @@ import static org.hamcrest.MatcherAssert.assertThat;
import static org.hamcrest.collection.IsCollectionWithSize.hasSize;
import static org.hamcrest.core.IsIterableContaining.hasItems;
import static org.junit.jupiter.api.Assertions.*;
import static org.mockito.ArgumentMatchers.*;
import static org.mockito.Mockito.*;
import java.io.ByteArrayOutputStream;
itests/org.openhab.core.io.rest.core.tests/src/main/java/org/openhab/core/io/rest/core/internal/link/ItemChannelLinkResourceOSGiTest.java
+2 -1
View File
@@ -16,7 +16,8 @@ import static org.hamcrest.MatcherAssert.assertThat;
import static org.hamcrest.collection.IsCollectionWithSize.hasSize;
import static org.hamcrest.core.IsIterableContaining.hasItems;
import static org.junit.jupiter.api.Assertions.*;
import static org.mockito.ArgumentMatchers.*;
import static org.mockito.ArgumentMatchers.any;
import static org.mockito.ArgumentMatchers.anyString;
import static org.mockito.Mockito.when;
import java.io.ByteArrayOutputStream;
itests/org.openhab.core.model.item.tests/itest.bndrun
+5 -5
View File
@@ -41,11 +41,11 @@ Fragment-Host: org.openhab.core.model.item
org.eclipse.emf.common;version='[2.30.0,2.30.1)',\
org.eclipse.emf.ecore;version='[2.36.0,2.36.1)',\
org.eclipse.equinox.common;version='[3.19.0,3.19.1)',\
junit-jupiter-api;version='[5.11.4,5.11.5)',\
junit-jupiter-engine;version='[5.11.4,5.11.5)',\
junit-platform-commons;version='[1.11.4,1.11.5)',\
junit-platform-engine;version='[1.11.4,1.11.5)',\
junit-platform-launcher;version='[1.11.4,1.11.5)',\
junit-jupiter-api;version='[5.13.4,5.13.5)',\
junit-jupiter-engine;version='[5.13.4,5.13.5)',\
junit-platform-commons;version='[1.13.4,1.13.5)',\
junit-platform-engine;version='[1.13.4,1.13.5)',\
junit-platform-launcher;version='[1.13.4,1.13.5)',\
org.opentest4j;version='[1.3.0,1.3.1)',\
ch.qos.logback.classic;version='[1.5.18,1.5.19)',\
ch.qos.logback.core;version='[1.5.18,1.5.19)',\
itests/org.openhab.core.model.rule.tests/itest.bndrun
+5 -5
View File
@@ -45,11 +45,11 @@ Fragment-Host: org.openhab.core.model.rule.runtime
org.eclipse.emf.common;version='[2.30.0,2.30.1)',\
org.eclipse.emf.ecore;version='[2.36.0,2.36.1)',\
org.eclipse.equinox.common;version='[3.19.0,3.19.1)',\
junit-jupiter-api;version='[5.11.4,5.11.5)',\
junit-jupiter-engine;version='[5.11.4,5.11.5)',\
junit-platform-commons;version='[1.11.4,1.11.5)',\
junit-platform-engine;version='[1.11.4,1.11.5)',\
junit-platform-launcher;version='[1.11.4,1.11.5)',\
junit-jupiter-api;version='[5.13.4,5.13.5)',\
junit-jupiter-engine;version='[5.13.4,5.13.5)',\
junit-platform-commons;version='[1.13.4,1.13.5)',\
junit-platform-engine;version='[1.13.4,1.13.5)',\
junit-platform-launcher;version='[1.13.4,1.13.5)',\
org.opentest4j;version='[1.3.0,1.3.1)',\
ch.qos.logback.classic;version='[1.5.18,1.5.19)',\
ch.qos.logback.core;version='[1.5.18,1.5.19)',\
itests/org.openhab.core.model.script.tests/itest.bndrun
+9 -9
View File
@@ -31,10 +31,10 @@ Fragment-Host: org.openhab.core.model.script
org.apache.felix.http.servlet-api;version='[1.2.0,1.2.1)',\
org.osgi.service.component;version='[1.5.1,1.5.2)',\
xstream;version='[1.4.21,1.4.22)',\
net.bytebuddy.byte-buddy;version='[1.12.19,1.12.20)',\
net.bytebuddy.byte-buddy-agent;version='[1.12.19,1.12.20)',\
org.mockito.junit-jupiter;version='[4.11.0,4.11.1)',\
org.mockito.mockito-core;version='[4.11.0,4.11.1)',\
net.bytebuddy.byte-buddy;version='[1.17.6,1.17.7)',\
net.bytebuddy.byte-buddy-agent;version='[1.17.6,1.17.7)',\
org.mockito.junit-jupiter;version='[5.19.0,5.19.1)',\
org.mockito.mockito-core;version='[5.19.0,5.19.1)',\
org.objenesis;version='[3.3.0,3.3.1)',\
javax.measure.unit-api;version='[2.2.0,2.2.1)',\
tech.units.indriya;version='[2.2.3,2.2.4)',\
@@ -50,11 +50,11 @@ Fragment-Host: org.openhab.core.model.script
org.eclipse.emf.common;version='[2.30.0,2.30.1)',\
org.eclipse.emf.ecore;version='[2.36.0,2.36.1)',\
org.eclipse.equinox.common;version='[3.19.0,3.19.1)',\
junit-jupiter-api;version='[5.11.4,5.11.5)',\
junit-jupiter-engine;version='[5.11.4,5.11.5)',\
junit-platform-commons;version='[1.11.4,1.11.5)',\
junit-platform-engine;version='[1.11.4,1.11.5)',\
junit-platform-launcher;version='[1.11.4,1.11.5)',\
junit-jupiter-api;version='[5.13.4,5.13.5)',\
junit-jupiter-engine;version='[5.13.4,5.13.5)',\
junit-platform-commons;version='[1.13.4,1.13.5)',\
junit-platform-engine;version='[1.13.4,1.13.5)',\
junit-platform-launcher;version='[1.13.4,1.13.5)',\
org.opentest4j;version='[1.3.0,1.3.1)',\
ch.qos.logback.classic;version='[1.5.18,1.5.19)',\
ch.qos.logback.core;version='[1.5.18,1.5.19)',\
itests/org.openhab.core.model.thing.tests/itest.bndrun
+10 -10
View File
@@ -28,10 +28,10 @@ Fragment-Host: org.openhab.core.model.thing
org.apache.felix.configadmin;version='[1.9.26,1.9.27)',\
org.osgi.service.component;version='[1.5.1,1.5.2)',\
xstream;version='[1.4.21,1.4.22)',\
net.bytebuddy.byte-buddy;version='[1.12.19,1.12.20)',\
net.bytebuddy.byte-buddy-agent;version='[1.12.19,1.12.20)',\
org.mockito.junit-jupiter;version='[4.11.0,4.11.1)',\
org.mockito.mockito-core;version='[4.11.0,4.11.1)',\
net.bytebuddy.byte-buddy;version='[1.17.6,1.17.7)',\
net.bytebuddy.byte-buddy-agent;version='[1.17.6,1.17.7)',\
org.mockito.junit-jupiter;version='[5.19.0,5.19.1)',\
org.mockito.mockito-core;version='[5.19.0,5.19.1)',\
org.objenesis;version='[3.3.0,3.3.1)',\
javax.measure.unit-api;version='[2.2.0,2.2.1)',\
tech.units.indriya;version='[2.2.3,2.2.4)',\
@@ -47,12 +47,12 @@ Fragment-Host: org.openhab.core.model.thing
org.eclipse.emf.common;version='[2.30.0,2.30.1)',\
org.eclipse.emf.ecore;version='[2.36.0,2.36.1)',\
org.eclipse.equinox.common;version='[3.19.0,3.19.1)',\
junit-jupiter-api;version='[5.11.4,5.11.5)',\
junit-jupiter-engine;version='[5.11.4,5.11.5)',\
junit-jupiter-params;version='[5.11.4,5.11.5)',\
junit-platform-commons;version='[1.11.4,1.11.5)',\
junit-platform-engine;version='[1.11.4,1.11.5)',\
junit-platform-launcher;version='[1.11.4,1.11.5)',\
junit-jupiter-api;version='[5.13.4,5.13.5)',\
junit-jupiter-engine;version='[5.13.4,5.13.5)',\
junit-jupiter-params;version='[5.13.4,5.13.5)',\
junit-platform-commons;version='[1.13.4,1.13.5)',\
junit-platform-engine;version='[1.13.4,1.13.5)',\
junit-platform-launcher;version='[1.13.4,1.13.5)',\
org.opentest4j;version='[1.3.0,1.3.1)',\
ch.qos.logback.classic;version='[1.5.18,1.5.19)',\
ch.qos.logback.core;version='[1.5.18,1.5.19)',\
itests/org.openhab.core.model.thing.tests/src/main/java/org/openhab/core/model/thing/test/GenericItemChannelLinkProviderJavaTest.java
-1
View File
@@ -15,7 +15,6 @@ package org.openhab.core.model.thing.test;
import static org.hamcrest.CoreMatchers.*;
import static org.hamcrest.MatcherAssert.assertThat;
import static org.junit.jupiter.api.Assertions.*;
import static org.mockito.ArgumentMatchers.*;
import static org.mockito.Mockito.*;
import java.io.ByteArrayInputStream;
itests/org.openhab.core.model.thing.tests/src/main/java/org/openhab/core/model/thing/test/hue/GenericThingProviderTest2.java
+2 -1
View File
@@ -14,7 +14,8 @@ package org.openhab.core.model.thing.test.hue;
import static org.hamcrest.CoreMatchers.*;
import static org.hamcrest.MatcherAssert.assertThat;
import static org.mockito.Mockito.*;
import static org.mockito.Mockito.mock;
import static org.mockito.Mockito.when;
import java.io.ByteArrayInputStream;
import java.util.Collection;
itests/org.openhab.core.model.thing.tests/src/main/java/org/openhab/core/model/thing/test/hue/GenericThingProviderTest3.java
+2 -1
View File
@@ -16,7 +16,8 @@ import static org.hamcrest.CoreMatchers.*;
import static org.hamcrest.MatcherAssert.assertThat;
import static org.mockito.ArgumentMatchers.any;
import static org.mockito.ArgumentMatchers.nullable;
import static org.mockito.Mockito.*;
import static org.mockito.Mockito.mock;
import static org.mockito.Mockito.when;
import java.io.ByteArrayInputStream;
import java.net.URI;
itests/org.openhab.core.model.thing.tests/src/main/java/org/openhab/core/model/thing/test/hue/GenericThingProviderTest4.java
+2 -1
View File
@@ -14,7 +14,8 @@ package org.openhab.core.model.thing.test.hue;
import static org.hamcrest.CoreMatchers.*;
import static org.hamcrest.MatcherAssert.assertThat;
import static org.mockito.Mockito.*;
import static org.mockito.Mockito.mock;
import static org.mockito.Mockito.when;
import java.io.ByteArrayInputStream;
import java.util.stream.Stream;
itests/org.openhab.core.storage.json.tests/itest.bndrun
+5 -5
View File
@@ -33,11 +33,11 @@ Fragment-Host: org.openhab.core.storage.json
org.osgi.service.event;version='[1.4.1,1.4.2)',\
org.osgi.util.promise;version='[1.3.0,1.3.1)',\
com.google.gson;version='[2.13.1,2.13.2)',\
junit-jupiter-api;version='[5.11.4,5.11.5)',\
junit-jupiter-engine;version='[5.11.4,5.11.5)',\
junit-platform-commons;version='[1.11.4,1.11.5)',\
junit-platform-engine;version='[1.11.4,1.11.5)',\
junit-platform-launcher;version='[1.11.4,1.11.5)',\
junit-jupiter-api;version='[5.13.4,5.13.5)',\
junit-jupiter-engine;version='[5.13.4,5.13.5)',\
junit-platform-commons;version='[1.13.4,1.13.5)',\
junit-platform-engine;version='[1.13.4,1.13.5)',\
junit-platform-launcher;version='[1.13.4,1.13.5)',\
org.opentest4j;version='[1.3.0,1.3.1)',\
ch.qos.logback.classic;version='[1.5.18,1.5.19)',\
ch.qos.logback.core;version='[1.5.18,1.5.19)',\
itests/org.openhab.core.tests/itest.bndrun
+9 -9
View File
@@ -22,10 +22,10 @@ Fragment-Host: org.openhab.core
org.apache.felix.configadmin;version='[1.9.26,1.9.27)',\
org.apache.felix.http.servlet-api;version='[1.2.0,1.2.1)',\
org.osgi.service.component;version='[1.5.1,1.5.2)',\
net.bytebuddy.byte-buddy;version='[1.12.19,1.12.20)',\
net.bytebuddy.byte-buddy-agent;version='[1.12.19,1.12.20)',\
org.mockito.junit-jupiter;version='[4.11.0,4.11.1)',\
org.mockito.mockito-core;version='[4.11.0,4.11.1)',\
net.bytebuddy.byte-buddy;version='[1.17.6,1.17.7)',\
net.bytebuddy.byte-buddy-agent;version='[1.17.6,1.17.7)',\
org.mockito.junit-jupiter;version='[5.19.0,5.19.1)',\
org.mockito.mockito-core;version='[5.19.0,5.19.1)',\
org.objenesis;version='[3.3.0,3.3.1)',\
javax.measure.unit-api;version='[2.2.0,2.2.1)',\
tech.units.indriya;version='[2.2.3,2.2.4)',\
@@ -37,11 +37,11 @@ Fragment-Host: org.openhab.core
org.osgi.service.event;version='[1.4.1,1.4.2)',\
org.osgi.util.promise;version='[1.3.0,1.3.1)',\
com.google.gson;version='[2.13.1,2.13.2)',\
junit-jupiter-api;version='[5.11.4,5.11.5)',\
junit-jupiter-engine;version='[5.11.4,5.11.5)',\
junit-platform-commons;version='[1.11.4,1.11.5)',\
junit-platform-engine;version='[1.11.4,1.11.5)',\
junit-platform-launcher;version='[1.11.4,1.11.5)',\
junit-jupiter-api;version='[5.13.4,5.13.5)',\
junit-jupiter-engine;version='[5.13.4,5.13.5)',\
junit-platform-commons;version='[1.13.4,1.13.5)',\
junit-platform-engine;version='[1.13.4,1.13.5)',\
junit-platform-launcher;version='[1.13.4,1.13.5)',\
org.opentest4j;version='[1.3.0,1.3.1)',\
ch.qos.logback.classic;version='[1.5.18,1.5.19)',\
ch.qos.logback.core;version='[1.5.18,1.5.19)',\
itests/org.openhab.core.thing.tests/itest.bndrun
+9 -9
View File
@@ -27,10 +27,10 @@ Fragment-Host: org.openhab.core.thing
org.apache.felix.http.servlet-api;version='[1.2.0,1.2.1)',\
org.osgi.service.component;version='[1.5.1,1.5.2)',\
xstream;version='[1.4.21,1.4.22)',\
net.bytebuddy.byte-buddy;version='[1.12.19,1.12.20)',\
net.bytebuddy.byte-buddy-agent;version='[1.12.19,1.12.20)',\
org.mockito.junit-jupiter;version='[4.11.0,4.11.1)',\
org.mockito.mockito-core;version='[4.11.0,4.11.1)',\
net.bytebuddy.byte-buddy;version='[1.17.6,1.17.7)',\
net.bytebuddy.byte-buddy-agent;version='[1.17.6,1.17.7)',\
org.mockito.junit-jupiter;version='[5.19.0,5.19.1)',\
org.mockito.mockito-core;version='[5.19.0,5.19.1)',\
org.objenesis;version='[3.3.0,3.3.1)',\
javax.measure.unit-api;version='[2.2.0,2.2.1)',\
tech.units.indriya;version='[2.2.3,2.2.4)',\
@@ -42,11 +42,11 @@ Fragment-Host: org.openhab.core.thing
org.osgi.service.event;version='[1.4.1,1.4.2)',\
org.osgi.util.promise;version='[1.3.0,1.3.1)',\
com.google.gson;version='[2.13.1,2.13.2)',\
junit-jupiter-api;version='[5.11.4,5.11.5)',\
junit-jupiter-engine;version='[5.11.4,5.11.5)',\
junit-platform-commons;version='[1.11.4,1.11.5)',\
junit-platform-engine;version='[1.11.4,1.11.5)',\
junit-platform-launcher;version='[1.11.4,1.11.5)',\
junit-jupiter-api;version='[5.13.4,5.13.5)',\
junit-jupiter-engine;version='[5.13.4,5.13.5)',\
junit-platform-commons;version='[1.13.4,1.13.5)',\
junit-platform-engine;version='[1.13.4,1.13.5)',\
junit-platform-launcher;version='[1.13.4,1.13.5)',\
org.opentest4j;version='[1.3.0,1.3.1)',\
ch.qos.logback.classic;version='[1.5.18,1.5.19)',\
ch.qos.logback.core;version='[1.5.18,1.5.19)',\
itests/org.openhab.core.thing.tests/src/main/java/org/openhab/core/thing/binding/ChangeThingTypeOSGiTest.java
+2 -1
View File
@@ -16,7 +16,8 @@ import static java.util.Map.entry;
import static org.hamcrest.CoreMatchers.*;
import static org.hamcrest.MatcherAssert.assertThat;
import static org.mockito.ArgumentMatchers.any;
import static org.mockito.Mockito.*;
import static org.mockito.Mockito.mock;
import static org.mockito.Mockito.when;
import java.net.URI;
import java.net.URISyntaxException;
itests/org.openhab.core.thing.tests/src/main/java/org/openhab/core/thing/binding/ThingFactoryTest.java
+2 -1
View File
@@ -17,7 +17,8 @@ import static org.hamcrest.CoreMatchers.*;
import static org.hamcrest.MatcherAssert.assertThat;
import static org.mockito.ArgumentMatchers.any;
import static org.mockito.ArgumentMatchers.nullable;
import static org.mockito.Mockito.*;
import static org.mockito.Mockito.mock;
import static org.mockito.Mockito.when;
import java.math.BigDecimal;
import java.net.URI;
itests/org.openhab.core.thing.tests/src/main/java/org/openhab/core/thing/firmware/FirmwareUpdateServiceFirmwareRestrictionTest.java
+2 -1
View File
@@ -15,7 +15,8 @@ package org.openhab.core.thing.firmware;
import static org.hamcrest.CoreMatchers.*;
import static org.hamcrest.MatcherAssert.assertThat;
import static org.mockito.ArgumentMatchers.any;
import static org.mockito.Mockito.*;
import static org.mockito.Mockito.mock;
import static org.mockito.Mockito.when;
import java.util.HashMap;
import java.util.Map;
itests/org.openhab.core.thing.tests/src/main/java/org/openhab/core/thing/firmware/FirmwareUpdateServicePrerequisiteVersionTest.java
+2 -1
View File
@@ -16,7 +16,8 @@ import static org.hamcrest.CoreMatchers.*;
import static org.hamcrest.MatcherAssert.assertThat;
import static org.mockito.ArgumentMatchers.any;
import static org.mockito.ArgumentMatchers.eq;
import static org.mockito.Mockito.*;
import static org.mockito.Mockito.mock;
import static org.mockito.Mockito.when;
import java.util.Locale;
import java.util.Map;
itests/org.openhab.core.thing.tests/src/main/java/org/openhab/core/thing/i18n/ThingStatusInfoI18nLocalizationServiceOSGiTest.java
-1
View File
@@ -15,7 +15,6 @@ package org.openhab.core.thing.i18n;
import static org.hamcrest.CoreMatchers.*;
import static org.hamcrest.MatcherAssert.assertThat;
import static org.junit.jupiter.api.Assertions.*;
import static org.mockito.ArgumentMatchers.*;
import static org.mockito.Mockito.*;
import java.io.IOException;
itests/org.openhab.core.thing.tests/src/main/java/org/openhab/core/thing/internal/ChannelLinkNotifierOSGiTest.java
-1
View File
@@ -15,7 +15,6 @@ package org.openhab.core.thing.internal;
import static org.hamcrest.CoreMatchers.*;
import static org.hamcrest.MatcherAssert.assertThat;
import static org.junit.jupiter.api.Assertions.assertTrue;
import static org.mockito.ArgumentMatchers.*;
import static org.mockito.ArgumentMatchers.any;
import static org.mockito.Mockito.*;
itests/org.openhab.core.thing.tests/src/main/java/org/openhab/core/thing/internal/CommunicationManagerOSGiTest.java
-1
View File
@@ -13,7 +13,6 @@
package org.openhab.core.thing.internal;
import static org.junit.jupiter.api.Assertions.*;
import static org.mockito.ArgumentMatchers.*;
import static org.mockito.Mockito.*;
import java.util.Collection;
itests/org.openhab.core.thing.tests/src/main/java/org/openhab/core/thing/internal/update/ThingUpdateOSGiTest.java
-1
View File
@@ -14,7 +14,6 @@ package org.openhab.core.thing.internal.update;
import static org.hamcrest.MatcherAssert.assertThat;
import static org.hamcrest.Matchers.*;
import static org.mockito.ArgumentMatchers.*;
import static org.mockito.Mockito.*;
import static org.openhab.core.thing.internal.ThingManagerImpl.PROPERTY_THING_TYPE_VERSION;
itests/org.openhab.core.thing.tests/src/main/java/org/openhab/core/thing/link/ItemChannelLinkOSGiTest.java
+2 -1
View File
@@ -15,7 +15,8 @@ package org.openhab.core.thing.link;
import static org.hamcrest.MatcherAssert.assertThat;
import static org.hamcrest.Matchers.*;
import static org.junit.jupiter.api.Assertions.*;
import static org.mockito.Mockito.*;
import static org.mockito.Mockito.mock;
import static org.mockito.Mockito.when;
import java.util.ArrayList;
import java.util.Hashtable;
itests/org.openhab.core.voice.tests/itest.bndrun
+6 -6
View File
@@ -38,12 +38,12 @@ Fragment-Host: org.openhab.core.voice
org.osgi.service.event;version='[1.4.1,1.4.2)',\
org.osgi.util.promise;version='[1.3.0,1.3.1)',\
com.google.gson;version='[2.13.1,2.13.2)',\
junit-jupiter-api;version='[5.11.4,5.11.5)',\
junit-jupiter-engine;version='[5.11.4,5.11.5)',\
junit-jupiter-params;version='[5.11.4,5.11.5)',\
junit-platform-commons;version='[1.11.4,1.11.5)',\
junit-platform-engine;version='[1.11.4,1.11.5)',\
junit-platform-launcher;version='[1.11.4,1.11.5)',\
junit-jupiter-api;version='[5.13.4,5.13.5)',\
junit-jupiter-engine;version='[5.13.4,5.13.5)',\
junit-jupiter-params;version='[5.13.4,5.13.5)',\
junit-platform-commons;version='[1.13.4,1.13.5)',\
junit-platform-engine;version='[1.13.4,1.13.5)',\
junit-platform-launcher;version='[1.13.4,1.13.5)',\
org.opentest4j;version='[1.3.0,1.3.1)',\
ch.qos.logback.classic;version='[1.5.18,1.5.19)',\
ch.qos.logback.core;version='[1.5.18,1.5.19)',\