Fix reload endpoint to return status

Signed-off-by: Adam Wudzinski <adam.wudzinski@nokia.com>
Issue-ID: AAF-997
wChange-Id: I4563428ef407b4dc8c84c3efc8ec213145806b32
Change-Id: Iee33a26feb5cc1acd39d91ee9f34a49183040e06

2 files changed, 108 insertions, 19 deletions

diff --git a/certService/src/test/java/org/onap/aaf/certservice/api/CertificationServiceTest.java b/certService/src/test/java/org/onap/aaf/certservice/api/CertificationControllerTest.java
index ee1ce1ef..2fc6d665 100644
--- a/certService/src/test/java/org/onap/aaf/certservice/api/CertificationServiceTest.java
+++ b/certService/src/test/java/org/onap/aaf/certservice/api/CertificationControllerTest.java
@@ -20,11 +20,21 @@
 
 package org.onap.aaf.certservice.api;
 
+import static org.assertj.core.api.Assertions.assertThat;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertThrows;
+import static org.mockito.ArgumentMatchers.any;
+import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.when;
+
 import com.google.gson.Gson;
+import java.io.IOException;
+import java.util.Arrays;
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.ExtendWith;
 import org.mockito.Mock;
-import org.mockito.MockitoAnnotations;
+import org.mockito.junit.jupiter.MockitoExtension;
 import org.onap.aaf.certservice.certification.CertificationModelFactory;
 import org.onap.aaf.certservice.certification.CsrModelFactory;
 import org.onap.aaf.certservice.certification.CsrModelFactory.StringBase64;
@@ -36,20 +46,11 @@ import org.onap.aaf.certservice.certification.model.CsrModel;
 import org.springframework.http.HttpStatus;
 import org.springframework.http.ResponseEntity;
 
-import java.io.IOException;
-import java.util.Arrays;
-
-import static org.assertj.core.api.Assertions.assertThat;
-import static org.junit.jupiter.api.Assertions.assertEquals;
-import static org.junit.jupiter.api.Assertions.assertThrows;
-import static org.mockito.ArgumentMatchers.any;
-import static org.mockito.Mockito.mock;
-import static org.mockito.Mockito.when;
-
 
-class CertificationServiceTest {
+@ExtendWith(MockitoExtension.class)
+class CertificationControllerTest {
 
-    private CertificationService certificationService;
+    private CertificationController certificationController;
 
     @Mock
     private CsrModelFactory csrModelFactory;
@@ -58,9 +59,8 @@ class CertificationServiceTest {
     private CertificationModelFactory certificationModelFactory;
 
     @BeforeEach
-    void serUp() {
-        MockitoAnnotations.initMocks(this);
-        certificationService = new CertificationService(csrModelFactory, certificationModelFactory);
+    void setUp() {
+        certificationController = new CertificationController(csrModelFactory, certificationModelFactory);
     }
 
     @Test
@@ -81,7 +81,7 @@ class CertificationServiceTest {
 
         // when
         ResponseEntity<String> testResponse =
-                certificationService.signCertificate(testCaName, "encryptedCSR", "encryptedPK");
+                certificationController.signCertificate(testCaName, "encryptedCSR", "encryptedPK");
 
         CertificationModel responseCertificationModel = new Gson().fromJson(testResponse.getBody(), CertificationModel.class);
 
@@ -101,7 +101,7 @@ class CertificationServiceTest {
 
         // when
         Exception exception = assertThrows(
-                CsrDecryptionException.class, () -> certificationService.
+                CsrDecryptionException.class, () -> certificationController.
                         signCertificate("TestCa", "encryptedCSR", "encryptedPK")
         );
 
@@ -120,7 +120,7 @@ class CertificationServiceTest {
 
         // when
         Exception exception = assertThrows(
-                KeyDecryptionException.class, () -> certificationService.
+                KeyDecryptionException.class, () -> certificationController.
                         signCertificate("TestCa", "encryptedCSR", "encryptedPK")
         );
 
diff --git a/certService/src/test/java/org/onap/aaf/certservice/api/ReloadConfigControllerTest.java b/certService/src/test/java/org/onap/aaf/certservice/api/ReloadConfigControllerTest.java
new file mode 100644
index 00000000..17db24b8
--- /dev/null
+++ b/certService/src/test/java/org/onap/aaf/certservice/api/ReloadConfigControllerTest.java
@@ -0,0 +1,89 @@
+/*
+ * ============LICENSE_START=======================================================
+ * PROJECT
+ * ================================================================================
+ * Copyright (C) 2020 Nokia. 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.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ * ============LICENSE_END=========================================================
+ */
+
+package org.onap.aaf.certservice.api;
+
+import static org.assertj.core.api.AssertionsForInterfaceTypes.assertThat;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertThrows;
+import static org.mockito.Mockito.doThrow;
+
+import org.assertj.core.api.Assertions;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.ExtendWith;
+import org.mockito.Mock;
+import org.mockito.junit.jupiter.MockitoExtension;
+import org.onap.aaf.certservice.certification.configuration.CmpServersConfig;
+import org.onap.aaf.certservice.certification.configuration.CmpServersConfigLoadingException;
+import org.springframework.http.HttpStatus;
+import org.springframework.http.ResponseEntity;
+
+@ExtendWith(MockitoExtension.class)
+public class ReloadConfigControllerTest {
+
+    private static final String ERROR_MESSAGE = "Exception occurred during CMP Servers configuration loading";
+
+    private ReloadConfigController reloadConfigController;
+
+    @Mock
+    public CmpServersConfig cmpServersConfig;
+
+    @BeforeEach
+    public void setUp() {
+        this.reloadConfigController = new ReloadConfigController(cmpServersConfig);
+    }
+
+    @Test
+    public void shouldReturnStatusOkWhenSuccessfullyReloaded() throws CmpServersConfigLoadingException {
+        // When
+        ResponseEntity<String> response = reloadConfigController.reloadConfiguration();
+
+        // Then
+        assertThat(response.getStatusCode()).isEqualTo(HttpStatus.OK);
+    }
+
+    @Test
+    public void shouldRethrowSameErrorWhenFailedToReload() throws CmpServersConfigLoadingException {
+        // Given
+        doThrow(new CmpServersConfigLoadingException(ERROR_MESSAGE)).when(cmpServersConfig).reloadConfiguration();
+
+        // When
+        Exception exception = assertThrows(
+            CmpServersConfigLoadingException.class,
+            () -> reloadConfigController.reloadConfiguration());
+
+        // Then
+        Assertions.assertThat(exception.getMessage()).isEqualTo(ERROR_MESSAGE);
+    }
+
+    @Test
+    void shouldReturnErrorStatusAndMessageWhenExceptionOccurred() {
+        // Given
+        CmpServersConfigLoadingException exception = new CmpServersConfigLoadingException(ERROR_MESSAGE);
+
+        // When
+        ResponseEntity<String> response = reloadConfigController.handle(exception);
+
+        // Then
+        assertEquals(ERROR_MESSAGE, response.getBody());
+        assertEquals(HttpStatus.INTERNAL_SERVER_ERROR, response.getStatusCode());
+    }
+}