From 65004e5645c112e13b0bfc5fd2830c103cf66283 Mon Sep 17 00:00:00 2001
From: Wouter Born <github@maindrain.net>
Date: Thu, 17 Oct 2024 07:28:00 +0200
Subject: [PATCH] Remove JUnit 4 dependencies (#17580)

Using JUnit 5 should suffice.

Signed-off-by: Wouter Born <github@maindrain.net>
---
 bundles/org.openhab.binding.broadlink/pom.xml             | 8 --------
 .../handler/BroadlinkRemoteModel4HandlerTest.java         | 2 +-
 .../handler/BroadlinkRemoteModelProHandlerTest.java       | 2 +-
 .../handler/BroadlinkSocketModel2HandlerTest.java         | 2 +-
 .../handler/BroadlinkSocketModel3HandlerTest.java         | 2 +-
 .../handler/BroadlinkSocketModel3SHandlerTest.java        | 2 +-
 bundles/org.openhab.binding.linktap/pom.xml               | 6 ------
 7 files changed, 5 insertions(+), 19 deletions(-)

diff --git a/bundles/org.openhab.binding.broadlink/pom.xml b/bundles/org.openhab.binding.broadlink/pom.xml
index 3f4fa7d0fb3eb..668b97f6b12e7 100644
--- 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 ac4867fdbb057..6f85131b6a3c4 100644
--- 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 49804bc1e769a..4d7b7b0bbd3fd 100644
--- 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 bc14c2c5ebfb4..6cf01fff6ce53 100644
--- 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 025eb94e49a24..1bc27470a4313 100644
--- 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 b54a7ab000394..ff67fe40c82a5 100644
--- 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 a9987b9a3f6d3..9c00a0789c6cd 100644
--- 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>