diff options
| author |   ITSERVICES\rb7147 <rb7147@att.com> | 2017-04-25 11:46:00 -0400 |
|---|---|---|
| committer | ITSERVICES\rb7147 <rb7147@att.com> | 2017-05-03 09:58:17 -0400 |
| commit | e0addf5b588a1244f9679becd90999dfcb4c3a94 (patch) | |
| tree | 1212772d6366730266ff0e093c874b07aa716c29 /PolicyEngineAPI/src/test/java/org/openecomp/policy/std/test | |
| parent | 39fb0f30472777e4b60d6a7ac8aa4eb9773961ff (diff) | |
Policy 1707 commit to LF
Change-Id: Ibe6f01d92f9a434c040abb05d5386e89d675ae65
Signed-off-by: ITSERVICES\rb7147 <rb7147@att.com>
Diffstat (limited to 'PolicyEngineAPI/src/test/java/org/openecomp/policy/std/test')
14 files changed, 384 insertions, 1387 deletions
diff --git a/PolicyEngineAPI/src/test/java/org/openecomp/policy/std/test/AutoClientEndTest.java b/PolicyEngineAPI/src/test/java/org/openecomp/policy/std/test/AutoClientEndTest.java index af36d6d71..97ff4bde6 100644 --- a/PolicyEngineAPI/src/test/java/org/openecomp/policy/std/test/AutoClientEndTest.java +++ b/PolicyEngineAPI/src/test/java/org/openecomp/policy/std/test/AutoClientEndTest.java @@ -277,7 +277,7 @@ public class AutoClientEndTest { public void setUp() throws Exception { // add set up code here - StdPolicyEngine policyEngine = new StdPolicyEngine("Test/config_pass.properties"); + StdPolicyEngine policyEngine = new StdPolicyEngine("Test/config_pass.properties", (String) null); NotificationHandler handler = policyEngine.getNotificationHandler(); AutoClientEnd.setAuto(NotificationScheme.AUTO_ALL_NOTIFICATIONS, handler); diff --git a/PolicyEngineAPI/src/test/java/org/openecomp/policy/std/test/AutoClientUEBTest.java b/PolicyEngineAPI/src/test/java/org/openecomp/policy/std/test/AutoClientUEBTest.java index f6760056f..28889677b 100644 --- a/PolicyEngineAPI/src/test/java/org/openecomp/policy/std/test/AutoClientUEBTest.java +++ b/PolicyEngineAPI/src/test/java/org/openecomp/policy/std/test/AutoClientUEBTest.java @@ -26,9 +26,7 @@ import java.util.List; import org.junit.*; import org.openecomp.policy.api.NotificationHandler; import org.openecomp.policy.api.NotificationScheme; -import org.openecomp.policy.std.AutoClientEnd; import org.openecomp.policy.std.AutoClientUEB; -import org.openecomp.policy.std.StdPolicyEngine; import static org.junit.Assert.*; @@ -50,9 +48,11 @@ public class AutoClientUEBTest { public void testAutoClientUEB_1() throws Exception { String url = ""; - List<String> uebURLList = new LinkedList(); + String apiKey = ""; + String apiSecret = ""; + List<String> uebURLList = new LinkedList<String>(); - AutoClientUEB result = new AutoClientUEB(url, uebURLList); + AutoClientUEB result = new AutoClientUEB(url, uebURLList, apiKey, apiSecret); // add additional test code here // An unexpected exception was thrown in user code while executing this test: @@ -129,7 +129,7 @@ public class AutoClientUEBTest { @Test public void testIsRunning_1() throws Exception { - AutoClientUEB fixture = new AutoClientUEB("", new LinkedList()); + AutoClientUEB fixture = new AutoClientUEB("", new LinkedList<String>(), "", ""); fixture.isRunning = true; boolean result = fixture.isRunning(); @@ -150,7 +150,7 @@ public class AutoClientUEBTest { @Test public void testRun_1() throws Exception { - AutoClientUEB fixture = new AutoClientUEB("", new LinkedList()); + AutoClientUEB fixture = new AutoClientUEB("", new LinkedList<String>(), "", ""); fixture.isRunning = true; fixture.run(); @@ -170,7 +170,7 @@ public class AutoClientUEBTest { @Test public void testRun_2() throws Exception { - AutoClientUEB fixture = new AutoClientUEB("", new LinkedList()); + AutoClientUEB fixture = new AutoClientUEB("", new LinkedList<String>(), "", ""); fixture.isRunning = true; fixture.run(); @@ -190,7 +190,7 @@ public class AutoClientUEBTest { @Test public void testRun_3() throws Exception { - AutoClientUEB fixture = new AutoClientUEB("", new LinkedList()); + AutoClientUEB fixture = new AutoClientUEB("", new LinkedList<String>(), "", ""); fixture.isRunning = true; fixture.run(); @@ -210,7 +210,7 @@ public class AutoClientUEBTest { @Test public void testRun_4() throws Exception { - AutoClientUEB fixture = new AutoClientUEB("", new LinkedList()); + AutoClientUEB fixture = new AutoClientUEB("", new LinkedList<String>(), "", ""); fixture.isRunning = true; fixture.run(); @@ -230,7 +230,7 @@ public class AutoClientUEBTest { @Test public void testRun_5() throws Exception { - AutoClientUEB fixture = new AutoClientUEB("", new LinkedList()); + AutoClientUEB fixture = new AutoClientUEB("", new LinkedList<String>(),"",""); fixture.isRunning = true; fixture.run(); @@ -250,7 +250,7 @@ public class AutoClientUEBTest { @Test public void testRun_6() throws Exception { - AutoClientUEB fixture = new AutoClientUEB("", new LinkedList()); + AutoClientUEB fixture = new AutoClientUEB("", new LinkedList<String>(),"",""); fixture.isRunning = true; fixture.run(); @@ -270,7 +270,7 @@ public class AutoClientUEBTest { @Test public void testRun_7() throws Exception { - AutoClientUEB fixture = new AutoClientUEB("", new LinkedList()); + AutoClientUEB fixture = new AutoClientUEB("", new LinkedList<String>(),"",""); fixture.isRunning = true; fixture.run(); @@ -290,7 +290,7 @@ public class AutoClientUEBTest { @Test public void testRun_8() throws Exception { - AutoClientUEB fixture = new AutoClientUEB("", new LinkedList()); + AutoClientUEB fixture = new AutoClientUEB("", new LinkedList<String>(),"",""); fixture.isRunning = true; fixture.run(); @@ -310,7 +310,7 @@ public class AutoClientUEBTest { @Test public void testRun_9() throws Exception { - AutoClientUEB fixture = new AutoClientUEB("", new LinkedList()); + AutoClientUEB fixture = new AutoClientUEB("", new LinkedList<String>(),"",""); fixture.isRunning = true; fixture.run(); @@ -330,7 +330,7 @@ public class AutoClientUEBTest { @Test public void testRun_10() throws Exception { - AutoClientUEB fixture = new AutoClientUEB("", new LinkedList()); + AutoClientUEB fixture = new AutoClientUEB("", new LinkedList<String>(),"",""); fixture.isRunning = true; fixture.run(); @@ -350,7 +350,7 @@ public class AutoClientUEBTest { @Test public void testRun_11() throws Exception { - AutoClientUEB fixture = new AutoClientUEB("", new LinkedList()); + AutoClientUEB fixture = new AutoClientUEB("", new LinkedList<String>(),"",""); fixture.isRunning = true; fixture.run(); @@ -370,7 +370,7 @@ public class AutoClientUEBTest { @Test public void testRun_12() throws Exception { - AutoClientUEB fixture = new AutoClientUEB("", new LinkedList()); + AutoClientUEB fixture = new AutoClientUEB("", new LinkedList<String>(),"",""); fixture.isRunning = true; fixture.run(); @@ -390,7 +390,7 @@ public class AutoClientUEBTest { @Test public void testRun_13() throws Exception { - AutoClientUEB fixture = new AutoClientUEB("", new LinkedList()); + AutoClientUEB fixture = new AutoClientUEB("", new LinkedList<String>(),"",""); fixture.isRunning = true; fixture.run(); @@ -410,7 +410,7 @@ public class AutoClientUEBTest { @Test public void testRun_14() throws Exception { - AutoClientUEB fixture = new AutoClientUEB("", new LinkedList()); + AutoClientUEB fixture = new AutoClientUEB("", new LinkedList<String>(),"",""); fixture.isRunning = true; fixture.run(); @@ -430,7 +430,7 @@ public class AutoClientUEBTest { @Test public void testRun_15() throws Exception { - AutoClientUEB fixture = new AutoClientUEB("", new LinkedList()); + AutoClientUEB fixture = new AutoClientUEB("", new LinkedList<String>(),"",""); fixture.isRunning = true; fixture.run(); @@ -450,7 +450,7 @@ public class AutoClientUEBTest { @Test public void testRun_16() throws Exception { - AutoClientUEB fixture = new AutoClientUEB("", new LinkedList()); + AutoClientUEB fixture = new AutoClientUEB("", new LinkedList<String>(),"",""); fixture.isRunning = true; fixture.run(); @@ -470,7 +470,7 @@ public class AutoClientUEBTest { @Test public void testSetAuto_1() throws Exception { - AutoClientUEB fixture = new AutoClientUEB("", new LinkedList()); + AutoClientUEB fixture = new AutoClientUEB("", new LinkedList<String>(),"",""); fixture.isRunning = true; NotificationScheme scheme = NotificationScheme.AUTO_ALL_NOTIFICATIONS; NotificationHandler handler = null; @@ -511,7 +511,7 @@ public class AutoClientUEBTest { @Test public void testTerminate_1() throws Exception { - AutoClientUEB fixture = new AutoClientUEB("", new LinkedList()); + AutoClientUEB fixture = new AutoClientUEB("", new LinkedList<String>(),"",""); fixture.isRunning = true; fixture.terminate(); @@ -533,12 +533,10 @@ public class AutoClientUEBTest { public void setUp() throws Exception { // add set up code here - StdPolicyEngine policyEngine = new StdPolicyEngine("Test/config_pass.properties"); List<String> urlList = new LinkedList<String>(); urlList.add("test2.com"); - AutoClientUEB client = new AutoClientUEB("test.com", urlList); + AutoClientUEB client = new AutoClientUEB("test.com", urlList, "testKey", "testSecret"); NotificationHandler handler = null; - //AutoClientEnd.setAuto(NotificationScheme.AUTO_ALL_NOTIFICATIONS, handler); client.setAuto(NotificationScheme.AUTO_ALL_NOTIFICATIONS, handler); } diff --git a/PolicyEngineAPI/src/test/java/org/openecomp/policy/std/test/Handler.java b/PolicyEngineAPI/src/test/java/org/openecomp/policy/std/test/Handler.java index e1e398e1a..460fb8883 100644 --- a/PolicyEngineAPI/src/test/java/org/openecomp/policy/std/test/Handler.java +++ b/PolicyEngineAPI/src/test/java/org/openecomp/policy/std/test/Handler.java @@ -56,6 +56,7 @@ public class Handler implements NotificationHandler{ // Checking the Name is correct or not. try { PolicyEngine policyEngine = new PolicyEngine("config.properties"); + @SuppressWarnings("deprecation") Collection<PolicyConfig> policyConfigs = policyEngine.getConfigByPolicyName(updatedPolicy.getPolicyName()); for(PolicyConfig policyConfig: policyConfigs){ if(policyConfig.getPolicyConfigStatus().equals(PolicyConfigStatus.CONFIG_RETRIEVED)){ @@ -93,6 +94,7 @@ public class Handler implements NotificationHandler{ // Checking the Name is correct or not. try { PolicyEngine policyEngine = new PolicyEngine("config.properties"); + @SuppressWarnings("deprecation") Collection<PolicyConfig> policyConfigs = policyEngine.getConfigByPolicyName(updatedPolicy.getPolicyName()); for(PolicyConfig policyConfig: policyConfigs){ if(policyConfig.getPolicyConfigStatus().equals(PolicyConfigStatus.CONFIG_RETRIEVED)){ diff --git a/PolicyEngineAPI/src/test/java/org/openecomp/policy/std/test/ManualClientEndTest.java b/PolicyEngineAPI/src/test/java/org/openecomp/policy/std/test/ManualClientEndTest.java index 21cb14f6a..d8aecb28c 100644 --- a/PolicyEngineAPI/src/test/java/org/openecomp/policy/std/test/ManualClientEndTest.java +++ b/PolicyEngineAPI/src/test/java/org/openecomp/policy/std/test/ManualClientEndTest.java @@ -94,7 +94,6 @@ public class ManualClientEndTest { @Test public void testOnMessage() throws Exception { - ManualClientEnd fixture = new ManualClientEnd(); ManualClientEnd mockclient = Mockito.mock(ManualClientEnd.class); String message = ""; Session mockSession = Mockito.mock(Session.class); diff --git a/PolicyEngineAPI/src/test/java/org/openecomp/policy/std/test/ManualClientEndUEBTest.java b/PolicyEngineAPI/src/test/java/org/openecomp/policy/std/test/ManualClientEndUEBTest.java index fedcc9992..c0c9316e7 100644 --- a/PolicyEngineAPI/src/test/java/org/openecomp/policy/std/test/ManualClientEndUEBTest.java +++ b/PolicyEngineAPI/src/test/java/org/openecomp/policy/std/test/ManualClientEndUEBTest.java @@ -20,21 +20,20 @@ package org.openecomp.policy.std.test; +import static org.junit.Assert.assertNotNull; +import static org.junit.Assert.assertNull; + import java.util.LinkedList; import java.util.List; -import org.junit.*; -import org.mockito.Mockito; -import org.mockito.invocation.InvocationOnMock; -import org.mockito.stubbing.Answer; +import org.junit.After; +import org.junit.Before; +import org.junit.Test; import org.openecomp.policy.api.NotificationScheme; import org.openecomp.policy.api.PDPNotification; import org.openecomp.policy.std.ManualClientEndUEB; -import org.openecomp.policy.std.NotificationUnMarshal; import org.openecomp.policy.std.StdPDPNotification; -import static org.junit.Assert.*; - /** * The class <code>ManualClientEndUEBTest</code> contains tests for the class <code>{@link ManualClientEndUEB}</code>. * @@ -59,7 +58,6 @@ public class ManualClientEndUEBTest { public void setUp() throws Exception { String url = "http://test.com"; - String uniqueID = "test"; List<String> uebURLList = new LinkedList<String>(); uebURLList.add(url); diff --git a/PolicyEngineAPI/src/test/java/org/openecomp/policy/std/test/MatchStoreTest.java b/PolicyEngineAPI/src/test/java/org/openecomp/policy/std/test/MatchStoreTest.java index 917e9d5e6..ab8946c60 100644 --- a/PolicyEngineAPI/src/test/java/org/openecomp/policy/std/test/MatchStoreTest.java +++ b/PolicyEngineAPI/src/test/java/org/openecomp/policy/std/test/MatchStoreTest.java @@ -20,18 +20,20 @@ package org.openecomp.policy.std.test; +import static org.junit.Assert.assertNotNull; +import static org.junit.Assert.assertNull; + import java.util.HashSet; import java.util.Hashtable; -import java.util.Map; -import org.junit.*; +import org.junit.After; +import org.junit.Before; +import org.junit.Test; import org.openecomp.policy.api.PDPNotification; import org.openecomp.policy.std.MatchStore; import org.openecomp.policy.std.Matches; import org.openecomp.policy.std.StdPDPNotification; -import static org.junit.Assert.*; - /** * The class <code>MatchStoreTest</code> contains tests for the class <code>{@link MatchStore}</code>. * @@ -467,7 +469,7 @@ public class MatchStoreTest { public void testStoreMatch_4() throws Exception { Matches newMatch = new Matches(); - newMatch.setConfigAttributes(new Hashtable()); + newMatch.setConfigAttributes(new Hashtable<String, String>()); newMatch.setConfigName(""); newMatch.setEcompName(""); @@ -489,7 +491,7 @@ public class MatchStoreTest { public void testStoreMatch_5() throws Exception { Matches newMatch = new Matches(); - newMatch.setConfigAttributes(new Hashtable()); + newMatch.setConfigAttributes(new Hashtable<String, String>()); newMatch.setConfigName(""); newMatch.setEcompName(""); @@ -511,7 +513,7 @@ public class MatchStoreTest { public void testStoreMatch_6() throws Exception { Matches newMatch = new Matches(); - newMatch.setConfigAttributes(new Hashtable()); + newMatch.setConfigAttributes(new Hashtable<String, String>()); newMatch.setConfigName(""); newMatch.setEcompName(""); @@ -533,7 +535,7 @@ public class MatchStoreTest { public void testStoreMatch_7() throws Exception { Matches newMatch = new Matches(); - newMatch.setConfigAttributes(new Hashtable()); + newMatch.setConfigAttributes(new Hashtable<String, String>()); newMatch.setConfigName(""); newMatch.setEcompName(""); @@ -596,7 +598,7 @@ public class MatchStoreTest { public void testStoreMatch_10() throws Exception { Matches newMatch = new Matches(); - newMatch.setConfigAttributes(new Hashtable()); + newMatch.setConfigAttributes(new Hashtable<String, String>()); newMatch.setConfigName(""); newMatch.setEcompName(""); @@ -618,7 +620,7 @@ public class MatchStoreTest { public void testStoreMatch_11() throws Exception { Matches newMatch = new Matches(); - newMatch.setConfigAttributes(new Hashtable()); + newMatch.setConfigAttributes(new Hashtable<String, String>()); newMatch.setConfigName(""); newMatch.setEcompName(""); @@ -640,7 +642,7 @@ public class MatchStoreTest { public void testStoreMatch_12() throws Exception { Matches newMatch = new Matches(); - newMatch.setConfigAttributes(new Hashtable()); + newMatch.setConfigAttributes(new Hashtable<String, String>()); newMatch.setConfigName(""); newMatch.setEcompName(""); @@ -662,7 +664,7 @@ public class MatchStoreTest { public void testStoreMatch_13() throws Exception { Matches newMatch = new Matches(); - newMatch.setConfigAttributes(new Hashtable()); + newMatch.setConfigAttributes(new Hashtable<String, String>()); newMatch.setConfigName(""); newMatch.setEcompName(""); @@ -684,7 +686,7 @@ public class MatchStoreTest { public void testStoreMatch_14() throws Exception { Matches newMatch = new Matches(); - newMatch.setConfigAttributes(new Hashtable()); + newMatch.setConfigAttributes(new Hashtable<String, String>()); newMatch.setConfigName(""); newMatch.setEcompName(""); diff --git a/PolicyEngineAPI/src/test/java/org/openecomp/policy/std/test/MatchesTest.java b/PolicyEngineAPI/src/test/java/org/openecomp/policy/std/test/MatchesTest.java index 735d12561..cdc9b5595 100644 --- a/PolicyEngineAPI/src/test/java/org/openecomp/policy/std/test/MatchesTest.java +++ b/PolicyEngineAPI/src/test/java/org/openecomp/policy/std/test/MatchesTest.java @@ -60,7 +60,7 @@ public class MatchesTest { throws Exception { Matches fixture = new Matches(); fixture.setEcompName(""); - fixture.setConfigAttributes(new Hashtable()); + fixture.setConfigAttributes(new Hashtable<String, String>()); fixture.setConfigName(""); Map<String, String> result = fixture.getConfigAttributes(); @@ -82,7 +82,7 @@ public class MatchesTest { throws Exception { Matches fixture = new Matches(); fixture.setEcompName(""); - fixture.setConfigAttributes(new Hashtable()); + fixture.setConfigAttributes(new Hashtable<String, String>()); fixture.setConfigName(""); String result = fixture.getConfigName(); @@ -103,7 +103,7 @@ public class MatchesTest { throws Exception { Matches fixture = new Matches(); fixture.setEcompName(""); - fixture.setConfigAttributes(new Hashtable()); + fixture.setConfigAttributes(new Hashtable<String, String>()); fixture.setConfigName(""); String result = fixture.getEcompName(); @@ -124,9 +124,9 @@ public class MatchesTest { throws Exception { Matches fixture = new Matches(); fixture.setEcompName(""); - fixture.setConfigAttributes(new Hashtable()); + fixture.setConfigAttributes(new Hashtable<String, String>()); fixture.setConfigName(""); - Map<String, String> configAttributes = new Hashtable(); + Map<String, String> configAttributes = new Hashtable<String, String>(); fixture.setConfigAttributes(configAttributes); @@ -145,7 +145,7 @@ public class MatchesTest { throws Exception { Matches fixture = new Matches(); fixture.setEcompName(""); - fixture.setConfigAttributes(new Hashtable()); + fixture.setConfigAttributes(new Hashtable<String, String>()); fixture.setConfigName(""); String configName = ""; @@ -166,7 +166,7 @@ public class MatchesTest { throws Exception { Matches fixture = new Matches(); fixture.setEcompName(""); - fixture.setConfigAttributes(new Hashtable()); + fixture.setConfigAttributes(new Hashtable<String, String>()); fixture.setConfigName(""); String ecompName = ""; diff --git a/PolicyEngineAPI/src/test/java/org/openecomp/policy/std/test/NotificationUnMarshalTest.java b/PolicyEngineAPI/src/test/java/org/openecomp/policy/std/test/NotificationUnMarshalTest.java index 7a93a7b49..674c58a00 100644 --- a/PolicyEngineAPI/src/test/java/org/openecomp/policy/std/test/NotificationUnMarshalTest.java +++ b/PolicyEngineAPI/src/test/java/org/openecomp/policy/std/test/NotificationUnMarshalTest.java @@ -20,14 +20,14 @@ package org.openecomp.policy.std.test; -import org.junit.*; +import static org.junit.Assert.assertNotNull; + +import org.junit.After; +import org.junit.Before; +import org.junit.Test; import org.openecomp.policy.std.NotificationUnMarshal; import org.openecomp.policy.std.StdPDPNotification; -import static org.junit.Assert.*; - -import com.fasterxml.jackson.databind.JsonMappingException; - /** * The class <code>NotificationUnMarshalTest</code> contains tests for the class <code>{@link NotificationUnMarshal}</code>. * diff --git a/PolicyEngineAPI/src/test/java/org/openecomp/policy/std/test/StdLoadedPolicyTest.java b/PolicyEngineAPI/src/test/java/org/openecomp/policy/std/test/StdLoadedPolicyTest.java index ce6d361df..de8a6a7ad 100644 --- a/PolicyEngineAPI/src/test/java/org/openecomp/policy/std/test/StdLoadedPolicyTest.java +++ b/PolicyEngineAPI/src/test/java/org/openecomp/policy/std/test/StdLoadedPolicyTest.java @@ -63,7 +63,7 @@ public class StdLoadedPolicyTest { fixture.setPolicyName(""); fixture.setVersionNo(""); fixture.setUpdateType(UpdateType.NEW); - fixture.setMatches(new Hashtable()); + fixture.setMatches(new Hashtable<String, String>()); Map<String, String> result = fixture.getMatches(); @@ -86,7 +86,7 @@ public class StdLoadedPolicyTest { fixture.setPolicyName(""); fixture.setVersionNo(""); fixture.setUpdateType(UpdateType.NEW); - fixture.setMatches(new Hashtable()); + fixture.setMatches(new Hashtable<String, String>()); String result = fixture.getPolicyName(); @@ -108,7 +108,7 @@ public class StdLoadedPolicyTest { fixture.setPolicyName((String) null); fixture.setVersionNo(""); fixture.setUpdateType(UpdateType.NEW); - fixture.setMatches(new Hashtable()); + fixture.setMatches(new Hashtable<String, String>()); String result = fixture.getPolicyName(); @@ -130,7 +130,7 @@ public class StdLoadedPolicyTest { fixture.setPolicyName(""); fixture.setVersionNo(""); fixture.setUpdateType(UpdateType.NEW); - fixture.setMatches(new Hashtable()); + fixture.setMatches(new Hashtable<String, String>()); String result = fixture.getPolicyName(); @@ -152,7 +152,7 @@ public class StdLoadedPolicyTest { fixture.setPolicyName(""); fixture.setVersionNo(""); fixture.setUpdateType(UpdateType.NEW); - fixture.setMatches(new Hashtable()); + fixture.setMatches(new Hashtable<String, String>()); UpdateType result = fixture.getUpdateType(); @@ -177,7 +177,7 @@ public class StdLoadedPolicyTest { fixture.setPolicyName(""); fixture.setVersionNo(""); fixture.setUpdateType(UpdateType.NEW); - fixture.setMatches(new Hashtable()); + fixture.setMatches(new Hashtable<String, String>()); String result = fixture.getVersionNo(); @@ -199,8 +199,8 @@ public class StdLoadedPolicyTest { fixture.setPolicyName(""); fixture.setVersionNo(""); fixture.setUpdateType(UpdateType.NEW); - fixture.setMatches(new Hashtable()); - Map<String, String> matches = new Hashtable(); + fixture.setMatches(new Hashtable<String, String>()); + Map<String, String> matches = new Hashtable<String, String>(); fixture.setMatches(matches); @@ -221,7 +221,7 @@ public class StdLoadedPolicyTest { fixture.setPolicyName(""); fixture.setVersionNo(""); fixture.setUpdateType(UpdateType.NEW); - fixture.setMatches(new Hashtable()); + fixture.setMatches(new Hashtable<String, String>()); String policyName = ""; fixture.setPolicyName(policyName); @@ -243,7 +243,7 @@ public class StdLoadedPolicyTest { fixture.setPolicyName(""); fixture.setVersionNo(""); fixture.setUpdateType(UpdateType.NEW); - fixture.setMatches(new Hashtable()); + fixture.setMatches(new Hashtable<String, String>()); UpdateType updateType = UpdateType.NEW; fixture.setUpdateType(updateType); @@ -265,7 +265,7 @@ public class StdLoadedPolicyTest { fixture.setPolicyName(""); fixture.setVersionNo(""); fixture.setUpdateType(UpdateType.NEW); - fixture.setMatches(new Hashtable()); + fixture.setMatches(new Hashtable<String, String>()); String versionNo = ""; fixture.setVersionNo(versionNo); diff --git a/PolicyEngineAPI/src/test/java/org/openecomp/policy/std/test/StdPDPNotificationTest.java b/PolicyEngineAPI/src/test/java/org/openecomp/policy/std/test/StdPDPNotificationTest.java index 490120fb9..1bda0e59f 100644 --- a/PolicyEngineAPI/src/test/java/org/openecomp/policy/std/test/StdPDPNotificationTest.java +++ b/PolicyEngineAPI/src/test/java/org/openecomp/policy/std/test/StdPDPNotificationTest.java @@ -64,9 +64,9 @@ public class StdPDPNotificationTest { public void testGetLoadedPolicies_1() throws Exception { StdPDPNotification fixture = new StdPDPNotification(); - fixture.setRemovedPolicies(new LinkedList()); + fixture.setRemovedPolicies(new LinkedList<StdRemovedPolicy>()); fixture.setNotificationType(NotificationType.BOTH); - fixture.setLoadedPolicies(new LinkedList()); + fixture.setLoadedPolicies(new LinkedList<StdLoadedPolicy>()); Collection<LoadedPolicy> result = fixture.getLoadedPolicies(); @@ -86,9 +86,9 @@ public class StdPDPNotificationTest { public void testGetLoadedPolicies_2() throws Exception { StdPDPNotification fixture = new StdPDPNotification(); - fixture.setRemovedPolicies(new LinkedList()); + fixture.setRemovedPolicies(new LinkedList<StdRemovedPolicy>()); fixture.setNotificationType(NotificationType.BOTH); - fixture.setLoadedPolicies(new LinkedList()); + fixture.setLoadedPolicies(new LinkedList<StdLoadedPolicy>()); Collection<LoadedPolicy> result = fixture.getLoadedPolicies(); @@ -108,7 +108,7 @@ public class StdPDPNotificationTest { public void testGetLoadedPolicies_3() throws Exception { StdPDPNotification fixture = new StdPDPNotification(); - fixture.setRemovedPolicies(new LinkedList()); + fixture.setRemovedPolicies(new LinkedList<StdRemovedPolicy>()); fixture.setNotificationType(NotificationType.BOTH); fixture.setLoadedPolicies(null); @@ -129,9 +129,9 @@ public class StdPDPNotificationTest { public void testGetNotificationType_1() throws Exception { StdPDPNotification fixture = new StdPDPNotification(); - fixture.setRemovedPolicies(new LinkedList()); + fixture.setRemovedPolicies(new LinkedList<StdRemovedPolicy>()); fixture.setNotificationType(NotificationType.BOTH); - fixture.setLoadedPolicies(new LinkedList()); + fixture.setLoadedPolicies(new LinkedList<StdLoadedPolicy>()); NotificationType result = fixture.getNotificationType(); @@ -153,9 +153,9 @@ public class StdPDPNotificationTest { public void testGetRemovedPolicies_1() throws Exception { StdPDPNotification fixture = new StdPDPNotification(); - fixture.setRemovedPolicies(new LinkedList()); + fixture.setRemovedPolicies(new LinkedList<StdRemovedPolicy>()); fixture.setNotificationType(NotificationType.BOTH); - fixture.setLoadedPolicies(new LinkedList()); + fixture.setLoadedPolicies(new LinkedList<StdLoadedPolicy>()); Collection<RemovedPolicy> result = fixture.getRemovedPolicies(); @@ -175,9 +175,9 @@ public class StdPDPNotificationTest { public void testGetRemovedPolicies_2() throws Exception { StdPDPNotification fixture = new StdPDPNotification(); - fixture.setRemovedPolicies(new LinkedList()); + fixture.setRemovedPolicies(new LinkedList<StdRemovedPolicy>()); fixture.setNotificationType(NotificationType.BOTH); - fixture.setLoadedPolicies(new LinkedList()); + fixture.setLoadedPolicies(new LinkedList<StdLoadedPolicy>()); Collection<RemovedPolicy> result = fixture.getRemovedPolicies(); @@ -199,7 +199,7 @@ public class StdPDPNotificationTest { StdPDPNotification fixture = new StdPDPNotification(); fixture.setRemovedPolicies(null); fixture.setNotificationType(NotificationType.BOTH); - fixture.setLoadedPolicies(new LinkedList()); + fixture.setLoadedPolicies(new LinkedList<StdLoadedPolicy>()); Collection<RemovedPolicy> result = fixture.getRemovedPolicies(); @@ -218,9 +218,9 @@ public class StdPDPNotificationTest { public void testSetNotificationType_1() throws Exception { StdPDPNotification fixture = new StdPDPNotification(); - fixture.setRemovedPolicies(new LinkedList()); + fixture.setRemovedPolicies(new LinkedList<StdRemovedPolicy>()); fixture.setNotificationType(NotificationType.BOTH); - fixture.setLoadedPolicies(new LinkedList()); + fixture.setLoadedPolicies(new LinkedList<StdLoadedPolicy>()); NotificationType notificationType = NotificationType.BOTH; fixture.setNotificationType(notificationType); @@ -239,10 +239,10 @@ public class StdPDPNotificationTest { public void testSetRemovedPolicies_1() throws Exception { StdPDPNotification fixture = new StdPDPNotification(); - fixture.setRemovedPolicies(new LinkedList()); + fixture.setRemovedPolicies(new LinkedList<StdRemovedPolicy>()); fixture.setNotificationType(NotificationType.BOTH); - fixture.setLoadedPolicies(new LinkedList()); - Collection<StdRemovedPolicy> removedPolicies = new LinkedList(); + fixture.setLoadedPolicies(new LinkedList<StdLoadedPolicy>()); + Collection<StdRemovedPolicy> removedPolicies = new LinkedList<StdRemovedPolicy>(); fixture.setRemovedPolicies(removedPolicies); @@ -260,10 +260,10 @@ public class StdPDPNotificationTest { public void testSetUpdatedPolicies_1() throws Exception { StdPDPNotification fixture = new StdPDPNotification(); - fixture.setRemovedPolicies(new LinkedList()); + fixture.setRemovedPolicies(new LinkedList<StdRemovedPolicy>()); fixture.setNotificationType(NotificationType.BOTH); - fixture.setLoadedPolicies(new LinkedList()); - Collection<StdLoadedPolicy> updatedPolicies = new LinkedList(); + fixture.setLoadedPolicies(new LinkedList<StdLoadedPolicy>()); + Collection<StdLoadedPolicy> updatedPolicies = new LinkedList<StdLoadedPolicy>(); fixture.setLoadedPolicies(updatedPolicies); diff --git a/PolicyEngineAPI/src/test/java/org/openecomp/policy/std/test/StdPolicyConfigTest.java b/PolicyEngineAPI/src/test/java/org/openecomp/policy/std/test/StdPolicyConfigTest.java index 88a22c300..a34737477 100644 --- a/PolicyEngineAPI/src/test/java/org/openecomp/policy/std/test/StdPolicyConfigTest.java +++ b/PolicyEngineAPI/src/test/java/org/openecomp/policy/std/test/StdPolicyConfigTest.java @@ -55,14 +55,14 @@ public class StdPolicyConfigTest { StdPolicyConfig fixture = new StdPolicyConfig(); fixture.setConfigStatus("", PolicyConfigStatus.CONFIG_NOT_FOUND); fixture.setDocument((Document) null); - fixture.setResponseAttributes(new Hashtable()); + fixture.setResponseAttributes(new Hashtable<String, String>()); fixture.setPolicyVersion(""); fixture.setOther(""); fixture.setPolicyType(PolicyType.JSON); fixture.setPolicyName(""); fixture.setProperties(new Properties()); fixture.setJsonObject((JsonObject) null); - fixture.setMatchingConditions(new Hashtable()); + fixture.setMatchingConditions(new Hashtable<String, String>()); Map<String, String> result = fixture.getMatchingConditions(); @@ -84,14 +84,14 @@ public class StdPolicyConfigTest { StdPolicyConfig fixture = new StdPolicyConfig(); fixture.setConfigStatus("", PolicyConfigStatus.CONFIG_NOT_FOUND); fixture.setDocument((Document) null); - fixture.setResponseAttributes(new Hashtable()); + fixture.setResponseAttributes(new Hashtable<String, String>()); fixture.setPolicyVersion(""); fixture.setOther(""); fixture.setPolicyType(PolicyType.JSON); fixture.setPolicyName(""); fixture.setProperties(new Properties()); fixture.setJsonObject((JsonObject) null); - fixture.setMatchingConditions(new Hashtable()); + fixture.setMatchingConditions(new Hashtable<String, String>()); String result = fixture.getPolicyConfigMessage(); @@ -112,14 +112,14 @@ public class StdPolicyConfigTest { StdPolicyConfig fixture = new StdPolicyConfig(); fixture.setConfigStatus("", PolicyConfigStatus.CONFIG_NOT_FOUND); fixture.setDocument((Document) null); - fixture.setResponseAttributes(new Hashtable()); + fixture.setResponseAttributes(new Hashtable<String, String>()); fixture.setPolicyVersion(""); fixture.setOther(""); fixture.setPolicyType(PolicyType.JSON); fixture.setPolicyName(""); fixture.setProperties(new Properties()); fixture.setJsonObject((JsonObject) null); - fixture.setMatchingConditions(new Hashtable()); + fixture.setMatchingConditions(new Hashtable<String, String>()); PolicyConfigStatus result = fixture.getPolicyConfigStatus(); @@ -143,14 +143,14 @@ public class StdPolicyConfigTest { StdPolicyConfig fixture = new StdPolicyConfig(); fixture.setConfigStatus("", PolicyConfigStatus.CONFIG_NOT_FOUND); fixture.setDocument((Document) null); - fixture.setResponseAttributes(new Hashtable()); + fixture.setResponseAttributes(new Hashtable<String, String>()); fixture.setPolicyVersion(""); fixture.setOther(""); fixture.setPolicyType(PolicyType.JSON); fixture.setPolicyName(""); fixture.setProperties(new Properties()); fixture.setJsonObject((JsonObject) null); - fixture.setMatchingConditions(new Hashtable()); + fixture.setMatchingConditions(new Hashtable<String, String>()); String result = fixture.getPolicyName(); @@ -171,14 +171,14 @@ public class StdPolicyConfigTest { StdPolicyConfig fixture = new StdPolicyConfig(); fixture.setConfigStatus("", PolicyConfigStatus.CONFIG_NOT_FOUND); fixture.setDocument((Document) null); - fixture.setResponseAttributes(new Hashtable()); + fixture.setResponseAttributes(new Hashtable<String, String>()); fixture.setPolicyVersion(""); fixture.setOther(""); fixture.setPolicyType(PolicyType.JSON); fixture.setPolicyName((String) null); fixture.setProperties(new Properties()); fixture.setJsonObject((JsonObject) null); - fixture.setMatchingConditions(new Hashtable()); + fixture.setMatchingConditions(new Hashtable<String, String>()); String result = fixture.getPolicyName(); @@ -199,14 +199,14 @@ public class StdPolicyConfigTest { StdPolicyConfig fixture = new StdPolicyConfig(); fixture.setConfigStatus("", PolicyConfigStatus.CONFIG_NOT_FOUND); fixture.setDocument((Document) null); - fixture.setResponseAttributes(new Hashtable()); + fixture.setResponseAttributes(new Hashtable<String, String>()); fixture.setPolicyVersion(""); fixture.setOther(""); fixture.setPolicyType(PolicyType.JSON); fixture.setPolicyName(""); fixture.setProperties(new Properties()); fixture.setJsonObject((JsonObject) null); - fixture.setMatchingConditions(new Hashtable()); + fixture.setMatchingConditions(new Hashtable<String, String>()); String result = fixture.getPolicyName(); @@ -227,14 +227,14 @@ public class StdPolicyConfigTest { StdPolicyConfig fixture = new StdPolicyConfig(); fixture.setConfigStatus("", PolicyConfigStatus.CONFIG_NOT_FOUND); fixture.setDocument((Document) null); - fixture.setResponseAttributes(new Hashtable()); + fixture.setResponseAttributes(new Hashtable<String, String>()); fixture.setPolicyVersion(""); fixture.setOther(""); fixture.setPolicyType(PolicyType.JSON); fixture.setPolicyName(""); fixture.setProperties(new Properties()); fixture.setJsonObject((JsonObject) null); - fixture.setMatchingConditions(new Hashtable()); + fixture.setMatchingConditions(new Hashtable<String, String>()); String result = fixture.getPolicyVersion(); @@ -255,14 +255,14 @@ public class StdPolicyConfigTest { StdPolicyConfig fixture = new StdPolicyConfig(); fixture.setConfigStatus("", PolicyConfigStatus.CONFIG_NOT_FOUND); fixture.setDocument((Document) null); - fixture.setResponseAttributes(new Hashtable()); + fixture.setResponseAttributes(new Hashtable<String, String>()); fixture.setPolicyVersion(""); fixture.setOther(""); fixture.setPolicyType(PolicyType.JSON); fixture.setPolicyName(""); fixture.setProperties(new Properties()); fixture.setJsonObject((JsonObject) null); - fixture.setMatchingConditions(new Hashtable()); + fixture.setMatchingConditions(new Hashtable<String, String>()); Map<String, String> result = fixture.getResponseAttributes(); @@ -284,14 +284,14 @@ public class StdPolicyConfigTest { StdPolicyConfig fixture = new StdPolicyConfig(); fixture.setConfigStatus("", PolicyConfigStatus.CONFIG_NOT_FOUND); fixture.setDocument((Document) null); - fixture.setResponseAttributes(new Hashtable()); + fixture.setResponseAttributes(new Hashtable<String, String>()); fixture.setPolicyVersion(""); fixture.setOther(""); fixture.setPolicyType(PolicyType.JSON); fixture.setPolicyName(""); fixture.setProperties(new Properties()); fixture.setJsonObject((JsonObject) null); - fixture.setMatchingConditions(new Hashtable()); + fixture.setMatchingConditions(new Hashtable<String, String>()); PolicyType result = fixture.getType(); @@ -315,14 +315,14 @@ public class StdPolicyConfigTest { StdPolicyConfig fixture = new StdPolicyConfig(); fixture.setConfigStatus("", PolicyConfigStatus.CONFIG_NOT_FOUND); fixture.setDocument((Document) null); - fixture.setResponseAttributes(new Hashtable()); + fixture.setResponseAttributes(new Hashtable<String, String>()); fixture.setPolicyVersion(""); fixture.setOther(""); fixture.setPolicyType(PolicyType.JSON); fixture.setPolicyName(""); fixture.setProperties(new Properties()); fixture.setJsonObject((JsonObject) null); - fixture.setMatchingConditions(new Hashtable()); + fixture.setMatchingConditions(new Hashtable<String, String>()); String configStatus = ""; fixture.setConfigStatus(configStatus); @@ -343,14 +343,14 @@ public class StdPolicyConfigTest { StdPolicyConfig fixture = new StdPolicyConfig(); fixture.setConfigStatus("", PolicyConfigStatus.CONFIG_NOT_FOUND); fixture.setDocument((Document) null); - fixture.setResponseAttributes(new Hashtable()); + fixture.setResponseAttributes(new Hashtable<String, String>()); fixture.setPolicyVersion(""); fixture.setOther(""); fixture.setPolicyType(PolicyType.JSON); fixture.setPolicyName(""); fixture.setProperties(new Properties()); fixture.setJsonObject((JsonObject) null); - fixture.setMatchingConditions(new Hashtable()); + fixture.setMatchingConditions(new Hashtable<String, String>()); String configStatus = ""; PolicyConfigStatus policyConfigStatus = PolicyConfigStatus.CONFIG_NOT_FOUND; @@ -372,14 +372,14 @@ public class StdPolicyConfigTest { StdPolicyConfig fixture = new StdPolicyConfig(); fixture.setConfigStatus("", PolicyConfigStatus.CONFIG_NOT_FOUND); fixture.setDocument((Document) null); - fixture.setResponseAttributes(new Hashtable()); + fixture.setResponseAttributes(new Hashtable<String, String>()); fixture.setPolicyVersion(""); fixture.setOther(""); fixture.setPolicyType(PolicyType.JSON); fixture.setPolicyName(""); fixture.setProperties(new Properties()); fixture.setJsonObject((JsonObject) null); - fixture.setMatchingConditions(new Hashtable()); + fixture.setMatchingConditions(new Hashtable<String, String>()); Document document = null; fixture.setDocument(document); @@ -400,14 +400,14 @@ public class StdPolicyConfigTest { StdPolicyConfig fixture = new StdPolicyConfig(); fixture.setConfigStatus("", PolicyConfigStatus.CONFIG_NOT_FOUND); fixture.setDocument((Document) null); - fixture.setResponseAttributes(new Hashtable()); + fixture.setResponseAttributes(new Hashtable<String, String>()); fixture.setPolicyVersion(""); fixture.setOther(""); fixture.setPolicyType(PolicyType.JSON); fixture.setPolicyName(""); fixture.setProperties(new Properties()); fixture.setJsonObject((JsonObject) null); - fixture.setMatchingConditions(new Hashtable()); + fixture.setMatchingConditions(new Hashtable<String, String>()); JsonObject jsonObject = null; fixture.setJsonObject(jsonObject); @@ -428,15 +428,15 @@ public class StdPolicyConfigTest { StdPolicyConfig fixture = new StdPolicyConfig(); fixture.setConfigStatus("", PolicyConfigStatus.CONFIG_NOT_FOUND); fixture.setDocument((Document) null); - fixture.setResponseAttributes(new Hashtable()); + fixture.setResponseAttributes(new Hashtable<String, String>()); fixture.setPolicyVersion(""); fixture.setOther(""); fixture.setPolicyType(PolicyType.JSON); fixture.setPolicyName(""); fixture.setProperties(new Properties()); fixture.setJsonObject((JsonObject) null); - fixture.setMatchingConditions(new Hashtable()); - Map<String, String> matchingConditions = new Hashtable(); + fixture.setMatchingConditions(new Hashtable<String, String>()); + Map<String, String> matchingConditions = new Hashtable<String, String>(); fixture.setMatchingConditions(matchingConditions); @@ -456,14 +456,14 @@ public class StdPolicyConfigTest { StdPolicyConfig fixture = new StdPolicyConfig(); fixture.setConfigStatus("", PolicyConfigStatus.CONFIG_NOT_FOUND); fixture.setDocument((Document) null); - fixture.setResponseAttributes(new Hashtable()); + fixture.setResponseAttributes(new Hashtable<String, String>()); fixture.setPolicyVersion(""); fixture.setOther(""); fixture.setPolicyType(PolicyType.JSON); fixture.setPolicyName(""); fixture.setProperties(new Properties()); fixture.setJsonObject((JsonObject) null); - fixture.setMatchingConditions(new Hashtable()); + fixture.setMatchingConditions(new Hashtable<String, String>()); String other = ""; fixture.setOther(other); @@ -484,14 +484,14 @@ public class StdPolicyConfigTest { StdPolicyConfig fixture = new StdPolicyConfig(); fixture.setConfigStatus("", PolicyConfigStatus.CONFIG_NOT_FOUND); fixture.setDocument((Document) null); - fixture.setResponseAttributes(new Hashtable()); + fixture.setResponseAttributes(new Hashtable<String, String>()); fixture.setPolicyVersion(""); fixture.setOther(""); fixture.setPolicyType(PolicyType.JSON); fixture.setPolicyName(""); fixture.setProperties(new Properties()); fixture.setJsonObject((JsonObject) null); - fixture.setMatchingConditions(new Hashtable()); + fixture.setMatchingConditions(new Hashtable<String, String>()); PolicyConfigStatus policyConfigStatus = PolicyConfigStatus.CONFIG_NOT_FOUND; fixture.setPolicyConfigStatus(policyConfigStatus); @@ -512,14 +512,14 @@ public class StdPolicyConfigTest { StdPolicyConfig fixture = new StdPolicyConfig(); fixture.setConfigStatus("", PolicyConfigStatus.CONFIG_NOT_FOUND); fixture.setDocument((Document) null); - fixture.setResponseAttributes(new Hashtable()); + fixture.setResponseAttributes(new Hashtable<String, String>()); fixture.setPolicyVersion(""); fixture.setOther(""); fixture.setPolicyType(PolicyType.JSON); fixture.setPolicyName(""); fixture.setProperties(new Properties()); fixture.setJsonObject((JsonObject) null); - fixture.setMatchingConditions(new Hashtable()); + fixture.setMatchingConditions(new Hashtable<String, String>()); String policyName = ""; fixture.setPolicyName(policyName); @@ -540,14 +540,14 @@ public class StdPolicyConfigTest { StdPolicyConfig fixture = new StdPolicyConfig(); fixture.setConfigStatus("", PolicyConfigStatus.CONFIG_NOT_FOUND); fixture.setDocument((Document) null); - fixture.setResponseAttributes(new Hashtable()); + fixture.setResponseAttributes(new Hashtable<String, String>()); fixture.setPolicyVersion(""); fixture.setOther(""); fixture.setPolicyType(PolicyType.JSON); fixture.setPolicyName(""); fixture.setProperties(new Properties()); fixture.setJsonObject((JsonObject) null); - fixture.setMatchingConditions(new Hashtable()); + fixture.setMatchingConditions(new Hashtable<String, String>()); PolicyType policyType = PolicyType.JSON; fixture.setPolicyType(policyType); @@ -568,14 +568,14 @@ public class StdPolicyConfigTest { StdPolicyConfig fixture = new StdPolicyConfig(); fixture.setConfigStatus("", PolicyConfigStatus.CONFIG_NOT_FOUND); fixture.setDocument((Document) null); - fixture.setResponseAttributes(new Hashtable()); + fixture.setResponseAttributes(new Hashtable<String, String>()); fixture.setPolicyVersion(""); fixture.setOther(""); fixture.setPolicyType(PolicyType.JSON); fixture.setPolicyName(""); fixture.setProperties(new Properties()); fixture.setJsonObject((JsonObject) null); - fixture.setMatchingConditions(new Hashtable()); + fixture.setMatchingConditions(new Hashtable<String, String>()); String policyVersion = ""; fixture.setPolicyVersion(policyVersion); @@ -596,14 +596,14 @@ public class StdPolicyConfigTest { StdPolicyConfig fixture = new StdPolicyConfig(); fixture.setConfigStatus("", PolicyConfigStatus.CONFIG_NOT_FOUND); fixture.setDocument((Document) null); - fixture.setResponseAttributes(new Hashtable()); + fixture.setResponseAttributes(new Hashtable<String, String>()); fixture.setPolicyVersion(""); fixture.setOther(""); fixture.setPolicyType(PolicyType.JSON); fixture.setPolicyName(""); fixture.setProperties(new Properties()); fixture.setJsonObject((JsonObject) null); - fixture.setMatchingConditions(new Hashtable()); + fixture.setMatchingConditions(new Hashtable<String, String>()); Properties properties = new Properties(); fixture.setProperties(properties); @@ -624,15 +624,15 @@ public class StdPolicyConfigTest { StdPolicyConfig fixture = new StdPolicyConfig(); fixture.setConfigStatus("", PolicyConfigStatus.CONFIG_NOT_FOUND); fixture.setDocument((Document) null); - fixture.setResponseAttributes(new Hashtable()); + fixture.setResponseAttributes(new Hashtable<String, String>()); fixture.setPolicyVersion(""); fixture.setOther(""); fixture.setPolicyType(PolicyType.JSON); fixture.setPolicyName(""); fixture.setProperties(new Properties()); fixture.setJsonObject((JsonObject) null); - fixture.setMatchingConditions(new Hashtable()); - Map<String, String> responseAttributes = new Hashtable(); + fixture.setMatchingConditions(new Hashtable<String, String>()); + Map<String, String> responseAttributes = new Hashtable<String, String>(); fixture.setResponseAttributes(responseAttributes); @@ -652,14 +652,14 @@ public class StdPolicyConfigTest { StdPolicyConfig fixture = new StdPolicyConfig(); fixture.setConfigStatus("", PolicyConfigStatus.CONFIG_NOT_FOUND); fixture.setDocument((Document) null); - fixture.setResponseAttributes(new Hashtable()); + fixture.setResponseAttributes(new Hashtable<String, String>()); fixture.setPolicyVersion(""); fixture.setOther(""); fixture.setPolicyType(PolicyType.JSON); fixture.setPolicyName(""); fixture.setProperties(new Properties()); fixture.setJsonObject((JsonObject) null); - fixture.setMatchingConditions(new Hashtable()); + fixture.setMatchingConditions(new Hashtable<String, String>()); JsonObject result = fixture.toJSON(); @@ -680,14 +680,14 @@ public class StdPolicyConfigTest { StdPolicyConfig fixture = new StdPolicyConfig(); fixture.setConfigStatus("", PolicyConfigStatus.CONFIG_NOT_FOUND); fixture.setDocument((Document) null); - fixture.setResponseAttributes(new Hashtable()); + fixture.setResponseAttributes(new Hashtable<String, String>()); fixture.setPolicyVersion(""); fixture.setOther(""); fixture.setPolicyType(PolicyType.JSON); fixture.setPolicyName(""); fixture.setProperties(new Properties()); fixture.setJsonObject((JsonObject) null); - fixture.setMatchingConditions(new Hashtable()); + fixture.setMatchingConditions(new Hashtable<String, String>()); String result = fixture.toOther(); @@ -708,14 +708,14 @@ public class StdPolicyConfigTest { StdPolicyConfig fixture = new StdPolicyConfig(); fixture.setConfigStatus("", PolicyConfigStatus.CONFIG_NOT_FOUND); fixture.setDocument((Document) null); - fixture.setResponseAttributes(new Hashtable()); + fixture.setResponseAttributes(new Hashtable<String, String>()); fixture.setPolicyVersion(""); fixture.setOther(""); fixture.setPolicyType(PolicyType.JSON); fixture.setPolicyName(""); fixture.setProperties(new Properties()); fixture.setJsonObject((JsonObject) null); - fixture.setMatchingConditions(new Hashtable()); + fixture.setMatchingConditions(new Hashtable<String, String>()); Properties result = fixture.toProperties(); @@ -737,14 +737,14 @@ public class StdPolicyConfigTest { StdPolicyConfig fixture = new StdPolicyConfig(); fixture.setConfigStatus("", PolicyConfigStatus.CONFIG_NOT_FOUND); fixture.setDocument((Document) null); - fixture.setResponseAttributes(new Hashtable()); + fixture.setResponseAttributes(new Hashtable<String, String>()); fixture.setPolicyVersion(""); fixture.setOther(""); fixture.setPolicyType(PolicyType.JSON); fixture.setPolicyName("test"); fixture.setProperties(new Properties()); fixture.setJsonObject((JsonObject) null); - fixture.setMatchingConditions(new Hashtable()); + fixture.setMatchingConditions(new Hashtable<String, String>()); String result = fixture.toString(); @@ -765,14 +765,14 @@ public class StdPolicyConfigTest { StdPolicyConfig fixture = new StdPolicyConfig(); fixture.setConfigStatus("", PolicyConfigStatus.CONFIG_NOT_FOUND); fixture.setDocument((Document) null); - fixture.setResponseAttributes(new Hashtable()); + fixture.setResponseAttributes(new Hashtable<String, String>()); fixture.setPolicyVersion(""); fixture.setOther(""); fixture.setPolicyType(PolicyType.JSON); fixture.setPolicyName(""); fixture.setProperties(new Properties()); fixture.setJsonObject((JsonObject) null); - fixture.setMatchingConditions(new Hashtable()); + fixture.setMatchingConditions(new Hashtable<String, String>()); Document result = fixture.toXML(); diff --git a/PolicyEngineAPI/src/test/java/org/openecomp/policy/std/test/StdPolicyEngineTest.java b/PolicyEngineAPI/src/test/java/org/openecomp/policy/std/test/StdPolicyEngineTest.java deleted file mode 100644 index c2fee2f0e..000000000 --- a/PolicyEngineAPI/src/test/java/org/openecomp/policy/std/test/StdPolicyEngineTest.java +++ /dev/null @@ -1,1002 +0,0 @@ -/*- - * ============LICENSE_START======================================================= - * PolicyEngineAPI - * ================================================================================ - * Copyright (C) 2017 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 - * - * 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.openecomp.policy.std.test; - -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertNotNull; -import static org.junit.Assert.assertNull; -import static org.junit.Assert.assertTrue; - -import java.io.BufferedReader; -import java.io.File; -import java.io.FileReader; -import java.io.IOException; -import java.io.StringReader; -import java.nio.file.Path; -import java.nio.file.Paths; -import java.util.ArrayList; -import java.util.Collection; -import java.util.HashMap; -import java.util.HashSet; -import java.util.Map; -import java.util.UUID; - -import javax.json.Json; -import javax.json.JsonObject; -import javax.json.JsonReader; - -import org.junit.After; -import org.junit.Before; -import org.junit.Test; -import org.mockito.Mockito; -import org.openecomp.policy.api.AttributeType; -import org.openecomp.policy.api.ConfigRequestParameters; -import org.openecomp.policy.api.DecisionRequestParameters; -import org.openecomp.policy.api.DecisionResponse; -import org.openecomp.policy.api.DeletePolicyCondition; -import org.openecomp.policy.api.DeletePolicyParameters; -import org.openecomp.policy.api.DictionaryParameters; -import org.openecomp.policy.api.DictionaryType; -import org.openecomp.policy.api.EventRequestParameters; -import org.openecomp.policy.api.ImportParameters; -import org.openecomp.policy.api.NotificationHandler; -import org.openecomp.policy.api.NotificationScheme; -import org.openecomp.policy.api.PolicyChangeResponse; -import org.openecomp.policy.api.PolicyClass; -import org.openecomp.policy.api.PolicyConfig; -import org.openecomp.policy.api.PolicyConfigStatus; -import org.openecomp.policy.api.PolicyConfigType; -import org.openecomp.policy.api.PolicyDecision; -import org.openecomp.policy.api.PolicyParameters; -import org.openecomp.policy.api.PolicyResponse; -import org.openecomp.policy.api.PolicyType; -import org.openecomp.policy.api.PushPolicyParameters; -import org.openecomp.policy.api.ImportParameters.IMPORT_TYPE; -import org.openecomp.policy.std.StdDecisionResponse; -import org.openecomp.policy.std.StdPolicyChangeResponse; -import org.openecomp.policy.std.StdPolicyConfig; -import org.openecomp.policy.std.StdPolicyEngine; -import org.openecomp.policy.std.StdPolicyResponse; - -import org.openecomp.policy.common.logging.flexlogger.FlexLogger; -import org.openecomp.policy.common.logging.flexlogger.Logger; - -/** - * The class <code>StdPolicyEngineTest</code> contains tests for the class <code>{@link StdPolicyEngine}</code>. - * - * @generatedBy CodePro at 6/3/16 2:03 PM - * @version $Revision: 1.0 $ - */ -public class StdPolicyEngineTest { - - private static final Logger logger = FlexLogger.getLogger(StdPolicyEngine.class); - - private StdPolicyEngine fixture = null; - private StdPolicyEngine mockEngine = null; - - PolicyChangeResponse result = null; - StdPolicyChangeResponse response = new StdPolicyChangeResponse(); - PolicyParameters policyParameters = new PolicyParameters(); - String json = null; - - /** - * Perform pre-test initialization. - * - * @throws Exception - * if the initialization fails for some reason - * - * @generatedBy CodePro at 6/3/16 2:03 PM - */ - @Before - public void setUp() - throws Exception { - fixture = new StdPolicyEngine("Test/config_pass.properties"); - - //Mocks - mockEngine = Mockito.mock(StdPolicyEngine.class); - } - - private static JsonObject buildJSON(String jsonString) { - JsonObject json = null;; - if (jsonString != null) { - StringReader in = null; - - in = new StringReader(jsonString); - - JsonReader jsonReader = Json.createReader(in); - json = jsonReader.readObject(); - } - - return json; - } - - //Reads a File and converts into a String. - private static String readFile( String file ) throws IOException { - BufferedReader reader = new BufferedReader( new FileReader (file)); - String line = null; - StringBuilder stringBuilder = new StringBuilder(); - String ls = System.getProperty("line.separator"); - - try { - while( ( line = reader.readLine() ) != null ) { - stringBuilder.append( line ); - stringBuilder.append( ls ); - } - - return stringBuilder.toString(); - } finally { - reader.close(); - } - } - - /** - * Run the StdPolicyEngine(String) constructor test. - * - * @throws Exception - * - * @generatedBy CodePro at 6/3/16 2:03 PM - */ - @Test - public void testStdPolicyEngine() - throws Exception { - String propertyFilePath = "Test/config_pass.properties"; - - StdPolicyEngine result = new StdPolicyEngine(propertyFilePath); - - assertNotNull(result); - } - - /** - * Run the StdPolicyEngine(String) constructor test. - * - * @throws Exception - * - * @generatedBy CodePro at 6/3/16 2:03 PM - */ -/* @Test - public void testStdPolicyEngine_2() - throws Exception { - String propertyFilePath = "http"; - - StdPolicyEngine result = new StdPolicyEngine(propertyFilePath); - - assertNull(result); - } -*/ - /** - * Run the StdPolicyEngine(String,NotificationScheme) constructor test. - * - * @throws Exception - * - * @generatedBy CodePro at 6/3/16 2:03 PM - */ - @Test - public void testStdPolicyEngine_3() - throws Exception { - String propertyFilePath = "Test/config_pass.properties"; - NotificationScheme scheme = NotificationScheme.AUTO_ALL_NOTIFICATIONS; - - StdPolicyEngine result = new StdPolicyEngine(propertyFilePath, scheme); - - assertNotNull(result); - } - - /** - * Run the StdPolicyEngine(String,NotificationScheme) constructor test. - * - * @throws Exception - * - * @generatedBy CodePro at 6/3/16 2:03 PM - */ -/* @Test - public void testStdPolicyEngine_4() - throws Exception { - String propertyFilePath = "http"; - NotificationScheme scheme = NotificationScheme.AUTO_ALL_NOTIFICATIONS; - - StdPolicyEngine result = new StdPolicyEngine(propertyFilePath, scheme); - - // add additional test code here - // An unexpected exception was thrown in user code while executing this test: - // java.lang.NoClassDefFoundError: Could not initialize class org.openecomp.policy.std.StdPolicyEngine - assertNull(result); - }*/ - - /** - * Run the StdPolicyEngine(String,NotificationScheme,NotificationHandler) constructor test. - * - * @throws Exception - * - * @generatedBy CodePro at 6/3/16 2:03 PM - */ -/* @Test - public void testStdPolicyEngine_5() - throws Exception { - String propertyFilePath = "Test/config_pass.properties"; - NotificationScheme scheme = NotificationScheme.AUTO_ALL_NOTIFICATIONS; - NotificationHandler handler = new Handler(); - - StdPolicyEngine result = new StdPolicyEngine(propertyFilePath, scheme, handler); - - assertNull(result); - }*/ - - /** - * Run the StdPolicyEngine(String,NotificationScheme,NotificationHandler) constructor test. - * - * @throws Exception - * - * @generatedBy CodePro at 6/3/16 2:03 PM - */ -/* @Test - public void testStdPolicyEngine_6() - throws Exception { - String propertyFilePath = "http"; - NotificationScheme scheme = NotificationScheme.AUTO_ALL_NOTIFICATIONS; - NotificationHandler handler = new Handler(); - - StdPolicyEngine result = new StdPolicyEngine(propertyFilePath, scheme, handler); - - assertNull(result); - } -*/ - /** - * Run the StdPolicyEngine(List<String>,List<String>,List<String>,List<String>,NotificationScheme,NotificationHandler,String) constructor test. - * - * @throws Exception - * - * @generatedBy CodePro at 6/3/16 2:03 PM - */ -/* @Test - public void testStdPolicyEngine_8() - throws Exception { - List<String> configURL = new LinkedList(); - List<String> configPapURL = new LinkedList(); - List<String> encodingPAP = new LinkedList(); - List<String> encoding = new LinkedList(); - NotificationScheme scheme = NotificationScheme.AUTO_ALL_NOTIFICATIONS; - NotificationHandler handler = new Handler(); - String clientAuth = "TEST"; - - StdPolicyEngine result = new StdPolicyEngine(configURL, configPapURL, encodingPAP, encoding, scheme, handler, clientAuth); - - // add additional test code here - // An unexpected exception was thrown in user code while executing this test: - // java.lang.NoClassDefFoundError: Could not initialize class org.openecomp.policy.std.StdPolicyEngine - assertNull(result); - } -*/ - /** - * Run the Collection<PolicyConfig> config(ConfigRequestParameters) method test. - * - * @throws Exception - * - * @generatedBy CodePro at 6/3/16 2:03 PM - */ - @Test - public void testConfig() - throws Exception { - String configMessage = "Error in Calling the Configuration URL java.lang.Exception: PE500 - Process Flow Issue: Cannot open a connection to the configURL"; - PolicyConfigStatus configStatus = PolicyConfigStatus.CONFIG_NOT_FOUND; - String policyName = "JunitTest.Config_testing"; - String policyVersion = "1"; - - ConfigRequestParameters configRequestParameters = new ConfigRequestParameters(); - configRequestParameters.setPolicyName(".*"); - Collection<PolicyConfig> result = fixture.config(configRequestParameters); - - //assertEquals(response, result); - for(PolicyConfig policyConfig: result){ - assertEquals(policyName, policyConfig.getPolicyName()); - assertEquals(policyVersion, policyConfig.getPolicyVersion()); - assertEquals(configStatus, policyConfig.getPolicyConfigStatus()); - assertEquals(configMessage, policyConfig.getPolicyConfigMessage()); - } - } - - - /** - * Run the Collection<String> listConfig(ConfigRequestParameters) method test. - * - * @throws Exception - * - */ - @Test - public void testListConfig() - throws Exception { - - Collection<String> response = new ArrayList<String>(); - response.add("Policy Name: listConfigTest"); - - ConfigRequestParameters configRequestParameters = new ConfigRequestParameters(); - configRequestParameters.setPolicyName(".*"); - Collection<String> result = fixture.listConfig(configRequestParameters); - - assertEquals(result, response); - } - - /** - * Run the String copyFile(String,String,StdPAPPolicy,String,UUID) method test. - * - * @throws Exception - * - * @generatedBy CodePro at 6/3/16 2:03 PM - */ -/* @Test - public void testCopyFile() - throws Exception { - String policyId = "test.testing"; - String group = "default"; - URI selectedURI = null; - StdPDPPolicy policy = new StdPDPPolicy("testing", true, "test", selectedURI, true, "test", "testing", "1"); - StdPAPPolicy location = new StdPAPPolicy(policy.getLocation()); - String clientScope = "Config"; - UUID requestID = UUID.randomUUID(); - - String result = fixture.copyFile(policyId, group, location, clientScope, requestID); - - assertNotNull(result); - }*/ - - /** - * Run the String copyPolicy(PDPPolicy,String,String,UUID) method test. - * - * @throws Exception - * - * @generatedBy CodePro at 6/3/16 2:03 PM - */ -/* @Test - public void testCopyPolicy() - throws Exception { - //StdPolicyEngine fixture = new StdPolicyEngine("http", NotificationScheme.AUTO_ALL_NOTIFICATIONS, (NotificationHandler) null); - URI selectedURI = null; - - StdPDPPolicy policy = new StdPDPPolicy("testing", true, "test", selectedURI, true, "test", "testing", "1"); - String group = "default"; - String policyType = "Base"; - UUID requestID = UUID.randomUUID(); - - String result = fixture.copyPolicy(policy, group, policyType, requestID); - - assertNotNull(result); - } -*/ - /** - * Run the String createConfigFirewallPolicy(String,JsonObject,String,UUID) method test. - * - * @throws Exception - * - * @generatedBy CodePro at 6/3/16 2:03 PM - */ - @Test - public void testCreateConfigFirewallPolicy() - throws Exception { - - response.setResponseMessage("success"); - PolicyParameters policyParameters = new PolicyParameters(); - policyParameters.setPolicyConfigType(PolicyConfigType.Firewall); - - String json= "{\"serviceTypeId\": \"/v0/firewall/pan\",\"configName\": \"rule1607\",\"deploymentOption\":{\"deployNow\": false},\"securityZoneId\": \"/v0/firewall/pan\",\"serviceGroups\": [{\"name\": \"1607Group\",\"description\": null,\"members\": [{\"type\": \"REFERENCE\",\"name\": \"SList\"},{\"type\": \"REFERENCE\",\"name\": \"Syslog\"}]}, {\"name\": \"Syslog\",\"description\": \"NA\",\"type\": \"SERVICE\",\"transportProtocol\": \"udp\",\"appProtocol\": null,\"ports\": \"514\"}, {\"name\": \"SList\",\"description\": \"Service List\",\"type\": \"SERVICE\",\"transportProtocol\": \"tcp\",\"appProtocol\": null,\"ports\": \"8080\"}],\"addressGroups\": [{\"name\": \"1607Group\",\"description\": null,\"members\": [{\"type\": \"REFERENCE\",\"name\": \"10.11.12.13/14\"},{\"type\": \"REFERENCE\",\"name\": \"10.11.12.13/14\"}]},{\"name\": \"PL_CCE3\",\"description\": \"CCE Routers\",\"members\":[{\"type\": \"REFERENCE\",\"name\": \"10.11.12.13/14\"}]}],\"firewallRuleList\": [{\"position\": \"1\",\"ruleName\": \"1607Rule\",\"fromZones\": [\"Trusted\"],\"toZones\": [\"Untrusted\"],\"negateSource\": false,\"negateDestination\": false,\"sourceList\": [{\"type\": \"REFERENCE\",\"name\": \"PL_CCE3\"}, {\"type\": \"REFERENCE\",\"name\": \"1607Group\"}],\"destinationList\": [{\"type\": \"REFERENCE\",\"name\": \"1607Group\"}],\"sourceServices\": [],\"destServices\": [{\"type\": \"REFERENCE\",\"name\": \"1607Group\"}],\"action\": \"accept\",\"description\": \"Rule for 1607 templates\",\"enabled\": true,\"log\": true}]}"; - policyParameters.setConfigBody(json); - policyParameters.setPolicyName("test.testing"); - - PolicyChangeResponse result = fixture.createPolicy(policyParameters); - - assertEquals(response.getResponseMessage(), result.getResponseMessage()); - } - - /** - * Run the String createConfigPolicy(String,String,String,String,Map<String,String>,String,String,String,UUID) method test. - * - * @throws Exception - * - * @generatedBy CodePro at 6/3/16 2:03 PM - */ - @Test - public void testCreateConfigPolicy() - throws Exception { - response.setResponseMessage("success"); - PolicyParameters policyParameters = new PolicyParameters(); - policyParameters.setPolicyConfigType(PolicyConfigType.Base); - policyParameters.setPolicyName("test.junittest"); - policyParameters.setPolicyDescription("testing junit"); - policyParameters.setEcompName("test"); - policyParameters.setConfigName("testname"); - Map<String, String> configAttributes = new HashMap<String, String>(); - configAttributes.put("Template", "SampleTemplate"); - configAttributes.put("controller", "default"); - configAttributes.put("SamPoll", "30"); - configAttributes.put("value", "abcd"); - Map<AttributeType, Map<String,String>> attributes = new HashMap<AttributeType, Map<String,String>>(); - attributes.put(AttributeType.MATCHING, configAttributes); - policyParameters.setAttributes(attributes); - policyParameters.setRequestID(UUID.randomUUID()); - policyParameters.setConfigBodyType(PolicyType.OTHER); - policyParameters.setConfigBody("test"); - - PolicyChangeResponse result = fixture.createPolicy(policyParameters); - - assertEquals(response.getResponseMessage(), result.getResponseMessage()); - } - - - /** - * Run the String createUpdateActionPolicy(String,String,Map<String,String>,List<String>,List<String>,List<String>,List<String>,String,String,String,Boolean,UUID) method test. - * - * @throws Exception - * - * @generatedBy CodePro at 6/3/16 2:03 PM - */ - @Test - public void testCreateUpdateActionPolicy_Create() - throws Exception { - response.setResponseMessage("success"); - PolicyParameters policyParameters = new PolicyParameters(); - policyParameters.setPolicyClass(PolicyClass.Action); - policyParameters.setPolicyName("test.junittest"); - policyParameters.setPolicyDescription("testing"); - Map<String, String> configAttributes = new HashMap<String, String>(); - configAttributes.put("Template", "UpdateTemplate"); - configAttributes.put("controller", "default"); - configAttributes.put("SamPoll", "30"); - configAttributes.put("value", "abcd"); - Map<AttributeType, Map<String,String>> attributes = new HashMap<AttributeType, Map<String,String>>(); - attributes.put(AttributeType.MATCHING, configAttributes); - policyParameters.setAttributes(attributes); - policyParameters.setActionPerformer("PDP"); - policyParameters.setActionAttribute("test"); - - PolicyChangeResponse result = fixture.createPolicy(policyParameters); - - assertEquals(response.getResponseMessage(), result.getResponseMessage()); - } - - /** - * Run the String createUpdateActionPolicy(String,String,Map<String,String>,List<String>,List<String>,List<String>,List<String>,String,String,String,Boolean,UUID) method test. - * - * @throws Exception - * - * @generatedBy CodePro at 6/3/16 2:03 PM - */ - @Test - public void testCreateUpdateActionPolicy_Update() - throws Exception { - response.setResponseMessage("success"); - PolicyParameters policyParameters = new PolicyParameters(); - policyParameters.setPolicyClass(PolicyClass.Action); - policyParameters.setPolicyName("test.junittest"); - policyParameters.setPolicyDescription("testing"); - Map<String, String> configAttributes = new HashMap<String, String>(); - configAttributes.put("Template", "UpdateTemplate"); - configAttributes.put("controller", "default"); - configAttributes.put("SamPoll", "30"); - configAttributes.put("value", "abcd"); - Map<AttributeType, Map<String,String>> attributes = new HashMap<AttributeType, Map<String,String>>(); - attributes.put(AttributeType.MATCHING, configAttributes); - policyParameters.setAttributes(attributes); - policyParameters.setActionPerformer("PDP"); - policyParameters.setActionAttribute("test"); - - PolicyChangeResponse result = fixture.updatePolicy(policyParameters); - - assertEquals(response.getResponseMessage(), result.getResponseMessage()); - } - - - /** - * Run the String createUpdateBRMSParamPolicy(String,String,Map<AttributeType,Map<String,String>>,String,String,Boolean,UUID,Map<AttributeType,Map<String,String>>) method test. - * - * @throws Exception - * - * @generatedBy CodePro at 6/3/16 2:03 PM - */ - @Test - public void testCreateUpdateBRMSParamPolicy_Create() - throws Exception { - response.setResponseMessage("success"); - PolicyParameters policyParameters = new PolicyParameters(); - policyParameters.setPolicyConfigType(PolicyConfigType.BRMS_PARAM); - policyParameters.setPolicyName("test.testing"); - policyParameters.setPolicyDescription("testing"); - Map<String, String> ruleAttributes = new HashMap<String, String>(); - ruleAttributes.put("templateName", "Sample"); // This sampleTemplate is the Template name from dictionary. - ruleAttributes.put("controller", "default"); // Set Rule to a PDP Controller, default is the controller name. - ruleAttributes.put("SamPoll", "300"); // Template specific key and value set by us. - ruleAttributes.put("value", "abcd"); // Template specific key and value set by us. - Map<AttributeType, Map<String, String>> attributes = new HashMap<AttributeType, Map<String, String>>(); - attributes.put(AttributeType.RULE, ruleAttributes); - policyParameters.setAttributes(attributes); - - PolicyChangeResponse result = fixture.createPolicy(policyParameters); - - assertEquals(response.getResponseMessage(), result.getResponseMessage()); - } - - /** - * Run the String createUpdateBRMSParamPolicy(String,String,Map<AttributeType,Map<String,String>>,String,String,Boolean,UUID,Map<AttributeType,Map<String,String>>) method test. - * - * @throws Exception - * - * @generatedBy CodePro at 6/3/16 2:03 PM - */ - @Test - public void testCreateUpdateBRMSParamPolicy_Update() - throws Exception { - response.setResponseMessage("success"); - PolicyParameters policyParameters = new PolicyParameters(); - policyParameters.setPolicyConfigType(PolicyConfigType.BRMS_PARAM); - policyParameters.setPolicyName("test.testing"); - policyParameters.setPolicyDescription("testing"); - Map<String, String> ruleAttributes = new HashMap<String, String>(); - ruleAttributes.put("templateName", "Sample"); // This sampleTemplate is the Template name from dictionary. - ruleAttributes.put("controller", "default"); // Set Rule to a PDP Controller, default is the controller name. - ruleAttributes.put("SamPoll", "300"); // Template specific key and value set by us. - ruleAttributes.put("value", "abcd"); // Template specific key and value set by us. - Map<AttributeType, Map<String, String>> attributes = new HashMap<AttributeType, Map<String, String>>(); - attributes.put(AttributeType.RULE, ruleAttributes); - policyParameters.setAttributes(attributes); - - PolicyChangeResponse result = fixture.updatePolicy(policyParameters); - - assertEquals(response.getResponseMessage(), result.getResponseMessage()); - } - - /** - * Run the String createUpdateBRMSRawPolicy(String,String,Map<AttributeType,Map<String,String>>,String,String,Boolean,UUID) method test. - * - * @throws Exception - * - * @generatedBy CodePro at 6/3/16 2:03 PM - */ - @Test - public void testCreateUpdateBRMSRawPolicy_Create() - throws Exception { - response.setResponseMessage("success"); - PolicyParameters policyParameters = new PolicyParameters(); - policyParameters.setPolicyConfigType(PolicyConfigType.BRMS_PARAM); - policyParameters.setPolicyName("test.testing"); - policyParameters.setPolicyDescription("testing"); - Map<String, String> attrib= new HashMap<String,String>(); - attrib.put("cpu","80"); - attrib.put("memory", "50"); - Map<AttributeType, Map<String, String>> attributes = new HashMap<AttributeType, Map<String, String>>(); - attributes.put(AttributeType.RULE, attrib); - - policyParameters.setAttributes(attributes); - - File rawBodyFile = null; - Path file = Paths.get("Test/test.Config_BRMS_Raw_TestBrmsPolicy.1.txt"); - rawBodyFile = file.toFile(); - - policyParameters.setConfigBody(readFile(rawBodyFile.toString())); - - PolicyChangeResponse result = fixture.updatePolicy(policyParameters); - - assertEquals(response.getResponseMessage(), result.getResponseMessage()); - } - - /** - * Run the PolicyChangeResponse createDictionaryItem(DictionaryParameters) method test. - * - * @throws Exception - * - */ - @Test - public void testCreateDictionaryItem() throws Exception { - response.setResponseMessage("success"); - DictionaryParameters parameters = new DictionaryParameters(); - - parameters.setDictionaryType(DictionaryType.Common); - parameters.setDictionary("Attribute"); - - Map<String,String> fields = new HashMap<String,String>(); - fields.put("ATTRIBUTEID", "A5:"); - fields.put("DATATYPE", "user"); - fields.put("DESCRIPTION", "testing something"); - fields.put("ATTRIBUTEVALUE", "1,2,A,B"); - fields.put("PRIORITY", "High"); - Map<AttributeType, Map<String,String>> dictionaryFields = new HashMap<AttributeType, Map<String,String>>(); - dictionaryFields.put(AttributeType.DICTIONARY, fields); - - parameters.setDictionaryFields(dictionaryFields); - - PolicyChangeResponse result = fixture.createDictionaryItem(parameters); - - assertEquals(response.getResponseMessage(), result.getResponseMessage()); - } - - - /** - * Run the PolicyDecision decide(DecisionRequestParameters) method test. - * - * @throws Exception - * - * @generatedBy CodePro at 6/3/16 2:03 PM - */ - @Test - public void testDecide() - throws Exception { - //StdPolicyEngine fixture = new StdPolicyEngine("http", NotificationScheme.AUTO_ALL_NOTIFICATIONS, (NotificationHandler) null); - StdDecisionResponse response = new StdDecisionResponse(); - response.setDecision(PolicyDecision.PERMIT); - - DecisionRequestParameters decisionRequestParameters = new DecisionRequestParameters(); - decisionRequestParameters.setECOMPComponentName("testEcompName"); - Map<String,String> decisionAttributes = new HashMap<String,String>(); - decisionAttributes.put("key", "value"); - decisionRequestParameters.setDecisionAttributes(decisionAttributes); - decisionRequestParameters.setRequestID(UUID.randomUUID()); - - Mockito.when(mockEngine.decide(decisionRequestParameters)).thenReturn(response); - DecisionResponse result = mockEngine.decide(decisionRequestParameters); - - assertNotNull(result); - } - - /** - * Run the PolicyChangeResponse deletePolicy(DeletePolicyParameters) method test. - * - * @throws Exception - * - * @generatedBy CodePro at 6/3/16 2:03 PM - */ - @Test - public void testDeletePolicy() - throws Exception { - response.setResponseMessage("success"); - DeletePolicyParameters parameters = new DeletePolicyParameters(); - parameters.setDeleteCondition(DeletePolicyCondition.ALL); - parameters.setPolicyComponent("PAP"); - parameters.setPolicyName("testing.Config_junittest.1.xml"); - - PolicyChangeResponse result = fixture.deletePolicy(parameters); - - assertNotNull(result); - } - - /** - * Run the Collection<PolicyResponse> event(EventRequestParameters) method test. - * - * @throws Exception - * - * @generatedBy CodePro at 6/3/16 2:03 PM - */ - @Test - public void testEvent() - throws Exception { - - //StdPolicyEngine fixture = new StdPolicyEngine("http", NotificationScheme.AUTO_ALL_NOTIFICATIONS, (NotificationHandler) null); - StdPolicyResponse response = new StdPolicyResponse(); - response.setPolicyResponseMessage("tested"); - Collection<PolicyResponse> mockResult = new HashSet<PolicyResponse>(); - mockResult.add(response); - StdPolicyEngine mockEngine = Mockito.mock(StdPolicyEngine.class); - - Map<String,String> eventAttributes = new HashMap<String,String>(); - eventAttributes.put("key", "test"); - EventRequestParameters eventRequestParameters = new EventRequestParameters(eventAttributes, UUID.randomUUID()); - Mockito.when(mockEngine.event(eventRequestParameters)).thenReturn(mockResult); - - Collection<PolicyResponse> result = mockEngine.event(eventRequestParameters); - - assertEquals(result, mockResult); - } - - /** - * Run the PDPNotification getNotification() method test. - * - * @throws Exception - * - * @generatedBy CodePro at 6/3/16 2:03 PM - */ -/* @Test - public void testGetNotification() - throws Exception { - //StdPolicyEngine fixture = new StdPolicyEngine("http", NotificationScheme.AUTO_ALL_NOTIFICATIONS, (NotificationHandler) null); - - PDPNotification result = fixture.getNotification(); - - assertNull(result); - }*/ - - /** - * Run the NotificationHandler getNotificationHandler() method test. - * - * @throws Exception - * - * @generatedBy CodePro at 6/3/16 2:03 PM - */ - @Test - public void testGetNotificationHandler() - throws Exception { - //StdPolicyEngine fixture = new StdPolicyEngine("http", NotificationScheme.AUTO_ALL_NOTIFICATIONS, (NotificationHandler) null); - - NotificationHandler result = fixture.getNotificationHandler(); - - assertNull(result); - } - - /** - * Run the String getPAPURL() method test. - * - * @throws Exception - * - * @generatedBy CodePro at 6/3/16 2:03 PM - */ - @Test - public void testGetPAPURL() - throws Exception { - - String result = StdPolicyEngine.getPAPURL(); - - assertNotNull(result); - } - - /** - * Run the String getPDPURL() method test. - * - * @throws Exception - * - * @generatedBy CodePro at 6/3/16 2:03 PM - */ - @Test - public void testGetPDPURL() - throws Exception { - - String result = StdPolicyEngine.getPDPURL(); - - assertNotNull(result); - } - - /** - * Run the NotificationScheme getScheme() method test. - * - * @throws Exception - * - * @generatedBy CodePro at 6/3/16 2:03 PM - */ - @Test - public void testGetScheme() - throws Exception { - //StdPolicyEngine fixture = new StdPolicyEngine("http", NotificationScheme.AUTO_ALL_NOTIFICATIONS, (NotificationHandler) null); - - NotificationScheme result = fixture.getScheme(); - - assertNull(result); - } - - /** - * Run the boolean isJSONValid(String) method test. - * - * @throws Exception - * - * @generatedBy CodePro at 6/3/16 2:03 PM - */ - @Test - public void testIsJSONValid() - throws Exception { - String data = "{\"test\": \"testing\"}"; - - boolean result = StdPolicyEngine.isJSONValid(data); - - assertTrue(result); - } - - /** - * Run the void notification(NotificationScheme,NotificationHandler) method test. - * - * @throws Exception - * - * @generatedBy CodePro at 6/3/16 2:03 PM - */ -/* @Test - public void testNotification() - throws Exception { - //StdPolicyEngine fixture = new StdPolicyEngine("http", NotificationScheme.AUTO_ALL_NOTIFICATIONS, (NotificationHandler) null); - NotificationScheme scheme = NotificationScheme.AUTO_ALL_NOTIFICATIONS; - Handler handler = new Handler(); - - fixture.notification(scheme, handler); - - } -*/ - /** - * Run the PolicyChangeResponse policyEngineImport(ImportParameters) method test. - * - * @throws Exception - * - * @generatedBy CodePro at 6/3/16 2:03 PM - */ - @Test - public void testPolicyEngineImport() - throws Exception { - response.setResponseMessage("success"); - ImportParameters importParameters = new ImportParameters(); - importParameters.setServiceName("ControllerServiceSampleSdnlServiceInstance"); - importParameters.setVersion("1607-2"); - importParameters.setFilePath("C:\\Workspaces\\models\\TestingModel\\ControllerServiceSampleSdnlServiceInstance-v0.1.0-SNAPSHOT.zip"); - importParameters.setServiceType(IMPORT_TYPE.MICROSERVICE); - - PolicyChangeResponse result = fixture.policyEngineImport(importParameters); - - assertNotNull(result); - - } - - /** - * Run the Collection<PolicyConfig> policyName(String,UUID) method test. - * - * @throws Exception - * - * @generatedBy CodePro at 6/3/16 2:03 PM - */ - @Test - public void testPolicyName() - throws Exception { - //StdPolicyEngine fixture = new StdPolicyEngine("http", NotificationScheme.AUTO_ALL_NOTIFICATIONS, (NotificationHandler) null); - StdPolicyConfig config = new StdPolicyConfig(); - config.setPolicyName("testing"); - Collection<PolicyConfig> response = new HashSet<PolicyConfig>(); - response.add(config); - String policyName = "test.testing"; - UUID requestID = UUID.randomUUID(); - - Mockito.when(mockEngine.policyName(policyName, requestID)).thenReturn(response); - Collection<PolicyConfig> result = mockEngine.policyName(policyName, requestID); - - assertEquals(result, response); - } - - /** - * Run the PolicyChangeResponse pushPolicy(PushPolicyParameters) method test. - * - * @throws Exception - * - * @generatedBy CodePro at 6/3/16 2:03 PM - */ - @Test - public void testPushPolicy() - throws Exception { - response.setResponseMessage("success"); - - response.setResponseMessage("success"); - PolicyChangeResponse result = null; - - PushPolicyParameters pushPolicyParameters = new PushPolicyParameters(); - pushPolicyParameters.setPolicyName("test.testPolicy"); - pushPolicyParameters.setPdpGroup("default"); - pushPolicyParameters.setPolicyType("Base"); - - try { - - Mockito.when(mockEngine.pushPolicy(pushPolicyParameters)).thenReturn(response); - result = mockEngine.pushPolicy(pushPolicyParameters); - - } catch (Exception e) { - logger.warn(e.getMessage()); - } - assertEquals(result, response); - } - - /** - * Run the void rotateList() method test. - * - * @throws Exception - * - * @generatedBy CodePro at 6/3/16 2:03 PM - */ - @Test - public void testRotateList() - throws Exception { - - StdPolicyEngine.rotateList(); - - } - - /** - * Run the void setScheme(NotificationScheme) method test. - * - * @throws Exception - * - * @generatedBy CodePro at 6/3/16 2:03 PM - */ - @Test - public void testSetScheme() - throws Exception { - //StdPolicyEngine fixture = new StdPolicyEngine("http", NotificationScheme.AUTO_ALL_NOTIFICATIONS, (NotificationHandler) null); - NotificationScheme scheme = NotificationScheme.AUTO_ALL_NOTIFICATIONS; - - fixture.setScheme(scheme); - - } - - /** - * Run the void stopNotification() method test. - * - * @throws Exception - * - * @generatedBy CodePro at 6/3/16 2:03 PM - */ -/* @Test - public void testStopNotification_1() - throws Exception { - Handler handler = new Handler(); - - Mockito.doNothing().when(mockStdPolicyEngine).notification(NotificationScheme.AUTO_ALL_NOTIFICATIONS, handler); - StdPolicyEngine fixture = new StdPolicyEngine("Test/config_pass.properties", NotificationScheme.AUTO_ALL_NOTIFICATIONS, handler); - - //verify(mockStdPolicyEngine, times(1)).fixture("Test/config_pass.properties", NotificationScheme.AUTO_ALL_NOTIFICATIONS, handler); - - fixture.stopNotification(); - }*/ - - /** - * Run the String updateConfigFirewallPolicy(String,JsonObject,String,UUID) method test. - * - * @throws Exception - * - * @generatedBy CodePro at 6/3/16 2:03 PM - */ - @Test - public void testUpdateConfigFirewallPolicy() - throws Exception { - response.setResponseMessage("success"); - String json= "{\"serviceTypeId\": \"/v0/firewall/pan\",\"configName\": \"rule1607\",\"deploymentOption\":{\"deployNow\": false},\"securityZoneId\": \"/v0/firewall/pan\",\"serviceGroups\": [{\"name\": \"1607Group\",\"description\": null,\"members\": [{\"type\": \"REFERENCE\",\"name\": \"SList\"},{\"type\": \"REFERENCE\",\"name\": \"Syslog\"}]}, {\"name\": \"Syslog\",\"description\": \"NA\",\"type\": \"SERVICE\",\"transportProtocol\": \"udp\",\"appProtocol\": null,\"ports\": \"514\"}, {\"name\": \"SList\",\"description\": \"Service List\",\"type\": \"SERVICE\",\"transportProtocol\": \"tcp\",\"appProtocol\": null,\"ports\": \"8080\"}],\"addressGroups\": [{\"name\": \"1607Group\",\"description\": null,\"members\": [{\"type\": \"REFERENCE\",\"name\": \"10.11.12.13/14\"},{\"type\": \"REFERENCE\",\"name\": \"10.11.12.13/14\"}]},{\"name\": \"PL_CCE3\",\"description\": \"CCE Routers\",\"members\":[{\"type\": \"REFERENCE\",\"name\": \"10.11.12.13/14\"}]}],\"firewallRuleList\": [{\"position\": \"1\",\"ruleName\": \"1607Rule\",\"fromZones\": [\"Trusted\"],\"toZones\": [\"Untrusted\"],\"negateSource\": false,\"negateDestination\": false,\"sourceList\": [{\"type\": \"REFERENCE\",\"name\": \"PL_CCE3\"}, {\"type\": \"REFERENCE\",\"name\": \"1607Group\"}],\"destinationList\": [{\"type\": \"REFERENCE\",\"name\": \"1607Group\"}],\"sourceServices\": [],\"destServices\": [{\"type\": \"REFERENCE\",\"name\": \"1607Group\"}],\"action\": \"accept\",\"description\": \"Rule for 1607 templates\",\"enabled\": true,\"log\": true}]}"; - String policyName = "testing"; - JsonObject firewallJson = buildJSON(json); - String policyScope = "test"; - UUID requestID = UUID.randomUUID(); - String riskLevel = ""; - String riskType = ""; - String guard = ""; - String date = ""; - - String result = fixture.updateConfigFirewallPolicy(policyName, firewallJson, policyScope, requestID,riskLevel, riskType, guard, date); - - assertNotNull(result); - } - - - /** - * Perform post-test clean-up. - * - * @throws Exception - * if the clean-up fails for some reason - * - * @generatedBy CodePro at 6/3/16 2:03 PM - */ - @After - public void tearDown() - throws Exception { - // Add additional tear down code here - } - - /** - * Launch the test. - * - * @param args the command line arguments - * - * @generatedBy CodePro at 6/3/16 2:03 PM - */ - public static void main(String[] args) { - new org.junit.runner.JUnitCore().run(StdPolicyEngineTest.class); - } -} diff --git a/PolicyEngineAPI/src/test/java/org/openecomp/policy/std/test/StdPolicyResponseTest.java b/PolicyEngineAPI/src/test/java/org/openecomp/policy/std/test/StdPolicyResponseTest.java index 2cb21ef19..a593c460b 100644 --- a/PolicyEngineAPI/src/test/java/org/openecomp/policy/std/test/StdPolicyResponseTest.java +++ b/PolicyEngineAPI/src/test/java/org/openecomp/policy/std/test/StdPolicyResponseTest.java @@ -48,9 +48,9 @@ public class StdPolicyResponseTest { throws Exception { StdPolicyResponse fixture = new StdPolicyResponse(); fixture.setPolicyResponseStatus("", PolicyResponseStatus.ACTION_ADVISED); - fixture.setRequestAttributes(new Hashtable()); - fixture.setActionAdvised(new Hashtable()); - fixture.setActionTaken(new Hashtable()); + fixture.setRequestAttributes(new Hashtable<String, String>()); + fixture.setActionAdvised(new Hashtable<String, String>()); + fixture.setActionTaken(new Hashtable<String, String>()); Map<String, String> result = fixture.getActionAdvised(); @@ -71,9 +71,9 @@ public class StdPolicyResponseTest { throws Exception { StdPolicyResponse fixture = new StdPolicyResponse(); fixture.setPolicyResponseStatus("", PolicyResponseStatus.ACTION_ADVISED); - fixture.setRequestAttributes(new Hashtable()); - fixture.setActionAdvised(new Hashtable()); - fixture.setActionTaken(new Hashtable()); + fixture.setRequestAttributes(new Hashtable<String, String>()); + fixture.setActionAdvised(new Hashtable<String, String>()); + fixture.setActionTaken(new Hashtable<String, String>()); Map<String, String> result = fixture.getActionTaken(); @@ -94,9 +94,9 @@ public class StdPolicyResponseTest { throws Exception { StdPolicyResponse fixture = new StdPolicyResponse(); fixture.setPolicyResponseStatus("", PolicyResponseStatus.ACTION_ADVISED); - fixture.setRequestAttributes(new Hashtable()); - fixture.setActionAdvised(new Hashtable()); - fixture.setActionTaken(new Hashtable()); + fixture.setRequestAttributes(new Hashtable<String, String>()); + fixture.setActionAdvised(new Hashtable<String, String>()); + fixture.setActionTaken(new Hashtable<String, String>()); String result = fixture.getPolicyResponseMessage(); @@ -116,9 +116,9 @@ public class StdPolicyResponseTest { throws Exception { StdPolicyResponse fixture = new StdPolicyResponse(); fixture.setPolicyResponseStatus("", PolicyResponseStatus.ACTION_ADVISED); - fixture.setRequestAttributes(new Hashtable()); - fixture.setActionAdvised(new Hashtable()); - fixture.setActionTaken(new Hashtable()); + fixture.setRequestAttributes(new Hashtable<String, String>()); + fixture.setActionAdvised(new Hashtable<String, String>()); + fixture.setActionTaken(new Hashtable<String, String>()); PolicyResponseStatus result = fixture.getPolicyResponseStatus(); @@ -141,9 +141,9 @@ public class StdPolicyResponseTest { throws Exception { StdPolicyResponse fixture = new StdPolicyResponse(); fixture.setPolicyResponseStatus("", PolicyResponseStatus.ACTION_ADVISED); - fixture.setRequestAttributes(new Hashtable()); - fixture.setActionAdvised(new Hashtable()); - fixture.setActionTaken(new Hashtable()); + fixture.setRequestAttributes(new Hashtable<String, String>()); + fixture.setActionAdvised(new Hashtable<String, String>()); + fixture.setActionTaken(new Hashtable<String, String>()); Map<String, String> result = fixture.getRequestAttributes(); @@ -164,10 +164,10 @@ public class StdPolicyResponseTest { throws Exception { StdPolicyResponse fixture = new StdPolicyResponse(); fixture.setPolicyResponseStatus("", PolicyResponseStatus.ACTION_ADVISED); - fixture.setRequestAttributes(new Hashtable()); - fixture.setActionAdvised(new Hashtable()); - fixture.setActionTaken(new Hashtable()); - Map<String, String> actionAdvised = new Hashtable(); + fixture.setRequestAttributes(new Hashtable<String, String>()); + fixture.setActionAdvised(new Hashtable<String, String>()); + fixture.setActionTaken(new Hashtable<String, String>()); + Map<String, String> actionAdvised = new Hashtable<String, String>(); fixture.setActionAdvised(actionAdvised); @@ -186,10 +186,10 @@ public class StdPolicyResponseTest { throws Exception { StdPolicyResponse fixture = new StdPolicyResponse(); fixture.setPolicyResponseStatus("", PolicyResponseStatus.ACTION_ADVISED); - fixture.setRequestAttributes(new Hashtable()); - fixture.setActionAdvised(new Hashtable()); - fixture.setActionTaken(new Hashtable()); - Map<String, String> actionTaken = new Hashtable(); + fixture.setRequestAttributes(new Hashtable<String, String>()); + fixture.setActionAdvised(new Hashtable<String, String>()); + fixture.setActionTaken(new Hashtable<String, String>()); + Map<String, String> actionTaken = new Hashtable<String, String>(); fixture.setActionTaken(actionTaken); @@ -208,9 +208,9 @@ public class StdPolicyResponseTest { throws Exception { StdPolicyResponse fixture = new StdPolicyResponse(); fixture.setPolicyResponseStatus("", PolicyResponseStatus.ACTION_ADVISED); - fixture.setRequestAttributes(new Hashtable()); - fixture.setActionAdvised(new Hashtable()); - fixture.setActionTaken(new Hashtable()); + fixture.setRequestAttributes(new Hashtable<String, String>()); + fixture.setActionAdvised(new Hashtable<String, String>()); + fixture.setActionTaken(new Hashtable<String, String>()); String policyResponseMessage = ""; fixture.setPolicyResponseMessage(policyResponseMessage); @@ -230,9 +230,9 @@ public class StdPolicyResponseTest { throws Exception { StdPolicyResponse fixture = new StdPolicyResponse(); fixture.setPolicyResponseStatus("", PolicyResponseStatus.ACTION_ADVISED); - fixture.setRequestAttributes(new Hashtable()); - fixture.setActionAdvised(new Hashtable()); - fixture.setActionTaken(new Hashtable()); + fixture.setRequestAttributes(new Hashtable<String, String>()); + fixture.setActionAdvised(new Hashtable<String, String>()); + fixture.setActionTaken(new Hashtable<String, String>()); PolicyResponseStatus policyResponseStatus = PolicyResponseStatus.ACTION_ADVISED; fixture.setPolicyResponseStatus(policyResponseStatus); @@ -252,9 +252,9 @@ public class StdPolicyResponseTest { throws Exception { StdPolicyResponse fixture = new StdPolicyResponse(); fixture.setPolicyResponseStatus("", PolicyResponseStatus.ACTION_ADVISED); - fixture.setRequestAttributes(new Hashtable()); - fixture.setActionAdvised(new Hashtable()); - fixture.setActionTaken(new Hashtable()); + fixture.setRequestAttributes(new Hashtable<String, String>()); + fixture.setActionAdvised(new Hashtable<String, String>()); + fixture.setActionTaken(new Hashtable<String, String>()); String policyResponseMessage = ""; PolicyResponseStatus policyResponseStatus = PolicyResponseStatus.ACTION_ADVISED; @@ -275,10 +275,10 @@ public class StdPolicyResponseTest { throws Exception { StdPolicyResponse fixture = new StdPolicyResponse(); fixture.setPolicyResponseStatus("", PolicyResponseStatus.ACTION_ADVISED); - fixture.setRequestAttributes(new Hashtable()); - fixture.setActionAdvised(new Hashtable()); - fixture.setActionTaken(new Hashtable()); - Map<String, String> requestAttributes = new Hashtable(); + fixture.setRequestAttributes(new Hashtable<String, String>()); + fixture.setActionAdvised(new Hashtable<String, String>()); + fixture.setActionTaken(new Hashtable<String, String>()); + Map<String, String> requestAttributes = new Hashtable<String, String>(); fixture.setRequestAttributes(requestAttributes); @@ -297,9 +297,9 @@ public class StdPolicyResponseTest { throws Exception { StdPolicyResponse fixture = new StdPolicyResponse(); fixture.setPolicyResponseStatus("", PolicyResponseStatus.ACTION_ADVISED); - fixture.setRequestAttributes(new Hashtable()); - fixture.setActionAdvised(new Hashtable()); - fixture.setActionTaken(new Hashtable()); + fixture.setRequestAttributes(new Hashtable<String, String>()); + fixture.setActionAdvised(new Hashtable<String, String>()); + fixture.setActionTaken(new Hashtable<String, String>()); String result = fixture.toString(); diff --git a/PolicyEngineAPI/src/test/java/org/openecomp/policy/std/test/StdStatusTest.java b/PolicyEngineAPI/src/test/java/org/openecomp/policy/std/test/StdStatusTest.java index 4412dbdb7..34918c2ea 100644 --- a/PolicyEngineAPI/src/test/java/org/openecomp/policy/std/test/StdStatusTest.java +++ b/PolicyEngineAPI/src/test/java/org/openecomp/policy/std/test/StdStatusTest.java @@ -58,19 +58,19 @@ public class StdStatusTest { fixture.setStatus("", PolicyResponseStatus.ACTION_ADVISED, PolicyConfigStatus.CONFIG_NOT_FOUND); fixture.setPolicyName(""); fixture.setPolicyType(PolicyType.JSON); - fixture.setResposneAttributes(new Hashtable()); - fixture.setMatchingConditions(new Hashtable()); + fixture.setResposneAttributes(new Hashtable<String, String>()); + fixture.setMatchingConditions(new Hashtable<String, String>()); fixture.setStatus("", PolicyResponseStatus.ACTION_ADVISED, PolicyConfigStatus.CONFIG_NOT_FOUND); fixture.setJsonObject((JsonObject) null); fixture.setDocument((Document) null); fixture.setProperties(new Properties()); - fixture.setRequestAttributes(new Hashtable()); + fixture.setRequestAttributes(new Hashtable<String, String>()); fixture.setPolicyVersion(""); - fixture.setActionAdvised(new Hashtable()); + fixture.setActionAdvised(new Hashtable<String, String>()); fixture.setOther(""); fixture.setDecision(PolicyDecision.DENY); fixture.setDetails(""); - fixture.setActionTaken(new Hashtable()); + fixture.setActionTaken(new Hashtable<String, String>()); Map<String, String> result = fixture.getActionAdvised(); @@ -93,19 +93,19 @@ public class StdStatusTest { fixture.setStatus("", PolicyResponseStatus.ACTION_ADVISED, PolicyConfigStatus.CONFIG_NOT_FOUND); fixture.setPolicyName(""); fixture.setPolicyType(PolicyType.JSON); - fixture.setResposneAttributes(new Hashtable()); - fixture.setMatchingConditions(new Hashtable()); + fixture.setResposneAttributes(new Hashtable<String, String>()); + fixture.setMatchingConditions(new Hashtable<String, String>()); fixture.setStatus("", PolicyResponseStatus.ACTION_ADVISED, PolicyConfigStatus.CONFIG_NOT_FOUND); fixture.setJsonObject((JsonObject) null); fixture.setDocument((Document) null); fixture.setProperties(new Properties()); - fixture.setRequestAttributes(new Hashtable()); + fixture.setRequestAttributes(new Hashtable<String, String>()); fixture.setPolicyVersion(""); - fixture.setActionAdvised(new Hashtable()); + fixture.setActionAdvised(new Hashtable<String, String>()); fixture.setOther(""); fixture.setDecision(PolicyDecision.DENY); fixture.setDetails(""); - fixture.setActionTaken(new Hashtable()); + fixture.setActionTaken(new Hashtable<String, String>()); Map<String, String> result = fixture.getActionTaken(); @@ -128,19 +128,19 @@ public class StdStatusTest { fixture.setStatus("", PolicyResponseStatus.ACTION_ADVISED, PolicyConfigStatus.CONFIG_NOT_FOUND); fixture.setPolicyName(""); fixture.setPolicyType(PolicyType.JSON); - fixture.setResposneAttributes(new Hashtable()); - fixture.setMatchingConditions(new Hashtable()); + fixture.setResposneAttributes(new Hashtable<String, String>()); + fixture.setMatchingConditions(new Hashtable<String, String>()); fixture.setStatus("", PolicyResponseStatus.ACTION_ADVISED, PolicyConfigStatus.CONFIG_NOT_FOUND); fixture.setJsonObject((JsonObject) null); fixture.setDocument((Document) null); fixture.setProperties(new Properties()); - fixture.setRequestAttributes(new Hashtable()); + fixture.setRequestAttributes(new Hashtable<String, String>()); fixture.setPolicyVersion(""); - fixture.setActionAdvised(new Hashtable()); + fixture.setActionAdvised(new Hashtable<String, String>()); fixture.setOther(""); fixture.setDecision(PolicyDecision.DENY); fixture.setDetails(""); - fixture.setActionTaken(new Hashtable()); + fixture.setActionTaken(new Hashtable<String, String>()); Map<String, String> result = fixture.getMatchingConditions(); @@ -163,19 +163,19 @@ public class StdStatusTest { fixture.setStatus("", PolicyResponseStatus.ACTION_ADVISED, PolicyConfigStatus.CONFIG_NOT_FOUND); fixture.setPolicyName(""); fixture.setPolicyType(PolicyType.JSON); - fixture.setResposneAttributes(new Hashtable()); - fixture.setMatchingConditions(new Hashtable()); + fixture.setResposneAttributes(new Hashtable<String, String>()); + fixture.setMatchingConditions(new Hashtable<String, String>()); fixture.setStatus("", PolicyResponseStatus.ACTION_ADVISED, PolicyConfigStatus.CONFIG_NOT_FOUND); fixture.setJsonObject((JsonObject) null); fixture.setDocument((Document) null); fixture.setProperties(new Properties()); - fixture.setRequestAttributes(new Hashtable()); + fixture.setRequestAttributes(new Hashtable<String, String>()); fixture.setPolicyVersion(""); - fixture.setActionAdvised(new Hashtable()); + fixture.setActionAdvised(new Hashtable<String, String>()); fixture.setOther(""); fixture.setDecision(PolicyDecision.DENY); fixture.setDetails(""); - fixture.setActionTaken(new Hashtable()); + fixture.setActionTaken(new Hashtable<String, String>()); String result = fixture.getPolicyConfigMessage(); @@ -197,19 +197,19 @@ public class StdStatusTest { fixture.setStatus("", PolicyResponseStatus.ACTION_ADVISED, PolicyConfigStatus.CONFIG_NOT_FOUND); fixture.setPolicyName(""); fixture.setPolicyType(PolicyType.JSON); - fixture.setResposneAttributes(new Hashtable()); - fixture.setMatchingConditions(new Hashtable()); + fixture.setResposneAttributes(new Hashtable<String, String>()); + fixture.setMatchingConditions(new Hashtable<String, String>()); fixture.setStatus("", PolicyResponseStatus.ACTION_ADVISED, PolicyConfigStatus.CONFIG_NOT_FOUND); fixture.setJsonObject((JsonObject) null); fixture.setDocument((Document) null); fixture.setProperties(new Properties()); - fixture.setRequestAttributes(new Hashtable()); + fixture.setRequestAttributes(new Hashtable<String, String>()); fixture.setPolicyVersion(""); - fixture.setActionAdvised(new Hashtable()); + fixture.setActionAdvised(new Hashtable<String, String>()); fixture.setOther(""); fixture.setDecision(PolicyDecision.DENY); fixture.setDetails(""); - fixture.setActionTaken(new Hashtable()); + fixture.setActionTaken(new Hashtable<String, String>()); PolicyConfigStatus result = fixture.getPolicyConfigStatus(); @@ -234,19 +234,19 @@ public class StdStatusTest { fixture.setStatus("", PolicyResponseStatus.ACTION_ADVISED, PolicyConfigStatus.CONFIG_NOT_FOUND); fixture.setPolicyName(""); fixture.setPolicyType(PolicyType.JSON); - fixture.setResposneAttributes(new Hashtable()); - fixture.setMatchingConditions(new Hashtable()); + fixture.setResposneAttributes(new Hashtable<String, String>()); + fixture.setMatchingConditions(new Hashtable<String, String>()); fixture.setStatus("", PolicyResponseStatus.ACTION_ADVISED, PolicyConfigStatus.CONFIG_NOT_FOUND); fixture.setJsonObject((JsonObject) null); fixture.setDocument((Document) null); fixture.setProperties(new Properties()); - fixture.setRequestAttributes(new Hashtable()); + fixture.setRequestAttributes(new Hashtable<String, String>()); fixture.setPolicyVersion(""); - fixture.setActionAdvised(new Hashtable()); + fixture.setActionAdvised(new Hashtable<String, String>()); fixture.setOther(""); fixture.setDecision(PolicyDecision.DENY); fixture.setDetails(""); - fixture.setActionTaken(new Hashtable()); + fixture.setActionTaken(new Hashtable<String, String>()); PolicyDecision result = fixture.getDecision(); @@ -271,19 +271,19 @@ public class StdStatusTest { fixture.setStatus("", PolicyResponseStatus.ACTION_ADVISED, PolicyConfigStatus.CONFIG_NOT_FOUND); fixture.setPolicyName(""); fixture.setPolicyType(PolicyType.JSON); - fixture.setResposneAttributes(new Hashtable()); - fixture.setMatchingConditions(new Hashtable()); + fixture.setResposneAttributes(new Hashtable<String, String>()); + fixture.setMatchingConditions(new Hashtable<String, String>()); fixture.setStatus("", PolicyResponseStatus.ACTION_ADVISED, PolicyConfigStatus.CONFIG_NOT_FOUND); fixture.setJsonObject((JsonObject) null); fixture.setDocument((Document) null); fixture.setProperties(new Properties()); - fixture.setRequestAttributes(new Hashtable()); + fixture.setRequestAttributes(new Hashtable<String, String>()); fixture.setPolicyVersion(""); - fixture.setActionAdvised(new Hashtable()); + fixture.setActionAdvised(new Hashtable<String, String>()); fixture.setOther(""); fixture.setDecision(PolicyDecision.DENY); fixture.setDetails(""); - fixture.setActionTaken(new Hashtable()); + fixture.setActionTaken(new Hashtable<String, String>()); String result = fixture.getPolicyName(); @@ -305,19 +305,19 @@ public class StdStatusTest { fixture.setStatus("", PolicyResponseStatus.ACTION_ADVISED, PolicyConfigStatus.CONFIG_NOT_FOUND); fixture.setPolicyName((String) null); fixture.setPolicyType(PolicyType.JSON); - fixture.setResposneAttributes(new Hashtable()); - fixture.setMatchingConditions(new Hashtable()); + fixture.setResposneAttributes(new Hashtable<String, String>()); + fixture.setMatchingConditions(new Hashtable<String, String>()); fixture.setStatus("", PolicyResponseStatus.ACTION_ADVISED, PolicyConfigStatus.CONFIG_NOT_FOUND); fixture.setJsonObject((JsonObject) null); fixture.setDocument((Document) null); fixture.setProperties(new Properties()); - fixture.setRequestAttributes(new Hashtable()); + fixture.setRequestAttributes(new Hashtable<String, String>()); fixture.setPolicyVersion(""); - fixture.setActionAdvised(new Hashtable()); + fixture.setActionAdvised(new Hashtable<String, String>()); fixture.setOther(""); fixture.setDecision(PolicyDecision.DENY); fixture.setDetails(""); - fixture.setActionTaken(new Hashtable()); + fixture.setActionTaken(new Hashtable<String, String>()); String result = fixture.getPolicyName(); @@ -339,19 +339,19 @@ public class StdStatusTest { fixture.setStatus("", PolicyResponseStatus.ACTION_ADVISED, PolicyConfigStatus.CONFIG_NOT_FOUND); fixture.setPolicyName(""); fixture.setPolicyType(PolicyType.JSON); - fixture.setResposneAttributes(new Hashtable()); - fixture.setMatchingConditions(new Hashtable()); + fixture.setResposneAttributes(new Hashtable<String, String>()); + fixture.setMatchingConditions(new Hashtable<String, String>()); fixture.setStatus("", PolicyResponseStatus.ACTION_ADVISED, PolicyConfigStatus.CONFIG_NOT_FOUND); fixture.setJsonObject((JsonObject) null); fixture.setDocument((Document) null); fixture.setProperties(new Properties()); - fixture.setRequestAttributes(new Hashtable()); + fixture.setRequestAttributes(new Hashtable<String, String>()); fixture.setPolicyVersion(""); - fixture.setActionAdvised(new Hashtable()); + fixture.setActionAdvised(new Hashtable<String, String>()); fixture.setOther(""); fixture.setDecision(PolicyDecision.DENY); fixture.setDetails(""); - fixture.setActionTaken(new Hashtable()); + fixture.setActionTaken(new Hashtable<String, String>()); String result = fixture.getPolicyName(); @@ -373,19 +373,19 @@ public class StdStatusTest { fixture.setStatus("", PolicyResponseStatus.ACTION_ADVISED, PolicyConfigStatus.CONFIG_NOT_FOUND); fixture.setPolicyName(""); fixture.setPolicyType(PolicyType.JSON); - fixture.setResposneAttributes(new Hashtable()); - fixture.setMatchingConditions(new Hashtable()); + fixture.setResposneAttributes(new Hashtable<String, String>()); + fixture.setMatchingConditions(new Hashtable<String, String>()); fixture.setStatus("", PolicyResponseStatus.ACTION_ADVISED, PolicyConfigStatus.CONFIG_NOT_FOUND); fixture.setJsonObject((JsonObject) null); fixture.setDocument((Document) null); fixture.setProperties(new Properties()); - fixture.setRequestAttributes(new Hashtable()); + fixture.setRequestAttributes(new Hashtable<String, String>()); fixture.setPolicyVersion(""); - fixture.setActionAdvised(new Hashtable()); + fixture.setActionAdvised(new Hashtable<String, String>()); fixture.setOther(""); fixture.setDecision(PolicyDecision.DENY); fixture.setDetails(""); - fixture.setActionTaken(new Hashtable()); + fixture.setActionTaken(new Hashtable<String, String>()); String result = fixture.getPolicyResponseMessage(); @@ -407,19 +407,19 @@ public class StdStatusTest { fixture.setStatus("", PolicyResponseStatus.ACTION_ADVISED, PolicyConfigStatus.CONFIG_NOT_FOUND); fixture.setPolicyName(""); fixture.setPolicyType(PolicyType.JSON); - fixture.setResposneAttributes(new Hashtable()); - fixture.setMatchingConditions(new Hashtable()); + fixture.setResposneAttributes(new Hashtable<String, String>()); + fixture.setMatchingConditions(new Hashtable<String, String>()); fixture.setStatus("", PolicyResponseStatus.ACTION_ADVISED, PolicyConfigStatus.CONFIG_NOT_FOUND); fixture.setJsonObject((JsonObject) null); fixture.setDocument((Document) null); fixture.setProperties(new Properties()); - fixture.setRequestAttributes(new Hashtable()); + fixture.setRequestAttributes(new Hashtable<String, String>()); fixture.setPolicyVersion(""); - fixture.setActionAdvised(new Hashtable()); + fixture.setActionAdvised(new Hashtable<String, String>()); fixture.setOther(""); fixture.setDecision(PolicyDecision.DENY); fixture.setDetails(""); - fixture.setActionTaken(new Hashtable()); + fixture.setActionTaken(new Hashtable<String, String>()); PolicyResponseStatus result = fixture.getPolicyResponseStatus(); @@ -444,19 +444,19 @@ public class StdStatusTest { fixture.setStatus("", PolicyResponseStatus.ACTION_ADVISED, PolicyConfigStatus.CONFIG_NOT_FOUND); fixture.setPolicyName(""); fixture.setPolicyType(PolicyType.JSON); - fixture.setResposneAttributes(new Hashtable()); - fixture.setMatchingConditions(new Hashtable()); + fixture.setResposneAttributes(new Hashtable<String, String>()); + fixture.setMatchingConditions(new Hashtable<String, String>()); fixture.setStatus("", PolicyResponseStatus.ACTION_ADVISED, PolicyConfigStatus.CONFIG_NOT_FOUND); fixture.setJsonObject((JsonObject) null); fixture.setDocument((Document) null); fixture.setProperties(new Properties()); - fixture.setRequestAttributes(new Hashtable()); + fixture.setRequestAttributes(new Hashtable<String, String>()); fixture.setPolicyVersion(""); - fixture.setActionAdvised(new Hashtable()); + fixture.setActionAdvised(new Hashtable<String, String>()); fixture.setOther(""); fixture.setDecision(PolicyDecision.DENY); fixture.setDetails(""); - fixture.setActionTaken(new Hashtable()); + fixture.setActionTaken(new Hashtable<String, String>()); String result = fixture.getPolicyVersion(); @@ -478,19 +478,19 @@ public class StdStatusTest { fixture.setStatus("", PolicyResponseStatus.ACTION_ADVISED, PolicyConfigStatus.CONFIG_NOT_FOUND); fixture.setPolicyName(""); fixture.setPolicyType(PolicyType.JSON); - fixture.setResposneAttributes(new Hashtable()); - fixture.setMatchingConditions(new Hashtable()); + fixture.setResposneAttributes(new Hashtable<String, String>()); + fixture.setMatchingConditions(new Hashtable<String, String>()); fixture.setStatus("", PolicyResponseStatus.ACTION_ADVISED, PolicyConfigStatus.CONFIG_NOT_FOUND); fixture.setJsonObject((JsonObject) null); fixture.setDocument((Document) null); fixture.setProperties(new Properties()); - fixture.setRequestAttributes(new Hashtable()); + fixture.setRequestAttributes(new Hashtable<String, String>()); fixture.setPolicyVersion(""); - fixture.setActionAdvised(new Hashtable()); + fixture.setActionAdvised(new Hashtable<String, String>()); fixture.setOther(""); fixture.setDecision(PolicyDecision.DENY); fixture.setDetails(""); - fixture.setActionTaken(new Hashtable()); + fixture.setActionTaken(new Hashtable<String, String>()); Map<String, String> result = fixture.getRequestAttributes(); @@ -513,19 +513,19 @@ public class StdStatusTest { fixture.setStatus("", PolicyResponseStatus.ACTION_ADVISED, PolicyConfigStatus.CONFIG_NOT_FOUND); fixture.setPolicyName(""); fixture.setPolicyType(PolicyType.JSON); - fixture.setResposneAttributes(new Hashtable()); - fixture.setMatchingConditions(new Hashtable()); + fixture.setResposneAttributes(new Hashtable<String, String>()); + fixture.setMatchingConditions(new Hashtable<String, String>()); fixture.setStatus("", PolicyResponseStatus.ACTION_ADVISED, PolicyConfigStatus.CONFIG_NOT_FOUND); fixture.setJsonObject((JsonObject) null); fixture.setDocument((Document) null); fixture.setProperties(new Properties()); - fixture.setRequestAttributes(new Hashtable()); + fixture.setRequestAttributes(new Hashtable<String, String>()); fixture.setPolicyVersion(""); - fixture.setActionAdvised(new Hashtable()); + fixture.setActionAdvised(new Hashtable<String, String>()); fixture.setOther(""); fixture.setDecision(PolicyDecision.DENY); fixture.setDetails(""); - fixture.setActionTaken(new Hashtable()); + fixture.setActionTaken(new Hashtable<String, String>()); Map<String, String> result = fixture.getResponseAttributes(); @@ -548,19 +548,19 @@ public class StdStatusTest { fixture.setStatus("", PolicyResponseStatus.ACTION_ADVISED, PolicyConfigStatus.CONFIG_NOT_FOUND); fixture.setPolicyName(""); fixture.setPolicyType(PolicyType.JSON); - fixture.setResposneAttributes(new Hashtable()); - fixture.setMatchingConditions(new Hashtable()); + fixture.setResposneAttributes(new Hashtable<String, String>()); + fixture.setMatchingConditions(new Hashtable<String, String>()); fixture.setStatus("", PolicyResponseStatus.ACTION_ADVISED, PolicyConfigStatus.CONFIG_NOT_FOUND); fixture.setJsonObject((JsonObject) null); fixture.setDocument((Document) null); fixture.setProperties(new Properties()); - fixture.setRequestAttributes(new Hashtable()); + fixture.setRequestAttributes(new Hashtable<String, String>()); fixture.setPolicyVersion(""); - fixture.setActionAdvised(new Hashtable()); + fixture.setActionAdvised(new Hashtable<String, String>()); fixture.setOther(""); fixture.setDecision(PolicyDecision.DENY); fixture.setDetails(""); - fixture.setActionTaken(new Hashtable()); + fixture.setActionTaken(new Hashtable<String, String>()); PolicyType result = fixture.getType(); @@ -585,20 +585,20 @@ public class StdStatusTest { fixture.setStatus("", PolicyResponseStatus.ACTION_ADVISED, PolicyConfigStatus.CONFIG_NOT_FOUND); fixture.setPolicyName(""); fixture.setPolicyType(PolicyType.JSON); - fixture.setResposneAttributes(new Hashtable()); - fixture.setMatchingConditions(new Hashtable()); + fixture.setResposneAttributes(new Hashtable<String, String>()); + fixture.setMatchingConditions(new Hashtable<String, String>()); fixture.setStatus("", PolicyResponseStatus.ACTION_ADVISED, PolicyConfigStatus.CONFIG_NOT_FOUND); fixture.setJsonObject((JsonObject) null); fixture.setDocument((Document) null); fixture.setProperties(new Properties()); - fixture.setRequestAttributes(new Hashtable()); + fixture.setRequestAttributes(new Hashtable<String, String>()); fixture.setPolicyVersion(""); - fixture.setActionAdvised(new Hashtable()); + fixture.setActionAdvised(new Hashtable<String, String>()); fixture.setOther(""); fixture.setDecision(PolicyDecision.DENY); fixture.setDetails(""); - fixture.setActionTaken(new Hashtable()); - Map<String, String> actionAdvised = new Hashtable(); + fixture.setActionTaken(new Hashtable<String, String>()); + Map<String, String> actionAdvised = new Hashtable<String, String>(); fixture.setActionAdvised(actionAdvised); @@ -619,20 +619,20 @@ public class StdStatusTest { fixture.setStatus("", PolicyResponseStatus.ACTION_ADVISED, PolicyConfigStatus.CONFIG_NOT_FOUND); fixture.setPolicyName(""); fixture.setPolicyType(PolicyType.JSON); - fixture.setResposneAttributes(new Hashtable()); - fixture.setMatchingConditions(new Hashtable()); + fixture.setResposneAttributes(new Hashtable<String, String>()); + fixture.setMatchingConditions(new Hashtable<String, String>()); fixture.setStatus("", PolicyResponseStatus.ACTION_ADVISED, PolicyConfigStatus.CONFIG_NOT_FOUND); fixture.setJsonObject((JsonObject) null); fixture.setDocument((Document) null); fixture.setProperties(new Properties()); - fixture.setRequestAttributes(new Hashtable()); + fixture.setRequestAttributes(new Hashtable<String, String>()); fixture.setPolicyVersion(""); - fixture.setActionAdvised(new Hashtable()); + fixture.setActionAdvised(new Hashtable<String, String>()); fixture.setOther(""); fixture.setDecision(PolicyDecision.DENY); fixture.setDetails(""); - fixture.setActionTaken(new Hashtable()); - Map<String, String> actionTaken = new Hashtable(); + fixture.setActionTaken(new Hashtable<String, String>()); + Map<String, String> actionTaken = new Hashtable<String, String>(); fixture.setActionTaken(actionTaken); @@ -653,19 +653,19 @@ public class StdStatusTest { fixture.setStatus("", PolicyResponseStatus.ACTION_ADVISED, PolicyConfigStatus.CONFIG_NOT_FOUND); fixture.setPolicyName(""); fixture.setPolicyType(PolicyType.JSON); - fixture.setResposneAttributes(new Hashtable()); - fixture.setMatchingConditions(new Hashtable()); + fixture.setResposneAttributes(new Hashtable<String, String>()); + fixture.setMatchingConditions(new Hashtable<String, String>()); fixture.setStatus("", PolicyResponseStatus.ACTION_ADVISED, PolicyConfigStatus.CONFIG_NOT_FOUND); fixture.setJsonObject((JsonObject) null); fixture.setDocument((Document) null); fixture.setProperties(new Properties()); - fixture.setRequestAttributes(new Hashtable()); + fixture.setRequestAttributes(new Hashtable<String, String>()); fixture.setPolicyVersion(""); - fixture.setActionAdvised(new Hashtable()); + fixture.setActionAdvised(new Hashtable<String, String>()); fixture.setOther(""); fixture.setDecision(PolicyDecision.DENY); fixture.setDetails(""); - fixture.setActionTaken(new Hashtable()); + fixture.setActionTaken(new Hashtable<String, String>()); String configStatus = ""; fixture.setConfigStatus(configStatus); @@ -687,19 +687,19 @@ public class StdStatusTest { fixture.setStatus("", PolicyResponseStatus.ACTION_ADVISED, PolicyConfigStatus.CONFIG_NOT_FOUND); fixture.setPolicyName(""); fixture.setPolicyType(PolicyType.JSON); - fixture.setResposneAttributes(new Hashtable()); - fixture.setMatchingConditions(new Hashtable()); + fixture.setResposneAttributes(new Hashtable<String, String>()); + fixture.setMatchingConditions(new Hashtable<String, String>()); fixture.setStatus("", PolicyResponseStatus.ACTION_ADVISED, PolicyConfigStatus.CONFIG_NOT_FOUND); fixture.setJsonObject((JsonObject) null); fixture.setDocument((Document) null); fixture.setProperties(new Properties()); - fixture.setRequestAttributes(new Hashtable()); + fixture.setRequestAttributes(new Hashtable<String, String>()); fixture.setPolicyVersion(""); - fixture.setActionAdvised(new Hashtable()); + fixture.setActionAdvised(new Hashtable<String, String>()); fixture.setOther(""); fixture.setDecision(PolicyDecision.DENY); fixture.setDetails(""); - fixture.setActionTaken(new Hashtable()); + fixture.setActionTaken(new Hashtable<String, String>()); Document document = null; fixture.setDocument(document); @@ -721,19 +721,19 @@ public class StdStatusTest { fixture.setStatus("", PolicyResponseStatus.ACTION_ADVISED, PolicyConfigStatus.CONFIG_NOT_FOUND); fixture.setPolicyName(""); fixture.setPolicyType(PolicyType.JSON); - fixture.setResposneAttributes(new Hashtable()); - fixture.setMatchingConditions(new Hashtable()); + fixture.setResposneAttributes(new Hashtable<String, String>()); + fixture.setMatchingConditions(new Hashtable<String, String>()); fixture.setStatus("", PolicyResponseStatus.ACTION_ADVISED, PolicyConfigStatus.CONFIG_NOT_FOUND); fixture.setJsonObject((JsonObject) null); fixture.setDocument((Document) null); fixture.setProperties(new Properties()); - fixture.setRequestAttributes(new Hashtable()); + fixture.setRequestAttributes(new Hashtable<String, String>()); fixture.setPolicyVersion(""); - fixture.setActionAdvised(new Hashtable()); + fixture.setActionAdvised(new Hashtable<String, String>()); fixture.setOther(""); fixture.setDecision(PolicyDecision.DENY); fixture.setDetails(""); - fixture.setActionTaken(new Hashtable()); + fixture.setActionTaken(new Hashtable<String, String>()); JsonObject jsonObject = null; fixture.setJsonObject(jsonObject); @@ -755,20 +755,20 @@ public class StdStatusTest { fixture.setStatus("", PolicyResponseStatus.ACTION_ADVISED, PolicyConfigStatus.CONFIG_NOT_FOUND); fixture.setPolicyName(""); fixture.setPolicyType(PolicyType.JSON); - fixture.setResposneAttributes(new Hashtable()); - fixture.setMatchingConditions(new Hashtable()); + fixture.setResposneAttributes(new Hashtable<String, String>()); + fixture.setMatchingConditions(new Hashtable<String, String>()); fixture.setStatus("", PolicyResponseStatus.ACTION_ADVISED, PolicyConfigStatus.CONFIG_NOT_FOUND); fixture.setJsonObject((JsonObject) null); fixture.setDocument((Document) null); fixture.setProperties(new Properties()); - fixture.setRequestAttributes(new Hashtable()); + fixture.setRequestAttributes(new Hashtable<String, String>()); fixture.setPolicyVersion(""); - fixture.setActionAdvised(new Hashtable()); + fixture.setActionAdvised(new Hashtable<String, String>()); fixture.setOther(""); fixture.setDecision(PolicyDecision.DENY); fixture.setDetails(""); - fixture.setActionTaken(new Hashtable()); - Map<String, String> matchingConditions = new Hashtable(); + fixture.setActionTaken(new Hashtable<String, String>()); + Map<String, String> matchingConditions = new Hashtable<String, String>(); fixture.setMatchingConditions(matchingConditions); @@ -789,19 +789,19 @@ public class StdStatusTest { fixture.setStatus("", PolicyResponseStatus.ACTION_ADVISED, PolicyConfigStatus.CONFIG_NOT_FOUND); fixture.setPolicyName(""); fixture.setPolicyType(PolicyType.JSON); - fixture.setResposneAttributes(new Hashtable()); - fixture.setMatchingConditions(new Hashtable()); + fixture.setResposneAttributes(new Hashtable<String, String>()); + fixture.setMatchingConditions(new Hashtable<String, String>()); fixture.setStatus("", PolicyResponseStatus.ACTION_ADVISED, PolicyConfigStatus.CONFIG_NOT_FOUND); fixture.setJsonObject((JsonObject) null); fixture.setDocument((Document) null); fixture.setProperties(new Properties()); - fixture.setRequestAttributes(new Hashtable()); + fixture.setRequestAttributes(new Hashtable<String, String>()); fixture.setPolicyVersion(""); - fixture.setActionAdvised(new Hashtable()); + fixture.setActionAdvised(new Hashtable<String, String>()); fixture.setOther(""); fixture.setDecision(PolicyDecision.DENY); fixture.setDetails(""); - fixture.setActionTaken(new Hashtable()); + fixture.setActionTaken(new Hashtable<String, String>()); String other = ""; fixture.setOther(other); @@ -823,19 +823,19 @@ public class StdStatusTest { fixture.setStatus("", PolicyResponseStatus.ACTION_ADVISED, PolicyConfigStatus.CONFIG_NOT_FOUND); fixture.setPolicyName(""); fixture.setPolicyType(PolicyType.JSON); - fixture.setResposneAttributes(new Hashtable()); - fixture.setMatchingConditions(new Hashtable()); + fixture.setResposneAttributes(new Hashtable<String, String>()); + fixture.setMatchingConditions(new Hashtable<String, String>()); fixture.setStatus("", PolicyResponseStatus.ACTION_ADVISED, PolicyConfigStatus.CONFIG_NOT_FOUND); fixture.setJsonObject((JsonObject) null); fixture.setDocument((Document) null); fixture.setProperties(new Properties()); - fixture.setRequestAttributes(new Hashtable()); + fixture.setRequestAttributes(new Hashtable<String, String>()); fixture.setPolicyVersion(""); - fixture.setActionAdvised(new Hashtable()); + fixture.setActionAdvised(new Hashtable<String, String>()); fixture.setOther(""); fixture.setDecision(PolicyDecision.DENY); fixture.setDetails(""); - fixture.setActionTaken(new Hashtable()); + fixture.setActionTaken(new Hashtable<String, String>()); PolicyConfigStatus policyConfigStatus = PolicyConfigStatus.CONFIG_NOT_FOUND; fixture.setPolicyConfigStatus(policyConfigStatus); @@ -857,19 +857,19 @@ public class StdStatusTest { fixture.setStatus("", PolicyResponseStatus.ACTION_ADVISED, PolicyConfigStatus.CONFIG_NOT_FOUND); fixture.setPolicyName(""); fixture.setPolicyType(PolicyType.JSON); - fixture.setResposneAttributes(new Hashtable()); - fixture.setMatchingConditions(new Hashtable()); + fixture.setResposneAttributes(new Hashtable<String, String>()); + fixture.setMatchingConditions(new Hashtable<String, String>()); fixture.setStatus("", PolicyResponseStatus.ACTION_ADVISED, PolicyConfigStatus.CONFIG_NOT_FOUND); fixture.setJsonObject((JsonObject) null); fixture.setDocument((Document) null); fixture.setProperties(new Properties()); - fixture.setRequestAttributes(new Hashtable()); + fixture.setRequestAttributes(new Hashtable<String, String>()); fixture.setPolicyVersion(""); - fixture.setActionAdvised(new Hashtable()); + fixture.setActionAdvised(new Hashtable<String, String>()); fixture.setOther(""); fixture.setDecision(PolicyDecision.DENY); fixture.setDetails(""); - fixture.setActionTaken(new Hashtable()); + fixture.setActionTaken(new Hashtable<String, String>()); String configStatus = ""; PolicyConfigStatus policyConfigStatus = PolicyConfigStatus.CONFIG_NOT_FOUND; @@ -892,19 +892,19 @@ public class StdStatusTest { fixture.setStatus("", PolicyResponseStatus.ACTION_ADVISED, PolicyConfigStatus.CONFIG_NOT_FOUND); fixture.setPolicyName(""); fixture.setPolicyType(PolicyType.JSON); - fixture.setResposneAttributes(new Hashtable()); - fixture.setMatchingConditions(new Hashtable()); + fixture.setResposneAttributes(new Hashtable<String, String>()); + fixture.setMatchingConditions(new Hashtable<String, String>()); fixture.setStatus("", PolicyResponseStatus.ACTION_ADVISED, PolicyConfigStatus.CONFIG_NOT_FOUND); fixture.setJsonObject((JsonObject) null); fixture.setDocument((Document) null); fixture.setProperties(new Properties()); - fixture.setRequestAttributes(new Hashtable()); + fixture.setRequestAttributes(new Hashtable<String, String>()); fixture.setPolicyVersion(""); - fixture.setActionAdvised(new Hashtable()); + fixture.setActionAdvised(new Hashtable<String, String>()); fixture.setOther(""); fixture.setDecision(PolicyDecision.DENY); fixture.setDetails(""); - fixture.setActionTaken(new Hashtable()); + fixture.setActionTaken(new Hashtable<String, String>()); PolicyDecision policyDecision = PolicyDecision.DENY; fixture.setDecision(policyDecision); @@ -926,19 +926,19 @@ public class StdStatusTest { fixture.setStatus("", PolicyResponseStatus.ACTION_ADVISED, PolicyConfigStatus.CONFIG_NOT_FOUND); fixture.setPolicyName(""); fixture.setPolicyType(PolicyType.JSON); - fixture.setResposneAttributes(new Hashtable()); - fixture.setMatchingConditions(new Hashtable()); + fixture.setResposneAttributes(new Hashtable<String, String>()); + fixture.setMatchingConditions(new Hashtable<String, String>()); fixture.setStatus("", PolicyResponseStatus.ACTION_ADVISED, PolicyConfigStatus.CONFIG_NOT_FOUND); fixture.setJsonObject((JsonObject) null); fixture.setDocument((Document) null); fixture.setProperties(new Properties()); - fixture.setRequestAttributes(new Hashtable()); + fixture.setRequestAttributes(new Hashtable<String, String>()); fixture.setPolicyVersion(""); - fixture.setActionAdvised(new Hashtable()); + fixture.setActionAdvised(new Hashtable<String, String>()); fixture.setOther(""); fixture.setDecision(PolicyDecision.DENY); fixture.setDetails(""); - fixture.setActionTaken(new Hashtable()); + fixture.setActionTaken(new Hashtable<String, String>()); String policyName = ""; fixture.setPolicyName(policyName); @@ -960,19 +960,19 @@ public class StdStatusTest { fixture.setStatus("", PolicyResponseStatus.ACTION_ADVISED, PolicyConfigStatus.CONFIG_NOT_FOUND); fixture.setPolicyName(""); fixture.setPolicyType(PolicyType.JSON); - fixture.setResposneAttributes(new Hashtable()); - fixture.setMatchingConditions(new Hashtable()); + fixture.setResposneAttributes(new Hashtable<String, String>()); + fixture.setMatchingConditions(new Hashtable<String, String>()); fixture.setStatus("", PolicyResponseStatus.ACTION_ADVISED, PolicyConfigStatus.CONFIG_NOT_FOUND); fixture.setJsonObject((JsonObject) null); fixture.setDocument((Document) null); fixture.setProperties(new Properties()); - fixture.setRequestAttributes(new Hashtable()); + fixture.setRequestAttributes(new Hashtable<String, String>()); fixture.setPolicyVersion(""); - fixture.setActionAdvised(new Hashtable()); + fixture.setActionAdvised(new Hashtable<String, String>()); fixture.setOther(""); fixture.setDecision(PolicyDecision.DENY); fixture.setDetails(""); - fixture.setActionTaken(new Hashtable()); + fixture.setActionTaken(new Hashtable<String, String>()); String policyResponseMessage = ""; fixture.setPolicyResponseMessage(policyResponseMessage); @@ -994,19 +994,19 @@ public class StdStatusTest { fixture.setStatus("", PolicyResponseStatus.ACTION_ADVISED, PolicyConfigStatus.CONFIG_NOT_FOUND); fixture.setPolicyName(""); fixture.setPolicyType(PolicyType.JSON); - fixture.setResposneAttributes(new Hashtable()); - fixture.setMatchingConditions(new Hashtable()); + fixture.setResposneAttributes(new Hashtable<String, String>()); + fixture.setMatchingConditions(new Hashtable<String, String>()); fixture.setStatus("", PolicyResponseStatus.ACTION_ADVISED, PolicyConfigStatus.CONFIG_NOT_FOUND); fixture.setJsonObject((JsonObject) null); fixture.setDocument((Document) null); fixture.setProperties(new Properties()); - fixture.setRequestAttributes(new Hashtable()); + fixture.setRequestAttributes(new Hashtable<String, String>()); fixture.setPolicyVersion(""); - fixture.setActionAdvised(new Hashtable()); + fixture.setActionAdvised(new Hashtable<String, String>()); fixture.setOther(""); fixture.setDecision(PolicyDecision.DENY); fixture.setDetails(""); - fixture.setActionTaken(new Hashtable()); + fixture.setActionTaken(new Hashtable<String, String>()); PolicyResponseStatus policyResponseStatus = PolicyResponseStatus.ACTION_ADVISED; fixture.setPolicyResponseStatus(policyResponseStatus); @@ -1028,19 +1028,19 @@ public class StdStatusTest { fixture.setStatus("", PolicyResponseStatus.ACTION_ADVISED, PolicyConfigStatus.CONFIG_NOT_FOUND); fixture.setPolicyName(""); fixture.setPolicyType(PolicyType.JSON); - fixture.setResposneAttributes(new Hashtable()); - fixture.setMatchingConditions(new Hashtable()); + fixture.setResposneAttributes(new Hashtable<String, String>()); + fixture.setMatchingConditions(new Hashtable<String, String>()); fixture.setStatus("", PolicyResponseStatus.ACTION_ADVISED, PolicyConfigStatus.CONFIG_NOT_FOUND); fixture.setJsonObject((JsonObject) null); fixture.setDocument((Document) null); fixture.setProperties(new Properties()); - fixture.setRequestAttributes(new Hashtable()); + fixture.setRequestAttributes(new Hashtable<String, String>()); fixture.setPolicyVersion(""); - fixture.setActionAdvised(new Hashtable()); + fixture.setActionAdvised(new Hashtable<String, String>()); fixture.setOther(""); fixture.setDecision(PolicyDecision.DENY); fixture.setDetails(""); - fixture.setActionTaken(new Hashtable()); + fixture.setActionTaken(new Hashtable<String, String>()); String policyResponseMessage = ""; PolicyResponseStatus policyResponseStatus = PolicyResponseStatus.ACTION_ADVISED; @@ -1063,19 +1063,19 @@ public class StdStatusTest { fixture.setStatus("", PolicyResponseStatus.ACTION_ADVISED, PolicyConfigStatus.CONFIG_NOT_FOUND); fixture.setPolicyName(""); fixture.setPolicyType(PolicyType.JSON); - fixture.setResposneAttributes(new Hashtable()); - fixture.setMatchingConditions(new Hashtable()); + fixture.setResposneAttributes(new Hashtable<String, String>()); + fixture.setMatchingConditions(new Hashtable<String, String>()); fixture.setStatus("", PolicyResponseStatus.ACTION_ADVISED, PolicyConfigStatus.CONFIG_NOT_FOUND); fixture.setJsonObject((JsonObject) null); fixture.setDocument((Document) null); fixture.setProperties(new Properties()); - fixture.setRequestAttributes(new Hashtable()); + fixture.setRequestAttributes(new Hashtable<String, String>()); fixture.setPolicyVersion(""); - fixture.setActionAdvised(new Hashtable()); + fixture.setActionAdvised(new Hashtable<String, String>()); fixture.setOther(""); fixture.setDecision(PolicyDecision.DENY); fixture.setDetails(""); - fixture.setActionTaken(new Hashtable()); + fixture.setActionTaken(new Hashtable<String, String>()); PolicyType policyType = PolicyType.JSON; fixture.setPolicyType(policyType); @@ -1097,19 +1097,19 @@ public class StdStatusTest { fixture.setStatus("", PolicyResponseStatus.ACTION_ADVISED, PolicyConfigStatus.CONFIG_NOT_FOUND); fixture.setPolicyName(""); fixture.setPolicyType(PolicyType.JSON); - fixture.setResposneAttributes(new Hashtable()); - fixture.setMatchingConditions(new Hashtable()); + fixture.setResposneAttributes(new Hashtable<String, String>()); + fixture.setMatchingConditions(new Hashtable<String, String>()); fixture.setStatus("", PolicyResponseStatus.ACTION_ADVISED, PolicyConfigStatus.CONFIG_NOT_FOUND); fixture.setJsonObject((JsonObject) null); fixture.setDocument((Document) null); fixture.setProperties(new Properties()); - fixture.setRequestAttributes(new Hashtable()); + fixture.setRequestAttributes(new Hashtable<String, String>()); fixture.setPolicyVersion(""); - fixture.setActionAdvised(new Hashtable()); + fixture.setActionAdvised(new Hashtable<String, String>()); fixture.setOther(""); fixture.setDecision(PolicyDecision.DENY); fixture.setDetails(""); - fixture.setActionTaken(new Hashtable()); + fixture.setActionTaken(new Hashtable<String, String>()); String policyVersion = ""; fixture.setPolicyVersion(policyVersion); @@ -1131,19 +1131,19 @@ public class StdStatusTest { fixture.setStatus("", PolicyResponseStatus.ACTION_ADVISED, PolicyConfigStatus.CONFIG_NOT_FOUND); fixture.setPolicyName(""); fixture.setPolicyType(PolicyType.JSON); - fixture.setResposneAttributes(new Hashtable()); - fixture.setMatchingConditions(new Hashtable()); + fixture.setResposneAttributes(new Hashtable<String, String>()); + fixture.setMatchingConditions(new Hashtable<String, String>()); fixture.setStatus("", PolicyResponseStatus.ACTION_ADVISED, PolicyConfigStatus.CONFIG_NOT_FOUND); fixture.setJsonObject((JsonObject) null); fixture.setDocument((Document) null); fixture.setProperties(new Properties()); - fixture.setRequestAttributes(new Hashtable()); + fixture.setRequestAttributes(new Hashtable<String, String>()); fixture.setPolicyVersion(""); - fixture.setActionAdvised(new Hashtable()); + fixture.setActionAdvised(new Hashtable<String, String>()); fixture.setOther(""); fixture.setDecision(PolicyDecision.DENY); fixture.setDetails(""); - fixture.setActionTaken(new Hashtable()); + fixture.setActionTaken(new Hashtable<String, String>()); Properties properties = new Properties(); fixture.setProperties(properties); @@ -1165,20 +1165,20 @@ public class StdStatusTest { fixture.setStatus("", PolicyResponseStatus.ACTION_ADVISED, PolicyConfigStatus.CONFIG_NOT_FOUND); fixture.setPolicyName(""); fixture.setPolicyType(PolicyType.JSON); - fixture.setResposneAttributes(new Hashtable()); - fixture.setMatchingConditions(new Hashtable()); + fixture.setResposneAttributes(new Hashtable<String, String>()); + fixture.setMatchingConditions(new Hashtable<String, String>()); fixture.setStatus("", PolicyResponseStatus.ACTION_ADVISED, PolicyConfigStatus.CONFIG_NOT_FOUND); fixture.setJsonObject((JsonObject) null); fixture.setDocument((Document) null); fixture.setProperties(new Properties()); - fixture.setRequestAttributes(new Hashtable()); + fixture.setRequestAttributes(new Hashtable<String, String>()); fixture.setPolicyVersion(""); - fixture.setActionAdvised(new Hashtable()); + fixture.setActionAdvised(new Hashtable<String, String>()); fixture.setOther(""); fixture.setDecision(PolicyDecision.DENY); fixture.setDetails(""); - fixture.setActionTaken(new Hashtable()); - Map<String, String> requestAttributes = new Hashtable(); + fixture.setActionTaken(new Hashtable<String, String>()); + Map<String, String> requestAttributes = new Hashtable<String, String>(); fixture.setRequestAttributes(requestAttributes); @@ -1199,20 +1199,20 @@ public class StdStatusTest { fixture.setStatus("", PolicyResponseStatus.ACTION_ADVISED, PolicyConfigStatus.CONFIG_NOT_FOUND); fixture.setPolicyName(""); fixture.setPolicyType(PolicyType.JSON); - fixture.setResposneAttributes(new Hashtable()); - fixture.setMatchingConditions(new Hashtable()); + fixture.setResposneAttributes(new Hashtable<String, String>()); + fixture.setMatchingConditions(new Hashtable<String, String>()); fixture.setStatus("", PolicyResponseStatus.ACTION_ADVISED, PolicyConfigStatus.CONFIG_NOT_FOUND); fixture.setJsonObject((JsonObject) null); fixture.setDocument((Document) null); fixture.setProperties(new Properties()); - fixture.setRequestAttributes(new Hashtable()); + fixture.setRequestAttributes(new Hashtable<String, String>()); fixture.setPolicyVersion(""); - fixture.setActionAdvised(new Hashtable()); + fixture.setActionAdvised(new Hashtable<String, String>()); fixture.setOther(""); fixture.setDecision(PolicyDecision.DENY); fixture.setDetails(""); - fixture.setActionTaken(new Hashtable()); - Map<String, String> responseAttributes = new Hashtable(); + fixture.setActionTaken(new Hashtable<String, String>()); + Map<String, String> responseAttributes = new Hashtable<String, String>(); fixture.setResposneAttributes(responseAttributes); @@ -1233,19 +1233,19 @@ public class StdStatusTest { fixture.setStatus("", PolicyResponseStatus.ACTION_ADVISED, PolicyConfigStatus.CONFIG_NOT_FOUND); fixture.setPolicyName(""); fixture.setPolicyType(PolicyType.JSON); - fixture.setResposneAttributes(new Hashtable()); - fixture.setMatchingConditions(new Hashtable()); + fixture.setResposneAttributes(new Hashtable<String, String>()); + fixture.setMatchingConditions(new Hashtable<String, String>()); fixture.setStatus("", PolicyResponseStatus.ACTION_ADVISED, PolicyConfigStatus.CONFIG_NOT_FOUND); fixture.setJsonObject((JsonObject) null); fixture.setDocument((Document) null); fixture.setProperties(new Properties()); - fixture.setRequestAttributes(new Hashtable()); + fixture.setRequestAttributes(new Hashtable<String, String>()); fixture.setPolicyVersion(""); - fixture.setActionAdvised(new Hashtable()); + fixture.setActionAdvised(new Hashtable<String, String>()); fixture.setOther(""); fixture.setDecision(PolicyDecision.DENY); fixture.setDetails(""); - fixture.setActionTaken(new Hashtable()); + fixture.setActionTaken(new Hashtable<String, String>()); String message = ""; PolicyResponseStatus policyResponseStatus = PolicyResponseStatus.ACTION_ADVISED; PolicyConfigStatus policyConfigStatus = PolicyConfigStatus.CONFIG_NOT_FOUND; @@ -1269,19 +1269,19 @@ public class StdStatusTest { fixture.setStatus("", PolicyResponseStatus.ACTION_ADVISED, PolicyConfigStatus.CONFIG_NOT_FOUND); fixture.setPolicyName(""); fixture.setPolicyType(PolicyType.JSON); - fixture.setResposneAttributes(new Hashtable()); - fixture.setMatchingConditions(new Hashtable()); + fixture.setResposneAttributes(new Hashtable<String, String>()); + fixture.setMatchingConditions(new Hashtable<String, String>()); fixture.setStatus("", PolicyResponseStatus.ACTION_ADVISED, PolicyConfigStatus.CONFIG_NOT_FOUND); fixture.setJsonObject((JsonObject) null); fixture.setDocument((Document) null); fixture.setProperties(new Properties()); - fixture.setRequestAttributes(new Hashtable()); + fixture.setRequestAttributes(new Hashtable<String, String>()); fixture.setPolicyVersion(""); - fixture.setActionAdvised(new Hashtable()); + fixture.setActionAdvised(new Hashtable<String, String>()); fixture.setOther(""); fixture.setDecision(PolicyDecision.DENY); fixture.setDetails(""); - fixture.setActionTaken(new Hashtable()); + fixture.setActionTaken(new Hashtable<String, String>()); JsonObject result = fixture.toJSON(); @@ -1303,19 +1303,19 @@ public class StdStatusTest { fixture.setStatus("", PolicyResponseStatus.ACTION_ADVISED, PolicyConfigStatus.CONFIG_NOT_FOUND); fixture.setPolicyName(""); fixture.setPolicyType(PolicyType.JSON); - fixture.setResposneAttributes(new Hashtable()); - fixture.setMatchingConditions(new Hashtable()); + fixture.setResposneAttributes(new Hashtable<String, String>()); + fixture.setMatchingConditions(new Hashtable<String, String>()); fixture.setStatus("", PolicyResponseStatus.ACTION_ADVISED, PolicyConfigStatus.CONFIG_NOT_FOUND); fixture.setJsonObject((JsonObject) null); fixture.setDocument((Document) null); fixture.setProperties(new Properties()); - fixture.setRequestAttributes(new Hashtable()); + fixture.setRequestAttributes(new Hashtable<String, String>()); fixture.setPolicyVersion(""); - fixture.setActionAdvised(new Hashtable()); + fixture.setActionAdvised(new Hashtable<String, String>()); fixture.setOther(""); fixture.setDecision(PolicyDecision.DENY); fixture.setDetails(""); - fixture.setActionTaken(new Hashtable()); + fixture.setActionTaken(new Hashtable<String, String>()); String result = fixture.toOther(); @@ -1337,19 +1337,19 @@ public class StdStatusTest { fixture.setStatus("", PolicyResponseStatus.ACTION_ADVISED, PolicyConfigStatus.CONFIG_NOT_FOUND); fixture.setPolicyName(""); fixture.setPolicyType(PolicyType.JSON); - fixture.setResposneAttributes(new Hashtable()); - fixture.setMatchingConditions(new Hashtable()); + fixture.setResposneAttributes(new Hashtable<String, String>()); + fixture.setMatchingConditions(new Hashtable<String, String>()); fixture.setStatus("", PolicyResponseStatus.ACTION_ADVISED, PolicyConfigStatus.CONFIG_NOT_FOUND); fixture.setJsonObject((JsonObject) null); fixture.setDocument((Document) null); fixture.setProperties(new Properties()); - fixture.setRequestAttributes(new Hashtable()); + fixture.setRequestAttributes(new Hashtable<String, String>()); fixture.setPolicyVersion(""); - fixture.setActionAdvised(new Hashtable()); + fixture.setActionAdvised(new Hashtable<String, String>()); fixture.setOther(""); fixture.setDecision(PolicyDecision.DENY); fixture.setDetails(""); - fixture.setActionTaken(new Hashtable()); + fixture.setActionTaken(new Hashtable<String, String>()); Properties result = fixture.toProperties(); @@ -1372,19 +1372,19 @@ public class StdStatusTest { fixture.setStatus("", PolicyResponseStatus.ACTION_ADVISED, PolicyConfigStatus.CONFIG_NOT_FOUND); fixture.setPolicyName(""); fixture.setPolicyType(PolicyType.JSON); - fixture.setResposneAttributes(new Hashtable()); - fixture.setMatchingConditions(new Hashtable()); + fixture.setResposneAttributes(new Hashtable<String, String>()); + fixture.setMatchingConditions(new Hashtable<String, String>()); fixture.setStatus("", PolicyResponseStatus.ACTION_ADVISED, PolicyConfigStatus.CONFIG_NOT_FOUND); fixture.setJsonObject((JsonObject) null); fixture.setDocument((Document) null); fixture.setProperties(new Properties()); - fixture.setRequestAttributes(new Hashtable()); + fixture.setRequestAttributes(new Hashtable<String, String>()); fixture.setPolicyVersion(""); - fixture.setActionAdvised(new Hashtable()); + fixture.setActionAdvised(new Hashtable<String, String>()); fixture.setOther(""); fixture.setDecision(PolicyDecision.DENY); fixture.setDetails(""); - fixture.setActionTaken(new Hashtable()); + fixture.setActionTaken(new Hashtable<String, String>()); Document result = fixture.toXML(); |