Merge pull request #23555 from vespa-engine/bjorncs/more-junit5v8.26.15

Bjorncs/more junit5

1 files changed, 10 insertions, 10 deletions

diff --git a/clustercontroller-core/src/test/java/com/yahoo/vespa/clustercontroller/core/restapiv2/requests/SetNodeStateRequestTest.java b/clustercontroller-core/src/test/java/com/yahoo/vespa/clustercontroller/core/restapiv2/requests/SetNodeStateRequestTest.java
index 9f14b2e71d2..1bd17b11755 100644
--- a/clustercontroller-core/src/test/java/com/yahoo/vespa/clustercontroller/core/restapiv2/requests/SetNodeStateRequestTest.java
+++ b/clustercontroller-core/src/test/java/com/yahoo/vespa/clustercontroller/core/restapiv2/requests/SetNodeStateRequestTest.java
@@ -15,8 +15,8 @@ import com.yahoo.vespa.clustercontroller.utils.staterestapi.errors.StateRestApiE
 import com.yahoo.vespa.clustercontroller.utils.staterestapi.requests.SetUnitStateRequest;
 import com.yahoo.vespa.clustercontroller.utils.staterestapi.response.SetResponse;
 import com.yahoo.vespa.clustercontroller.utils.staterestapi.response.UnitState;
-import org.junit.Before;
-import org.junit.Test;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
 
 import java.util.HashMap;
 import java.util.Map;
@@ -43,13 +43,13 @@ public class SetNodeStateRequestTest {
     private boolean inMasterMoratorium = false;
     private boolean probe = false;
 
-    @Before
+    @BeforeEach
     public void setUp() {
         newStates.put("user", unitState);
     }
 
     @Test
-    public void testUpToMaintenance() throws StateRestApiException {
+    void testUpToMaintenance() throws StateRestApiException {
         testSetStateRequest(
                 "maintenance",
                 State.UP, State.UP,
@@ -58,7 +58,7 @@ public class SetNodeStateRequestTest {
     }
 
     @Test
-    public void testProbingDoesntChangeState() throws StateRestApiException {
+    void testProbingDoesntChangeState() throws StateRestApiException {
         probe = true;
         testSetStateRequest(
                 "maintenance",
@@ -68,7 +68,7 @@ public class SetNodeStateRequestTest {
     }
 
     @Test
-    public void testUpToDown() throws StateRestApiException {
+    void testUpToDown() throws StateRestApiException {
         testSetStateRequest(
                 "down",
                 State.UP, State.UP,
@@ -77,7 +77,7 @@ public class SetNodeStateRequestTest {
     }
 
     @Test
-    public void testMaintenanceToUp() throws StateRestApiException {
+    void testMaintenanceToUp() throws StateRestApiException {
         testSetStateRequest(
                 "up",
                 State.MAINTENANCE, State.DOWN,
@@ -86,7 +86,7 @@ public class SetNodeStateRequestTest {
     }
 
     @Test
-    public void testDownToUp() throws StateRestApiException {
+    void testDownToUp() throws StateRestApiException {
         testSetStateRequest(
                 "up",
                 State.DOWN, State.DOWN,
@@ -95,7 +95,7 @@ public class SetNodeStateRequestTest {
     }
 
     @Test
-    public void testOnlyStorageInMaintenaceToMaintenance() throws StateRestApiException {
+    void testOnlyStorageInMaintenaceToMaintenance() throws StateRestApiException {
         testSetStateRequest(
                 "maintenance",
                 State.MAINTENANCE, State.UP,
@@ -104,7 +104,7 @@ public class SetNodeStateRequestTest {
     }
 
     @Test
-    public void testNoOpMaintenaceToMaintenance() throws StateRestApiException {
+    void testNoOpMaintenaceToMaintenance() throws StateRestApiException {
         testSetStateRequest(
                 "maintenance",
                 State.MAINTENANCE, State.DOWN,