2 files changed, 205 insertions, 72 deletions

diff --git a/vid-app-common/src/test/java/org/onap/vid/controller/PropertyControllerTest.java b/vid-app-common/src/test/java/org/onap/vid/controller/PropertyControllerTest.java
index e9d2cfd44..5dbe010bf 100644
--- a/vid-app-common/src/test/java/org/onap/vid/controller/PropertyControllerTest.java
+++ b/vid-app-common/src/test/java/org/onap/vid/controller/PropertyControllerTest.java
@@ -1,39 +1,139 @@
+/*-
+ * ============LICENSE_START=======================================================
+ * VID
+ * ================================================================================
+ * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
+ * ================================================================================
+ * Modifications Copyright 2019 Nokia
+ * ================================================================================
+ * 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.vid.controller;
 
-import org.junit.Test;
-import org.springframework.http.ResponseEntity;
-import org.springframework.web.servlet.ModelAndView;
+import static org.mockito.BDDMockito.given;
+import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.get;
+import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.content;
+import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.status;
 
-import javax.servlet.http.HttpServletRequest;
+import com.fasterxml.jackson.databind.ObjectMapper;
+import com.google.common.collect.ImmutableList;
+import com.google.common.collect.ImmutableMap;
+import org.apache.log4j.BasicConfigurator;
+import org.junit.Before;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.mockito.Mock;
+import org.mockito.junit.MockitoJUnitRunner;
+import org.onap.vid.category.CategoryParameterOptionRep;
+import org.onap.vid.category.CategoryParametersResponse;
+import org.onap.vid.model.CategoryParameter.Family;
+import org.onap.vid.services.CategoryParameterService;
+import org.onap.vid.utils.SystemPropertiesWrapper;
+import org.springframework.http.MediaType;
+import org.springframework.test.web.servlet.MockMvc;
+import org.springframework.test.web.servlet.setup.MockMvcBuilders;
 
+@RunWith(MockitoJUnitRunner.class)
 public class PropertyControllerTest {
 
-	private PropertyController createTestSubject() {
-		return new PropertyController();
-	}
-
-	@Test
-	public void testWelcome() throws Exception {
-		PropertyController testSubject;
-		HttpServletRequest request = null;
-		ModelAndView result;
-
-		// default test
-		testSubject = createTestSubject();
-		result = testSubject.welcome(request);
-	}
-
-
-	@Test
-	public void testGetProperty() throws Exception {
-		PropertyController testSubject;
-		String name = "";
-		String defaultvalue = "";
-		HttpServletRequest request = null;
-		ResponseEntity<String> result;
-
-		// default test
-		testSubject = createTestSubject();
-		result = testSubject.getProperty(name, defaultvalue, request);
-	}
+    private static final String GET_PROPERTY = "/get_property/{name}/{defaultvalue}";
+    private static final String CATEGORY_PARAMETER = "/category_parameter";
+
+    private static final String ERROR_MSG = "Internal error occurred: ";
+    private static final String FAMILY_NAME = "familyName";
+
+    private PropertyController propertyController;
+    private MockMvc mockMvc;
+    private ObjectMapper objectMapper;
+
+    @Mock
+    private CategoryParameterService service;
+    @Mock
+    private SystemPropertiesWrapper systemPropertiesWrapper;
+
+    @Before
+    public void setUp() {
+        propertyController = new PropertyController(service, systemPropertiesWrapper);
+        BasicConfigurator.configure();
+        mockMvc = MockMvcBuilders.standaloneSetup(propertyController).build();
+        objectMapper = new ObjectMapper();
+    }
+
+    @Test
+    public void shouldReturnInputJson_whenPropertyIsNotFound() throws Exception {
+        String inputJson = "{key1: val1}";
+        given(systemPropertiesWrapper.getOrDefault("name.1", inputJson)).willReturn(inputJson);
+
+        mockMvc.perform(get(GET_PROPERTY, "name_1", inputJson)
+            .contentType(MediaType.APPLICATION_JSON))
+            .andExpect(status().isOk())
+            .andExpect(content().json(inputJson));
+    }
+
+    @Test
+    public void shouldReturnGivenJson_whenPropertyIsFound() throws Exception {
+        String propertyJson = "{key1: val1}";
+        String inputJson = "{key2: val2}";
+        given(systemPropertiesWrapper.getOrDefault("name.1", inputJson)).willReturn(propertyJson);
+
+        mockMvc.perform(get(GET_PROPERTY, "name_1", inputJson)
+            .contentType(MediaType.APPLICATION_JSON))
+            .andExpect(status().isOk())
+            .andExpect(content().json(propertyJson));
+    }
+
+    @Test
+    public void shouldReturnInternalServerError_whenExceptionIsThrownFromSystemProperties() throws Exception {
+        String exceptionMessage = "Test exception message from system properties";
+        String inputJson = "{key1: val1}";
+        given(systemPropertiesWrapper.getOrDefault("name.1", inputJson)).willThrow(new RuntimeException(exceptionMessage));
+
+        mockMvc.perform(get(GET_PROPERTY, "name_1", inputJson)
+            .contentType(MediaType.APPLICATION_JSON))
+            .andExpect(status().isInternalServerError())
+            .andExpect(content().string(ERROR_MSG + exceptionMessage));
+    }
+
+    @Test
+    public void shouldReturnResponse_whenResponseIsFound() throws Exception {
+
+        CategoryParametersResponse categoryParametersResponse =
+            new CategoryParametersResponse(
+                ImmutableMap.of(
+                    "key1", ImmutableList.of(
+                        new CategoryParameterOptionRep("testId", "testName"))));
+
+        given(service.getCategoryParameters(Family.PARAMETER_STANDARDIZATION)).willReturn(categoryParametersResponse);
+
+        mockMvc.perform(get(CATEGORY_PARAMETER)
+            .param(FAMILY_NAME, "PARAMETER_STANDARDIZATION")
+            .contentType(MediaType.APPLICATION_JSON))
+            .andExpect(status().isOk())
+            .andExpect(content().json(objectMapper.writeValueAsString(categoryParametersResponse)));
+    }
+
+    @Test
+    public void shouldReturnInternalServerError_whenExceptionIsThrownFromService() throws Exception {
+        String exceptionMessage = "Test exception message from category parameter service";
+        given(service.getCategoryParameters(Family.PARAMETER_STANDARDIZATION)).willThrow(new RuntimeException(
+            exceptionMessage));
+
+        mockMvc.perform(get(CATEGORY_PARAMETER)
+            .param(FAMILY_NAME, "PARAMETER_STANDARDIZATION")
+            .contentType(MediaType.APPLICATION_JSON))
+            .andExpect(status().isInternalServerError())
+            .andExpect(content().string(ERROR_MSG + exceptionMessage));
+    }
 }
\ No newline at end of file
diff --git a/vid-app-common/src/test/java/org/onap/vid/mso/MsoUtilTest.java b/vid-app-common/src/test/java/org/onap/vid/mso/MsoUtilTest.java
index 9d625c4f7..82242b6d1 100644
--- a/vid-app-common/src/test/java/org/onap/vid/mso/MsoUtilTest.java
+++ b/vid-app-common/src/test/java/org/onap/vid/mso/MsoUtilTest.java
@@ -1,50 +1,83 @@
+/*-
+ * ============LICENSE_START=======================================================
+ * VID
+ * ================================================================================
+ * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
+ * Modifications Copyright (C) 2019 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.vid.mso;
 
-import org.glassfish.jersey.client.ClientResponse;
-import org.junit.Assert;
+import io.joshworks.restclient.http.HttpResponse;
+import io.joshworks.restclient.http.mapper.ObjectMapper;
+import org.apache.http.HttpResponseFactory;
+import org.apache.http.entity.StringEntity;
+import org.apache.http.impl.DefaultHttpResponseFactory;
+import org.apache.http.message.BasicStatusLine;
 import org.junit.Test;
 
-public class MsoUtilTest {
-
-	private MsoUtil createTestSubject() {
-		return new MsoUtil();
-	}
-
-	@Test
-	public void testWrapResponse() throws Exception {
-		String body = "";
-		int statusCode = 0;
-		MsoResponseWrapper result;
+import static org.apache.http.HttpStatus.SC_OK;
+import static org.apache.http.HttpVersion.HTTP_1_1;
+import static org.assertj.core.api.Assertions.assertThat;
 
-		// default test
-		result = MsoUtil.wrapResponse(body, statusCode);
-	}
-
-
-	@Test
-	public void testWrapResponse_2() throws Exception {
-		RestObject<String> rs = null;
-		MsoResponseWrapper result;
-
-		// test 1
-		result = MsoUtil.wrapResponse(rs);
-		Assert.assertNotNull(result);
-	}
+public class MsoUtilTest {
 
-	@Test
-	public void testConvertPojoToString() throws Exception {
-		String result;
+    @Test
+    public void shouldWrapRestObject() {
+        // given
+        String entity = "entity";
+        RestObject<String> restObject = new RestObject<>();
+        restObject.set(entity);
+        restObject.setStatusCode(SC_OK);
+        // when
+        MsoResponseWrapper result = MsoUtil.wrapResponse(restObject);
+        // then
+        assertThat(result.getEntity()).isEqualTo(entity);
+        assertThat(result.getStatus()).isEqualTo(SC_OK);
+    }
 
-		// test 1
-		result = MsoUtil.convertPojoToString(null);
-		Assert.assertEquals("", result);
-	}
+    @Test
+    public void shouldWrapHttpResponse() throws Exception {
+        // given
+        HttpResponse<String> httpResponse = createTestHttpResponse(SC_OK, null);
+        // when
+        MsoResponseWrapper result = MsoUtil.wrapResponse(httpResponse);
+        // then
+        assertThat(result.getEntity()).isEqualTo(null);
+        assertThat(result.getStatus()).isEqualTo(SC_OK);
+    }
 
-	@Test
-	public void testMain() throws Exception {
-		String[] args = new String[] { "" };
+    @Test
+    public void shouldWrapHttpResponseWithEntity() throws Exception {
+        // given
+        String entity = "entity";
+        HttpResponse<String> httpResponse = createTestHttpResponse(SC_OK, entity);
+        // when
+        MsoResponseWrapper result = MsoUtil.wrapResponse(httpResponse);
+        // then
+        assertThat(result.getEntity()).isEqualTo(entity);
+        assertThat(result.getStatus()).isEqualTo(SC_OK);
+    }
 
-		// default test
-		MsoUtil.main(args);
-	}
+    private HttpResponse<String> createTestHttpResponse(int statusCode, String entity) throws Exception {
+        HttpResponseFactory factory = new DefaultHttpResponseFactory();
+        org.apache.http.HttpResponse response = factory.newHttpResponse(new BasicStatusLine(HTTP_1_1, statusCode, null), null);
+        if (entity != null) {
+            response.setEntity(new StringEntity(entity));
+        }
+        return new HttpResponse<>(response, String.class, null);
+    }
 }
\ No newline at end of file