1 files changed, 72 insertions, 60 deletions

diff --git a/policy-management/src/test/java/org/onap/policy/drools/controller/internal/NullDroolsControllerTest.java b/policy-management/src/test/java/org/onap/policy/drools/controller/internal/NullDroolsControllerTest.java
index 010056bb..f61412d9 100644
--- a/policy-management/src/test/java/org/onap/policy/drools/controller/internal/NullDroolsControllerTest.java
+++ b/policy-management/src/test/java/org/onap/policy/drools/controller/internal/NullDroolsControllerTest.java
@@ -3,6 +3,7 @@
  * ONAP
  * ================================================================================
  * Copyright (C) 2018-2021 AT&T Intellectual Property. All rights reserved.
+ * Modifications Copyright (C) 2024 Nordix Foundation.
  * ================================================================================
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -21,147 +22,158 @@
 package org.onap.policy.drools.controller.internal;
 
 import static org.assertj.core.api.Assertions.assertThatCode;
-
-import org.junit.Assert;
-import org.junit.Test;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
+import static org.junit.jupiter.api.Assertions.assertNull;
+import static org.junit.jupiter.api.Assertions.assertThrows;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+
+import org.junit.jupiter.api.Test;
 import org.onap.policy.common.utils.gson.GsonTestUtils;
 import org.onap.policy.drools.controller.DroolsController;
 import org.onap.policy.drools.controller.DroolsControllerConstants;
 
-public class NullDroolsControllerTest {
+class NullDroolsControllerTest {
 
     @Test
-    public void testStart() {
+    void testStart() {
         DroolsController controller = new NullDroolsController();
         controller.start();
-        Assert.assertFalse(controller.isAlive());
+        assertFalse(controller.isAlive());
         controller.stop();
-        Assert.assertFalse(controller.isAlive());
+        assertFalse(controller.isAlive());
         controller.shutdown();
-        Assert.assertFalse(controller.isAlive());
+        assertFalse(controller.isAlive());
         controller.halt();
-        Assert.assertFalse(controller.isAlive());
+        assertFalse(controller.isAlive());
     }
 
     @Test
-    public void testSerialize() {
+    void testSerialize() {
         assertThatCode(() -> new GsonTestUtils().compareGson(new NullDroolsController(),
                         NullDroolsControllerTest.class)).doesNotThrowAnyException();
     }
 
     @Test
-    public void testLock() {
+    void testLock() {
         DroolsController controller = new NullDroolsController();
         controller.lock();
-        Assert.assertFalse(controller.isLocked());
+        assertFalse(controller.isLocked());
         controller.unlock();
-        Assert.assertFalse(controller.isLocked());
+        assertFalse(controller.isLocked());
     }
 
     @Test
-    public void getGroupId() {
-        Assert.assertEquals(DroolsControllerConstants.NO_GROUP_ID, new NullDroolsController().getGroupId());
+    void getGroupId() {
+        assertEquals(DroolsControllerConstants.NO_GROUP_ID, new NullDroolsController().getGroupId());
     }
 
     @Test
-    public void getArtifactId() {
-        Assert.assertEquals(DroolsControllerConstants.NO_ARTIFACT_ID, new NullDroolsController().getArtifactId());
+    void getArtifactId() {
+        assertEquals(DroolsControllerConstants.NO_ARTIFACT_ID, new NullDroolsController().getArtifactId());
     }
 
     @Test
-    public void getVersion() {
-        Assert.assertEquals(DroolsControllerConstants.NO_VERSION, new NullDroolsController().getVersion());
+    void getVersion() {
+        assertEquals(DroolsControllerConstants.NO_VERSION, new NullDroolsController().getVersion());
     }
 
     @Test
-    public void getSessionNames() {
-        Assert.assertTrue(new NullDroolsController().getSessionNames().isEmpty());
+    void getSessionNames() {
+        assertTrue(new NullDroolsController().getSessionNames().isEmpty());
     }
 
     @Test
-    public void getCanonicalSessionNames() {
-        Assert.assertTrue(new NullDroolsController().getCanonicalSessionNames().isEmpty());
+    void getCanonicalSessionNames() {
+        assertTrue(new NullDroolsController().getCanonicalSessionNames().isEmpty());
     }
 
     @Test
-    public void offer() {
-        Assert.assertFalse(new NullDroolsController().offer(null, null));
+    void offer() {
+        assertFalse(new NullDroolsController().offer(null, null));
     }
 
-    @Test(expected = IllegalStateException.class)
-    public void deliver() {
-        new NullDroolsController().deliver(null, null);
+    @Test
+    void deliver() {
+        var controller = new NullDroolsController();
+        assertThrows(IllegalStateException.class, () -> controller.deliver(null, null));
     }
 
     @Test
-    public void getRecentSourceEvents() {
-        Assert.assertEquals(0, new NullDroolsController().getRecentSourceEvents().length);
+    void getRecentSourceEvents() {
+        assertEquals(0, new NullDroolsController().getRecentSourceEvents().length);
     }
 
     @Test
-    public void getRecentSinkEvents() {
-        Assert.assertEquals(0, new NullDroolsController().getRecentSinkEvents().length);
+    void getRecentSinkEvents() {
+        assertEquals(0, new NullDroolsController().getRecentSinkEvents().length);
     }
 
     @Test
-    public void getContainer() {
-        Assert.assertNull(new NullDroolsController().getContainer());
+    void getContainer() {
+        assertNull(new NullDroolsController().getContainer());
     }
 
     @Test
-    public void getDomains() {
-        Assert.assertTrue(new NullDroolsController().getBaseDomainNames().isEmpty());
+    void getDomains() {
+        assertTrue(new NullDroolsController().getBaseDomainNames().isEmpty());
     }
 
-    @Test(expected = IllegalStateException.class)
-    public void ownsCoder() {
-        new NullDroolsController().ownsCoder(null, 0);
+    @Test
+    void ownsCoder() {
+        var controller = new NullDroolsController();
+        assertThrows(IllegalStateException.class, () -> controller.ownsCoder(null, 0));
     }
 
-    @Test(expected = IllegalArgumentException.class)
-    public void fetchModelClass() {
-        new NullDroolsController().fetchModelClass(this.getClass().getName());
+    @Test
+    void fetchModelClass() {
+        var controller = new NullDroolsController();
+        var className = this.getClass().getName();
+        assertThrows(IllegalArgumentException.class, () -> controller.fetchModelClass(className));
     }
 
     @Test
-    public void isBrained() {
-        Assert.assertFalse(new NullDroolsController().isBrained());
+    void isBrained() {
+        assertFalse(new NullDroolsController().isBrained());
     }
 
     @Test
-    public void stringify() {
-        Assert.assertNotNull(new NullDroolsController().toString());
+    void stringify() {
+        assertNotNull(new NullDroolsController().toString());
     }
 
-    @Test(expected = IllegalArgumentException.class)
-    public void updateToVersion() {
-        new NullDroolsController().updateToVersion(null, null, null, null, null);
+    @Test
+    void updateToVersion() {
+        var controller = new NullDroolsController();
+        assertThrows(IllegalArgumentException.class, () ->
+            controller.updateToVersion(null, null, null, null, null));
     }
 
     @Test
-    public void factClassNames() {
-        Assert.assertTrue(new NullDroolsController().factClassNames(null).isEmpty());
+    void factClassNames() {
+        assertTrue(new NullDroolsController().factClassNames(null).isEmpty());
     }
 
     @Test
-    public void factCount() {
-        Assert.assertEquals(0, new NullDroolsController().factCount(null));
+    void factCount() {
+        assertEquals(0, new NullDroolsController().factCount(null));
     }
 
     @Test
-    public void facts() {
-        Assert.assertTrue(new NullDroolsController().facts(null, null, true).isEmpty());
+    void facts() {
+        assertTrue(new NullDroolsController().facts(null, null, true).isEmpty());
     }
 
     @Test
-    public void factQuery() {
-        Assert.assertTrue(new NullDroolsController().factQuery(null, null, null, false).isEmpty());
+    void factQuery() {
+        assertTrue(new NullDroolsController().factQuery(null, null, null, false).isEmpty());
     }
 
     @Test
-    public void exists() {
+    void exists() {
         Object o1 = new Object();
-        Assert.assertFalse(new NullDroolsController().exists("blah", o1));
-        Assert.assertFalse(new NullDroolsController().exists(o1));
+        assertFalse(new NullDroolsController().exists("blah", o1));
+        assertFalse(new NullDroolsController().exists(o1));
     }
 }