Merge "INT-763 - build small vid images"

diff --git a/vid-app-common/src/main/java/org/onap/vid/controller/RoleGeneratorController.java b/vid-app-common/src/main/java/org/onap/vid/controller/RoleGeneratorController.java
index 78f1e37..97718bd 100644 (file)
--- a/vid-app-common/src/main/java/org/onap/vid/controller/RoleGeneratorController.java
+++ b/vid-app-common/src/main/java/org/onap/vid/controller/RoleGeneratorController.java
@@ -1,9 +1,32 @@
+/*-
+ * ============LICENSE_START=======================================================
+ * VID
+ * ================================================================================
+ * Copyright © 2018 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 static org.springframework.http.HttpStatus.OK;
+
 import org.onap.portalsdk.core.controller.UnRestrictedBaseController;
 import org.onap.vid.services.RoleGeneratorService;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.http.HttpStatus;
 import org.springframework.http.ResponseEntity;
 import org.springframework.web.bind.annotation.PathVariable;
 import org.springframework.web.bind.annotation.RequestMapping;
@@ -12,15 +35,15 @@ import org.springframework.web.bind.annotation.RestController;
 
 @RestController
 public class RoleGeneratorController extends UnRestrictedBaseController {
-    @Autowired
-    private RoleGeneratorService roleGeneratorService;
     public static final String GENERATE_ROLE_SCRIPT = "generateRoleScript";
+    private RoleGeneratorService roleGeneratorService;
+
+    @Autowired
+    public RoleGeneratorController(RoleGeneratorService roleGeneratorService) {
+        this.roleGeneratorService = roleGeneratorService;
+    }
     @RequestMapping(value =  GENERATE_ROLE_SCRIPT +"/{firstRun}", method = RequestMethod.GET )
     public ResponseEntity<String> generateRoleScript (@PathVariable("firstRun") boolean firstRun) {
-        ResponseEntity<String> response = null;
-        String query = roleGeneratorService.generateRoleScript(firstRun);
-        response = new ResponseEntity<>(query, HttpStatus.OK);
-        return response;
+        return ResponseEntity.status(OK).body(roleGeneratorService.generateRoleScript(firstRun));
     }
-
 }

diff --git a/vid-app-common/src/test/java/org/onap/vid/controller/RoleGeneratorControllerTest.java b/vid-app-common/src/test/java/org/onap/vid/controller/RoleGeneratorControllerTest.java
index c19b810..e1c6504 100644 (file)
--- a/vid-app-common/src/test/java/org/onap/vid/controller/RoleGeneratorControllerTest.java
+++ b/vid-app-common/src/test/java/org/onap/vid/controller/RoleGeneratorControllerTest.java
@@ -1,26 +1,80 @@
+/*-
+ * ============LICENSE_START=======================================================
+ * VID
+ * ================================================================================
+ * Copyright © 2018 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 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 org.apache.log4j.BasicConfigurator;
+import org.junit.Before;
 import org.junit.Test;
-import org.springframework.http.ResponseEntity;
+import org.junit.runner.RunWith;
+import org.mockito.Mock;
+import org.mockito.runners.MockitoJUnitRunner;
+import org.onap.vid.services.RoleGeneratorService;
+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 RoleGeneratorControllerTest {
 
-    private RoleGeneratorController createTestSubject() {
-        return new RoleGeneratorController();
+    private static final String PATH = "/generateRoleScript/{firstRun}";
+
+    private static final String FIRST_JSON = "{key1: val1}";
+    private static final String SECOND_JSON = "{key2: val2}";
+
+    private RoleGeneratorController roleGeneratorController;
+    private MockMvc mockMvc;
+
+    @Mock
+    private RoleGeneratorService service;
+
+    @Before
+    public void setUp() {
+        roleGeneratorController = new RoleGeneratorController(service);
+        BasicConfigurator.configure();
+        mockMvc = MockMvcBuilders.standaloneSetup(roleGeneratorController).build();
+
+        given(service.generateRoleScript(true)).willReturn(FIRST_JSON);
+        given(service.generateRoleScript(false)).willReturn(SECOND_JSON);
+    }
+
+    @Test
+    public void generateRoleScript_shouldReturnJson_whenFirstRun() throws Exception {
+        mockMvc.perform(get(PATH, "true")
+            .contentType(MediaType.APPLICATION_JSON))
+            .andExpect(status().isOk())
+            .andExpect(content().json(FIRST_JSON));
     }
 
     @Test
-    public void testGenerateRoleScript() throws Exception {
-        RoleGeneratorController testSubject;
-        boolean firstRun = false;
-        ResponseEntity<String> result;
-
-        // default test
-        try {
-            testSubject = createTestSubject();
-            result = testSubject.generateRoleScript(firstRun);
-        } catch (Exception e) {
-
-        }
+    public void generateRoleScript_shouldReturnJson_whenNoFirstRun() throws Exception {
+        mockMvc.perform(get(PATH, "false")
+            .contentType(MediaType.APPLICATION_JSON))
+            .andExpect(status().isOk())
+            .andExpect(content().json(SECOND_JSON));
     }
 }
\ No newline at end of file