Convert models to JUnit 5

Review for models-impl

Issue-ID: POLICY-5042
Change-Id: I22ff90b12da3fb2ba4d0eead7afb9282eac6921f
Signed-off-by: waynedunican <wayne.dunican@est.tech>

22 files changed, 151 insertions, 149 deletions

diff --git a/models-interactions/model-impl/so/src/test/java/org/onap/policy/so/DemoTest.java b/models-interactions/model-impl/so/src/test/java/org/onap/policy/so/DemoTest.java
index e45ee0aea..3295b8a6f 100644
--- a/models-interactions/model-impl/so/src/test/java/org/onap/policy/so/DemoTest.java
+++ b/models-interactions/model-impl/so/src/test/java/org/onap/policy/so/DemoTest.java
@@ -3,7 +3,7 @@
  * ONAP
  * ================================================================================
  * Copyright (C) 2017-2020 AT&T Intellectual Property. All rights reserved.
- * Modifications Copyright (C) 2019 Nordix Foundation.
+ * Modifications Copyright (C) 2019, 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,20 +21,20 @@
 
 package org.onap.policy.so;
 
-import static org.junit.Assert.assertNotNull;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
 
 import java.util.HashMap;
 import java.util.Map;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 import org.onap.policy.so.util.Serialization;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-public class DemoTest {
+class DemoTest {
     private static final Logger logger = LoggerFactory.getLogger(DemoTest.class);
 
     @Test
-    public void test() {
+    void test() {
 
         SoRequest request = new SoRequest();
         request.setRequestDetails(new SoRequestDetails());
@@ -108,7 +108,7 @@ public class DemoTest {
     }
 
     @Test
-    public void testHack() {
+    void testHack() {
 
         logger.debug("**  HACK  **");
 
diff --git a/models-interactions/model-impl/so/src/test/java/org/onap/policy/so/SoAsyncRequestStatusTest.java b/models-interactions/model-impl/so/src/test/java/org/onap/policy/so/SoAsyncRequestStatusTest.java
index 4aa2db37c..e868789a6 100644
--- a/models-interactions/model-impl/so/src/test/java/org/onap/policy/so/SoAsyncRequestStatusTest.java
+++ b/models-interactions/model-impl/so/src/test/java/org/onap/policy/so/SoAsyncRequestStatusTest.java
@@ -4,7 +4,7 @@
  * ================================================================================
  *
  * Modifications Copyright (C) 2019-2020 AT&T Intellectual Property. All rights reserved
- * Modifications Copyright (C) 2019 Nordix Foundation.
+ * Modifications Copyright (C) 2019, 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.
@@ -22,16 +22,16 @@
 
 package org.onap.policy.so;
 
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertNull;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertNull;
 
 import java.time.LocalDateTime;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 
-public class SoAsyncRequestStatusTest {
+class SoAsyncRequestStatusTest {
 
     @Test
-    public void testConstructor() {
+    void testConstructor() {
         SoAsyncRequestStatus obj = new SoAsyncRequestStatus();
 
         assertNull(obj.getCorrelator());
@@ -44,7 +44,7 @@ public class SoAsyncRequestStatusTest {
     }
 
     @Test
-    public void testSetGet() {
+    void testSetGet() {
         SoAsyncRequestStatus obj = new SoAsyncRequestStatus();
 
         obj.setCorrelator("correlator");
diff --git a/models-interactions/model-impl/so/src/test/java/org/onap/policy/so/SoCloudConfigurationTest.java b/models-interactions/model-impl/so/src/test/java/org/onap/policy/so/SoCloudConfigurationTest.java
index 59626f45d..f54d41aaa 100644
--- a/models-interactions/model-impl/so/src/test/java/org/onap/policy/so/SoCloudConfigurationTest.java
+++ b/models-interactions/model-impl/so/src/test/java/org/onap/policy/so/SoCloudConfigurationTest.java
@@ -4,7 +4,7 @@
  * ================================================================================
  *
  * Modifications Copyright (C) 2019-2020 AT&T Intellectual Property. All rights reserved
- * Modifications Copyright (C) 2019 Nordix Foundation.
+ * Modifications Copyright (C) 2019, 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.
@@ -22,15 +22,15 @@
 
 package org.onap.policy.so;
 
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertNull;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertNull;
 
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 
-public class SoCloudConfigurationTest {
+class SoCloudConfigurationTest {
 
     @Test
-    public void testConstructor() {
+    void testConstructor() {
         SoCloudConfiguration obj = new SoCloudConfiguration();
 
         assertNull(obj.getLcpCloudRegionId());
@@ -38,7 +38,7 @@ public class SoCloudConfigurationTest {
     }
 
     @Test
-    public void testSetGet() {
+    void testSetGet() {
         SoCloudConfiguration obj = new SoCloudConfiguration();
 
         obj.setLcpCloudRegionId("lcpCloudRegionId");
diff --git a/models-interactions/model-impl/so/src/test/java/org/onap/policy/so/SoDummyServer.java b/models-interactions/model-impl/so/src/test/java/org/onap/policy/so/SoDummyServer.java
index bb7e85144..850d543cc 100644
--- a/models-interactions/model-impl/so/src/test/java/org/onap/policy/so/SoDummyServer.java
+++ b/models-interactions/model-impl/so/src/test/java/org/onap/policy/so/SoDummyServer.java
@@ -34,7 +34,7 @@ import java.util.Map;
 import java.util.concurrent.ConcurrentHashMap;
 
 @Path("/SO")
-public class SoDummyServer {
+class SoDummyServer {
 
     private static final String ONGOING = "ONGOING";
     private static int postMessagesReceived = 0;
diff --git a/models-interactions/model-impl/so/src/test/java/org/onap/policy/so/SoInstanceReferencesTest.java b/models-interactions/model-impl/so/src/test/java/org/onap/policy/so/SoInstanceReferencesTest.java
index b8e01c6c1..374e4727d 100644
--- a/models-interactions/model-impl/so/src/test/java/org/onap/policy/so/SoInstanceReferencesTest.java
+++ b/models-interactions/model-impl/so/src/test/java/org/onap/policy/so/SoInstanceReferencesTest.java
@@ -3,7 +3,7 @@
  * so
  * ================================================================================
  * Copyright (C) 2017-2020 AT&T Intellectual Property. All rights reserved.
- * Modifications Copyright (C) 2019 Nordix Foundation.
+ * Modifications Copyright (C) 2019, 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,15 +21,15 @@
 
 package org.onap.policy.so;
 
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertNull;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertNull;
 
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 
-public class SoInstanceReferencesTest {
+class SoInstanceReferencesTest {
 
     @Test
-    public void testConstructor() {
+    void testConstructor() {
         SoInstanceReferences obj = new SoInstanceReferences();
 
         assertNull(obj.getInstanceId());
@@ -37,7 +37,7 @@ public class SoInstanceReferencesTest {
     }
 
     @Test
-    public void testSetGet() {
+    void testSetGet() {
         SoInstanceReferences obj = new SoInstanceReferences();
 
         obj.setInstanceId("instanceId");
diff --git a/models-interactions/model-impl/so/src/test/java/org/onap/policy/so/SoModelInfoTest.java b/models-interactions/model-impl/so/src/test/java/org/onap/policy/so/SoModelInfoTest.java
index a9f5baaba..09bbc128f 100644
--- a/models-interactions/model-impl/so/src/test/java/org/onap/policy/so/SoModelInfoTest.java
+++ b/models-interactions/model-impl/so/src/test/java/org/onap/policy/so/SoModelInfoTest.java
@@ -4,7 +4,7 @@
  * ================================================================================
  *
  * Modifications Copyright (C) 2019-2020 AT&T Intellectual Property. All rights reserved
- * Modifications Copyright (C) 2019 Nordix Foundation.
+ * Modifications Copyright (C) 2019, 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.
@@ -22,15 +22,15 @@
 
 package org.onap.policy.so;
 
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertNull;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertNull;
 
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 
-public class SoModelInfoTest {
+class SoModelInfoTest {
 
     @Test
-    public void testConstructor() {
+    void testConstructor() {
         SoModelInfo obj = new SoModelInfo();
 
         assertNull(obj.getModelCustomizationId());
@@ -43,7 +43,7 @@ public class SoModelInfoTest {
     }
 
     @Test
-    public void testSetGet() {
+    void testSetGet() {
         SoModelInfo obj = new SoModelInfo();
 
         obj.setModelCustomizationId("modelCustomizationId");
diff --git a/models-interactions/model-impl/so/src/test/java/org/onap/policy/so/SoPolicyExceptionHolderTest.java b/models-interactions/model-impl/so/src/test/java/org/onap/policy/so/SoPolicyExceptionHolderTest.java
index e6fc8fee9..3bc6f3d24 100644
--- a/models-interactions/model-impl/so/src/test/java/org/onap/policy/so/SoPolicyExceptionHolderTest.java
+++ b/models-interactions/model-impl/so/src/test/java/org/onap/policy/so/SoPolicyExceptionHolderTest.java
@@ -3,7 +3,7 @@
  * so
  * ================================================================================
  * Copyright (C) 2017-2020 AT&T Intellectual Property. All rights reserved.
- * Modifications Copyright (C) 2019 Nordix Foundation.
+ * Modifications Copyright (C) 2019, 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,15 +21,15 @@
 
 package org.onap.policy.so;
 
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertNull;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertNull;
 
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 
-public class SoPolicyExceptionHolderTest {
+class SoPolicyExceptionHolderTest {
 
     @Test
-    public void testConstructor() {
+    void testConstructor() {
         SoPolicyExceptionHolder obj = new SoPolicyExceptionHolder();
 
         assertNull(obj.getMessageId());
@@ -37,7 +37,7 @@ public class SoPolicyExceptionHolderTest {
     }
 
     @Test
-    public void testSetGet() {
+    void testSetGet() {
         SoPolicyExceptionHolder obj = new SoPolicyExceptionHolder();
 
         obj.setMessageId("messageId");
diff --git a/models-interactions/model-impl/so/src/test/java/org/onap/policy/so/SoRelatedInstanceListElementTest.java b/models-interactions/model-impl/so/src/test/java/org/onap/policy/so/SoRelatedInstanceListElementTest.java
index b6c2e0671..d493abe7a 100644
--- a/models-interactions/model-impl/so/src/test/java/org/onap/policy/so/SoRelatedInstanceListElementTest.java
+++ b/models-interactions/model-impl/so/src/test/java/org/onap/policy/so/SoRelatedInstanceListElementTest.java
@@ -4,7 +4,7 @@
  * ================================================================================
  *
  * Modifications Copyright (C) 2019-2020 AT&T Intellectual Property. All rights reserved
- * Modifications Copyright (C) 2019 Nordix Foundation.
+ * Modifications Copyright (C) 2019, 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.
@@ -22,22 +22,22 @@
 
 package org.onap.policy.so;
 
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertNull;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertNull;
 
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 
-public class SoRelatedInstanceListElementTest {
+class SoRelatedInstanceListElementTest {
 
     @Test
-    public void testConstructor() {
+    void testConstructor() {
         SoRelatedInstanceListElement obj = new SoRelatedInstanceListElement();
 
         assertNull(obj.getRelatedInstance());
     }
 
     @Test
-    public void testSetGet() {
+    void testSetGet() {
         SoRelatedInstanceListElement obj = new SoRelatedInstanceListElement();
 
         SoRelatedInstance relatedInstance = new SoRelatedInstance();
diff --git a/models-interactions/model-impl/so/src/test/java/org/onap/policy/so/SoRelatedInstanceTest.java b/models-interactions/model-impl/so/src/test/java/org/onap/policy/so/SoRelatedInstanceTest.java
index f215d0184..7be735222 100644
--- a/models-interactions/model-impl/so/src/test/java/org/onap/policy/so/SoRelatedInstanceTest.java
+++ b/models-interactions/model-impl/so/src/test/java/org/onap/policy/so/SoRelatedInstanceTest.java
@@ -3,7 +3,7 @@
  * so
  * ================================================================================
  * Copyright (C) 2017-2020 AT&T Intellectual Property. All rights reserved.
- * Modifications Copyright (C) 2019 Nordix Foundation.
+ * Modifications Copyright (C) 2019, 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,15 +21,15 @@
 
 package org.onap.policy.so;
 
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertNull;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertNull;
 
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 
-public class SoRelatedInstanceTest {
+class SoRelatedInstanceTest {
 
     @Test
-    public void testConstructor() {
+    void testConstructor() {
         SoRelatedInstance obj = new SoRelatedInstance();
 
         assertNull(obj.getInstanceId());
@@ -38,7 +38,7 @@ public class SoRelatedInstanceTest {
     }
 
     @Test
-    public void testSetGet() {
+    void testSetGet() {
         SoRelatedInstance obj = new SoRelatedInstance();
 
         obj.setInstanceId("instanceId");
diff --git a/models-interactions/model-impl/so/src/test/java/org/onap/policy/so/SoRequest3gppTest.java b/models-interactions/model-impl/so/src/test/java/org/onap/policy/so/SoRequest3gppTest.java
index a7369120c..834d8a8a4 100644
--- a/models-interactions/model-impl/so/src/test/java/org/onap/policy/so/SoRequest3gppTest.java
+++ b/models-interactions/model-impl/so/src/test/java/org/onap/policy/so/SoRequest3gppTest.java
@@ -3,6 +3,7 @@
  * ONAP
  * ================================================================================
  * Copyright (C) 2020 Wipro Limited.
+ * 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.
@@ -28,12 +29,12 @@ import com.openpojo.validation.rule.impl.GetterMustExistRule;
 import com.openpojo.validation.rule.impl.SetterMustExistRule;
 import com.openpojo.validation.test.impl.GetterTester;
 import com.openpojo.validation.test.impl.SetterTester;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 
-public class SoRequest3gppTest {
+class SoRequest3gppTest {
 
     @Test
-    public void testSetGet() {
+    void testSetGet() {
         PojoClass pojoClass = PojoClassFactory.getPojoClass(SoRequest3gpp.class);
         Validator validator = ValidatorBuilder
                 .create()
diff --git a/models-interactions/model-impl/so/src/test/java/org/onap/policy/so/SoRequestCllTest.java b/models-interactions/model-impl/so/src/test/java/org/onap/policy/so/SoRequestCllTest.java
index 3d3168656..8c7de5042 100644
--- a/models-interactions/model-impl/so/src/test/java/org/onap/policy/so/SoRequestCllTest.java
+++ b/models-interactions/model-impl/so/src/test/java/org/onap/policy/so/SoRequestCllTest.java
@@ -3,6 +3,7 @@
  * ONAP
  * ================================================================================
  * Copyright (C) 2022 CTC 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.
@@ -28,12 +29,12 @@ import com.openpojo.validation.rule.impl.GetterMustExistRule;
 import com.openpojo.validation.rule.impl.SetterMustExistRule;
 import com.openpojo.validation.test.impl.GetterTester;
 import com.openpojo.validation.test.impl.SetterTester;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 
-public class SoRequestCllTest {
+class SoRequestCllTest {
 
     @Test
-    public void testSetGet() {
+    void testSetGet() {
         PojoClass pojoClass = PojoClassFactory.getPojoClass(SoRequestCll.class);
         Validator validator = ValidatorBuilder
                 .create()
diff --git a/models-interactions/model-impl/so/src/test/java/org/onap/policy/so/SoRequestDetailsTest.java b/models-interactions/model-impl/so/src/test/java/org/onap/policy/so/SoRequestDetailsTest.java
index 4866f3ba1..98a828979 100644
--- a/models-interactions/model-impl/so/src/test/java/org/onap/policy/so/SoRequestDetailsTest.java
+++ b/models-interactions/model-impl/so/src/test/java/org/onap/policy/so/SoRequestDetailsTest.java
@@ -4,7 +4,7 @@
  * ================================================================================
  * Copyright (C) 2018 Ericsson. All rights reserved.
  * Modifications Copyright (C) 2019-2021 AT&T Intellectual Property. All rights reserved
- * Modifications Copyright (C) 2019 Nordix Foundation.
+ * Modifications Copyright (C) 2019, 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.
@@ -22,20 +22,20 @@
 
 package org.onap.policy.so;
 
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertNotEquals;
-import static org.junit.Assert.assertNotNull;
-import static org.junit.Assert.assertNull;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertNotEquals;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
+import static org.junit.jupiter.api.Assertions.assertNull;
 
 import java.util.ArrayList;
 import java.util.List;
 import java.util.function.BiConsumer;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 
-public class SoRequestDetailsTest {
+class SoRequestDetailsTest {
 
     @Test
-    public void testConstructor() {
+    void testConstructor() {
         SoRequestDetails obj = new SoRequestDetails();
 
         assertNull(obj.getCloudConfiguration());
@@ -49,7 +49,7 @@ public class SoRequestDetailsTest {
     }
 
     @Test
-    public void testSetGet() {
+    void testSetGet() {
         SoRequestDetails obj = new SoRequestDetails();
 
         SoCloudConfiguration cloudConfiguration = new SoCloudConfiguration();
@@ -74,7 +74,7 @@ public class SoRequestDetailsTest {
     }
 
     @Test
-    public void testSoMRequestDetailsMethods() {
+    void testSoMRequestDetailsMethods() {
         SoRequestDetails details = new SoRequestDetails();
         assertNotNull(details);
         assertNotEquals(0, details.hashCode());
diff --git a/models-interactions/model-impl/so/src/test/java/org/onap/policy/so/SoRequestErrorTest.java b/models-interactions/model-impl/so/src/test/java/org/onap/policy/so/SoRequestErrorTest.java
index f70e598f2..265bb9023 100644
--- a/models-interactions/model-impl/so/src/test/java/org/onap/policy/so/SoRequestErrorTest.java
+++ b/models-interactions/model-impl/so/src/test/java/org/onap/policy/so/SoRequestErrorTest.java
@@ -4,7 +4,7 @@
  * ================================================================================
  * Copyright (C) 2017-2020 AT&T Intellectual Property. All rights reserved.
  * Modifications Copyright (C) 2019 AT&T Intellectual Property. All rights reserved
- * Modifications Copyright (C) 2019 Nordix Foundation.
+ * Modifications Copyright (C) 2019, 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.
@@ -22,15 +22,15 @@
 
 package org.onap.policy.so;
 
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertNull;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertNull;
 
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 
-public class SoRequestErrorTest {
+class SoRequestErrorTest {
 
     @Test
-    public void testConstructor() {
+    void testConstructor() {
         SoRequestError obj = new SoRequestError();
 
         assertNull(obj.getPolicyException());
@@ -38,7 +38,7 @@ public class SoRequestErrorTest {
     }
 
     @Test
-    public void testSetGet() {
+    void testSetGet() {
         SoRequestError obj = new SoRequestError();
 
         SoPolicyExceptionHolder policyException = new SoPolicyExceptionHolder();
diff --git a/models-interactions/model-impl/so/src/test/java/org/onap/policy/so/SoRequestInfoTest.java b/models-interactions/model-impl/so/src/test/java/org/onap/policy/so/SoRequestInfoTest.java
index dd7db84f3..8bc420273 100644
--- a/models-interactions/model-impl/so/src/test/java/org/onap/policy/so/SoRequestInfoTest.java
+++ b/models-interactions/model-impl/so/src/test/java/org/onap/policy/so/SoRequestInfoTest.java
@@ -3,7 +3,7 @@
  * so
  * ================================================================================
  * Copyright (C) 2017-2019 AT&T Intellectual Property. All rights reserved.
- * Modifications Copyright (C) 2019 Nordix Foundation.
+ * Modifications Copyright (C) 2019, 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,16 +21,16 @@
 
 package org.onap.policy.so;
 
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertFalse;
-import static org.junit.Assert.assertNull;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertNull;
 
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 
-public class SoRequestInfoTest {
+class SoRequestInfoTest {
 
     @Test
-    public void testConstructor() {
+    void testConstructor() {
         SoRequestInfo obj = new SoRequestInfo();
 
         assertNull(obj.getBillingAccountNumber());
@@ -46,7 +46,7 @@ public class SoRequestInfoTest {
     }
 
     @Test
-    public void testSetGet() {
+    void testSetGet() {
         SoRequestInfo obj = new SoRequestInfo();
 
         obj.setBillingAccountNumber("billingAccountNumber");
diff --git a/models-interactions/model-impl/so/src/test/java/org/onap/policy/so/SoRequestParametersTest.java b/models-interactions/model-impl/so/src/test/java/org/onap/policy/so/SoRequestParametersTest.java
index 563e28d31..0159c8e59 100644
--- a/models-interactions/model-impl/so/src/test/java/org/onap/policy/so/SoRequestParametersTest.java
+++ b/models-interactions/model-impl/so/src/test/java/org/onap/policy/so/SoRequestParametersTest.java
@@ -3,7 +3,7 @@
  * so
  * ================================================================================
  * Copyright (C) 2017-2020 AT&T Intellectual Property. All rights reserved.
- * Modifications Copyright (C) 2019 Nordix Foundation.
+ * Modifications Copyright (C) 2019, 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,16 +21,16 @@
 
 package org.onap.policy.so;
 
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertNotNull;
-import static org.junit.Assert.assertNull;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
+import static org.junit.jupiter.api.Assertions.assertNull;
 
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 
-public class SoRequestParametersTest {
+class SoRequestParametersTest {
 
     @Test
-    public void testConstructor() {
+    void testConstructor() {
         SoRequestParameters obj = new SoRequestParameters();
 
         assertNull(obj.getSubscriptionServiceType());
@@ -39,7 +39,7 @@ public class SoRequestParametersTest {
     }
 
     @Test
-    public void testSetGet() {
+    void testSetGet() {
         SoRequestParameters obj = new SoRequestParameters();
 
         obj.setSubscriptionServiceType("subscriptionServiceType");
diff --git a/models-interactions/model-impl/so/src/test/java/org/onap/policy/so/SoRequestReferencesTest.java b/models-interactions/model-impl/so/src/test/java/org/onap/policy/so/SoRequestReferencesTest.java
index 83172dee2..43e3eb93b 100644
--- a/models-interactions/model-impl/so/src/test/java/org/onap/policy/so/SoRequestReferencesTest.java
+++ b/models-interactions/model-impl/so/src/test/java/org/onap/policy/so/SoRequestReferencesTest.java
@@ -3,7 +3,7 @@
  * so
  * ================================================================================
  * Copyright (C) 2017-2020 AT&T Intellectual Property. All rights reserved.
- * Modifications Copyright (C) 2019 Nordix Foundation.
+ * Modifications Copyright (C) 2019, 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,15 +21,15 @@
 
 package org.onap.policy.so;
 
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertNull;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertNull;
 
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 
-public class SoRequestReferencesTest {
+class SoRequestReferencesTest {
 
     @Test
-    public void testConstructor() {
+    void testConstructor() {
         SoRequestReferences obj = new SoRequestReferences();
 
         assertNull(obj.getInstanceId());
@@ -37,7 +37,7 @@ public class SoRequestReferencesTest {
     }
 
     @Test
-    public void testSetGet() {
+    void testSetGet() {
         SoRequestReferences obj = new SoRequestReferences();
 
         obj.setInstanceId("instanceId");
diff --git a/models-interactions/model-impl/so/src/test/java/org/onap/policy/so/SoRequestStatusTest.java b/models-interactions/model-impl/so/src/test/java/org/onap/policy/so/SoRequestStatusTest.java
index 2b0c572ce..3b57daae8 100644
--- a/models-interactions/model-impl/so/src/test/java/org/onap/policy/so/SoRequestStatusTest.java
+++ b/models-interactions/model-impl/so/src/test/java/org/onap/policy/so/SoRequestStatusTest.java
@@ -3,7 +3,7 @@
  * so
  * ================================================================================
  * Copyright (C) 2017-2020 AT&T Intellectual Property. All rights reserved.
- * Modifications Copyright (C) 2019 Nordix Foundation.
+ * Modifications Copyright (C) 2019, 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,17 +21,17 @@
 
 package org.onap.policy.so;
 
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertFalse;
-import static org.junit.Assert.assertNull;
-import static org.junit.Assert.assertTrue;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertNull;
+import static org.junit.jupiter.api.Assertions.assertTrue;
 
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 
-public class SoRequestStatusTest {
+class SoRequestStatusTest {
 
     @Test
-    public void testConstructor() {
+    void testConstructor() {
         SoRequestStatus obj = new SoRequestStatus();
 
         assertEquals(0, obj.getPercentProgress());
@@ -41,7 +41,7 @@ public class SoRequestStatusTest {
     }
 
     @Test
-    public void testSetGet() {
+    void testSetGet() {
         SoRequestStatus obj = new SoRequestStatus();
 
         obj.setPercentProgress(2008);
diff --git a/models-interactions/model-impl/so/src/test/java/org/onap/policy/so/SoRequestTest.java b/models-interactions/model-impl/so/src/test/java/org/onap/policy/so/SoRequestTest.java
index 959016445..6951a800a 100644
--- a/models-interactions/model-impl/so/src/test/java/org/onap/policy/so/SoRequestTest.java
+++ b/models-interactions/model-impl/so/src/test/java/org/onap/policy/so/SoRequestTest.java
@@ -3,7 +3,7 @@
  * so
  * ================================================================================
  * Copyright (C) 2017-2020 AT&T Intellectual Property. All rights reserved.
- * Modifications Copyright (C) 2019 Nordix Foundation.
+ * Modifications Copyright (C) 2019, 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,17 +21,17 @@
 
 package org.onap.policy.so;
 
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertNull;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertNull;
 
 import java.time.LocalDateTime;
 import java.util.UUID;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 
-public class SoRequestTest {
+class SoRequestTest {
 
     @Test
-    public void testConstructor() {
+    void testConstructor() {
         SoRequest obj = new SoRequest();
 
         assertNull(obj.getFinishTime());
@@ -44,7 +44,7 @@ public class SoRequestTest {
     }
 
     @Test
-    public void testSetGet() {
+    void testSetGet() {
         SoRequest obj = new SoRequest();
 
         LocalDateTime finishTime = LocalDateTime.now();
diff --git a/models-interactions/model-impl/so/src/test/java/org/onap/policy/so/SoResponseTest.java b/models-interactions/model-impl/so/src/test/java/org/onap/policy/so/SoResponseTest.java
index c75aa9ec9..c2691060d 100644
--- a/models-interactions/model-impl/so/src/test/java/org/onap/policy/so/SoResponseTest.java
+++ b/models-interactions/model-impl/so/src/test/java/org/onap/policy/so/SoResponseTest.java
@@ -3,7 +3,7 @@
  * so
  * ================================================================================
  * Copyright (C) 2017-2020 AT&T Intellectual Property. All rights reserved.
- * Modifications Copyright (C) 2019 Nordix Foundation.
+ * Modifications Copyright (C) 2019, 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,15 +21,15 @@
 
 package org.onap.policy.so;
 
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertNull;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertNull;
 
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 
-public class SoResponseTest {
+class SoResponseTest {
 
     @Test
-    public void testConstructor() {
+    void testConstructor() {
         SoResponse obj = new SoResponse();
 
         assertEquals(0, obj.getHttpResponseCode());
@@ -39,7 +39,7 @@ public class SoResponseTest {
     }
 
     @Test
-    public void testSetGet() {
+    void testSetGet() {
         SoResponse obj = new SoResponse();
 
         obj.setHttpResponseCode(2008);
diff --git a/models-interactions/model-impl/so/src/test/java/org/onap/policy/so/SoResponseWrapperTest.java b/models-interactions/model-impl/so/src/test/java/org/onap/policy/so/SoResponseWrapperTest.java
index 42f57c7e4..f33bfd72f 100644
--- a/models-interactions/model-impl/so/src/test/java/org/onap/policy/so/SoResponseWrapperTest.java
+++ b/models-interactions/model-impl/so/src/test/java/org/onap/policy/so/SoResponseWrapperTest.java
@@ -3,7 +3,7 @@
  * so
  * ================================================================================
  * Copyright (C) 2018-2020 AT&T Intellectual Property. All rights reserved.
- * Modifications Copyright (C) 2019 Nordix Foundation.
+ * Modifications Copyright (C) 2019, 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,19 +21,19 @@
 
 package org.onap.policy.so;
 
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertNotEquals;
-import static org.junit.Assert.assertNotNull;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertNotEquals;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
 
 import java.util.UUID;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 
-public class SoResponseWrapperTest {
+class SoResponseWrapperTest {
 
     private static final String REQ_ID = "reqID";
 
     @Test
-    public void testConstructor() {
+    void testConstructor() {
         SoResponse response = new SoResponse();
         SoResponseWrapper obj = new SoResponseWrapper(response, REQ_ID);
 
@@ -42,7 +42,7 @@ public class SoResponseWrapperTest {
     }
 
     @Test
-    public void testSetGet() {
+    void testSetGet() {
         SoResponse response = new SoResponse();
         SoResponseWrapper obj = new SoResponseWrapper(response, REQ_ID);
 
@@ -56,7 +56,7 @@ public class SoResponseWrapperTest {
     }
 
     @Test
-    public void testSoResponseWrapperMethods() {
+    void testSoResponseWrapperMethods() {
         String requestId = UUID.randomUUID().toString();
         SoResponse response = new SoResponse();
 
diff --git a/models-interactions/model-impl/so/src/test/java/org/onap/policy/so/SoServiceExceptionHolderTest.java b/models-interactions/model-impl/so/src/test/java/org/onap/policy/so/SoServiceExceptionHolderTest.java
index 981db650d..ac94dd24e 100644
--- a/models-interactions/model-impl/so/src/test/java/org/onap/policy/so/SoServiceExceptionHolderTest.java
+++ b/models-interactions/model-impl/so/src/test/java/org/onap/policy/so/SoServiceExceptionHolderTest.java
@@ -3,7 +3,7 @@
  * so
  * ================================================================================
  * Copyright (C) 2017-2020 AT&T Intellectual Property. All rights reserved.
- * Modifications Copyright (C) 2019 Nordix Foundation.
+ * Modifications Copyright (C) 2019, 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,16 +21,16 @@
 
 package org.onap.policy.so;
 
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertNotNull;
-import static org.junit.Assert.assertNull;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
+import static org.junit.jupiter.api.Assertions.assertNull;
 
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 
-public class SoServiceExceptionHolderTest {
+class SoServiceExceptionHolderTest {
 
     @Test
-    public void testConstructor() {
+    void testConstructor() {
         SoServiceExceptionHolder obj = new SoServiceExceptionHolder();
 
         assertNull(obj.getMessageId());
@@ -40,7 +40,7 @@ public class SoServiceExceptionHolderTest {
     }
 
     @Test
-    public void testSetGet() {
+    void testSetGet() {
         SoServiceExceptionHolder obj = new SoServiceExceptionHolder();
 
         obj.setMessageId("messageId");
diff --git a/models-interactions/model-impl/so/src/test/java/org/onap/policy/so/SoSubscriberInfoTest.java b/models-interactions/model-impl/so/src/test/java/org/onap/policy/so/SoSubscriberInfoTest.java
index 56278b0a9..fa2a89040 100644
--- a/models-interactions/model-impl/so/src/test/java/org/onap/policy/so/SoSubscriberInfoTest.java
+++ b/models-interactions/model-impl/so/src/test/java/org/onap/policy/so/SoSubscriberInfoTest.java
@@ -3,7 +3,7 @@
  * so
  * ================================================================================
  * Copyright (C) 2017-2020 AT&T Intellectual Property. All rights reserved.
- * Modifications Copyright (C) 2019 Nordix Foundation.
+ * Modifications Copyright (C) 2019, 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,15 +21,15 @@
 
 package org.onap.policy.so;
 
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertNull;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertNull;
 
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 
-public class SoSubscriberInfoTest {
+class SoSubscriberInfoTest {
 
     @Test
-    public void testConstructor() {
+    void testConstructor() {
         SoSubscriberInfo obj = new SoSubscriberInfo();
 
         assertNull(obj.getGlobalSubscriberId());
@@ -38,7 +38,7 @@ public class SoSubscriberInfoTest {
     }
 
     @Test
-    public void testSetGet() {
+    void testSetGet() {
         SoSubscriberInfo obj = new SoSubscriberInfo();
 
         obj.setGlobalSubscriberId("globalSubscriberId");