Consolidate PolicyRestAdapter setup

[policy/engine.git] / ONAP-PAP-REST / src / test / java / org / onap / policy / pap / xacml / rest / controller / DescriptiveDictionaryControllerTest.java

diff --git a/ONAP-PAP-REST/src/test/java/org/onap/policy/pap/xacml/rest/controller/DescriptiveDictionaryControllerTest.java b/ONAP-PAP-REST/src/test/java/org/onap/policy/pap/xacml/rest/controller/DescriptiveDictionaryControllerTest.java
index 0950b1c..f122993 100644 (file)
--- a/ONAP-PAP-REST/src/test/java/org/onap/policy/pap/xacml/rest/controller/DescriptiveDictionaryControllerTest.java
+++ b/ONAP-PAP-REST/src/test/java/org/onap/policy/pap/xacml/rest/controller/DescriptiveDictionaryControllerTest.java
@@ -2,14 +2,14 @@
  * ============LICENSE_START=======================================================
  * ONAP-PAP-REST
  * ================================================================================
  * ============LICENSE_START=======================================================
  * ONAP-PAP-REST
  * ================================================================================

- * Copyright (C) 2018 AT&T Intellectual Property. All rights reserved.
+ * Copyright (C) 2018-2019 AT&T Intellectual Property. 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
  * ================================================================================
  * 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
  *      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.
  * 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.


@@ -17,6 +17,7 @@
  * limitations under the License.
  * ============LICENSE_END=========================================================
  */
  * limitations under the License.
  * ============LICENSE_END=========================================================
  */

+

 package org.onap.policy.pap.xacml.rest.controller;
 
 import static org.junit.Assert.assertTrue;
 package org.onap.policy.pap.xacml.rest.controller;
 
 import static org.junit.Assert.assertTrue;


@@ -53,7 +54,7 @@ public class DescriptiveDictionaryControllerTest {
     private DescriptiveDictionaryController controller = null;
     private MockHttpServletResponse response = null;
     private UserInfo userInfo;
     private DescriptiveDictionaryController controller = null;
     private MockHttpServletResponse response = null;
     private UserInfo userInfo;

-    private List<String>  data;
+    private List<String> data;

 
     @Before
     public void setUp() throws Exception {
 
     @Before
     public void setUp() throws Exception {


@@ -74,15 +75,15 @@ public class DescriptiveDictionaryControllerTest {
         controller.setCommonClassDao(commonClassDao);
 
         request = Mockito.mock(HttpServletRequest.class);
         controller.setCommonClassDao(commonClassDao);
 
         request = Mockito.mock(HttpServletRequest.class);

-        response =  new MockHttpServletResponse();
+        response = new MockHttpServletResponse();

         new DictionaryUtils(commonClassDao);
         DictionaryUtils.setDictionaryUtils(new DictionaryUtils());
         mock(DictionaryUtils.class);
         logger.info("setUp: exit");
     }
 
         new DictionaryUtils(commonClassDao);
         DictionaryUtils.setDictionaryUtils(new DictionaryUtils());
         mock(DictionaryUtils.class);
         logger.info("setUp: exit");
     }
 

-    public List<Object> testDescriptiveScope(){
-        List<Object>  objectData = new ArrayList<>();
+    public List<Object> testDescriptiveScope() {
+        List<Object> objectData = new ArrayList<>();

 
         DescriptiveScope data = new DescriptiveScope();
         data.setId(1);
 
         DescriptiveScope data = new DescriptiveScope();
         data.setId(1);


@@ -94,75 +95,89 @@ public class DescriptiveDictionaryControllerTest {
         data.setSearch("Test");
         assertTrue("Test".equals(data.getSearch()));
         data.setCreatedDate(new Date());
         data.setSearch("Test");
         assertTrue("Test".equals(data.getSearch()));
         data.setCreatedDate(new Date());

-        assertTrue(data.getCreatedDate()!= null);
+        assertTrue(data.getCreatedDate() != null);

         data.setModifiedDate(new Date());
         data.setModifiedDate(new Date());

-        assertTrue(data.getModifiedDate()!= null);
+        assertTrue(data.getModifiedDate() != null);

         data.setUserCreatedBy(userInfo);
         data.setUserCreatedBy(userInfo);

-        assertTrue(data.getUserCreatedBy()!= null);
+        assertTrue(data.getUserCreatedBy() != null);

         data.setUserModifiedBy(userInfo);
         data.setUserModifiedBy(userInfo);

-        assertTrue(data.getUserModifiedBy()!= null);
+        assertTrue(data.getUserModifiedBy() != null);

         objectData.add(data);
 
         return objectData;
     }
 
     @Test
         objectData.add(data);
 
         return objectData;
     }
 
     @Test

-    public void testGetDescriptiveDictionaryByNameEntityData(){
+    public void testGetDescriptiveDictionaryByNameEntityData() {

         when(commonClassDao.getDataByColumn(DescriptiveScope.class, "descriptiveScopeName")).thenReturn(data);
         controller.getDescriptiveDictionaryByNameEntityData(response);
         try {
         when(commonClassDao.getDataByColumn(DescriptiveScope.class, "descriptiveScopeName")).thenReturn(data);
         controller.getDescriptiveDictionaryByNameEntityData(response);
         try {

-            assertTrue( response.getContentAsString() != null && response.getContentAsString().contains("descriptiveScopeDictionaryDatas"));
+            assertTrue(response.getContentAsString() != null
+                    && response.getContentAsString().contains("descriptiveScopeDictionaryDatas"));

         } catch (Exception e) {
             fail();
         } catch (Exception e) {
             fail();

-            logger.error(e.getMessage(),e);
+            logger.error(e.getMessage(), e);

         }
     }
 
     @Test
         }
     }
 
     @Test

-    public void testGetDescriptiveDictionaryEntityData(){
+    public void testGetDescriptiveDictionaryEntityData() {

         when(commonClassDao.getData(DescriptiveScope.class)).thenReturn(testDescriptiveScope());
         controller.getDescriptiveDictionaryEntityData(response);
         try {
         when(commonClassDao.getData(DescriptiveScope.class)).thenReturn(testDescriptiveScope());
         controller.getDescriptiveDictionaryEntityData(response);
         try {

-            assertTrue( response.getContentAsString() != null && response.getContentAsString().contains("descriptiveScopeDictionaryDatas"));
+            assertTrue(response.getContentAsString() != null
+                    && response.getContentAsString().contains("descriptiveScopeDictionaryDatas"));

         } catch (Exception e) {
             fail();
         } catch (Exception e) {
             fail();

-            logger.error(e.getMessage(),e);
+            logger.error(e.getMessage(), e);

         }
     }
 
     @Test
         }
     }
 
     @Test

-    public void testSaveDescriptiveDictionary(){
-        jsonString = "{\"descriptiveScopeDictionaryData\":{\"attributes\":[{\"$$hashKey\":\"object:257\",\"id\":\"choice1\",\"number\":\"12\",\"option\":\"test\"}],\"description\":\"test\",\"descriptiveScopeName\":\"Test\",\"search\":\"Test\"},\"userid\":\"demo\"}";
-        try(BufferedReader br = new BufferedReader(new StringReader(jsonString))){
+    public void testSaveDescriptiveDictionary() {
+        jsonString =
+                "{\"descriptiveScopeDictionaryData\":{\"attributes\":[{\"$$hashKey\":\"object:257\",\"id\":"
+                + "\"choice1\",\"number\":\"12\",\"option\":\"test\"}],\"description\":\"test\","
+                + "\"descriptiveScopeName\":\"Test\",\"search\":\"Test\"},\"userid\":\"demo\"}";
+        try (BufferedReader br = new BufferedReader(new StringReader(jsonString))) {

             when(request.getReader()).thenReturn(br);
             controller.saveDescriptiveDictionary(request, response);
             when(request.getReader()).thenReturn(br);
             controller.saveDescriptiveDictionary(request, response);

-            assertTrue( response.getContentAsString() != null && response.getContentAsString().contains("descriptiveScopeDictionaryDatas"));
-        }catch(Exception e){
-            logger.error("Exception"+ e);
+            assertTrue(response.getContentAsString() != null
+                    && response.getContentAsString().contains("descriptiveScopeDictionaryDatas"));
+        } catch (Exception e) {
+            logger.error("Exception" + e);

         }
     }
 
     @Test
         }
     }
 
     @Test

-    public void testUpdateDescriptiveDictionary(){
-        jsonString = "{\"descriptiveScopeDictionaryData\":{\"attributes\":[{\"$$hashKey\":\"object:257\",\"id\":\"choice1\",\"number\":\"12\",\"option\":\"test\"}],\"description\":\"test\",\"descriptiveScopeName\":\"Test\",\"id\":1,\"search\":\"Test\"},\"userid\":\"demo\"}";
-        try(BufferedReader br = new BufferedReader(new StringReader(jsonString))){
+    public void testUpdateDescriptiveDictionary() {
+        jsonString =
+                "{\"descriptiveScopeDictionaryData\":{\"attributes\":[{\"$$hashKey\":\"object:257\",\"id\":"
+                + "\"choice1\",\"number\":\"12\",\"option\":\"test\"}],\"description\":\"test\","
+                + "\"descriptiveScopeName\":\"Test\",\"id\":1,\"search\":\"Test\"},\"userid\":\"demo\"}";
+        try (BufferedReader br = new BufferedReader(new StringReader(jsonString))) {

             when(request.getReader()).thenReturn(br);
             controller.saveDescriptiveDictionary(request, response);
             when(request.getReader()).thenReturn(br);
             controller.saveDescriptiveDictionary(request, response);

-            assertTrue( response.getContentAsString() != null && response.getContentAsString().contains("descriptiveScopeDictionaryDatas"));
-        }catch(Exception e){
-            logger.error("Exception"+ e);
+            assertTrue(response.getContentAsString() != null
+                    && response.getContentAsString().contains("descriptiveScopeDictionaryDatas"));
+        } catch (Exception e) {
+            logger.error("Exception" + e);

         }
     }
 
     @Test
         }
     }
 
     @Test

-    public void testRemoveDescriptiveDictionary(){
-        jsonString = "{\"data\":{\"attributes\":[{\"$$hashKey\":\"object:257\",\"id\":\"choice1\",\"number\":\"12\",\"option\":\"test\"}],\"description\":\"test\",\"descriptiveScopeName\":\"Test\",\"id\":1,\"search\":\"Test\"},\"userid\":\"demo\"}";
-        try(BufferedReader br = new BufferedReader(new StringReader(jsonString))){
+    public void testRemoveDescriptiveDictionary() {
+        jsonString =
+                "{\"data\":{\"attributes\":[{\"$$hashKey\":\"object:257\",\"id\":\"choice1\",\"number\":\"12\","
+                + "\"option\":\"test\"}],\"description\":\"test\",\"descriptiveScopeName\":\"Test\",\"id\":1,"
+                + "\"search\":\"Test\"},\"userid\":\"demo\"}";
+        try (BufferedReader br = new BufferedReader(new StringReader(jsonString))) {

             when(request.getReader()).thenReturn(br);
             controller.removeDescriptiveDictionary(request, response);
             when(request.getReader()).thenReturn(br);
             controller.removeDescriptiveDictionary(request, response);

-            assertTrue( response.getContentAsString() != null && response.getContentAsString().contains("descriptiveScopeDictionaryDatas"));
-        }catch(Exception e){
-            logger.error("Exception"+ e);
+            assertTrue(response.getContentAsString() != null
+                    && response.getContentAsString().contains("descriptiveScopeDictionaryDatas"));
+        } catch (Exception e) {
+            logger.error("Exception" + e);

         }
     }
         }
     }

-}
\ No newline at end of file
+}