ExternalVendorCode/HIRS
1
0
Fork 0
mirror of https://github.com/nsacyber/HIRS.git synced 2025-05-02 16:53:07 +00:00
Code Issues Actions 3 Packages Projects Releases Wiki Activity

[#49] Modify getPolicy behavior to reflect use

Browse Source 
DBPolicyManager's getPolicy(appraiser, device) has historically
returned the default policy for an appraiser if none is defined
in the device group that the given device belongs to.  However,
this behavior does not in fact support the current use of devices,
groups, and policies; in the case where a group has no policy
assigned for a type of appraiser, the system is in a state
where that type of appraisal will not occur for devices in
a given group.  To better reflect desired behavior, the method
now returns null if a policy is not explicitly set for
the given (appraiser, device group) pair.

Closes #49.
This commit is contained in:
apldev1 2018-11-07 13:18:04 -05:00 committed by apldev3
parent 0586afb9d8
commit c12cb135f1
2 changed files with 80 additions and 106 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

45
HIRS_Utils/src/main/java/hirs/persist/DBPolicyManager.java
View File

@ -1,5 +1,6 @@
package hirs.persist; package hirs.persist;
import com.google.common.base.Preconditions;
import hirs.appraiser.Appraiser; import hirs.appraiser.Appraiser;
import hirs.data.persist.Baseline; import hirs.data.persist.Baseline;
import hirs.data.persist.Device; import hirs.data.persist.Device;
@ -297,9 +298,7 @@ public class DBPolicyManager extends DBManager<Policy> implements PolicyManager
* the <code>IntegrityReport</code> without worrying about figuring out * the <code>IntegrityReport</code> without worrying about figuring out
* which device group it belongs to - this method does the work of finding * which device group it belongs to - this method does the work of finding
* the device group. If the policy has not been set for that particular * the device group. If the policy has not been set for that particular
* device group and appraiser pair, then this method will attempt to find * device group and appraiser pair, then this method will return null.
* the default policy. If neither the specific policy for the device or the
* default policy can be found, then null is returned.
* *
* @param appraiser * @param appraiser
* appraiser * appraiser
@ -309,12 +308,11 @@ public class DBPolicyManager extends DBManager<Policy> implements PolicyManager
* there is none * there is none
*/ */
@Override @Override
public final Policy getPolicy(final Appraiser appraiser, public final Policy getPolicy(
final Appraiser appraiser,
final Device device) { final Device device) {
if (appraiser == null) { Preconditions.checkArgument(appraiser != null, "Appraiser must not be null");
LOGGER.error("cannot get policy for null appraiser"); Preconditions.checkArgument(device != null, "Device must not be null");
return null;
}
Policy ret = null; Policy ret = null;
final SessionFactory factory = getFactory(); final SessionFactory factory = getFactory();
@ -337,7 +335,7 @@ public class DBPolicyManager extends DBManager<Policy> implements PolicyManager
final PolicyMapper mapper = (PolicyMapper) cr.uniqueResult(); final PolicyMapper mapper = (PolicyMapper) cr.uniqueResult();
if (mapper == null) { if (mapper == null) {
LOGGER.debug("no policy mapper found for appraiser {} and " LOGGER.debug("no policy mapper found for appraiser {} and "
+ "device group {}", appraiser, deviceGroup); + "device group {}", appraiser, deviceGroup);
} else { } else {
ret = mapper.getPolicy(); ret = mapper.getPolicy();
} }
@ -352,13 +350,6 @@ public class DBPolicyManager extends DBManager<Policy> implements PolicyManager
throw new DBManagerException(msg, e); throw new DBManagerException(msg, e);
} }
if (ret == null) {
LOGGER.debug("unable to find policy for appraiser '{}' for device "
+ "'{}', attempting to use default policy instead",
appraiser.getName(), device.getName());
ret = getDefaultPolicy(appraiser);
}
return ret; return ret;
} }
@ -441,21 +432,15 @@ public class DBPolicyManager extends DBManager<Policy> implements PolicyManager
@Override @Override
public final void setPolicy(final Appraiser appraiser, public final void setPolicy(final Appraiser appraiser,
final DeviceGroup deviceGroup, final Policy policy) { final DeviceGroup deviceGroup, final Policy policy) {
LOGGER.debug("set policy"); Preconditions.checkNotNull(appraiser, "Cannot set policy on null appraiser");
if (appraiser == null) { Preconditions.checkNotNull(deviceGroup, "Cannot set policy on null device group");
LOGGER.error("cannot set policy on null appraiser");
throw new NullPointerException("appraiser");
}
if (deviceGroup == null) {
LOGGER.error("cannot set policy on null device group");
throw new NullPointerException("deviceGroup");
}
final SessionFactory factory = getFactory(); final SessionFactory factory = getFactory();
Transaction tx = null; Transaction tx = null;
Session session = factory.getCurrentSession(); Session session = factory.getCurrentSession();
try { try {
tx = session.beginTransaction(); tx = session.beginTransaction();
LOGGER.debug("finding existing policy mapper from db where " LOGGER.debug("Finding existing policy mapper from db where "
+ "appraiser = {} and device group = {}", appraiser, + "appraiser = {} and device group = {}", appraiser,
deviceGroup); deviceGroup);
final Criteria cr = session.createCriteria(PolicyMapper.class) final Criteria cr = session.createCriteria(PolicyMapper.class)
@ -463,12 +448,12 @@ public class DBPolicyManager extends DBManager<Policy> implements PolicyManager
.add(Restrictions.eq("deviceGroup", deviceGroup)); .add(Restrictions.eq("deviceGroup", deviceGroup));
final PolicyMapper mapper = (PolicyMapper) cr.uniqueResult(); final PolicyMapper mapper = (PolicyMapper) cr.uniqueResult();
if (policy == null) { if (policy == null) {
LOGGER.debug("policy is null so removing policy"); LOGGER.info("Policy is null, so removing policy from device group {}");
if (mapper != null) { if (mapper != null) {
session.delete(mapper); session.delete(mapper);
} }
} else { } else {
LOGGER.info("setting policy {} on appraiser {} on device " LOGGER.info("Setting policy {} on appraiser {} on device "
+ "group {}", policy, appraiser, deviceGroup); + "group {}", policy, appraiser, deviceGroup);
if (mapper == null) { if (mapper == null) {
session.save(new PolicyMapper(appraiser, policy, session.save(new PolicyMapper(appraiser, policy,
@ -480,10 +465,10 @@ public class DBPolicyManager extends DBManager<Policy> implements PolicyManager
} }
session.getTransaction().commit(); session.getTransaction().commit();
} catch (Exception e) { } catch (Exception e) {
final String msg = "unable to set policy"; final String msg = "Unable to set policy";
LOGGER.error(msg, e); LOGGER.error(msg, e);
if (tx != null) { if (tx != null) {
LOGGER.debug("rolling back transaction"); LOGGER.debug("Rolling back transaction");
tx.rollback(); tx.rollback();
} }
throw new PolicyManagerException(msg, e); throw new PolicyManagerException(msg, e);

141
HIRS_Utils/src/test/java/hirs/persist/DBPolicyManagerTest.java
View File

@ -107,7 +107,6 @@ public final class DBPolicyManagerTest extends SpringPersistenceTest {
*/ */
@Test @Test
public void testSave() throws PolicyManagerException { public void testSave() throws PolicyManagerException {
LOGGER.debug("testSave test started");
final TestPolicy policy = new TestPolicy(POLICY_NAME); final TestPolicy policy = new TestPolicy(POLICY_NAME);
final PolicyManager mgr = new DBPolicyManager(sessionFactory); final PolicyManager mgr = new DBPolicyManager(sessionFactory);
final TestPolicy p2 = (TestPolicy) mgr.savePolicy(policy); final TestPolicy p2 = (TestPolicy) mgr.savePolicy(policy);
@ -125,7 +124,6 @@ public final class DBPolicyManagerTest extends SpringPersistenceTest {
*/ */
@Test(expectedExceptions = PolicyManagerException.class) @Test(expectedExceptions = PolicyManagerException.class)
public void testSaveTwice() throws PolicyManagerException { public void testSaveTwice() throws PolicyManagerException {
LOGGER.debug("testSaveTwice test started");
final TestPolicy policy = new TestPolicy(POLICY_NAME); final TestPolicy policy = new TestPolicy(POLICY_NAME);
final PolicyManager mgr = new DBPolicyManager(sessionFactory); final PolicyManager mgr = new DBPolicyManager(sessionFactory);
final TestPolicy p2 = (TestPolicy) mgr.savePolicy(policy); final TestPolicy p2 = (TestPolicy) mgr.savePolicy(policy);
@ -143,7 +141,6 @@ public final class DBPolicyManagerTest extends SpringPersistenceTest {
*/ */
@Test(expectedExceptions = PolicyManagerException.class) @Test(expectedExceptions = PolicyManagerException.class)
public void testSaveSameName() throws PolicyManagerException { public void testSaveSameName() throws PolicyManagerException {
LOGGER.debug("testSaveSameName test started");
final TestPolicy policy = new TestPolicy(POLICY_NAME); final TestPolicy policy = new TestPolicy(POLICY_NAME);
final TestPolicy policy2 = new TestPolicy(POLICY_NAME); final TestPolicy policy2 = new TestPolicy(POLICY_NAME);
final PolicyManager mgr = new DBPolicyManager(sessionFactory); final PolicyManager mgr = new DBPolicyManager(sessionFactory);
@ -162,7 +159,6 @@ public final class DBPolicyManagerTest extends SpringPersistenceTest {
*/ */
@Test(expectedExceptions = NullPointerException.class) @Test(expectedExceptions = NullPointerException.class)
public void testSaveNullPolicy() throws PolicyManagerException { public void testSaveNullPolicy() throws PolicyManagerException {
LOGGER.debug("testSaveNullPolicy test started");
final PolicyManager mgr = new DBPolicyManager(sessionFactory); final PolicyManager mgr = new DBPolicyManager(sessionFactory);
mgr.savePolicy(null); mgr.savePolicy(null);
Assert.fail("save did not fail"); Assert.fail("save did not fail");
@ -177,7 +173,6 @@ public final class DBPolicyManagerTest extends SpringPersistenceTest {
*/ */
@Test @Test
public void testUpdate() throws PolicyManagerException { public void testUpdate() throws PolicyManagerException {
LOGGER.debug("testUpdate test started");
final String updatedName = "Updated Policy"; final String updatedName = "Updated Policy";
final PolicyManager mgr = new DBPolicyManager(sessionFactory); final PolicyManager mgr = new DBPolicyManager(sessionFactory);
final Policy policy = createPolicy(mgr); final Policy policy = createPolicy(mgr);
@ -197,7 +192,6 @@ public final class DBPolicyManagerTest extends SpringPersistenceTest {
*/ */
@Test @Test
public void testUpdateSameName() throws PolicyManagerException { public void testUpdateSameName() throws PolicyManagerException {
LOGGER.debug("testUpdateSameName test started");
final String name1 = "Test Policy 1"; final String name1 = "Test Policy 1";
final String name2 = "Test Policy 2"; final String name2 = "Test Policy 2";
final PolicyManager mgr = new DBPolicyManager(sessionFactory); final PolicyManager mgr = new DBPolicyManager(sessionFactory);
@ -224,7 +218,6 @@ public final class DBPolicyManagerTest extends SpringPersistenceTest {
*/ */
@Test(expectedExceptions = NullPointerException.class) @Test(expectedExceptions = NullPointerException.class)
public void testUpdateNullPolicy() throws PolicyManagerException { public void testUpdateNullPolicy() throws PolicyManagerException {
LOGGER.debug("testUpdateNullPolicy test started");
final PolicyManager mgr = new DBPolicyManager(sessionFactory); final PolicyManager mgr = new DBPolicyManager(sessionFactory);
mgr.updatePolicy(null); mgr.updatePolicy(null);
Assert.fail("save did not fail"); Assert.fail("save did not fail");
@ -239,7 +232,6 @@ public final class DBPolicyManagerTest extends SpringPersistenceTest {
*/ */
@Test @Test
public void testGet() throws PolicyManagerException { public void testGet() throws PolicyManagerException {
LOGGER.debug("testGet test started");
final PolicyManager mgr = new DBPolicyManager(sessionFactory); final PolicyManager mgr = new DBPolicyManager(sessionFactory);
Assert.assertNull(mgr.getPolicy(POLICY_NAME)); Assert.assertNull(mgr.getPolicy(POLICY_NAME));
final Policy policy = createPolicy(mgr); final Policy policy = createPolicy(mgr);
@ -258,7 +250,6 @@ public final class DBPolicyManagerTest extends SpringPersistenceTest {
*/ */
@Test @Test
public void testGetUnknown() throws PolicyManagerException { public void testGetUnknown() throws PolicyManagerException {
LOGGER.debug("testGetUnknown test started");
final PolicyManager mgr = new DBPolicyManager(sessionFactory); final PolicyManager mgr = new DBPolicyManager(sessionFactory);
Assert.assertNull(mgr.getPolicy("Some Unknown Policy")); Assert.assertNull(mgr.getPolicy("Some Unknown Policy"));
} }
@ -272,7 +263,6 @@ public final class DBPolicyManagerTest extends SpringPersistenceTest {
*/ */
@Test @Test
public void testGetNull() throws PolicyManagerException { public void testGetNull() throws PolicyManagerException {
LOGGER.debug("testGetUnknown test started");
final PolicyManager mgr = new DBPolicyManager(sessionFactory); final PolicyManager mgr = new DBPolicyManager(sessionFactory);
Assert.assertNull(mgr.getPolicy(null)); Assert.assertNull(mgr.getPolicy(null));
} }
@ -286,7 +276,6 @@ public final class DBPolicyManagerTest extends SpringPersistenceTest {
*/ */
@Test @Test
public void testGetPolicyList() throws PolicyManagerException { public void testGetPolicyList() throws PolicyManagerException {
LOGGER.debug("testGetPolicyList test started");
final PolicyManager mgr = new DBPolicyManager(sessionFactory); final PolicyManager mgr = new DBPolicyManager(sessionFactory);
final String[] names = {"Policy1", "Policy2", "Policy3"}; final String[] names = {"Policy1", "Policy2", "Policy3"};
final Policy[] expectedPolicies = new Policy[names.length]; final Policy[] expectedPolicies = new Policy[names.length];
@ -309,7 +298,6 @@ public final class DBPolicyManagerTest extends SpringPersistenceTest {
*/ */
@Test @Test
public void testGetPolicyListNullClass() throws PolicyManagerException { public void testGetPolicyListNullClass() throws PolicyManagerException {
LOGGER.debug("testGetPolicyList test started");
final PolicyManager mgr = new DBPolicyManager(sessionFactory); final PolicyManager mgr = new DBPolicyManager(sessionFactory);
final String[] names = {"Policy1", "Policy2", "Policy3"}; final String[] names = {"Policy1", "Policy2", "Policy3"};
final Policy[] expectedPolicies = new Policy[names.length]; final Policy[] expectedPolicies = new Policy[names.length];
@ -333,7 +321,6 @@ public final class DBPolicyManagerTest extends SpringPersistenceTest {
@Test @Test
public void testGetPolicyListDifferentClass() public void testGetPolicyListDifferentClass()
throws PolicyManagerException { throws PolicyManagerException {
LOGGER.debug("testGetPolicyListDifferentClass test started");
final PolicyManager mgr = new DBPolicyManager(sessionFactory); final PolicyManager mgr = new DBPolicyManager(sessionFactory);
final String[] names = {"Policy1", "Policy2", "Policy3"}; final String[] names = {"Policy1", "Policy2", "Policy3"};
final Policy[] expectedPolicies = new Policy[names.length]; final Policy[] expectedPolicies = new Policy[names.length];
@ -359,7 +346,6 @@ public final class DBPolicyManagerTest extends SpringPersistenceTest {
@Test @Test
public void testGetPolicyListDifferentClassNoReturn() public void testGetPolicyListDifferentClassNoReturn()
throws PolicyManagerException { throws PolicyManagerException {
LOGGER.debug("testGetPolicyListDifferentClassNoReturn test started");
final PolicyManager mgr = new DBPolicyManager(sessionFactory); final PolicyManager mgr = new DBPolicyManager(sessionFactory);
final String[] names = {"Policy1", "Policy2", "Policy3"}; final String[] names = {"Policy1", "Policy2", "Policy3"};
for (int i = 0; i < names.length; ++i) { for (int i = 0; i < names.length; ++i) {
@ -377,7 +363,6 @@ public final class DBPolicyManagerTest extends SpringPersistenceTest {
*/ */
@Test @Test
public void testArchive() throws PolicyManagerException { public void testArchive() throws PolicyManagerException {
LOGGER.debug("testArchive test started");
final PolicyManager mgr = new DBPolicyManager(sessionFactory); final PolicyManager mgr = new DBPolicyManager(sessionFactory);
Assert.assertNull(mgr.getPolicy(POLICY_NAME)); Assert.assertNull(mgr.getPolicy(POLICY_NAME));
createPolicy(mgr); createPolicy(mgr);
@ -396,7 +381,6 @@ public final class DBPolicyManagerTest extends SpringPersistenceTest {
*/ */
@Test @Test
public void testArchiveUnknown() throws PolicyManagerException { public void testArchiveUnknown() throws PolicyManagerException {
LOGGER.debug("testArchiveUnknown test started");
final String name = "Some unknown policy"; final String name = "Some unknown policy";
final PolicyManager mgr = new DBPolicyManager(sessionFactory); final PolicyManager mgr = new DBPolicyManager(sessionFactory);
boolean archived = mgr.archive(name); boolean archived = mgr.archive(name);
@ -413,7 +397,6 @@ public final class DBPolicyManagerTest extends SpringPersistenceTest {
*/ */
@Test @Test
public void testArchiveNull() throws PolicyManagerException { public void testArchiveNull() throws PolicyManagerException {
LOGGER.debug("testArchiveNull test started");
final String name = null; final String name = null;
final PolicyManager mgr = new DBPolicyManager(sessionFactory); final PolicyManager mgr = new DBPolicyManager(sessionFactory);
boolean archived = mgr.archive(name); boolean archived = mgr.archive(name);
@ -428,12 +411,11 @@ public final class DBPolicyManagerTest extends SpringPersistenceTest {
*/ */
@Test @Test
public void testSetAndGetPolicy() throws Exception { public void testSetAndGetPolicy() throws Exception {
LOGGER.debug("testSetAndGetDefaultPolicy test started");
TestPolicy policy = new TestPolicy(POLICY_NAME); TestPolicy policy = new TestPolicy(POLICY_NAME);
final PolicyManager mgr = new DBPolicyManager(sessionFactory); final PolicyManager mgr = new DBPolicyManager(sessionFactory);
policy = (TestPolicy) mgr.savePolicy(policy); policy = (TestPolicy) mgr.savePolicy(policy);
DeviceGroup deviceGroup = DeviceGroup deviceGroup =
createDeviceGroup("Test Device Group", "Test Device"); createDeviceGroupWithDevice("Test Device Group", "Test Device");
mgr.setPolicy(appraiser, deviceGroup, policy); mgr.setPolicy(appraiser, deviceGroup, policy);
final Policy retrievedPolicy = mgr.getPolicy(appraiser, deviceGroup); final Policy retrievedPolicy = mgr.getPolicy(appraiser, deviceGroup);
Assert.assertEquals(retrievedPolicy, policy); Assert.assertEquals(retrievedPolicy, policy);
@ -448,16 +430,15 @@ public final class DBPolicyManagerTest extends SpringPersistenceTest {
*/ */
@Test @Test
public void testSetAndGetPolicyUsingDevice() throws Exception { public void testSetAndGetPolicyUsingDevice() throws Exception {
LOGGER.debug("testSetAndGetDefaultPolicy test started");
TestPolicy policy = new TestPolicy(POLICY_NAME); TestPolicy policy = new TestPolicy(POLICY_NAME);
final PolicyManager mgr = new DBPolicyManager(sessionFactory); final PolicyManager mgr = new DBPolicyManager(sessionFactory);
policy = (TestPolicy) mgr.savePolicy(policy); policy = (TestPolicy) mgr.savePolicy(policy);
DeviceGroup deviceGroup = DeviceGroup deviceGroup =
createDeviceGroup("Test Device Group", "Test Device"); createDeviceGroupWithDevice("Test Device Group", "Test Device");
mgr.setPolicy(appraiser, deviceGroup, policy); mgr.setPolicy(appraiser, deviceGroup, policy);
final Policy retrievedPolicy = final Policy retrievedPolicy = mgr.getPolicy(
mgr.getPolicy(appraiser, deviceGroup.getDevices().iterator() appraiser, deviceGroup.getDevices().iterator().next()
.next()); );
Assert.assertEquals(retrievedPolicy, policy); Assert.assertEquals(retrievedPolicy, policy);
} }
@ -469,12 +450,11 @@ public final class DBPolicyManagerTest extends SpringPersistenceTest {
*/ */
@Test @Test
public void testSetPolicyRemove() throws Exception { public void testSetPolicyRemove() throws Exception {
LOGGER.debug("testSetPolicyRemove test started");
TestPolicy policy = new TestPolicy(POLICY_NAME); TestPolicy policy = new TestPolicy(POLICY_NAME);
final PolicyManager mgr = new DBPolicyManager(sessionFactory); final PolicyManager mgr = new DBPolicyManager(sessionFactory);
policy = (TestPolicy) mgr.savePolicy(policy); policy = (TestPolicy) mgr.savePolicy(policy);
DeviceGroup deviceGroup = DeviceGroup deviceGroup =
createDeviceGroup("Test Device Group", "Test Device"); createDeviceGroupWithDevice("Test Device Group", "Test Device");
mgr.setPolicy(appraiser, deviceGroup, policy); mgr.setPolicy(appraiser, deviceGroup, policy);
Policy retrievedPolicy = mgr.getPolicy(appraiser, deviceGroup); Policy retrievedPolicy = mgr.getPolicy(appraiser, deviceGroup);
Assert.assertEquals(retrievedPolicy, policy); Assert.assertEquals(retrievedPolicy, policy);
@ -493,11 +473,10 @@ public final class DBPolicyManagerTest extends SpringPersistenceTest {
*/ */
@Test(expectedExceptions = NullPointerException.class) @Test(expectedExceptions = NullPointerException.class)
public void testSetPolicyNullAppraiser() throws Exception { public void testSetPolicyNullAppraiser() throws Exception {
LOGGER.debug("testSetPolicyNullAppraiser test started");
TestPolicy policy = new TestPolicy(POLICY_NAME); TestPolicy policy = new TestPolicy(POLICY_NAME);
final PolicyManager mgr = new DBPolicyManager(sessionFactory); final PolicyManager mgr = new DBPolicyManager(sessionFactory);
DeviceGroup deviceGroup = DeviceGroup deviceGroup =
createDeviceGroup("Test Device Group", "Test Device"); createDeviceGroupWithDevice("Test Device Group", "Test Device");
policy = (TestPolicy) mgr.savePolicy(policy); policy = (TestPolicy) mgr.savePolicy(policy);
mgr.setPolicy(null, deviceGroup, policy); mgr.setPolicy(null, deviceGroup, policy);
} }
@ -510,12 +489,11 @@ public final class DBPolicyManagerTest extends SpringPersistenceTest {
*/ */
@Test @Test
public void testSetPolicyTwice() throws Exception { public void testSetPolicyTwice() throws Exception {
LOGGER.debug("testSetDefaultPolicy test started");
TestPolicy policy = new TestPolicy(POLICY_NAME); TestPolicy policy = new TestPolicy(POLICY_NAME);
final PolicyManager mgr = new DBPolicyManager(sessionFactory); final PolicyManager mgr = new DBPolicyManager(sessionFactory);
policy = (TestPolicy) mgr.savePolicy(policy); policy = (TestPolicy) mgr.savePolicy(policy);
DeviceGroup deviceGroup = DeviceGroup deviceGroup =
createDeviceGroup("Test Device Group", "Test Device"); createDeviceGroupWithDevice("Test Device Group", "Test Device");
mgr.setPolicy(appraiser, deviceGroup, policy); mgr.setPolicy(appraiser, deviceGroup, policy);
Policy retrievedPolicy = mgr.getPolicy(appraiser, deviceGroup); Policy retrievedPolicy = mgr.getPolicy(appraiser, deviceGroup);
Assert.assertEquals(retrievedPolicy, policy); Assert.assertEquals(retrievedPolicy, policy);
@ -537,7 +515,6 @@ public final class DBPolicyManagerTest extends SpringPersistenceTest {
*/ */
@Test @Test
public void testSetDifferentPolicesOnDeviceGroups() throws Exception { public void testSetDifferentPolicesOnDeviceGroups() throws Exception {
LOGGER.debug("testSetDefaultPolicy test started");
TestPolicy policy = new TestPolicy(POLICY_NAME); TestPolicy policy = new TestPolicy(POLICY_NAME);
final String policyName2 = "Test Policy 2"; final String policyName2 = "Test Policy 2";
TestPolicy policy2 = new TestPolicy(policyName2); TestPolicy policy2 = new TestPolicy(policyName2);
@ -545,9 +522,9 @@ public final class DBPolicyManagerTest extends SpringPersistenceTest {
policy = (TestPolicy) mgr.savePolicy(policy); policy = (TestPolicy) mgr.savePolicy(policy);
policy2 = (TestPolicy) mgr.savePolicy(policy2); policy2 = (TestPolicy) mgr.savePolicy(policy2);
DeviceGroup deviceGroup = DeviceGroup deviceGroup =
createDeviceGroup("Test Device Group", "Test Device"); createDeviceGroupWithDevice("Test Device Group", "Test Device");
DeviceGroup deviceGroup2 = DeviceGroup deviceGroup2 =
createDeviceGroup("Test Device Group 2", "Test Device 2"); createDeviceGroupWithDevice("Test Device Group 2", "Test Device 2");
mgr.setPolicy(appraiser, deviceGroup, policy); mgr.setPolicy(appraiser, deviceGroup, policy);
mgr.setPolicy(appraiser, deviceGroup2, policy2); mgr.setPolicy(appraiser, deviceGroup2, policy2);
Policy retrievedPolicy = mgr.getPolicy(appraiser, deviceGroup); Policy retrievedPolicy = mgr.getPolicy(appraiser, deviceGroup);
@ -564,35 +541,55 @@ public final class DBPolicyManagerTest extends SpringPersistenceTest {
} }
/** /**
* Tests that if the policy for a device group is not set, the default * Tests that if the policy for a device group is not set, then null
* policy is returned. * is returned.
* *
* @throws Exception * @throws Exception
* if error occurs while creating test Device * if error occurs while creating test Device
*/ */
@Test @Test
public void testGetPolicyReturnsDefaultPolicyWhenDeviceGroupPolicyNotSet() public void testGetPolicyReturnsNullWhenDeviceGroupPolicyNotSet() throws Exception {
throws Exception { final PolicyManager policyMgr = new DBPolicyManager(sessionFactory);
LOGGER.debug("testSetDefaultPolicy test started");
TestPolicy policy = new TestPolicy(POLICY_NAME); // save Test Policy
final String defaultPolicyName2 = "Test Default Policy"; TestPolicy testPolicy = new TestPolicy(POLICY_NAME);
TestPolicy defaultPolicy = new TestPolicy(defaultPolicyName2); testPolicy = (TestPolicy) policyMgr.savePolicy(testPolicy);
final PolicyManager mgr = new DBPolicyManager(sessionFactory);
policy = (TestPolicy) mgr.savePolicy(policy); // save Test Default Policy
defaultPolicy = (TestPolicy) mgr.savePolicy(defaultPolicy); TestPolicy testDefaultPolicy = new TestPolicy("Test Default Policy");
Device deviceWithDefaults = new Device("Device1"); testDefaultPolicy = (TestPolicy) policyMgr.savePolicy(testDefaultPolicy);
createDeviceGroup(DeviceGroup.DEFAULT_GROUP,
"This is the default group"); // create device and put it in Default Group
DeviceGroup deviceGroup = Device deviceInDefaultGroup = new Device("DeviceInDefaultGroup");
createDeviceGroup("Test Device Group", "Test Device"); DeviceGroup defaultGroup = createDeviceGroupWithDevice(
mgr.setDefaultPolicy(appraiser, defaultPolicy); DeviceGroup.DEFAULT_GROUP, deviceInDefaultGroup.getName()
mgr.setPolicy(appraiser, deviceGroup, policy); );
Policy retrievedPolicy = mgr.getPolicy(appraiser, deviceGroup);
Policy retrievedPolicy2 = mgr.getPolicy(appraiser, // create device and put it in Test Device Group
deviceWithDefaults); Device deviceInTestGroup = new Device("DeviceInTestGroup");
Assert.assertEquals(retrievedPolicy, policy); DeviceGroup testDeviceGroup = createDeviceGroupWithDevice(
Assert.assertEquals(retrievedPolicy2, defaultPolicy); "Test Device Group", deviceInTestGroup.getName()
Assert.assertNotEquals(retrievedPolicy2, retrievedPolicy); );
// set default policy for TestAppraiser to Test Default Policy
policyMgr.setDefaultPolicy(appraiser, testDefaultPolicy);
// set policy for TestAppraiser & Test Device Group to Test Policy
policyMgr.setPolicy(appraiser, testDeviceGroup, testPolicy);
Assert.assertEquals(policyMgr.getPolicy(appraiser, defaultGroup), testDefaultPolicy);
Assert.assertEquals(policyMgr.getPolicy(appraiser, testDeviceGroup), testPolicy);
Assert.assertEquals(
policyMgr.getPolicy(appraiser, deviceInDefaultGroup),
testDefaultPolicy
);
Assert.assertEquals(policyMgr.getPolicy(appraiser, deviceInTestGroup), testPolicy);
// remove policy for Test Group and make sure the policy for the device in the group is null
policyMgr.setPolicy(appraiser, testDeviceGroup, null);
Assert.assertNull(policyMgr.getPolicy(appraiser, testDeviceGroup));
Assert.assertNull(policyMgr.getPolicy(appraiser, deviceInTestGroup));
} }
/** /**
@ -603,10 +600,9 @@ public final class DBPolicyManagerTest extends SpringPersistenceTest {
*/ */
@Test @Test
public void testGetPolicyNullAppraiser() throws Exception { public void testGetPolicyNullAppraiser() throws Exception {
LOGGER.debug("testGetPolicyNullAppraiser test started");
final PolicyManager mgr = new DBPolicyManager(sessionFactory); final PolicyManager mgr = new DBPolicyManager(sessionFactory);
DeviceGroup deviceGroup = DeviceGroup deviceGroup =
createDeviceGroup("Test Device Group", "Test Device"); createDeviceGroupWithDevice("Test Device Group", "Test Device");
final Policy policy = mgr.getPolicy(null, deviceGroup); final Policy policy = mgr.getPolicy(null, deviceGroup);
Assert.assertNull(policy); Assert.assertNull(policy);
} }
@ -619,10 +615,9 @@ public final class DBPolicyManagerTest extends SpringPersistenceTest {
*/ */
@Test @Test
public void testGetPolicyNoneSet() throws Exception { public void testGetPolicyNoneSet() throws Exception {
LOGGER.debug("testGetDefaultPolicyNoneSet test started");
final PolicyManager mgr = new DBPolicyManager(sessionFactory); final PolicyManager mgr = new DBPolicyManager(sessionFactory);
DeviceGroup deviceGroup = DeviceGroup deviceGroup =
createDeviceGroup("Test Device Group", "Test Device"); createDeviceGroupWithDevice("Test Device Group", "Test Device");
final Policy policy = mgr.getPolicy(appraiser, deviceGroup); final Policy policy = mgr.getPolicy(appraiser, deviceGroup);
Assert.assertNull(policy); Assert.assertNull(policy);
} }
@ -635,11 +630,10 @@ public final class DBPolicyManagerTest extends SpringPersistenceTest {
*/ */
@Test @Test
public void testSetAndGetDefaultPolicy() throws Exception { public void testSetAndGetDefaultPolicy() throws Exception {
LOGGER.debug("testSetAndGetDefaultPolicy test started");
TestPolicy policy = new TestPolicy(POLICY_NAME); TestPolicy policy = new TestPolicy(POLICY_NAME);
final PolicyManager mgr = new DBPolicyManager(sessionFactory); final PolicyManager mgr = new DBPolicyManager(sessionFactory);
policy = (TestPolicy) mgr.savePolicy(policy); policy = (TestPolicy) mgr.savePolicy(policy);
createDeviceGroup(DeviceGroup.DEFAULT_GROUP, "Test Device"); createDeviceGroupWithDevice(DeviceGroup.DEFAULT_GROUP, "Test Device");
mgr.setDefaultPolicy(appraiser, policy); mgr.setDefaultPolicy(appraiser, policy);
final Policy defaultPolicy = mgr.getDefaultPolicy(appraiser); final Policy defaultPolicy = mgr.getDefaultPolicy(appraiser);
Assert.assertEquals(defaultPolicy, policy); Assert.assertEquals(defaultPolicy, policy);
@ -653,11 +647,10 @@ public final class DBPolicyManagerTest extends SpringPersistenceTest {
*/ */
@Test @Test
public void testSetDefaultPolicyRemove() throws Exception { public void testSetDefaultPolicyRemove() throws Exception {
LOGGER.debug("testSetDefaultPolicyRemove test started");
TestPolicy policy = new TestPolicy(POLICY_NAME); TestPolicy policy = new TestPolicy(POLICY_NAME);
final PolicyManager mgr = new DBPolicyManager(sessionFactory); final PolicyManager mgr = new DBPolicyManager(sessionFactory);
policy = (TestPolicy) mgr.savePolicy(policy); policy = (TestPolicy) mgr.savePolicy(policy);
createDeviceGroup(DeviceGroup.DEFAULT_GROUP, "Test Device"); createDeviceGroupWithDevice(DeviceGroup.DEFAULT_GROUP, "Test Device");
mgr.setDefaultPolicy(appraiser, policy); mgr.setDefaultPolicy(appraiser, policy);
Policy defaultPolicy = mgr.getDefaultPolicy(appraiser); Policy defaultPolicy = mgr.getDefaultPolicy(appraiser);
Assert.assertEquals(defaultPolicy, policy); Assert.assertEquals(defaultPolicy, policy);
@ -673,7 +666,6 @@ public final class DBPolicyManagerTest extends SpringPersistenceTest {
*/ */
@Test(expectedExceptions = NullPointerException.class) @Test(expectedExceptions = NullPointerException.class)
public void testSetDefaultPolicyNullAppraiser() { public void testSetDefaultPolicyNullAppraiser() {
LOGGER.debug("testSetDefaultPolicyNullAppraiser test started");
TestPolicy policy = new TestPolicy(POLICY_NAME); TestPolicy policy = new TestPolicy(POLICY_NAME);
final PolicyManager mgr = new DBPolicyManager(sessionFactory); final PolicyManager mgr = new DBPolicyManager(sessionFactory);
policy = (TestPolicy) mgr.savePolicy(policy); policy = (TestPolicy) mgr.savePolicy(policy);
@ -688,11 +680,10 @@ public final class DBPolicyManagerTest extends SpringPersistenceTest {
*/ */
@Test @Test
public void testSetDefaultPolicyTwice() throws Exception { public void testSetDefaultPolicyTwice() throws Exception {
LOGGER.debug("testSetDefaultPolicy test started");
TestPolicy policy = new TestPolicy(POLICY_NAME); TestPolicy policy = new TestPolicy(POLICY_NAME);
final PolicyManager mgr = new DBPolicyManager(sessionFactory); final PolicyManager mgr = new DBPolicyManager(sessionFactory);
policy = (TestPolicy) mgr.savePolicy(policy); policy = (TestPolicy) mgr.savePolicy(policy);
createDeviceGroup(DeviceGroup.DEFAULT_GROUP, "Test Device"); createDeviceGroupWithDevice(DeviceGroup.DEFAULT_GROUP, "Test Device");
mgr.setDefaultPolicy(appraiser, policy); mgr.setDefaultPolicy(appraiser, policy);
Policy defaultPolicy = mgr.getDefaultPolicy(appraiser); Policy defaultPolicy = mgr.getDefaultPolicy(appraiser);
Assert.assertEquals(defaultPolicy, policy); Assert.assertEquals(defaultPolicy, policy);
@ -709,7 +700,6 @@ public final class DBPolicyManagerTest extends SpringPersistenceTest {
*/ */
@Test @Test
public void testGetDefaultPolicyNullAppraiser() { public void testGetDefaultPolicyNullAppraiser() {
LOGGER.debug("testGetDefaultPolicyNullAppraiser test started");
final PolicyManager mgr = new DBPolicyManager(sessionFactory); final PolicyManager mgr = new DBPolicyManager(sessionFactory);
final Policy policy = mgr.getDefaultPolicy(null); final Policy policy = mgr.getDefaultPolicy(null);
Assert.assertNull(policy); Assert.assertNull(policy);
@ -720,7 +710,6 @@ public final class DBPolicyManagerTest extends SpringPersistenceTest {
*/ */
@Test @Test
public void testGetDefaultPolicyNoneSet() { public void testGetDefaultPolicyNoneSet() {
LOGGER.debug("testGetDefaultPolicyNoneSet test started");
final PolicyManager mgr = new DBPolicyManager(sessionFactory); final PolicyManager mgr = new DBPolicyManager(sessionFactory);
final Policy policy = mgr.getDefaultPolicy(appraiser); final Policy policy = mgr.getDefaultPolicy(appraiser);
Assert.assertNull(policy); Assert.assertNull(policy);
@ -738,9 +727,9 @@ public final class DBPolicyManagerTest extends SpringPersistenceTest {
final Policy policy2 = new TestPolicy("Policy2"); final Policy policy2 = new TestPolicy("Policy2");
final Policy policy3 = new TestPolicy("Policy3"); final Policy policy3 = new TestPolicy("Policy3");
final Policy policy4 = new TestPolicy("Policy4"); final Policy policy4 = new TestPolicy("Policy4");
final DeviceGroup deviceGroup1 = createDeviceGroup("Group1", "Device1"); final DeviceGroup deviceGroup1 = createDeviceGroupWithDevice("Group1", "Device1");
final DeviceGroup deviceGroup2 = createDeviceGroup("Group2", "Device2"); final DeviceGroup deviceGroup2 = createDeviceGroupWithDevice("Group2", "Device2");
final DeviceGroup deviceGroup3 = createDeviceGroup("Group3", "Device3"); final DeviceGroup deviceGroup3 = createDeviceGroupWithDevice("Group3", "Device3");
policyManager.savePolicy(policy1); policyManager.savePolicy(policy1);
policyManager.savePolicy(policy2); policyManager.savePolicy(policy2);
@ -785,8 +774,9 @@ public final class DBPolicyManagerTest extends SpringPersistenceTest {
return mgr.savePolicy(policy); return mgr.savePolicy(policy);
} }
private DeviceGroup createDeviceGroup(final String deviceGroupName, private DeviceGroup createDeviceGroupWithDevice(
final String deviceName) throws Exception { final String deviceGroupName, final String deviceName
) throws Exception {
DeviceGroupManager deviceGroupManager = new DBDeviceGroupManager(sessionFactory); DeviceGroupManager deviceGroupManager = new DBDeviceGroupManager(sessionFactory);
DeviceManager deviceManager = new DBDeviceManager(sessionFactory); DeviceManager deviceManager = new DBDeviceManager(sessionFactory);
Device device = DeviceTest.getTestDevice(deviceName); Device device = DeviceTest.getTestDevice(deviceName);
@ -795,7 +785,6 @@ public final class DBPolicyManagerTest extends SpringPersistenceTest {
deviceGroup.addDevice(device); deviceGroup.addDevice(device);
device.setDeviceGroup(deviceGroup); device.setDeviceGroup(deviceGroup);
deviceManager.saveDevice(device); deviceManager.saveDevice(device);
deviceGroupManager.updateDeviceGroup(deviceGroup); deviceGroupManager.updateDeviceGroup(deviceGroup);
return deviceGroup; return deviceGroup;
} }