Java 17 / Spring 6 / Spring Boot 3 Upgrade

[policy/api.git] / main / src / test / java / org / onap / policy / api / main / service / TestToscaServiceTemplateForNodeTemplate.java

diff --git a/main/src/test/java/org/onap/policy/api/main/service/TestToscaServiceTemplateForNodeTemplate.java b/main/src/test/java/org/onap/policy/api/main/service/TestToscaServiceTemplateForNodeTemplate.java
index 8f8fc46..fee7f40 100644 (file)
--- a/main/src/test/java/org/onap/policy/api/main/service/TestToscaServiceTemplateForNodeTemplate.java
+++ b/main/src/test/java/org/onap/policy/api/main/service/TestToscaServiceTemplateForNodeTemplate.java
@@ -2,7 +2,7 @@
  * ============LICENSE_START=======================================================
  * ONAP Policy API
  * ================================================================================
- * Copyright (C) 2022 Nordix Foundation. All rights reserved.
+ * Copyright (C) 2022-2023 Nordix Foundation. All rights reserved.
  * ================================================================================
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -24,16 +24,14 @@ package org.onap.policy.api.main.service;
 
 import static org.assertj.core.api.Assertions.assertThat;
 import static org.assertj.core.api.Assertions.assertThatThrownBy;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertNotNull;
-import static org.junit.Assert.assertTrue;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
+import static org.junit.jupiter.api.Assertions.assertTrue;
 
 import java.util.List;
-import org.junit.Before;
-import org.junit.Test;
-import org.junit.runner.RunWith;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
 import org.mockito.InjectMocks;
-import org.mockito.junit.MockitoJUnitRunner;
 import org.onap.policy.common.utils.coder.CoderException;
 import org.onap.policy.common.utils.coder.StandardCoder;
 import org.onap.policy.common.utils.resources.ResourceUtils;
@@ -42,20 +40,17 @@ import org.onap.policy.models.tosca.authorative.concepts.ToscaNodeTemplate;
 import org.onap.policy.models.tosca.authorative.concepts.ToscaServiceTemplate;
 import org.onap.policy.models.tosca.simple.concepts.JpaToscaNodeTemplate;
 
-@RunWith(MockitoJUnitRunner.class)
-public class TestToscaServiceTemplateForNodeTemplate extends TestCommonToscaServiceTemplateService {
+class TestToscaServiceTemplateForNodeTemplate extends TestCommonToscaServiceTemplateService {
 
     private static final String NODE_TEMPLATES_JSON = "nodetemplates/nodetemplates.metadatasets.input.tosca.json";
     private static final String UPDATED_NODE_TEMPLATE_JSON = "nodetemplates/nodetemplates.metadatasets.update.json";
     private static ToscaServiceTemplate toscaServiceTemplate;
     private static ToscaServiceTemplate updatedToscaServiceTemplate;
-    private StandardCoder standardCoder;
 
     @InjectMocks
     private ToscaServiceTemplateService toscaServiceTemplateService;
 
-
-    @Before
+    @BeforeEach
     public void setUp() {
         super.setUp();
     }
@@ -65,9 +60,9 @@ public class TestToscaServiceTemplateForNodeTemplate extends TestCommonToscaServ
      *
      * @throws CoderException when error parsing the json
      */
-    @Before
-    public void fetchToscaNodeTemplateJson() throws CoderException {
-        standardCoder = new StandardCoder();
+    @BeforeEach
+    void fetchToscaNodeTemplateJson() throws CoderException {
+        StandardCoder standardCoder = new StandardCoder();
         toscaServiceTemplate =
             standardCoder.decode(ResourceUtils.getResourceAsString(NODE_TEMPLATES_JSON), ToscaServiceTemplate.class);
         updatedToscaServiceTemplate =
@@ -76,7 +71,7 @@ public class TestToscaServiceTemplateForNodeTemplate extends TestCommonToscaServ
     }
 
     @Test
-    public void testToscaNodeTemplatesGet() throws Exception {
+    void testToscaNodeTemplatesGet() throws Exception {
 
         assertNotNull(toscaServiceTemplate);
         var createdTemplate = toscaServiceTemplateService.createToscaNodeTemplates(toscaServiceTemplate);
@@ -99,11 +94,10 @@ public class TestToscaServiceTemplateForNodeTemplate extends TestCommonToscaServ
     }
 
     @Test
-    public void testToscaNodeTemplatesCreate() throws Exception {
+    void testToscaNodeTemplatesCreate() throws Exception {
 
-        assertThatThrownBy(() -> {
-            toscaServiceTemplateService.createToscaNodeTemplates(null);
-        }).hasMessageMatching("^serviceTemplate is marked .*on.*ull but is null$");
+        assertThatThrownBy(() -> toscaServiceTemplateService.createToscaNodeTemplates(null))
+            .hasMessageMatching("^serviceTemplate is marked .*on.*ull but is null$");
 
         ToscaServiceTemplate createdNodeTemplates =
             toscaServiceTemplateService.createToscaNodeTemplates(toscaServiceTemplate);
@@ -113,11 +107,10 @@ public class TestToscaServiceTemplateForNodeTemplate extends TestCommonToscaServ
     }
 
     @Test
-    public void testToscaNodeTemplateUpdate() throws Exception {
+    void testToscaNodeTemplateUpdate() throws Exception {
 
-        assertThatThrownBy(() -> {
-            toscaServiceTemplateService.updateToscaNodeTemplates(null);
-        }).hasMessageMatching("^serviceTemplate is marked .*on.*ull but is null$");
+        assertThatThrownBy(() -> toscaServiceTemplateService.updateToscaNodeTemplates(null))
+            .hasMessageMatching("^serviceTemplate is marked .*on.*ull but is null$");
 
         JpaToscaNodeTemplate jpaNodeTemplate = new JpaToscaNodeTemplate();
         PfConceptKey key = new PfConceptKey("apexMetadata_grpc", "1.0.0");
@@ -131,21 +124,18 @@ public class TestToscaServiceTemplateForNodeTemplate extends TestCommonToscaServ
     }
 
     @Test
-    public void testToscaNodeTemplateDelete() throws Exception {
+    void testToscaNodeTemplateDelete() throws Exception {
 
-        assertThatThrownBy(() -> {
-            toscaServiceTemplateService.deleteToscaNodeTemplate(null, null);
-        }).hasMessageMatching("^name is marked .*on.*ull but is null$");
+        assertThatThrownBy(() -> toscaServiceTemplateService.deleteToscaNodeTemplate(null, null))
+            .hasMessageMatching("^name is marked .*on.*ull but is null$");
 
-        assertThatThrownBy(() -> {
-            toscaServiceTemplateService.deleteToscaNodeTemplate("name", null);
-        }).hasMessageMatching("^version is marked .*on.*ull but is null$");
+        assertThatThrownBy(() -> toscaServiceTemplateService.deleteToscaNodeTemplate("name", null))
+            .hasMessageMatching("^version is marked .*on.*ull but is null$");
 
         var createdTemplate = toscaServiceTemplateService.createToscaNodeTemplates(toscaServiceTemplate);
         mockDbServiceTemplate(createdTemplate, null, null);
-        assertThatThrownBy(() -> {
-            toscaServiceTemplateService.deleteToscaNodeTemplate("dummyname", "1.0.1");
-        }).hasMessage("node template dummyname:1.0.1 not found");
+        assertThatThrownBy(() -> toscaServiceTemplateService.deleteToscaNodeTemplate("dummyname", "1.0.1"))
+            .hasMessage("node template dummyname:1.0.1 not found");
 
         ToscaServiceTemplate responseTemplate =
             toscaServiceTemplateService.deleteToscaNodeTemplate("apexMetadata_decisionMaker", "1.0.0");