X-Git-Url: https://gerrit.onap.org/r/gitweb?p=policy%2Fengine.git;a=blobdiff_plain;f=ONAP-REST%2Fsrc%2Ftest%2Fjava%2Forg%2Fonap%2Fpolicy%2Frest%2Fdaoimpl%2FPolicyValidationDaoImplTest.java;h=47456106b5ce0dddb9f9fb3a0def26827a15f2da;hp=4d9d1c576f2daea1a006dd79b9ef38e4fab996a6;hb=2f3ca9fc5edc5a52659b3486605e0db508143318;hpb=0c20d1c294fe146e1018f14b07a8d861c29fe527

diff --git a/ONAP-REST/src/test/java/org/onap/policy/rest/daoimpl/PolicyValidationDaoImplTest.java b/ONAP-REST/src/test/java/org/onap/policy/rest/daoimpl/PolicyValidationDaoImplTest.java
index 4d9d1c576..47456106b 100644
--- a/ONAP-REST/src/test/java/org/onap/policy/rest/daoimpl/PolicyValidationDaoImplTest.java
+++ b/ONAP-REST/src/test/java/org/onap/policy/rest/daoimpl/PolicyValidationDaoImplTest.java
@@ -70,6 +70,7 @@ public class PolicyValidationDaoImplTest {
 
     /**
      * Set up all unit tests.
+     * 
      * @throws SQLException on SQL exceptions
      */
     @BeforeClass
@@ -136,13 +137,12 @@ public class PolicyValidationDaoImplTest {
         userinfo.setUserName("Test");
         commonClassDao.save(userinfo);
         OnapName onapName = new OnapName();
-        onapName.setOnapName("Test");
+        onapName.setName("Test");
         onapName.setUserCreatedBy(userinfo);
         onapName.setUserModifiedBy(userinfo);
         onapName.setModifiedDate(new Date());
         commonClassDao.save(onapName);
 
-
         List<Object> list = commonClassDao.getData(OnapName.class);
         assertTrue(list.size() == 1);
         logger.debug(list.size());
@@ -160,7 +160,6 @@ public class PolicyValidationDaoImplTest {
         userinfo.setUserName(loginIdUserName);
         commonClassDao.save(userinfo);
 
-
         List<Object> dataCur = commonClassDao.getDataByQuery("from UserInfo", new SimpleBindings());
 
         assertEquals(1, dataCur.size());
@@ -224,7 +223,6 @@ public class PolicyValidationDaoImplTest {
         params.put("scope", scope);
         List<Object> dataCur = commonClassDao.getDataByQuery(query, params);
 
-
         assertTrue(1 == dataCur.size());
         assertEquals(pv, dataCur.get(0));
     }
@@ -244,7 +242,6 @@ public class PolicyValidationDaoImplTest {
         userinfo.setUserName(loginIdUserName);
         commonClassDao.save(userinfo);
 
-
         List<Object> dataCur = commonClassDao.getDataByQuery("from UserInfo", new SimpleBindings());
 
         assertEquals(1, dataCur.size());
@@ -254,7 +251,6 @@ public class PolicyValidationDaoImplTest {
 
         assertFalse(dataCur.isEmpty());
 
-
         watch.setPolicyName("bananaWatch");
         commonClassDao.save(watch);
 
@@ -281,7 +277,6 @@ public class PolicyValidationDaoImplTest {
         assertEquals(watch, dataCur.get(0));
     }
 
-
     @Test
     @Transactional
     @Rollback(true)
@@ -326,7 +321,6 @@ public class PolicyValidationDaoImplTest {
         watch.setPolicyName(finalName);
         commonClassDao.save(watch);
 
-
         // Current Implementation
         String query = "from WatchPolicyNotificationTable where POLICYNAME = :finalName and LOGINIDS = :userId";
         SimpleBindings params = new SimpleBindings();
@@ -363,7 +357,6 @@ public class PolicyValidationDaoImplTest {
         // SQL Injection attempt
         String finalName = "banana' OR '1'='1";
 
-
         // Current Implementation
         String query = "from WatchPolicyNotificationTable where POLICYNAME = :finalName and LOGINIDS = :userId";
         SimpleBindings params = new SimpleBindings();
@@ -394,8 +387,8 @@ public class PolicyValidationDaoImplTest {
         commonClassDao.update(userInfoUpdate);
         List<String> data1 = commonClassDao.getDataByColumn(UserInfo.class, "userLoginId");
         assertTrue(data1.size() == 1);
-        UserInfo data2 =
-                (UserInfo) commonClassDao.getEntityItem(UserInfo.class, "userLoginId:userName", "TestID:Test1");
+        UserInfo data2 = (UserInfo) commonClassDao.getEntityItem(UserInfo.class, "userLoginId:userName",
+                        "TestID:Test1");
         assertTrue("TestID".equals(data2.getUserLoginId()));
         List<Object> data3 = commonClassDao.checkDuplicateEntry("TestID:Test1", "userLoginId:userName", UserInfo.class);
         assertTrue(data3.size() == 1);
@@ -408,8 +401,8 @@ public class PolicyValidationDaoImplTest {
         assertTrue(roles1.size() == 1);
         List<String> multipleData = new ArrayList<>();
         multipleData.add("TestID:Test1");
-        List<Object> data4 =
-                commonClassDao.getMultipleDataOnAddingConjunction(UserInfo.class, "userLoginId:userName", multipleData);
+        List<Object> data4 = commonClassDao.getMultipleDataOnAddingConjunction(UserInfo.class, "userLoginId:userName",
+                        multipleData);
         assertTrue(data4.size() == 1);
         commonClassDao.delete(data2);
     }
@@ -433,7 +426,7 @@ public class PolicyValidationDaoImplTest {
         data = commonClassDao.getDataById(UserInfo.class, "userLoginIduserName", "TestIDTest");
         assertNull(data);
         data = commonClassDao.getDataById(UserInfo.class, "userLoginId   data2.getUserLoginId()" + ":userName",
-                "TestIDTest");
+                        "TestIDTest");
         assertNull(data);
         commonClassDao.delete(data);
     }
@@ -463,8 +456,8 @@ public class PolicyValidationDaoImplTest {
         commonClassDao.save(userInfo);
         List<String> multipleData = new ArrayList<>();
         multipleData.add("TestID:Test1");
-        List<Object> data =
-                commonClassDao.getMultipleDataOnAddingConjunction(UserInfo.class, "userLoginId:userName", multipleData);
+        List<Object> data = commonClassDao.getMultipleDataOnAddingConjunction(UserInfo.class, "userLoginId:userName",
+                        multipleData);
         assertTrue(data.size() == 0);
         data = commonClassDao.getMultipleDataOnAddingConjunction(null, null, null);
         assertNull(data);
@@ -506,7 +499,6 @@ public class PolicyValidationDaoImplTest {
         commonClassDao.delete(data);
     }
 
-
     @Test
     public void testGetEntityItemParameters() {
         UserInfo userInfo = new UserInfo();
@@ -520,8 +512,8 @@ public class PolicyValidationDaoImplTest {
         commonClassDao.update(userInfoUpdate);
         List<String> data1 = commonClassDao.getDataByColumn(UserInfo.class, "userLoginId");
         assertTrue(data1.size() == 1);
-        UserInfo data2 =
-                (UserInfo) commonClassDao.getEntityItem(UserInfo.class, "userLoginId:userName", "TestID:Test1");
+        UserInfo data2 = (UserInfo) commonClassDao.getEntityItem(UserInfo.class, "userLoginId:userName",
+                        "TestID:Test1");
         assertTrue("TestID".equals(data2.getUserLoginId()));
         data2 = (UserInfo) commonClassDao.getEntityItem(null, null, null);
         assertNull(data2);
@@ -587,7 +579,6 @@ public class PolicyValidationDaoImplTest {
         commonClassDao.delete(data);
     }
 
-
     @Test
     public void testGetDataByQueryParameters() {
         // Add data