X-Git-Url: https://gerrit.onap.org/r/gitweb?p=policy%2Fengine.git;a=blobdiff_plain;f=ONAP-PAP-REST%2Fsrc%2Ftest%2Fjava%2Forg%2Fonap%2Fpolicy%2Fpap%2Fxacml%2Frest%2Fcontroller%2FFirewallDictionaryControllerTest.java;h=3359a7aedd6c254e61f5329b68dd22e54f9e80ad;hp=b94e8d338f098fcde96a898aa50110ba09dfa13a;hb=0c20d1c294fe146e1018f14b07a8d861c29fe527;hpb=2ee068fed59becbd3327937125264bdcf651f7b8

diff --git a/ONAP-PAP-REST/src/test/java/org/onap/policy/pap/xacml/rest/controller/FirewallDictionaryControllerTest.java b/ONAP-PAP-REST/src/test/java/org/onap/policy/pap/xacml/rest/controller/FirewallDictionaryControllerTest.java
index b94e8d338..3359a7aed 100644
--- a/ONAP-PAP-REST/src/test/java/org/onap/policy/pap/xacml/rest/controller/FirewallDictionaryControllerTest.java
+++ b/ONAP-PAP-REST/src/test/java/org/onap/policy/pap/xacml/rest/controller/FirewallDictionaryControllerTest.java
@@ -47,8 +47,8 @@ import org.onap.policy.rest.adapter.Term;
 import org.onap.policy.rest.dao.CommonClassDao;
 import org.onap.policy.rest.jpa.ActionList;
 import org.onap.policy.rest.jpa.AddressGroup;
-import org.onap.policy.rest.jpa.FWTag;
-import org.onap.policy.rest.jpa.FWTagPicker;
+import org.onap.policy.rest.jpa.FwTag;
+import org.onap.policy.rest.jpa.FwTagPicker;
 import org.onap.policy.rest.jpa.FirewallDictionaryList;
 import org.onap.policy.rest.jpa.GroupServiceList;
 import org.onap.policy.rest.jpa.PortList;
@@ -228,25 +228,25 @@ public class FirewallDictionaryControllerTest {
 
     @Test
     public void testGetTagPickerNameEntityDataByName() {
-        test_WithGetDataByColumn(FWTagPicker.class, "fwTagPickerDictionaryDatas", "tagPickerName",
+        test_WithGetDataByColumn(FwTagPicker.class, "fwTagPickerDictionaryDatas", "tagPickerName",
                 () -> controller.getTagPickerNameEntityDataByName(response));
     }
 
     @Test
     public void testGetTagPickerDictionaryEntityData() {
-        test_WithGetData(FWTagPicker.class, "fwTagPickerDictionaryDatas",
+        test_WithGetData(FwTagPicker.class, "fwTagPickerDictionaryDatas",
                 () -> controller.getTagPickerDictionaryEntityData(response));
     }
 
     @Test
     public void testGetTagNameEntityDataByName() {
-        test_WithGetDataByColumn(FWTag.class, "fwTagDictionaryDatas", "fwTagName",
+        test_WithGetDataByColumn(FwTag.class, "fwTagDictionaryDatas", "fwTagName",
                 () -> controller.getTagNameEntityDataByName(response));
     }
 
     @Test
     public void testGetTagDictionaryEntityData() {
-        test_WithGetData(FWTag.class, "fwTagDictionaryDatas", () -> controller.getTagDictionaryEntityData(response));
+        test_WithGetData(FwTag.class, "fwTagDictionaryDatas", () -> controller.getTagDictionaryEntityData(response));
     }
 
     @Test
@@ -563,7 +563,7 @@ public class FirewallDictionaryControllerTest {
                 "{\"fwTagPickerDictionaryData\":{\"description\":\"test\",\"networkRole\":\"test\",\"tagPickerName\":"
                 + "\"Test\",\"tags\":[{\"$$hashKey\":\"object:1855\",\"id\":\"choice1\",\"number\":\"test\",\"option\":"
                 + "\"Test\"}]},\"userid\":\"demo\"}";
-        testSave(FWTagPicker.class, "fwTagPickerDictionaryDatas", "tagPickerName",
+        testSave(FwTagPicker.class, "fwTagPickerDictionaryDatas", "tagPickerName",
                 () -> controller.saveFirewallTagPickerDictionary(request, response));
     }
 
@@ -573,14 +573,14 @@ public class FirewallDictionaryControllerTest {
                 "{\"fwTagPickerDictionaryData\":{\"id\":1,\"description\":\"test\",\"networkRole\":"
                 + "\"test\",\"tagPickerName\":\"Test\",\"tags\":[{\"$$hashKey\":\"object:1855\",\"id\":"
                 + "\"choice1\",\"number\":\"test\",\"option\":\"Test\"}]},\"userid\":\"demo\"}";
-        testUpdate(FWTagPicker.class, "fwTagPickerDictionaryDatas", "tagPickerName",
+        testUpdate(FwTagPicker.class, "fwTagPickerDictionaryDatas", "tagPickerName",
                 () -> controller.saveFirewallTagPickerDictionary(request, response));
     }
 
     @Test
     public void testRemoveFirewallTagPickerDictionary() {
         jsonString = "{\"userid\":\"demo\",\"data\":{\"id\":1,\"description\":\"test\",\"tagPickerName\":\"Test\"}}";
-        testRemove(FWTagPicker.class, "fwTagPickerDictionaryDatas",
+        testRemove(FwTagPicker.class, "fwTagPickerDictionaryDatas",
                 () -> controller.removeFirewallTagPickerDictionary(request, response));
     }
 
@@ -589,7 +589,7 @@ public class FirewallDictionaryControllerTest {
         jsonString =
                 "{\"fwTagDictionaryData\":{\"description\":\"test\",\"fwTagName\":\"Test\",\"tags\":[{\"$$hashKey\":"
                 + "\"object:1690\",\"id\":\"choice1\",\"tags\":\"test\"}]},\"userid\":\"demo\"}";
-        testSave(FWTag.class, "fwTagDictionaryDatas", "fwTagName",
+        testSave(FwTag.class, "fwTagDictionaryDatas", "fwTagName",
                 () -> controller.saveFirewallTagDictionary(request, response));
     }
 
@@ -598,14 +598,14 @@ public class FirewallDictionaryControllerTest {
         jsonString =
                 "{\"fwTagDictionaryData\":{\"id\":1,\"description\":\"test\",\"fwTagName\":\"Test\",\"tags\":"
                 + "[{\"$$hashKey\":\"object:1690\",\"id\":\"choice1\",\"tags\":\"test\"}]},\"userid\":\"demo\"}";
-        testUpdate(FWTag.class, "fwTagDictionaryDatas", "fwTagName",
+        testUpdate(FwTag.class, "fwTagDictionaryDatas", "fwTagName",
                 () -> controller.saveFirewallTagDictionary(request, response));
     }
 
     @Test
     public void testRemoveFirewallTagDictionary() {
         jsonString = "{\"userid\":\"demo\",\"data\":{\"id\":1,\"description\":\"test\",\"fwTagName\":\"Test\"}}";
-        testRemove(FWTag.class, "fwTagDictionaryDatas",
+        testRemove(FwTag.class, "fwTagDictionaryDatas",
                 () -> controller.removeFirewallTagDictionary(request, response));
     }