Remove JUnit 4 dependencies (#17580)

Using JUnit 5 should suffice.

Signed-off-by: Wouter Born <github@maindrain.net>

diff --git a/bundles/org.openhab.binding.broadlink/pom.xml b/bundles/org.openhab.binding.broadlink/pom.xml
index 3f4fa7d0fb3eb16141acac3b32f63b71afde108e..668b97f6b12e73971759d3c1af6711ceee05fa43 100644 (file)
--- a/bundles/org.openhab.binding.broadlink/pom.xml
+++ b/bundles/org.openhab.binding.broadlink/pom.xml
@@ -14,12 +14,4 @@
 
   <name>openHAB Add-ons :: Bundles :: Broadlink Binding</name>
 
-  <dependencies>
-    <dependency>
-      <groupId>junit</groupId>
-      <artifactId>junit</artifactId>
-      <version>4.13</version>
-      <scope>test</scope>
-    </dependency>
-  </dependencies>
 </project>

diff --git a/bundles/org.openhab.binding.broadlink/src/test/java/org/openhab/binding/broadlink/internal/handler/BroadlinkRemoteModel4HandlerTest.java b/bundles/org.openhab.binding.broadlink/src/test/java/org/openhab/binding/broadlink/internal/handler/BroadlinkRemoteModel4HandlerTest.java
index ac4867fdbb0571704eaf589be24308159eb1cbfa..6f85131b6a3c48b04f91a2e265d726fdc9156f4e 100644 (file)
--- a/bundles/org.openhab.binding.broadlink/src/test/java/org/openhab/binding/broadlink/internal/handler/BroadlinkRemoteModel4HandlerTest.java
+++ b/bundles/org.openhab.binding.broadlink/src/test/java/org/openhab/binding/broadlink/internal/handler/BroadlinkRemoteModel4HandlerTest.java
@@ -12,8 +12,8 @@
  */
 package org.openhab.binding.broadlink.internal.handler;
 
-import static org.junit.Assert.fail;
 import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.fail;
 import static org.mockito.Mockito.*;
 import static org.openhab.binding.broadlink.internal.BroadlinkBindingConstants.*;
 

diff --git a/bundles/org.openhab.binding.broadlink/src/test/java/org/openhab/binding/broadlink/internal/handler/BroadlinkRemoteModelProHandlerTest.java b/bundles/org.openhab.binding.broadlink/src/test/java/org/openhab/binding/broadlink/internal/handler/BroadlinkRemoteModelProHandlerTest.java
index 49804bc1e769ae6f1c2d15f64fa7f5e10e8d47ee..4d7b7b0bbd3fdc70289a8de0c6bd56ca7eabb309 100644 (file)
--- a/bundles/org.openhab.binding.broadlink/src/test/java/org/openhab/binding/broadlink/internal/handler/BroadlinkRemoteModelProHandlerTest.java
+++ b/bundles/org.openhab.binding.broadlink/src/test/java/org/openhab/binding/broadlink/internal/handler/BroadlinkRemoteModelProHandlerTest.java
@@ -12,8 +12,8 @@
  */
 package org.openhab.binding.broadlink.internal.handler;
 
-import static org.junit.Assert.fail;
 import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.fail;
 import static org.mockito.Mockito.*;
 
 import java.io.IOException;

diff --git a/bundles/org.openhab.binding.broadlink/src/test/java/org/openhab/binding/broadlink/internal/handler/BroadlinkSocketModel2HandlerTest.java b/bundles/org.openhab.binding.broadlink/src/test/java/org/openhab/binding/broadlink/internal/handler/BroadlinkSocketModel2HandlerTest.java
index bc14c2c5ebfb4211a36f2408608229639ce73c6d..6cf01fff6ce53c70d9e4d4907b2f62364e2c193b 100644 (file)
--- a/bundles/org.openhab.binding.broadlink/src/test/java/org/openhab/binding/broadlink/internal/handler/BroadlinkSocketModel2HandlerTest.java
+++ b/bundles/org.openhab.binding.broadlink/src/test/java/org/openhab/binding/broadlink/internal/handler/BroadlinkSocketModel2HandlerTest.java
@@ -12,8 +12,8 @@
  */
 package org.openhab.binding.broadlink.internal.handler;
 
-import static org.junit.Assert.fail;
 import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.fail;
 import static org.mockito.Mockito.*;
 import static org.openhab.binding.broadlink.internal.BroadlinkBindingConstants.*;
 

diff --git a/bundles/org.openhab.binding.broadlink/src/test/java/org/openhab/binding/broadlink/internal/handler/BroadlinkSocketModel3HandlerTest.java b/bundles/org.openhab.binding.broadlink/src/test/java/org/openhab/binding/broadlink/internal/handler/BroadlinkSocketModel3HandlerTest.java
index 025eb94e49a24adf784560e38c3ac3e641132b07..1bc27470a4313dd98aa8bcc0b0cfe5595970046f 100644 (file)
--- a/bundles/org.openhab.binding.broadlink/src/test/java/org/openhab/binding/broadlink/internal/handler/BroadlinkSocketModel3HandlerTest.java
+++ b/bundles/org.openhab.binding.broadlink/src/test/java/org/openhab/binding/broadlink/internal/handler/BroadlinkSocketModel3HandlerTest.java
@@ -12,8 +12,8 @@
  */
 package org.openhab.binding.broadlink.internal.handler;
 
-import static org.junit.Assert.fail;
 import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.fail;
 import static org.mockito.Mockito.*;
 import static org.openhab.binding.broadlink.internal.BroadlinkBindingConstants.*;
 import static org.openhab.binding.broadlink.internal.handler.BroadlinkSocketModel3Handler.mergeOnOffBits;

diff --git a/bundles/org.openhab.binding.broadlink/src/test/java/org/openhab/binding/broadlink/internal/handler/BroadlinkSocketModel3SHandlerTest.java b/bundles/org.openhab.binding.broadlink/src/test/java/org/openhab/binding/broadlink/internal/handler/BroadlinkSocketModel3SHandlerTest.java
index b54a7ab00039498f500d62a488ab4b2ef1c0e928..ff67fe40c82a5926bc08a87c545fc8bdc96d00df 100644 (file)
--- a/bundles/org.openhab.binding.broadlink/src/test/java/org/openhab/binding/broadlink/internal/handler/BroadlinkSocketModel3SHandlerTest.java
+++ b/bundles/org.openhab.binding.broadlink/src/test/java/org/openhab/binding/broadlink/internal/handler/BroadlinkSocketModel3SHandlerTest.java
@@ -12,8 +12,8 @@
  */
 package org.openhab.binding.broadlink.internal.handler;
 
-import static org.junit.Assert.fail;
 import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.fail;
 import static org.mockito.Mockito.*;
 import static org.openhab.binding.broadlink.internal.BroadlinkBindingConstants.*;
 

diff --git a/bundles/org.openhab.binding.linktap/pom.xml b/bundles/org.openhab.binding.linktap/pom.xml
index a9987b9a3f6d33d32568bd6b37dd764c13ca8e16..9c00a0789c6cd40935919eec27acabcc8ebc2363 100644 (file)
--- a/bundles/org.openhab.binding.linktap/pom.xml
+++ b/bundles/org.openhab.binding.linktap/pom.xml
@@ -25,12 +25,6 @@
       <version>${jsoup.version}</version>
       <scope>provided</scope>
     </dependency>
-    <dependency>
-      <groupId>junit</groupId>
-      <artifactId>junit</artifactId>
-      <version>4.13.2</version>
-      <scope>test</scope>
-    </dependency>
   </dependencies>
 
 </project>