X-Git-Url: https://gerrit.onap.org/r/gitweb?a=blobdiff_plain;f=ONAP-PAP-REST%2Fsrc%2Ftest%2Fjava%2Forg%2Fonap%2Fpolicy%2Fpap%2Fxacml%2Frest%2Fcontroller%2FSafePolicyControllerTest.java;h=ae1840ebb37b6a09d617701cccf82c889e4d7f13;hb=4068da123ee33b532b4b52f15545c76a978f977e;hp=7d23475a16048e21b3cb683deaa38f2890718cb4;hpb=10f11fafcf434c70cc9c302d2ab4a801601b71f7;p=policy%2Fengine.git

diff --git a/ONAP-PAP-REST/src/test/java/org/onap/policy/pap/xacml/rest/controller/SafePolicyControllerTest.java b/ONAP-PAP-REST/src/test/java/org/onap/policy/pap/xacml/rest/controller/SafePolicyControllerTest.java
index 7d23475a1..ae1840ebb 100644
--- a/ONAP-PAP-REST/src/test/java/org/onap/policy/pap/xacml/rest/controller/SafePolicyControllerTest.java
+++ b/ONAP-PAP-REST/src/test/java/org/onap/policy/pap/xacml/rest/controller/SafePolicyControllerTest.java
@@ -45,158 +45,158 @@ import org.onap.policy.rest.jpa.UserInfo;
 import org.springframework.mock.web.MockHttpServletResponse;
 
 public class SafePolicyControllerTest {
-	
-	private static Logger logger = FlexLogger.getLogger(SafePolicyControllerTest.class);
-	private static CommonClassDao commonClassDao;
-	private String jsonString = null;
-	private HttpServletRequest request = null;
-	private SafePolicyController controller = null;
-	private MockHttpServletResponse response = null;
-	private UserInfo userInfo;
-	private List<String>  data;
-
-	@Before
-	public void setUp() throws Exception {
-		logger.info("setUp: Entering");
-		commonClassDao = Mockito.mock(CommonClassDao.class);
-
-		data = new ArrayList<>();
-		data.add("Test");
-
-		userInfo = new UserInfo();
-		userInfo.setUserLoginId("Test");
-		userInfo.setUserName("Test");
-
-		doNothing().when(commonClassDao).delete(new RiskType());
-		doNothing().when(commonClassDao).save(new RiskType());
-
-		controller = new SafePolicyController();
-		controller.setCommonClassDao(commonClassDao);
-		new DictionaryUtils(commonClassDao);
-		DictionaryUtils.setDictionaryUtils(new DictionaryUtils());
-		mock(DictionaryUtils.class);
-		request = Mockito.mock(HttpServletRequest.class);
-		response =  new MockHttpServletResponse();  
-		logger.info("setUp: exit");
-	}
-	
-	@Test
-	public void testGetRiskTypeDictionaryByNameEntityData(){
-		when(commonClassDao.getDataByColumn(RiskType.class, "name")).thenReturn(data);
-		controller.getRiskTypeDictionaryByNameEntityData(response);
-		try {
-			assertTrue(response.getContentAsString() != null && response.getContentAsString().contains("riskTypeDictionaryDatas"));
-		} catch (Exception e) {
-			fail();
-			logger.error(e.getMessage(),e);
-		}
-	}
-	
-	@Test
-	public void testGetRiskTypeDictionaryEntityData(){
-		when(commonClassDao.getData(RiskType.class)).thenReturn(new ArrayList<>());
-		controller.getRiskTypeDictionaryEntityData(response);
-		try {
-			assertTrue(response.getContentAsString() != null && response.getContentAsString().contains("riskTypeDictionaryDatas"));
-		} catch (Exception e) {
-			fail();
-			logger.error(e.getMessage(),e);
-		}
-	}
-	
-	@Test
-	public void testGetSafePolicyWarningEntityDataByName(){
-		when(commonClassDao.getDataByColumn(SafePolicyWarning.class, "name")).thenReturn(data);
-		controller.getSafePolicyWarningEntityDataByName(response);
-		try {
-			assertTrue(response.getContentAsString() != null && response.getContentAsString().contains("safePolicyWarningDatas"));
-		} catch (Exception e) {
-			fail();
-			logger.error(e.getMessage(),e);
-		}
-	}
-	
-	@Test
-	public void testGetSafePolicyWarningeEntityData(){
-		when(commonClassDao.getData(SafePolicyWarning.class)).thenReturn(new ArrayList<>());
-		controller.getSafePolicyWarningeEntityData(response);
-		try {
-			assertTrue(response.getContentAsString() != null && response.getContentAsString().contains("safePolicyWarningDatas"));
-		} catch (Exception e) {
-			fail();
-			logger.error(e.getMessage(),e);
-		}
-	}
-	
-	@Test
-	public void testSaveRiskTypeDictionary(){
-		jsonString = "{\"userid\":\"demo\",\"riskTypeDictionaryData\":{\"id\":1,\"description\":\"test\",\"name\":\"Test\"}}";
-		try(BufferedReader br = new BufferedReader(new StringReader(jsonString))){
-			when(request.getReader()).thenReturn(br);
-			controller.saveRiskTypeDictionary(request, response);
-			assertTrue( response.getContentAsString() != null && response.getContentAsString().contains("riskTypeDictionaryDatas"));
-		}catch(Exception e){
-			logger.error("Exception"+ e);
-		} 
-	}
-	
-	@Test
-	public void testUpdateRiskTypeDictionary(){
-		jsonString = "{\"userid\":\"demo\",\"riskTypeDictionaryData\":{\"description\":\"test\",\"name\":\"Test\"}}";
-		try(BufferedReader br = new BufferedReader(new StringReader(jsonString))){
-			when(request.getReader()).thenReturn(br);
-			controller.saveRiskTypeDictionary(request, response);
-			assertTrue( response.getContentAsString() != null && response.getContentAsString().contains("riskTypeDictionaryDatas"));
-		}catch(Exception e){
-			logger.error("Exception"+ e);
-		} 
-	}
-	
-	@Test
-	public void testRemoveRiskTypeDictionary(){
-		jsonString = "{\"userid\":\"demo\",\"data\":{\"id\":1,\"description\":\"test\",\"name\":\"Test\"}}";
-		try(BufferedReader br = new BufferedReader(new StringReader(jsonString))){
-			when(request.getReader()).thenReturn(br);
-			controller.removeRiskTypeDictionary(request, response);
-			assertTrue( response.getContentAsString() != null && response.getContentAsString().contains("riskTypeDictionaryDatas"));
-		}catch(Exception e){
-			logger.error("Exception"+ e);
-		} 
-	}
-	
-	@Test
-	public void testSaveSafePolicyWarningDictionary(){
-		jsonString = "{\"userid\":\"demo\",\"safePolicyWarningData\":{\"id\":1,\"description\":\"test\",\"name\":\"Test\"}}";
-		try(BufferedReader br = new BufferedReader(new StringReader(jsonString))){
-			when(request.getReader()).thenReturn(br);
-			controller.saveSafePolicyWarningDictionary(request, response);
-			assertTrue( response.getContentAsString() != null && response.getContentAsString().contains("safePolicyWarningDatas"));
-		}catch(Exception e){
-			logger.error("Exception"+ e);
-		} 
-	}
-	
-	@Test
-	public void testUpdateSafePolicyWarningDictionary(){
-		jsonString = "{\"userid\":\"demo\",\"safePolicyWarningData\":{\"description\":\"test\",\"name\":\"Test\"}}";
-		try(BufferedReader br = new BufferedReader(new StringReader(jsonString))){
-			when(request.getReader()).thenReturn(br);
-			controller.saveSafePolicyWarningDictionary(request, response);
-			assertTrue( response.getContentAsString() != null && response.getContentAsString().contains("safePolicyWarningDatas"));
-		}catch(Exception e){
-			logger.error("Exception"+ e);
-		} 
-	}
-	
-	@Test
-	public void testRemoveSafePolicyWarningDictionary(){
-		jsonString = "{\"userid\":\"demo\",\"data\":{\"id\":1,\"description\":\"test\",\"name\":\"Test\"}}";
-		try(BufferedReader br = new BufferedReader(new StringReader(jsonString))){
-			when(request.getReader()).thenReturn(br);
-			controller.removeSafePolicyWarningDictionary(request, response);
-			assertTrue( response.getContentAsString() != null && response.getContentAsString().contains("safePolicyWarningDatas"));
-		}catch(Exception e){
-			logger.error("Exception"+ e);
-		} 
-	}
+
+    private static Logger logger = FlexLogger.getLogger(SafePolicyControllerTest.class);
+    private static CommonClassDao commonClassDao;
+    private String jsonString = null;
+    private HttpServletRequest request = null;
+    private SafePolicyController controller = null;
+    private MockHttpServletResponse response = null;
+    private UserInfo userInfo;
+    private List<String>  data;
+
+    @Before
+    public void setUp() throws Exception {
+        logger.info("setUp: Entering");
+        commonClassDao = Mockito.mock(CommonClassDao.class);
+
+        data = new ArrayList<>();
+        data.add("Test");
+
+        userInfo = new UserInfo();
+        userInfo.setUserLoginId("Test");
+        userInfo.setUserName("Test");
+
+        doNothing().when(commonClassDao).delete(new RiskType());
+        doNothing().when(commonClassDao).save(new RiskType());
+
+        controller = new SafePolicyController();
+        controller.setCommonClassDao(commonClassDao);
+        new DictionaryUtils(commonClassDao);
+        DictionaryUtils.setDictionaryUtils(new DictionaryUtils());
+        mock(DictionaryUtils.class);
+        request = Mockito.mock(HttpServletRequest.class);
+        response =  new MockHttpServletResponse();
+        logger.info("setUp: exit");
+    }
+
+    @Test
+    public void testGetRiskTypeDictionaryByNameEntityData(){
+        when(commonClassDao.getDataByColumn(RiskType.class, "name")).thenReturn(data);
+        controller.getRiskTypeDictionaryByNameEntityData(response);
+        try {
+            assertTrue(response.getContentAsString() != null && response.getContentAsString().contains("riskTypeDictionaryDatas"));
+        } catch (Exception e) {
+            fail();
+            logger.error(e.getMessage(),e);
+        }
+    }
+
+    @Test
+    public void testGetRiskTypeDictionaryEntityData(){
+        when(commonClassDao.getData(RiskType.class)).thenReturn(new ArrayList<>());
+        controller.getRiskTypeDictionaryEntityData(response);
+        try {
+            assertTrue(response.getContentAsString() != null && response.getContentAsString().contains("riskTypeDictionaryDatas"));
+        } catch (Exception e) {
+            fail();
+            logger.error(e.getMessage(),e);
+        }
+    }
+
+    @Test
+    public void testGetSafePolicyWarningEntityDataByName(){
+        when(commonClassDao.getDataByColumn(SafePolicyWarning.class, "name")).thenReturn(data);
+        controller.getSafePolicyWarningEntityDataByName(response);
+        try {
+            assertTrue(response.getContentAsString() != null && response.getContentAsString().contains("safePolicyWarningDatas"));
+        } catch (Exception e) {
+            fail();
+            logger.error(e.getMessage(),e);
+        }
+    }
+
+    @Test
+    public void testGetSafePolicyWarningeEntityData(){
+        when(commonClassDao.getData(SafePolicyWarning.class)).thenReturn(new ArrayList<>());
+        controller.getSafePolicyWarningeEntityData(response);
+        try {
+            assertTrue(response.getContentAsString() != null && response.getContentAsString().contains("safePolicyWarningDatas"));
+        } catch (Exception e) {
+            fail();
+            logger.error(e.getMessage(),e);
+        }
+    }
+
+    @Test
+    public void testSaveRiskTypeDictionary(){
+        jsonString = "{\"userid\":\"demo\",\"riskTypeDictionaryData\":{\"id\":1,\"description\":\"test\",\"name\":\"Test\"}}";
+        try(BufferedReader br = new BufferedReader(new StringReader(jsonString))){
+            when(request.getReader()).thenReturn(br);
+            controller.saveRiskTypeDictionary(request, response);
+            assertTrue( response.getContentAsString() != null && response.getContentAsString().contains("riskTypeDictionaryDatas"));
+        }catch(Exception e){
+            logger.error("Exception"+ e);
+        }
+    }
+
+    @Test
+    public void testUpdateRiskTypeDictionary(){
+        jsonString = "{\"userid\":\"demo\",\"riskTypeDictionaryData\":{\"description\":\"test\",\"name\":\"Test\"}}";
+        try(BufferedReader br = new BufferedReader(new StringReader(jsonString))){
+            when(request.getReader()).thenReturn(br);
+            controller.saveRiskTypeDictionary(request, response);
+            assertTrue( response.getContentAsString() != null && response.getContentAsString().contains("riskTypeDictionaryDatas"));
+        }catch(Exception e){
+            logger.error("Exception"+ e);
+        }
+    }
+
+    @Test
+    public void testRemoveRiskTypeDictionary(){
+        jsonString = "{\"userid\":\"demo\",\"data\":{\"id\":1,\"description\":\"test\",\"name\":\"Test\"}}";
+        try(BufferedReader br = new BufferedReader(new StringReader(jsonString))){
+            when(request.getReader()).thenReturn(br);
+            controller.removeRiskTypeDictionary(request, response);
+            assertTrue( response.getContentAsString() != null && response.getContentAsString().contains("riskTypeDictionaryDatas"));
+        }catch(Exception e){
+            logger.error("Exception"+ e);
+        }
+    }
+
+    @Test
+    public void testSaveSafePolicyWarningDictionary(){
+        jsonString = "{\"userid\":\"demo\",\"safePolicyWarningData\":{\"id\":1,\"description\":\"test\",\"name\":\"Test\"}}";
+        try(BufferedReader br = new BufferedReader(new StringReader(jsonString))){
+            when(request.getReader()).thenReturn(br);
+            controller.saveSafePolicyWarningDictionary(request, response);
+            assertTrue( response.getContentAsString() != null && response.getContentAsString().contains("safePolicyWarningDatas"));
+        }catch(Exception e){
+            logger.error("Exception"+ e);
+        }
+    }
+
+    @Test
+    public void testUpdateSafePolicyWarningDictionary(){
+        jsonString = "{\"userid\":\"demo\",\"safePolicyWarningData\":{\"description\":\"test\",\"name\":\"Test\"}}";
+        try(BufferedReader br = new BufferedReader(new StringReader(jsonString))){
+            when(request.getReader()).thenReturn(br);
+            controller.saveSafePolicyWarningDictionary(request, response);
+            assertTrue( response.getContentAsString() != null && response.getContentAsString().contains("safePolicyWarningDatas"));
+        }catch(Exception e){
+            logger.error("Exception"+ e);
+        }
+    }
+
+    @Test
+    public void testRemoveSafePolicyWarningDictionary(){
+        jsonString = "{\"userid\":\"demo\",\"data\":{\"id\":1,\"description\":\"test\",\"name\":\"Test\"}}";
+        try(BufferedReader br = new BufferedReader(new StringReader(jsonString))){
+            when(request.getReader()).thenReturn(br);
+            controller.removeSafePolicyWarningDictionary(request, response);
+            assertTrue( response.getContentAsString() != null && response.getContentAsString().contains("safePolicyWarningDatas"));
+        }catch(Exception e){
+            logger.error("Exception"+ e);
+        }
+    }
 }