X-Git-Url: https://gerrit.onap.org/r/gitweb?a=blobdiff_plain;f=main%2Fsrc%2Ftest%2Fjava%2Forg%2Fonap%2Fpolicy%2Fapi%2Fmain%2Fservice%2FTestCommonToscaServiceTemplateService.java;fp=main%2Fsrc%2Ftest%2Fjava%2Forg%2Fonap%2Fpolicy%2Fapi%2Fmain%2Fservice%2FTestCommonToscaServiceTemplateService.java;h=5c92bad1f206aefb2531317d2067dd28b51370ce;hb=9b0780e59376d20ae9044575ce9921fb7e6b519f;hp=4af309379059fcb395376b0d2df90f84bd5276ac;hpb=535f62b4b4870505d2351ed098415d8d643b2ace;p=policy%2Fapi.git

diff --git a/main/src/test/java/org/onap/policy/api/main/service/TestCommonToscaServiceTemplateService.java b/main/src/test/java/org/onap/policy/api/main/service/TestCommonToscaServiceTemplateService.java
index 4af30937..5c92bad1 100644
--- a/main/src/test/java/org/onap/policy/api/main/service/TestCommonToscaServiceTemplateService.java
+++ b/main/src/test/java/org/onap/policy/api/main/service/TestCommonToscaServiceTemplateService.java
@@ -1,6 +1,7 @@
 /*
  *  ============LICENSE_START=======================================================
- *   Copyright (C) 2022 Bell Canada. All rights reserved.
+ *  Copyright (C) 2022 Bell Canada. All rights reserved.
+ *  Modifications Copyright (C) 2023 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,9 +22,11 @@
 package org.onap.policy.api.main.service;
 
 import java.util.Optional;
-import org.junit.Before;
+import org.junit.jupiter.api.AfterEach;
+import org.junit.jupiter.api.BeforeEach;
 import org.mockito.Mock;
 import org.mockito.Mockito;
+import org.mockito.MockitoAnnotations;
 import org.onap.policy.api.main.repository.ToscaServiceTemplateRepository;
 import org.onap.policy.models.base.PfConceptKey;
 import org.onap.policy.models.tosca.authorative.concepts.ToscaServiceTemplate;
@@ -50,17 +53,20 @@ public class TestCommonToscaServiceTemplateService {
     @Mock
     protected NodeTemplateService nodeTemplateService;
 
+    AutoCloseable autoCloseable;
+
     /**
-     * Setup the DB TOSCA service template object post create, and delete request.
-     * @param dbSvcTemplate ToscaServiceTemplate object to update
+     * Set up the DB TOSCA service template object post create, and delete request.
+     *
+     * @param dbSvcTemplate       ToscaServiceTemplate object to update
      * @param svcTemplateFragment the CRUD operation response ToscaServiceTemplate object
-     * @param operation the CRUD operation performed
+     * @param operation           the CRUD operation performed
      */
     protected void mockDbServiceTemplate(ToscaServiceTemplate dbSvcTemplate, ToscaServiceTemplate svcTemplateFragment,
-        TestToscaServiceTemplateServiceForPolicyCrud.Operation operation) {
+                                         TestToscaServiceTemplateServiceForPolicyCrud.Operation operation) {
         if (operation != null) {
             switch (operation) {
-                case CREATE_POLICY_TYPE:
+                case CREATE_POLICY_TYPE -> {
                     dbSvcTemplate.getPolicyTypes().putAll(svcTemplateFragment.getPolicyTypes());
                     if (svcTemplateFragment.getDataTypes() != null) {
                         if (dbSvcTemplate.getDataTypes() == null) {
@@ -69,18 +75,14 @@ public class TestCommonToscaServiceTemplateService {
                             dbSvcTemplate.getDataTypes().putAll(svcTemplateFragment.getDataTypes());
                         }
                     }
-                    break;
-                case DELETE_POLICY_TYPE:
+                }
+                case DELETE_POLICY_TYPE ->
                     dbSvcTemplate.getPolicyTypes().keySet().removeAll(svcTemplateFragment.getPolicyTypes().keySet());
-                    break;
-                case CREATE_POLICY:
+                case CREATE_POLICY ->
                     dbSvcTemplate.setToscaTopologyTemplate(svcTemplateFragment.getToscaTopologyTemplate());
-                    break;
-                case DELETE_POLICY:
-                    dbSvcTemplate.getToscaTopologyTemplate().setPolicies(null);
-                    break;
-                default:
-                    break;
+                case DELETE_POLICY -> dbSvcTemplate.getToscaTopologyTemplate().setPolicies(null);
+                default -> {
+                }
             }
         }
         Mockito.when(toscaServiceTemplateRepository.findById(new PfConceptKey(JpaToscaServiceTemplate.DEFAULT_NAME,
@@ -91,9 +93,15 @@ public class TestCommonToscaServiceTemplateService {
     /**
      * Setup to return empty DB service template.
      */
-    @Before
+    @BeforeEach
     public void setUp() {
+        autoCloseable = MockitoAnnotations.openMocks(this);
         Mockito.when(toscaServiceTemplateRepository.findById(new PfConceptKey(JpaToscaServiceTemplate.DEFAULT_NAME,
             JpaToscaServiceTemplate.DEFAULT_VERSION))).thenReturn(Optional.of(new JpaToscaServiceTemplate()));
     }
+
+    @AfterEach
+    public void tearDown() throws Exception {
+        autoCloseable.close();
+    }
 }
\ No newline at end of file