Resolve checkstyle formatting

This submission is mostly focused on 120 spacing, missing
spaces, rearranged imports, newlines before package
and a few other items. Will have to submit further
reviews to finish this.

Issue-ID: POLICY-883
Change-Id: I772a2077ac97a0cb929810d8afadd2f415fae17b
Signed-off-by: Pamela Dragosh <pdragosh@research.att.com>

9 files changed, 996 insertions, 964 deletions

diff --git a/controlloop/common/policy-yaml/src/test/java/org/onap/policy/controlloop/compiler/CompilerExceptionTest.java b/controlloop/common/policy-yaml/src/test/java/org/onap/policy/controlloop/compiler/CompilerExceptionTest.java
index 0ec882fef..d48336b3d 100644
--- a/controlloop/common/policy-yaml/src/test/java/org/onap/policy/controlloop/compiler/CompilerExceptionTest.java
+++ b/controlloop/common/policy-yaml/src/test/java/org/onap/policy/controlloop/compiler/CompilerExceptionTest.java
@@ -15,16 +15,17 @@
  * limitations under the License.
  * ============LICENSE_END=========================================================
  */
+
 package org.onap.policy.controlloop.compiler;
 
 import org.junit.Test;
 import org.onap.policy.common.utils.test.ExceptionsTester;
 
-public class CompilerExceptionTest extends ExceptionsTester{
-	
-	@Test
-	public void test() throws Exception {
-		test(CompilerException.class);
-	}
+public class CompilerExceptionTest extends ExceptionsTester {
+
+    @Test
+    public void test() throws Exception {
+        test(CompilerException.class);
+    }
 
 }
diff --git a/controlloop/common/policy-yaml/src/test/java/org/onap/policy/controlloop/compiler/ControlLoopCompilerTest.java b/controlloop/common/policy-yaml/src/test/java/org/onap/policy/controlloop/compiler/ControlLoopCompilerTest.java
index 048aef270..b69343862 100644
--- a/controlloop/common/policy-yaml/src/test/java/org/onap/policy/controlloop/compiler/ControlLoopCompilerTest.java
+++ b/controlloop/common/policy-yaml/src/test/java/org/onap/policy/controlloop/compiler/ControlLoopCompilerTest.java
@@ -2,7 +2,7 @@
  * ============LICENSE_START=======================================================
  * policy-yaml unit test
  * ================================================================================
- * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
+ * Copyright (C) 2017-2018 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.
@@ -37,162 +37,174 @@ import org.onap.policy.controlloop.policy.ControlLoopPolicy;
 import org.onap.policy.controlloop.policy.FinalResult;
 
 public class ControlLoopCompilerTest {
-	
-	@Rule
-	public ExpectedException expectedException = ExpectedException.none();
-
-	@Test 
-	public void testTest() throws Exception {
-		List<String> expectedOnErrorMessages = new ArrayList<>();
-		expectedOnErrorMessages.add("Operational Policy has an bad ID");
-		expectedOnErrorMessages.add("Policy id is set to a PolicyResult SUCCESS");
-		expectedOnErrorMessages.add("Policy id is set to a FinalResult FINAL_SUCCESS");
+
+    @Rule
+    public ExpectedException expectedException = ExpectedException.none();
+
+    @Test 
+    public void testTest() throws Exception {
+        List<String> expectedOnErrorMessages = new ArrayList<>();
+        expectedOnErrorMessages.add("Operational Policy has an bad ID");
+        expectedOnErrorMessages.add("Policy id is set to a PolicyResult SUCCESS");
+        expectedOnErrorMessages.add("Policy id is set to a FinalResult FINAL_SUCCESS");
         expectedOnErrorMessages.add("Policy actor is null");
-		expectedOnErrorMessages.add("Policy actor is invalid");
-		expectedOnErrorMessages.add("Policy recipe is null");
-		expectedOnErrorMessages.add("Policy recipe is invalid");
+        expectedOnErrorMessages.add("Policy actor is invalid");
+        expectedOnErrorMessages.add("Policy recipe is null");
+        expectedOnErrorMessages.add("Policy recipe is invalid");
         expectedOnErrorMessages.add("Policy recipe is invalid");
         expectedOnErrorMessages.add("Policy recipe is invalid");
-		expectedOnErrorMessages.add("Policy target is null");
-		expectedOnErrorMessages.add("Policy target is invalid");
-		expectedOnErrorMessages.add("Policy success is neither another policy nor FINAL_SUCCESS");
-		expectedOnErrorMessages.add("Policy failure is neither another policy nor FINAL_FAILURE");
-		expectedOnErrorMessages.add("Policy failure retries is neither another policy nor FINAL_FAILURE_RETRIES");
-		expectedOnErrorMessages.add("Policy failure timeout is neither another policy nor FINAL_FAILURE_TIMEOUT");
-		expectedOnErrorMessages.add("Policy failure exception is neither another policy nor FINAL_FAILURE_EXCEPTION");
-		expectedOnErrorMessages.add("Policy failure guard is neither another policy nor FINAL_FAILURE_GUARD");
+        expectedOnErrorMessages.add("Policy target is null");
+        expectedOnErrorMessages.add("Policy target is invalid");
+        expectedOnErrorMessages.add("Policy success is neither another policy nor FINAL_SUCCESS");
+        expectedOnErrorMessages.add("Policy failure is neither another policy nor FINAL_FAILURE");
+        expectedOnErrorMessages.add("Policy failure retries is neither another policy nor FINAL_FAILURE_RETRIES");
+        expectedOnErrorMessages.add("Policy failure timeout is neither another policy nor FINAL_FAILURE_TIMEOUT");
+        expectedOnErrorMessages.add("Policy failure exception is neither another policy nor FINAL_FAILURE_EXCEPTION");
+        expectedOnErrorMessages.add("Policy failure guard is neither another policy nor FINAL_FAILURE_GUARD");
         expectedOnErrorMessages.add("Unsupported version for this compiler");
         expectedOnErrorMessages.add("controlLoop overall timeout is less than the sum of operational policy timeouts.");
-        
-		TestControlLoopCompilerCallback testControlLoopCompilerCallback = new TestControlLoopCompilerCallback(expectedOnErrorMessages);
-		ControlLoopPolicy controlLoopPolicy = this.test("src/test/resources/v1.0.0/test.yaml", testControlLoopCompilerCallback);
-		assertEquals(22, controlLoopPolicy.getPolicies().size());
-		assertTrue(testControlLoopCompilerCallback.areAllExpectedOnErrorsReceived());
-	}
-	
-	@Test
-	public void testSuccessConnectedToUnknownPolicy() throws Exception {
-		expectedException.expect(CompilerException.class);
-		expectedException.expectMessage("Operation Policy unique-policy-id-1-restart is connected to unknown policy unknown-policy");
-		this.test("src/test/resources/v1.0.0/bad_policy_success_connected_to_unknown_policy.yaml");	
-	}
-	
-	@Test
-	public void testFailureConnectedToUnknownPolicy() throws Exception {
-		expectedException.expect(CompilerException.class);
-		expectedException.expectMessage("Operation Policy unique-policy-id-1-restart is connected to unknown policy unknown-policy");
-		this.test("src/test/resources/v1.0.0/bad_policy_failure_connected_to_unknown_policy.yaml");	
-	}
-	
-	@Test
-	public void testFailureTimeoutToUnknownPolicy() throws Exception {
-		expectedException.expect(CompilerException.class);
-		expectedException.expectMessage("Operation Policy unique-policy-id-1-restart is connected to unknown policy unknown-policy");
-		this.test("src/test/resources/v1.0.0/bad_policy_failure_timeout_connected_to_unknown_policy.yaml");	
-	}
-	
-	@Test
-	public void testFailureRetriesToUnknownPolicy() throws Exception {
-		expectedException.expect(CompilerException.class);
-		expectedException.expectMessage("Operation Policy unique-policy-id-1-restart is connected to unknown policy unknown-policy");
-		this.test("src/test/resources/v1.0.0/bad_policy_failure_retries_connected_to_unknown_policy.yaml");	
-	}
-	
-	@Test
-	public void testFailureExceptionToUnknownPolicy() throws Exception {
-		expectedException.expect(CompilerException.class);
-		expectedException.expectMessage("Operation Policy unique-policy-id-1-restart is connected to unknown policy unknown-policy");
-		this.test("src/test/resources/v1.0.0/bad_policy_failure_exception_connected_to_unknown_policy.yaml");	
-	}
-	
-	@Test
-	public void testFailureGuardToUnknownPolicy() throws Exception {
-		expectedException.expect(CompilerException.class);
-		expectedException.expectMessage("Operation Policy unique-policy-id-1-restart is connected to unknown policy unknown-policy");
-		this.test("src/test/resources/v1.0.0/bad_policy_failure_guard_connected_to_unknown_policy.yaml");	
-	}
-	
-	@Test 
-	public void testInvalidTriggerPolicyId() throws Exception {
-		expectedException.expect(CompilerException.class);
-		expectedException.expectMessage("Unexpected value for trigger_policy, should only be " + FinalResult.FINAL_OPENLOOP.toString() + " or a valid Policy ID");
-		this.test("src/test/resources/v1.0.0/bad_trigger_1.yaml");
-	}
-	
-	@Test 
-	public void testNoTriggerPolicyId() throws Exception {
-		expectedException.expect(CompilerException.class);
-		this.test("src/test/resources/v1.0.0/bad_trigger_no_trigger_id.yaml");
-	}
-	
-	@Test 
-	public void testNoControlLoopName() throws Exception {
-		List<String> expectedOnErrorMessages = new ArrayList<>();
+
+        TestControlLoopCompilerCallback testControlLoopCompilerCallback = 
+                        new TestControlLoopCompilerCallback(expectedOnErrorMessages);
+        ControlLoopPolicy controlLoopPolicy = this.test("src/test/resources/v1.0.0/test.yaml", 
+                        testControlLoopCompilerCallback);
+        assertEquals(22, controlLoopPolicy.getPolicies().size());
+        assertTrue(testControlLoopCompilerCallback.areAllExpectedOnErrorsReceived());
+    }
+
+    @Test
+    public void testSuccessConnectedToUnknownPolicy() throws Exception {
+        expectedException.expect(CompilerException.class);
+        expectedException.expectMessage(
+                        "Operation Policy unique-policy-id-1-restart is connected to unknown policy unknown-policy");
+        this.test("src/test/resources/v1.0.0/bad_policy_success_connected_to_unknown_policy.yaml");
+    }
+
+    @Test
+    public void testFailureConnectedToUnknownPolicy() throws Exception {
+        expectedException.expect(CompilerException.class);
+        expectedException.expectMessage(
+                        "Operation Policy unique-policy-id-1-restart is connected to unknown policy unknown-policy");
+        this.test("src/test/resources/v1.0.0/bad_policy_failure_connected_to_unknown_policy.yaml");
+    }
+
+    @Test
+    public void testFailureTimeoutToUnknownPolicy() throws Exception {
+        expectedException.expect(CompilerException.class);
+        expectedException.expectMessage(
+                        "Operation Policy unique-policy-id-1-restart is connected to unknown policy unknown-policy");
+        this.test("src/test/resources/v1.0.0/bad_policy_failure_timeout_connected_to_unknown_policy.yaml");
+    }
+
+    @Test
+    public void testFailureRetriesToUnknownPolicy() throws Exception {
+        expectedException.expect(CompilerException.class);
+        expectedException.expectMessage(
+                        "Operation Policy unique-policy-id-1-restart is connected to unknown policy unknown-policy");
+        this.test("src/test/resources/v1.0.0/bad_policy_failure_retries_connected_to_unknown_policy.yaml");
+    }
+
+    @Test
+    public void testFailureExceptionToUnknownPolicy() throws Exception {
+        expectedException.expect(CompilerException.class);
+        expectedException.expectMessage(
+                        "Operation Policy unique-policy-id-1-restart is connected to unknown policy unknown-policy");
+        this.test("src/test/resources/v1.0.0/bad_policy_failure_exception_connected_to_unknown_policy.yaml");
+    }
+
+    @Test
+    public void testFailureGuardToUnknownPolicy() throws Exception {
+        expectedException.expect(CompilerException.class);
+        expectedException.expectMessage(
+                        "Operation Policy unique-policy-id-1-restart is connected to unknown policy unknown-policy");
+        this.test("src/test/resources/v1.0.0/bad_policy_failure_guard_connected_to_unknown_policy.yaml");
+    }
+
+    @Test 
+    public void testInvalidTriggerPolicyId() throws Exception {
+        expectedException.expect(CompilerException.class);
+        expectedException.expectMessage(
+                        "Unexpected value for trigger_policy, should only be " 
+                        + FinalResult.FINAL_OPENLOOP.toString() + " or a valid Policy ID");
+        this.test("src/test/resources/v1.0.0/bad_trigger_1.yaml");
+    }
+
+    @Test 
+    public void testNoTriggerPolicyId() throws Exception {
+        expectedException.expect(CompilerException.class);
+        this.test("src/test/resources/v1.0.0/bad_trigger_no_trigger_id.yaml");
+    }
+
+    @Test 
+    public void testNoControlLoopName() throws Exception {
+        List<String> expectedOnErrorMessages = new ArrayList<>();
         expectedOnErrorMessages.add("Missing controlLoopName");
         expectedOnErrorMessages.add("Unsupported version for this compiler");
-        TestControlLoopCompilerCallback testControlLoopCompilerCallback = new TestControlLoopCompilerCallback(expectedOnErrorMessages);
-		this.test("src/test/resources/v1.0.0/bad_control_loop_no_control_loop_name.yaml", testControlLoopCompilerCallback);
-	    assertTrue(testControlLoopCompilerCallback.areAllExpectedOnErrorsReceived());
-	}
-	
-	@Test 
-	public void testInvalidFinalResult() throws Exception {
-		expectedException.expect(CompilerException.class);
-		expectedException.expectMessage("Unexpected Final Result for trigger_policy, should only be FINAL_OPENLOOP or a valid Policy ID");
-		this.test("src/test/resources/v1.0.0/bad_trigger_2.yaml");
-	}
-	
-	@Test 
-	public void testCompileEmptyFile() throws Exception {
-		expectedException.expect(CompilerException.class);
-		expectedException.expectMessage("Could not parse yaml specification.");
-		this.test("src/test/resources/v1.0.0/empty.yaml");
-	}
-	
-	public ControlLoopPolicy test(String testFile) throws Exception {
-		return test(testFile, null);
-	}
-	
-	public ControlLoopPolicy test(String testFile, ControlLoopCompilerCallback controlLoopCompilerCallback) throws Exception {
-		try (InputStream is = new FileInputStream(new File(testFile))) {
-			return ControlLoopCompiler.compile(is, controlLoopCompilerCallback);
-		} catch (FileNotFoundException e) {
-			fail(e.getMessage());
-		} catch (IOException e) {
-			fail(e.getMessage());
-		} catch (Exception e) {
-			throw e;
-		}
-		return null;
-	}
-	
-	class TestControlLoopCompilerCallback implements ControlLoopCompilerCallback{
-		
-		private List<String> expectedOnErrorMessages;
-		
-		public TestControlLoopCompilerCallback(List<String> expectedOnErrorMessages){
-			this.expectedOnErrorMessages = expectedOnErrorMessages;
-		}
-
-		@Override
-		public boolean onWarning(String message) {
-			return true;
-		}
-
-		@Override
-		public boolean onError(String message) {
-			if (!expectedOnErrorMessages.remove(message)){
-			    fail("Unexpected onError message: " + message);
-			}
-			return true;
-		}
-		
-		public boolean areAllExpectedOnErrorsReceived(){
-			return expectedOnErrorMessages.size() == 0;
-		}
-		
-	};
+        TestControlLoopCompilerCallback testControlLoopCompilerCallback = 
+                        new TestControlLoopCompilerCallback(expectedOnErrorMessages);
+        this.test("src/test/resources/v1.0.0/bad_control_loop_no_control_loop_name.yaml", 
+                        testControlLoopCompilerCallback);
+        assertTrue(testControlLoopCompilerCallback.areAllExpectedOnErrorsReceived());
+    }
 
-}
+    @Test 
+    public void testInvalidFinalResult() throws Exception {
+        expectedException.expect(CompilerException.class);
+        expectedException.expectMessage(
+                     "Unexpected Final Result for trigger_policy, should only be FINAL_OPENLOOP or a valid Policy ID");
+        this.test("src/test/resources/v1.0.0/bad_trigger_2.yaml");
+    }
+
+    @Test 
+    public void testCompileEmptyFile() throws Exception {
+        expectedException.expect(CompilerException.class);
+        expectedException.expectMessage("Could not parse yaml specification.");
+        this.test("src/test/resources/v1.0.0/empty.yaml");
+    }
+
+    public ControlLoopPolicy test(String testFile) throws Exception {
+        return test(testFile, null);
+    }
+
+    public ControlLoopPolicy test(String testFile, 
+                    ControlLoopCompilerCallback controlLoopCompilerCallback) throws Exception {
+        try (InputStream is = new FileInputStream(new File(testFile))) {
+            return ControlLoopCompiler.compile(is, controlLoopCompilerCallback);
+        } catch (FileNotFoundException e) {
+            fail(e.getMessage());
+        } catch (IOException e) {
+            fail(e.getMessage());
+        } catch (Exception e) {
+            throw e;
+        }
+        return null;
+    }
+
+    class TestControlLoopCompilerCallback implements ControlLoopCompilerCallback {
 
+        private List<String> expectedOnErrorMessages;
 
+        public TestControlLoopCompilerCallback(List<String> expectedOnErrorMessages) {
+            this.expectedOnErrorMessages = expectedOnErrorMessages;
+        }
+
+        @Override
+        public boolean onWarning(String message) {
+            return true;
+        }
+
+        @Override
+        public boolean onError(String message) {
+            if (!expectedOnErrorMessages.remove(message)) {
+                fail("Unexpected onError message: " + message);
+            }
+            return true;
+        }
+
+        public boolean areAllExpectedOnErrorsReceived() {
+            return expectedOnErrorMessages.size() == 0;
+        }
+
+    }
+
+}
diff --git a/controlloop/common/policy-yaml/src/test/java/org/onap/policy/controlloop/compiler/ControlLoopGuardCompilerTest.java b/controlloop/common/policy-yaml/src/test/java/org/onap/policy/controlloop/compiler/ControlLoopGuardCompilerTest.java
index f381aa207..54c4eccff 100644
--- a/controlloop/common/policy-yaml/src/test/java/org/onap/policy/controlloop/compiler/ControlLoopGuardCompilerTest.java
+++ b/controlloop/common/policy-yaml/src/test/java/org/onap/policy/controlloop/compiler/ControlLoopGuardCompilerTest.java
@@ -2,7 +2,7 @@
  * ============LICENSE_START=======================================================
  * policy-yaml unit test
  * ================================================================================
- * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
+ * Copyright (C) 2017-2018 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.
@@ -34,70 +34,70 @@ import org.onap.policy.controlloop.guard.compiler.ControlLoopGuardCompiler;
 
 public class ControlLoopGuardCompilerTest {
 
-	@Test 
-	public void testTest1() {
-		try {
-			this.test("src/test/resources/v2.0.0-guard/policy_guard_ONAP_demo_vDNS.yaml");
-		} catch (Exception e) {
-			fail(e.getMessage());
-		}
-	}
-	
-	@Test 
-	public void testTest2() {
-		try {
-			this.test("src/test/resources/v2.0.0-guard/policy_guard_appc_restart.yaml");
-		} catch (Exception e) {
-			fail(e.getMessage());
-		}
-	}
-	
-	@Test 
-	public void testBad1() {
-		try {
-			this.test("src/test/resources/v2.0.0-guard/no_guard_policy.yaml");
-		} catch (Exception e) {
-			e.printStackTrace();
-		}
-	}
-	
-	@Test 
-	public void testBad2() {
-		try {
-			this.test("src/test/resources/v2.0.0-guard/duplicate_guard_policy.yaml");
-		} catch (Exception e) {
-			e.printStackTrace();
-		}
-	}
-	
-	@Test 
-	public void testBad3() {
-		try {
-			this.test("src/test/resources/v2.0.0-guard/no_guard_constraint.yaml");
-		} catch (Exception e) {
-			e.printStackTrace();
-		}
-	}
-	
-	@Test 
-	public void testBad4() {
-		try {
-			this.test("src/test/resources/v2.0.0-guard/duplicate_guard_constraint.yaml");
-		} catch (Exception e) {
-			e.printStackTrace();
-		}
-	}
-	
-	public void test(String testFile) throws Exception {
-		try (InputStream is = new FileInputStream(new File(testFile))) {
-			ControlLoopGuardCompiler.compile(is, null);
-		} catch (FileNotFoundException e) {
-			fail(e.getMessage());
-		} catch (IOException e) {
-			fail(e.getMessage());
-		} catch (Exception e) {
-			throw e;
-		}
-	}
-	
+    @Test 
+    public void testTest1() {
+        try {
+            this.test("src/test/resources/v2.0.0-guard/policy_guard_ONAP_demo_vDNS.yaml");
+        } catch (Exception e) {
+            fail(e.getMessage());
+        }
+    }
+
+    @Test 
+    public void testTest2() {
+        try {
+            this.test("src/test/resources/v2.0.0-guard/policy_guard_appc_restart.yaml");
+        } catch (Exception e) {
+            fail(e.getMessage());
+        }
+    }
+
+    @Test 
+    public void testBad1() {
+        try {
+            this.test("src/test/resources/v2.0.0-guard/no_guard_policy.yaml");
+        } catch (Exception e) {
+            e.printStackTrace();
+        }
+    }
+
+    @Test 
+    public void testBad2() {
+        try {
+            this.test("src/test/resources/v2.0.0-guard/duplicate_guard_policy.yaml");
+        } catch (Exception e) {
+            e.printStackTrace();
+        }
+    }
+
+    @Test 
+    public void testBad3() {
+        try {
+            this.test("src/test/resources/v2.0.0-guard/no_guard_constraint.yaml");
+        } catch (Exception e) {
+            e.printStackTrace();
+        }
+    }
+
+    @Test 
+    public void testBad4() {
+        try {
+            this.test("src/test/resources/v2.0.0-guard/duplicate_guard_constraint.yaml");
+        } catch (Exception e) {
+            e.printStackTrace();
+        }
+    }
+
+    public void test(String testFile) throws Exception {
+        try (InputStream is = new FileInputStream(new File(testFile))) {
+            ControlLoopGuardCompiler.compile(is, null);
+        } catch (FileNotFoundException e) {
+            fail(e.getMessage());
+        } catch (IOException e) {
+            fail(e.getMessage());
+        } catch (Exception e) {
+            throw e;
+        }
+    }
+
 }
diff --git a/controlloop/common/policy-yaml/src/test/java/org/onap/policy/controlloop/policy/ControlLoopPolicyTest.java b/controlloop/common/policy-yaml/src/test/java/org/onap/policy/controlloop/policy/ControlLoopPolicyTest.java
index b847009cc..6212b17f4 100644
--- a/controlloop/common/policy-yaml/src/test/java/org/onap/policy/controlloop/policy/ControlLoopPolicyTest.java
+++ b/controlloop/common/policy-yaml/src/test/java/org/onap/policy/controlloop/policy/ControlLoopPolicyTest.java
@@ -2,7 +2,7 @@
  * ============LICENSE_START=======================================================
  * policy-yaml unit test
  * ================================================================================
- * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
+ * Copyright (C) 2017-2018 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.
@@ -38,83 +38,84 @@ import org.yaml.snakeyaml.constructor.Constructor;
 
 
 public class ControlLoopPolicyTest {
-	private static final Logger logger = LoggerFactory.getLogger(ControlLoopPolicyTest.class);
-	@Test 
-	public void test() {
-		this.test("src/test/resources/v1.0.0/policy_Test.yaml");
-	}
-	
-	@Test 
-	public void testvService1() {
-		this.test("src/test/resources/v1.0.0/policy_vService.yaml");
-	}
+    private static final Logger logger = LoggerFactory.getLogger(ControlLoopPolicyTest.class);
+    
+    @Test 
+    public void test() {
+        this.test("src/test/resources/v1.0.0/policy_Test.yaml");
+    }
 
-	@Test 
-	public void testOpenLoop() {
-		this.test("src/test/resources/v1.0.0/policy_OpenLoop.yaml");
-	}
+    @Test 
+    public void testvService1() {
+        this.test("src/test/resources/v1.0.0/policy_vService.yaml");
+    }
 
-	@Test 
-	public void testvDNS() {
-		this.test("src/test/resources/v2.0.0/policy_ONAP_demo_vDNS.yaml");
-	}
+    @Test 
+    public void testOpenLoop() {
+        this.test("src/test/resources/v1.0.0/policy_OpenLoop.yaml");
+    }
 
-	@Test 
-	public void testvFirewall() {
-		// Chenfei to fix this.
-//		this.test("src/test/resources/v2.0.0/policy_ONAP_demo_vFirewall.yaml");
-	}
+    @Test 
+    public void testvDNS() {
+        this.test("src/test/resources/v2.0.0/policy_ONAP_demo_vDNS.yaml");
+    }
 
-	@Test 
-	public void testvCPE() {
-		this.test("src/test/resources/v2.0.0/policy_ONAP_UseCase_vCPE.yaml");
-	}
+    @Test 
+    public void testvFirewall() {
+        // Chenfei to fix this.
+        //		this.test("src/test/resources/v2.0.0/policy_ONAP_demo_vFirewall.yaml");
+    }
 
-	@Test 
-	public void testVOLTE() {
-		this.test("src/test/resources/v2.0.0/policy_ONAP_UseCase_VOLTE.yaml");
-	}
+    @Test 
+    public void testvCPE() {
+        this.test("src/test/resources/v2.0.0/policy_ONAP_UseCase_vCPE.yaml");
+    }
 
-	public void test(String testFile) {
-		try (InputStream is = new FileInputStream(new File(testFile))) {
-			//
-			// Read the yaml into our Java Object
-			//
-			Yaml yaml = new Yaml(new Constructor(ControlLoopPolicy.class));
-			Object obj = yaml.load(is);
-			assertNotNull(obj);
-			assertTrue(obj instanceof ControlLoopPolicy);
-			dump(obj);
-			//
-			// Now dump it to a yaml string
-			//
-			DumperOptions options = new DumperOptions();
-			options.setDefaultFlowStyle(FlowStyle.BLOCK);
-			options.setPrettyFlow(true);
-			yaml = new Yaml(options);
-			String dumpedYaml = yaml.dump(obj);
-			logger.debug(dumpedYaml);
-			//
-			// Read that string back into our java object
-			//
-			Object newObject = yaml.load(dumpedYaml);
-			dump(newObject);
-			assertNotNull(newObject);
-			assertTrue(newObject instanceof ControlLoopPolicy);
-			//
-			// Have to comment it out tentatively since it causes junit to fail. 
-			// Seems we cannot use assertEquals here. Need advice.
-			//
-			//assertEquals(newObject, obj);
-		} catch (FileNotFoundException e) {
-			fail(e.getLocalizedMessage());
-		} catch (IOException e) {
-			fail(e.getLocalizedMessage());
-		}
-	}
-	
-	public void dump(Object obj) {
-		logger.debug("Dumping ", obj.getClass().getCanonicalName());
-		logger.debug("{}", obj);
-	}
+    @Test 
+    public void testVOLTE() {
+        this.test("src/test/resources/v2.0.0/policy_ONAP_UseCase_VOLTE.yaml");
+    }
+
+    public void test(String testFile) {
+        try (InputStream is = new FileInputStream(new File(testFile))) {
+            //
+            // Read the yaml into our Java Object
+            //
+            Yaml yaml = new Yaml(new Constructor(ControlLoopPolicy.class));
+            Object obj = yaml.load(is);
+            assertNotNull(obj);
+            assertTrue(obj instanceof ControlLoopPolicy);
+            dump(obj);
+            //
+            // Now dump it to a yaml string
+            //
+            DumperOptions options = new DumperOptions();
+            options.setDefaultFlowStyle(FlowStyle.BLOCK);
+            options.setPrettyFlow(true);
+            yaml = new Yaml(options);
+            String dumpedYaml = yaml.dump(obj);
+            logger.debug(dumpedYaml);
+            //
+            // Read that string back into our java object
+            //
+            Object newObject = yaml.load(dumpedYaml);
+            dump(newObject);
+            assertNotNull(newObject);
+            assertTrue(newObject instanceof ControlLoopPolicy);
+            //
+            // Have to comment it out tentatively since it causes junit to fail. 
+            // Seems we cannot use assertEquals here. Need advice.
+            //
+            //assertEquals(newObject, obj);
+        } catch (FileNotFoundException e) {
+            fail(e.getLocalizedMessage());
+        } catch (IOException e) {
+            fail(e.getLocalizedMessage());
+        }
+    }
+
+    public void dump(Object obj) {
+        logger.debug("Dumping ", obj.getClass().getCanonicalName());
+        logger.debug("{}", obj);
+    }
 }
diff --git a/controlloop/common/policy-yaml/src/test/java/org/onap/policy/controlloop/policy/OperationsAccumulateParamsTest.java b/controlloop/common/policy-yaml/src/test/java/org/onap/policy/controlloop/policy/OperationsAccumulateParamsTest.java
index 5d627a906..adf85af3a 100644
--- a/controlloop/common/policy-yaml/src/test/java/org/onap/policy/controlloop/policy/OperationsAccumulateParamsTest.java
+++ b/controlloop/common/policy-yaml/src/test/java/org/onap/policy/controlloop/policy/OperationsAccumulateParamsTest.java
@@ -15,6 +15,7 @@
  * limitations under the License.
  * ============LICENSE_END=========================================================
  */
+
 package org.onap.policy.controlloop.policy;
 
 import static org.junit.Assert.*;
@@ -23,94 +24,97 @@ import org.junit.Test;
 
 public class OperationsAccumulateParamsTest {
 
-	@Test
-	public void testConstructor() {
-		OperationsAccumulateParams operationsAccumulateParams = new OperationsAccumulateParams();
-		assertNull(operationsAccumulateParams.getPeriod());
-		assertNull(operationsAccumulateParams.getLimit());
-	}
-
-	@Test
-	public void testConstructorOperationsAccumulateParams() {
-		String period = "15m";
-		Integer limit = 10;
-		OperationsAccumulateParams operationsAccumulateParams1 = new OperationsAccumulateParams(period, limit);
-		OperationsAccumulateParams operationsAccumulateParams2 = new OperationsAccumulateParams(operationsAccumulateParams1);
-		assertEquals(period, operationsAccumulateParams1.getPeriod());
-		assertEquals(limit, operationsAccumulateParams2.getLimit());		
-	}
-
-	@Test
-	public void testOperationsAccumulateParamsStringInteger() {
-		String period = "15m";
-		Integer limit = 10;
-		OperationsAccumulateParams operationsAccumulateParams = new OperationsAccumulateParams(period, limit);
-		assertEquals(period, operationsAccumulateParams.getPeriod());
-		assertEquals(limit, operationsAccumulateParams.getLimit());	
-	}
-
-	@Test
-	public void testSetAndGetPeriod() {
-		String period = "15m";
-		OperationsAccumulateParams operationsAccumulateParams = new OperationsAccumulateParams();
-		operationsAccumulateParams.setPeriod(period);
-		assertEquals(period, operationsAccumulateParams.getPeriod());	
-	}
-
-	@Test
-	public void testSetLimit() {
-		Integer limit = 10;
-		OperationsAccumulateParams operationsAccumulateParams = new OperationsAccumulateParams();
-		operationsAccumulateParams.setLimit(limit);
-		assertEquals(limit, operationsAccumulateParams.getLimit());	}
-
-	@Test
-	public void testToString() {
-		String period = "15m";
-		Integer limit = 10;
-		OperationsAccumulateParams operationsAccumulateParams = new OperationsAccumulateParams(period, limit);
-		assertEquals("OperationsAccumulateParams [period=15m, limit=10]", operationsAccumulateParams.toString());
-	}
-
-	@Test
-	public void testEqualsAndHashCode() {
-		String period = "15m";
-		Integer limit = 10;
-		OperationsAccumulateParams operationsAccumulateParams1 = new OperationsAccumulateParams();	
-		OperationsAccumulateParams operationsAccumulateParams2 = new OperationsAccumulateParams();	
-		
-		assertTrue(operationsAccumulateParams1.equals(operationsAccumulateParams2));
-		
-		operationsAccumulateParams1.setPeriod(period);
-		assertFalse(operationsAccumulateParams1.equals(operationsAccumulateParams2));
-		operationsAccumulateParams2.setPeriod(period);
-		assertTrue(operationsAccumulateParams1.equals(operationsAccumulateParams2));
-		assertEquals(operationsAccumulateParams1.hashCode(), operationsAccumulateParams2.hashCode());
-		
-		operationsAccumulateParams1.setLimit(limit);;
-		assertFalse(operationsAccumulateParams1.equals(operationsAccumulateParams2));
-		operationsAccumulateParams2.setLimit(limit);
-		assertTrue(operationsAccumulateParams1.equals(operationsAccumulateParams2));
-		assertEquals(operationsAccumulateParams1.hashCode(), operationsAccumulateParams2.hashCode());
-	}
-	
-	
-	@Test
-	public void testEqualsSameObject(){
-		OperationsAccumulateParams operationsAccumulateParams = new OperationsAccumulateParams();	
-		assertTrue(operationsAccumulateParams.equals(operationsAccumulateParams));
-	}
-	
-	@Test
-	public void testEqualsNull(){
-		OperationsAccumulateParams operationsAccumulateParams = new OperationsAccumulateParams();	
-		assertFalse(operationsAccumulateParams.equals(null));
-	}
-	
-	@Test
-	public void testEqualsInstanceOfDiffClass(){
-		OperationsAccumulateParams operationsAccumulateParams = new OperationsAccumulateParams();	
-		assertFalse(operationsAccumulateParams.equals(""));
-	}
+    @Test
+    public void testConstructor() {
+        OperationsAccumulateParams operationsAccumulateParams = new OperationsAccumulateParams();
+        assertNull(operationsAccumulateParams.getPeriod());
+        assertNull(operationsAccumulateParams.getLimit());
+    }
+
+    @Test
+    public void testConstructorOperationsAccumulateParams() {
+        String period = "15m";
+        Integer limit = 10;
+        OperationsAccumulateParams operationsAccumulateParams1 = 
+                        new OperationsAccumulateParams(period, limit);
+        OperationsAccumulateParams operationsAccumulateParams2 = 
+                        new OperationsAccumulateParams(operationsAccumulateParams1);
+        assertEquals(period, operationsAccumulateParams1.getPeriod());
+        assertEquals(limit, operationsAccumulateParams2.getLimit());
+    }
+
+    @Test
+    public void testOperationsAccumulateParamsStringInteger() {
+        String period = "15m";
+        Integer limit = 10;
+        OperationsAccumulateParams operationsAccumulateParams = new OperationsAccumulateParams(period, limit);
+        assertEquals(period, operationsAccumulateParams.getPeriod());
+        assertEquals(limit, operationsAccumulateParams.getLimit());
+    }
+
+    @Test
+    public void testSetAndGetPeriod() {
+        String period = "15m";
+        OperationsAccumulateParams operationsAccumulateParams = new OperationsAccumulateParams();
+        operationsAccumulateParams.setPeriod(period);
+        assertEquals(period, operationsAccumulateParams.getPeriod());
+    }
+
+    @Test
+    public void testSetLimit() {
+        Integer limit = 10;
+        OperationsAccumulateParams operationsAccumulateParams = new OperationsAccumulateParams();
+        operationsAccumulateParams.setLimit(limit);
+        assertEquals(limit, operationsAccumulateParams.getLimit());
+    }
+
+    @Test
+    public void testToString() {
+        String period = "15m";
+        Integer limit = 10;
+        OperationsAccumulateParams operationsAccumulateParams = new OperationsAccumulateParams(period, limit);
+        assertEquals("OperationsAccumulateParams [period=15m, limit=10]", operationsAccumulateParams.toString());
+    }
+
+    @Test
+    public void testEqualsAndHashCode() {
+        String period = "15m";
+        Integer limit = 10;
+        OperationsAccumulateParams operationsAccumulateParams1 = new OperationsAccumulateParams();
+        OperationsAccumulateParams operationsAccumulateParams2 = new OperationsAccumulateParams();
+
+        assertTrue(operationsAccumulateParams1.equals(operationsAccumulateParams2));
+
+        operationsAccumulateParams1.setPeriod(period);
+        assertFalse(operationsAccumulateParams1.equals(operationsAccumulateParams2));
+        operationsAccumulateParams2.setPeriod(period);
+        assertTrue(operationsAccumulateParams1.equals(operationsAccumulateParams2));
+        assertEquals(operationsAccumulateParams1.hashCode(), operationsAccumulateParams2.hashCode());
+
+        operationsAccumulateParams1.setLimit(limit);;
+        assertFalse(operationsAccumulateParams1.equals(operationsAccumulateParams2));
+        operationsAccumulateParams2.setLimit(limit);
+        assertTrue(operationsAccumulateParams1.equals(operationsAccumulateParams2));
+        assertEquals(operationsAccumulateParams1.hashCode(), operationsAccumulateParams2.hashCode());
+    }
+
+
+    @Test
+    public void testEqualsSameObject() {
+        OperationsAccumulateParams operationsAccumulateParams = new OperationsAccumulateParams();
+        assertTrue(operationsAccumulateParams.equals(operationsAccumulateParams));
+    }
+
+    @Test
+    public void testEqualsNull() {
+        OperationsAccumulateParams operationsAccumulateParams = new OperationsAccumulateParams();
+        assertFalse(operationsAccumulateParams.equals(null));
+    }
+
+    @Test
+    public void testEqualsInstanceOfDiffClass() {
+        OperationsAccumulateParams operationsAccumulateParams = new OperationsAccumulateParams();
+        assertFalse(operationsAccumulateParams.equals(""));
+    }
 
 }
diff --git a/controlloop/common/policy-yaml/src/test/java/org/onap/policy/controlloop/policy/guard/ConstraintTest.java b/controlloop/common/policy-yaml/src/test/java/org/onap/policy/controlloop/policy/guard/ConstraintTest.java
index d0aa2e675..14e46b6bf 100644
--- a/controlloop/common/policy-yaml/src/test/java/org/onap/policy/controlloop/policy/guard/ConstraintTest.java
+++ b/controlloop/common/policy-yaml/src/test/java/org/onap/policy/controlloop/policy/guard/ConstraintTest.java
@@ -15,6 +15,7 @@
  * limitations under the License.
  * ============LICENSE_END=========================================================
  */
+
 package org.onap.policy.controlloop.policy.guard;
 
 import static org.junit.Assert.*;
@@ -28,222 +29,224 @@ import org.junit.Test;
 
 public class ConstraintTest {
 
-	@Test
-	public void testConstraint() {
-		Constraint constraint = new Constraint();
-		
-		assertNull(constraint.getFreq_limit_per_target());
-		assertNull(constraint.getTime_window());
-		assertNull(constraint.getActive_time_range());
-		assertNull(constraint.getBlacklist());
-	}
-
-	@Test
-	public void testGetAndSetFreq_limit_per_target() {
-		Integer freqLimitPerTarget = 10;
-		Constraint constraint = new Constraint();
-		constraint.setFreq_limit_per_target(freqLimitPerTarget);
-		assertEquals(freqLimitPerTarget, constraint.getFreq_limit_per_target());
-	}
-
-	@Test
-	public void testGetAndSetTime_window() {
-		Map<String, String> timeWindow = new HashMap<>();
-		timeWindow.put("timeWindowKey", "timeWindowValue");
-		Constraint constraint = new Constraint();
-		constraint.setTime_window(timeWindow);
-		assertEquals(timeWindow, constraint.getTime_window());
-	}
-
-	@Test
-	public void testGetAndSetActive_time_range() {
-		Map<String, String> activeTimeRange = new HashMap<>();
-		activeTimeRange.put("timeWindowKey", "timeWindowValue");
-		Constraint constraint = new Constraint();
-		constraint.setActive_time_range(activeTimeRange);;
-		assertEquals(activeTimeRange, constraint.getActive_time_range());	
-	}
-
-	@Test
-	public void testGetAndSetBlacklist() {
-		List<String> blacklist = new ArrayList<>();
-		blacklist.add("blacklist item");
-		Constraint constraint = new Constraint();
-		constraint.setBlacklist(blacklist);
-		assertEquals(blacklist, constraint.getBlacklist());	
-	}
-
-	@Test
-	public void testConstraintIntegerMapOfStringString() {
-		Integer freqLimitPerTarget = 10;
-		Map<String, String> timeWindow = new HashMap<>();
-
-		Constraint constraint = new Constraint(freqLimitPerTarget, timeWindow);
-		
-		assertEquals(freqLimitPerTarget, constraint.getFreq_limit_per_target());
-		assertEquals(timeWindow, constraint.getTime_window());
-		assertNull(constraint.getActive_time_range());
-		assertNull(constraint.getBlacklist());
-	}
-
-	@Test
-	public void testConstraintListOfString() {
-		List<String> blacklist = new ArrayList<>();
-		blacklist.add("blacklist item");
-		Constraint constraint = new Constraint(blacklist);
-		
-		assertNull(constraint.getFreq_limit_per_target());
-		assertNull(constraint.getTime_window());
-		assertNull(constraint.getActive_time_range());
-		assertEquals(blacklist, constraint.getBlacklist());
-	}
-
-	@Test
-	public void testConstraintIntegerMapOfStringStringListOfString() {
-		Integer freqLimitPerTarget = 10;
-		Map<String, String> timeWindow = new HashMap<>();
-		List<String> blacklist = new ArrayList<>();
-		blacklist.add("blacklist item");
-		Constraint constraint = new Constraint(freqLimitPerTarget, timeWindow, blacklist);
-		
-		assertEquals(freqLimitPerTarget, constraint.getFreq_limit_per_target());
-		assertEquals(timeWindow, constraint.getTime_window());
-		assertNull(constraint.getActive_time_range());
-		assertEquals(blacklist, constraint.getBlacklist());
-	}
-
-	@Test
-	public void testConstraintIntegerMapOfStringStringMapOfStringString() {
-		Integer freqLimitPerTarget = 10;
-		Map<String, String> timeWindow = new HashMap<>();
-		Map<String, String> activeTimeRange = new HashMap<>();
-		activeTimeRange.put("timeWindowKey", "timeWindowValue");
-		Constraint constraint = new Constraint(freqLimitPerTarget, timeWindow, activeTimeRange);
-		
-		assertEquals(freqLimitPerTarget, constraint.getFreq_limit_per_target());
-		assertEquals(timeWindow, constraint.getTime_window());
-		assertEquals(activeTimeRange, constraint.getActive_time_range());
-		assertNull(constraint.getBlacklist());
-
-	}
-
-	@Test
-	public void testConstraintIntegerMapOfStringStringMapOfStringStringListOfString() {
-		Integer freqLimitPerTarget = 10;
-		Map<String, String> timeWindow = new HashMap<>();
-		Map<String, String> activeTimeRange = new HashMap<>();
-		activeTimeRange.put("timeWindowKey", "timeWindowValue");
-		List<String> blacklist = new ArrayList<>();
-		blacklist.add("blacklist item");
-		Constraint constraint = new Constraint(freqLimitPerTarget, timeWindow, activeTimeRange, blacklist);
-		
-		assertEquals(freqLimitPerTarget, constraint.getFreq_limit_per_target());
-		assertEquals(timeWindow, constraint.getTime_window());
-		assertEquals(activeTimeRange, constraint.getActive_time_range());
-		assertEquals(blacklist, constraint.getBlacklist());
-	}
-
-	@Test
-	public void testConstraintConstraint() {
-		Integer freqLimitPerTarget = 10;
-		Map<String, String> timeWindow = new HashMap<>();
-		Map<String, String> activeTimeRange = new HashMap<>();
-		activeTimeRange.put("timeWindowKey", "timeWindowValue");
-		List<String> blacklist = new ArrayList<>();
-		blacklist.add("blacklist item");
-		Constraint constraint1 = new Constraint(freqLimitPerTarget, timeWindow, activeTimeRange, blacklist);
-		Constraint constraint2 = new Constraint(constraint1);
-
-		assertEquals(freqLimitPerTarget, constraint2.getFreq_limit_per_target());
-		assertEquals(timeWindow, constraint2.getTime_window());
-		assertEquals(activeTimeRange, constraint2.getActive_time_range());
-		assertEquals(blacklist, constraint2.getBlacklist());
-	}
-
-	@Test
-	public void testIsValid() {
-		Integer freqLimitPerTarget = 10;
-		Map<String, String> timeWindow = new HashMap<>();
-
-		Constraint constraint = new Constraint();
-		assertTrue(constraint.isValid());
-		
-		constraint.setFreq_limit_per_target(freqLimitPerTarget);
-		assertFalse(constraint.isValid());
-
-		constraint.setTime_window(timeWindow);
-		assertTrue(constraint.isValid());
-		
-		constraint.setFreq_limit_per_target(null);
-		assertFalse(constraint.isValid());
-	}
-
-	@Test
-	public void testToString() {
-		Integer freqLimitPerTarget = 10;
-		Map<String, String> timeWindow = new HashMap<>();
-		Map<String, String> activeTimeRange = new HashMap<>();
-		activeTimeRange.put("timeWindowKey", "timeWindowValue");
-		List<String> blacklist = new ArrayList<>();
-		blacklist.add("blacklist item");
-		Constraint constraint = new Constraint(freqLimitPerTarget, timeWindow, activeTimeRange, blacklist);
-		
-		assertEquals(constraint.toString(), "Constraint [freq_limit_per_target=" + freqLimitPerTarget + ", time_window=" + timeWindow + ", active_time_range=" + activeTimeRange + ", blacklist=" + blacklist + "]");		
-	}
-
-	@Test
-	public void testEquals() {
-		Integer freqLimitPerTarget = 10;
-		Map<String, String> timeWindow = new HashMap<>();
-		Map<String, String> activeTimeRange = new HashMap<>();
-		List<String> blacklist = new ArrayList<>();
-		blacklist.add("blacklist item");
-		
-		Constraint constraint1 = new Constraint();
-		Constraint constraint2 = new Constraint();
-		assertTrue(constraint1.equals(constraint2));
-		
-		constraint1.setFreq_limit_per_target(freqLimitPerTarget);
-		assertFalse(constraint1.equals(constraint2));
-		constraint2.setFreq_limit_per_target(freqLimitPerTarget);
-		assertTrue(constraint1.equals(constraint2));
-		assertEquals(constraint1.hashCode(), constraint2.hashCode());
-		
-		constraint1.setTime_window(timeWindow);
-		assertFalse(constraint1.equals(constraint2));
-		constraint2.setTime_window(timeWindow);
-		assertTrue(constraint1.equals(constraint2));
-		assertEquals(constraint1.hashCode(), constraint2.hashCode());
-		
-		constraint1.setActive_time_range(activeTimeRange);
-		assertFalse(constraint1.equals(constraint2));
-		constraint2.setActive_time_range(activeTimeRange);
-		assertTrue(constraint1.equals(constraint2));
-		assertEquals(constraint1.hashCode(), constraint2.hashCode());
-		
-		constraint1.setBlacklist(blacklist);
-		assertFalse(constraint1.equals(constraint2));
-		constraint2.setBlacklist(blacklist);
-		assertTrue(constraint1.equals(constraint2));
-		assertEquals(constraint1.hashCode(), constraint2.hashCode());
-	}
-	
-	@Test
-	public void testEqualsSameObject(){
-		Constraint constraint = new Constraint();
-		assertTrue(constraint.equals(constraint));
-	}
-	
-	@Test
-	public void testEqualsNull(){
-		Constraint constraint = new Constraint();
-		assertFalse(constraint.equals(null));
-	}
-	
-	@Test
-	public void testEqualsInstanceOfDiffClass(){
-		Constraint constraint = new Constraint();
-		assertFalse(constraint.equals(""));
-	}
+    @Test
+    public void testConstraint() {
+        Constraint constraint = new Constraint();
+
+        assertNull(constraint.getFreq_limit_per_target());
+        assertNull(constraint.getTime_window());
+        assertNull(constraint.getActive_time_range());
+        assertNull(constraint.getBlacklist());
+    }
+
+    @Test
+    public void testGetAndSetFreq_limit_per_target() {
+        Integer freqLimitPerTarget = 10;
+        Constraint constraint = new Constraint();
+        constraint.setFreq_limit_per_target(freqLimitPerTarget);
+        assertEquals(freqLimitPerTarget, constraint.getFreq_limit_per_target());
+    }
+
+    @Test
+    public void testGetAndSetTime_window() {
+        Map<String, String> timeWindow = new HashMap<>();
+        timeWindow.put("timeWindowKey", "timeWindowValue");
+        Constraint constraint = new Constraint();
+        constraint.setTime_window(timeWindow);
+        assertEquals(timeWindow, constraint.getTime_window());
+    }
+
+    @Test
+    public void testGetAndSetActive_time_range() {
+        Map<String, String> activeTimeRange = new HashMap<>();
+        activeTimeRange.put("timeWindowKey", "timeWindowValue");
+        Constraint constraint = new Constraint();
+        constraint.setActive_time_range(activeTimeRange);;
+        assertEquals(activeTimeRange, constraint.getActive_time_range());	
+    }
+
+    @Test
+    public void testGetAndSetBlacklist() {
+        List<String> blacklist = new ArrayList<>();
+        blacklist.add("blacklist item");
+        Constraint constraint = new Constraint();
+        constraint.setBlacklist(blacklist);
+        assertEquals(blacklist, constraint.getBlacklist());	
+    }
+
+    @Test
+    public void testConstraintIntegerMapOfStringString() {
+        Integer freqLimitPerTarget = 10;
+        Map<String, String> timeWindow = new HashMap<>();
+
+        Constraint constraint = new Constraint(freqLimitPerTarget, timeWindow);
+
+        assertEquals(freqLimitPerTarget, constraint.getFreq_limit_per_target());
+        assertEquals(timeWindow, constraint.getTime_window());
+        assertNull(constraint.getActive_time_range());
+        assertNull(constraint.getBlacklist());
+    }
+
+    @Test
+    public void testConstraintListOfString() {
+        List<String> blacklist = new ArrayList<>();
+        blacklist.add("blacklist item");
+        Constraint constraint = new Constraint(blacklist);
+
+        assertNull(constraint.getFreq_limit_per_target());
+        assertNull(constraint.getTime_window());
+        assertNull(constraint.getActive_time_range());
+        assertEquals(blacklist, constraint.getBlacklist());
+    }
+
+    @Test
+    public void testConstraintIntegerMapOfStringStringListOfString() {
+        Integer freqLimitPerTarget = 10;
+        Map<String, String> timeWindow = new HashMap<>();
+        List<String> blacklist = new ArrayList<>();
+        blacklist.add("blacklist item");
+        Constraint constraint = new Constraint(freqLimitPerTarget, timeWindow, blacklist);
+
+        assertEquals(freqLimitPerTarget, constraint.getFreq_limit_per_target());
+        assertEquals(timeWindow, constraint.getTime_window());
+        assertNull(constraint.getActive_time_range());
+        assertEquals(blacklist, constraint.getBlacklist());
+    }
+
+    @Test
+    public void testConstraintIntegerMapOfStringStringMapOfStringString() {
+        Integer freqLimitPerTarget = 10;
+        Map<String, String> timeWindow = new HashMap<>();
+        Map<String, String> activeTimeRange = new HashMap<>();
+        activeTimeRange.put("timeWindowKey", "timeWindowValue");
+        Constraint constraint = new Constraint(freqLimitPerTarget, timeWindow, activeTimeRange);
+
+        assertEquals(freqLimitPerTarget, constraint.getFreq_limit_per_target());
+        assertEquals(timeWindow, constraint.getTime_window());
+        assertEquals(activeTimeRange, constraint.getActive_time_range());
+        assertNull(constraint.getBlacklist());
+
+    }
+
+    @Test
+    public void testConstraintIntegerMapOfStringStringMapOfStringStringListOfString() {
+        Integer freqLimitPerTarget = 10;
+        Map<String, String> timeWindow = new HashMap<>();
+        Map<String, String> activeTimeRange = new HashMap<>();
+        activeTimeRange.put("timeWindowKey", "timeWindowValue");
+        List<String> blacklist = new ArrayList<>();
+        blacklist.add("blacklist item");
+        Constraint constraint = new Constraint(freqLimitPerTarget, timeWindow, activeTimeRange, blacklist);
+
+        assertEquals(freqLimitPerTarget, constraint.getFreq_limit_per_target());
+        assertEquals(timeWindow, constraint.getTime_window());
+        assertEquals(activeTimeRange, constraint.getActive_time_range());
+        assertEquals(blacklist, constraint.getBlacklist());
+    }
+
+    @Test
+    public void testConstraintConstraint() {
+        Integer freqLimitPerTarget = 10;
+        Map<String, String> timeWindow = new HashMap<>();
+        Map<String, String> activeTimeRange = new HashMap<>();
+        activeTimeRange.put("timeWindowKey", "timeWindowValue");
+        List<String> blacklist = new ArrayList<>();
+        blacklist.add("blacklist item");
+        Constraint constraint1 = new Constraint(freqLimitPerTarget, timeWindow, activeTimeRange, blacklist);
+        Constraint constraint2 = new Constraint(constraint1);
+
+        assertEquals(freqLimitPerTarget, constraint2.getFreq_limit_per_target());
+        assertEquals(timeWindow, constraint2.getTime_window());
+        assertEquals(activeTimeRange, constraint2.getActive_time_range());
+        assertEquals(blacklist, constraint2.getBlacklist());
+    }
+
+    @Test
+    public void testIsValid() {
+        Integer freqLimitPerTarget = 10;
+        Map<String, String> timeWindow = new HashMap<>();
+
+        Constraint constraint = new Constraint();
+        assertTrue(constraint.isValid());
+
+        constraint.setFreq_limit_per_target(freqLimitPerTarget);
+        assertFalse(constraint.isValid());
+
+        constraint.setTime_window(timeWindow);
+        assertTrue(constraint.isValid());
+
+        constraint.setFreq_limit_per_target(null);
+        assertFalse(constraint.isValid());
+    }
+
+    @Test
+    public void testToString() {
+        Integer freqLimitPerTarget = 10;
+        Map<String, String> timeWindow = new HashMap<>();
+        Map<String, String> activeTimeRange = new HashMap<>();
+        activeTimeRange.put("timeWindowKey", "timeWindowValue");
+        List<String> blacklist = new ArrayList<>();
+        blacklist.add("blacklist item");
+        Constraint constraint = new Constraint(freqLimitPerTarget, timeWindow, activeTimeRange, blacklist);
+
+        assertEquals(constraint.toString(), "Constraint [freq_limit_per_target=" + freqLimitPerTarget
+                        + ", time_window=" + timeWindow + ", active_time_range=" + activeTimeRange 
+                        + ", blacklist=" + blacklist + "]");
+    }
+
+    @Test
+    public void testEquals() {
+        Integer freqLimitPerTarget = 10;
+        Map<String, String> timeWindow = new HashMap<>();
+        Map<String, String> activeTimeRange = new HashMap<>();
+        List<String> blacklist = new ArrayList<>();
+        blacklist.add("blacklist item");
+
+        Constraint constraint1 = new Constraint();
+        Constraint constraint2 = new Constraint();
+        assertTrue(constraint1.equals(constraint2));
+
+        constraint1.setFreq_limit_per_target(freqLimitPerTarget);
+        assertFalse(constraint1.equals(constraint2));
+        constraint2.setFreq_limit_per_target(freqLimitPerTarget);
+        assertTrue(constraint1.equals(constraint2));
+        assertEquals(constraint1.hashCode(), constraint2.hashCode());
+
+        constraint1.setTime_window(timeWindow);
+        assertFalse(constraint1.equals(constraint2));
+        constraint2.setTime_window(timeWindow);
+        assertTrue(constraint1.equals(constraint2));
+        assertEquals(constraint1.hashCode(), constraint2.hashCode());
+
+        constraint1.setActive_time_range(activeTimeRange);
+        assertFalse(constraint1.equals(constraint2));
+        constraint2.setActive_time_range(activeTimeRange);
+        assertTrue(constraint1.equals(constraint2));
+        assertEquals(constraint1.hashCode(), constraint2.hashCode());
+
+        constraint1.setBlacklist(blacklist);
+        assertFalse(constraint1.equals(constraint2));
+        constraint2.setBlacklist(blacklist);
+        assertTrue(constraint1.equals(constraint2));
+        assertEquals(constraint1.hashCode(), constraint2.hashCode());
+    }
+
+    @Test
+    public void testEqualsSameObject() {
+        Constraint constraint = new Constraint();
+        assertTrue(constraint.equals(constraint));
+    }
+
+    @Test
+    public void testEqualsNull() {
+        Constraint constraint = new Constraint();
+        assertFalse(constraint.equals(null));
+    }
+
+    @Test
+    public void testEqualsInstanceOfDiffClass() {
+        Constraint constraint = new Constraint();
+        assertFalse(constraint.equals(""));
+    }
 
 }
diff --git a/controlloop/common/policy-yaml/src/test/java/org/onap/policy/controlloop/policy/guard/ControlLoopGuardBuilderTest.java b/controlloop/common/policy-yaml/src/test/java/org/onap/policy/controlloop/policy/guard/ControlLoopGuardBuilderTest.java
index 36cf34e5f..45e9c4202 100644
--- a/controlloop/common/policy-yaml/src/test/java/org/onap/policy/controlloop/policy/guard/ControlLoopGuardBuilderTest.java
+++ b/controlloop/common/policy-yaml/src/test/java/org/onap/policy/controlloop/policy/guard/ControlLoopGuardBuilderTest.java
@@ -2,7 +2,7 @@
  * ============LICENSE_START=======================================================
  * policy-yaml unit test
  * ================================================================================
- * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
+ * Copyright (C) 2017-2018 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.
@@ -46,7 +46,8 @@ import org.yaml.snakeyaml.Yaml;
 import org.yaml.snakeyaml.constructor.Constructor;
 
 public class ControlLoopGuardBuilderTest {
-	private static final Logger logger = LoggerFactory.getLogger(ControlLoopGuardBuilderTest.class);
+    private static final Logger logger = LoggerFactory.getLogger(ControlLoopGuardBuilderTest.class);
+    
     @Test
     public void testControlLoopGuard() {
         try {
@@ -60,7 +61,8 @@ public class ControlLoopGuardBuilderTest {
             Results results = builder.buildSpecification();
             boolean no_guard_policies = false;
             for (Message m : results.getMessages()) {
-                if (m.getMessage().equals("ControlLoop Guard should have at least one guard policies") && m.getLevel() == MessageLevel.ERROR) {
+                if (m.getMessage().equals("ControlLoop Guard should have at least one guard policies") 
+                                && m.getLevel() == MessageLevel.ERROR) {
                     no_guard_policies = true;
                     break;
                 }
@@ -83,7 +85,8 @@ public class ControlLoopGuardBuilderTest {
             results = builder.buildSpecification();
             boolean no_constraint = false;
             for (Message m : results.getMessages()) {
-                if (m.getMessage().equals("Guard policy guardpolicy1 does not have any limit constraint") && m.getLevel() == MessageLevel.ERROR) {
+                if (m.getMessage().equals("Guard policy guardpolicy1 does not have any limit constraint") 
+                                && m.getLevel() == MessageLevel.ERROR) {
                     no_constraint = true;
                     break;
                 }
@@ -113,7 +116,8 @@ public class ControlLoopGuardBuilderTest {
             results = builder.buildSpecification();
             boolean duplicate_constraint = false;
             for (Message m : results.getMessages()) {
-                if (m.getMessage().equals("Guard policy guardpolicy1 has duplicate limit constraints") && m.getLevel() == MessageLevel.WARNING) {
+                if (m.getMessage().equals("Guard policy guardpolicy1 has duplicate limit constraints") 
+                                && m.getLevel() == MessageLevel.WARNING) {
                     duplicate_constraint = true;
                     break;
                 }
@@ -134,7 +138,8 @@ public class ControlLoopGuardBuilderTest {
             results = builder.buildSpecification();
             boolean duplicate_guard_policy = false;
             for (Message m : results.getMessages()) {
-                if (m.getMessage().equals("There are duplicate guard policies") && m.getLevel() == MessageLevel.WARNING) {
+                if (m.getMessage().equals("There are duplicate guard policies") 
+                                && m.getLevel() == MessageLevel.WARNING) {
                     duplicate_guard_policy = true;
                     break;
                 }
@@ -178,12 +183,14 @@ public class ControlLoopGuardBuilderTest {
             //
             // Now we're going to try to use the builder to build this.
             //
-            ControlLoopGuardBuilder builder = ControlLoopGuardBuilder.Factory.buildControlLoopGuard(guardTobuild.getGuard());
+            ControlLoopGuardBuilder builder = 
+                            ControlLoopGuardBuilder.Factory.buildControlLoopGuard(guardTobuild.getGuard());
             //
             // Add guard policy
             //
             if (guardTobuild.getGuards() != null) {
-                builder = builder.addGuardPolicy(guardTobuild.getGuards().toArray(new GuardPolicy[guardTobuild.getGuards().size()]));
+                builder = builder.addGuardPolicy(guardTobuild.getGuards().toArray(
+                                new GuardPolicy[guardTobuild.getGuards().size()]));
             }
             //
             // Build the specification
diff --git a/controlloop/common/policy-yaml/src/test/java/org/onap/policy/controlloop/policy/guard/ControlLoopGuardTest.java b/controlloop/common/policy-yaml/src/test/java/org/onap/policy/controlloop/policy/guard/ControlLoopGuardTest.java
index 711997dac..81c76c76a 100644
--- a/controlloop/common/policy-yaml/src/test/java/org/onap/policy/controlloop/policy/guard/ControlLoopGuardTest.java
+++ b/controlloop/common/policy-yaml/src/test/java/org/onap/policy/controlloop/policy/guard/ControlLoopGuardTest.java
@@ -2,7 +2,7 @@
  * ============LICENSE_START=======================================================
  * policy-yaml unit test
  * ================================================================================
- * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
+ * Copyright (C) 2017-2018 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.
@@ -39,121 +39,122 @@ import org.yaml.snakeyaml.constructor.Constructor;
 
 
 public class ControlLoopGuardTest {
-	private static final Logger logger = LoggerFactory.getLogger(ControlLoopGuardTest.class);
-	@Test 
-	public void testGuardvDNS() {
-		this.test("src/test/resources/v2.0.0-guard/policy_guard_ONAP_demo_vDNS.yaml");
-	}
-
-	@Test 
-	public void testGuardvUSP() {
-		this.test("src/test/resources/v2.0.0-guard/policy_guard_appc_restart.yaml");
-	}
-
-	@Test
-	public void testConstructorControlLoopGuard(){
-		Guard guard1 = new Guard();
-		GuardPolicy guardPolicy1 = new GuardPolicy();
-		GuardPolicy guardPolicy2 = new GuardPolicy();
-		LinkedList<GuardPolicy> guardPolicies = new LinkedList<>();
-		guardPolicies.add(guardPolicy1);
-		guardPolicies.add(guardPolicy2);
-
-		ControlLoopGuard controlLoopGuard1 = new ControlLoopGuard();
-		controlLoopGuard1.setGuard(guard1);
-		controlLoopGuard1.setGuards(guardPolicies);
-		ControlLoopGuard controlLoopGuard2 = new ControlLoopGuard(controlLoopGuard1);
-		
-		assertEquals(guard1, controlLoopGuard2.getGuard());
-		assertEquals(guardPolicies, controlLoopGuard2.getGuards());
-	}
-	
-	@Test
-	public void testEqualsAndHashCode(){
-		Guard guard1 = new Guard();
-		GuardPolicy guardPolicy1 = new GuardPolicy();
-		GuardPolicy guardPolicy2 = new GuardPolicy();
-		LinkedList<GuardPolicy> guardPolicies = new LinkedList<>();
-		guardPolicies.add(guardPolicy1);
-		guardPolicies.add(guardPolicy2);
-
-		ControlLoopGuard controlLoopGuard1 = new ControlLoopGuard();
-		ControlLoopGuard controlLoopGuard2 = new ControlLoopGuard();
-		
-		assertTrue(controlLoopGuard1.equals(controlLoopGuard2));
-		assertEquals(controlLoopGuard1.hashCode(), controlLoopGuard2.hashCode());
-
-		controlLoopGuard1.setGuard(guard1);
-		assertFalse(controlLoopGuard1.equals(controlLoopGuard2));
-		controlLoopGuard2.setGuard(guard1);
-		assertTrue(controlLoopGuard1.equals(controlLoopGuard2));
-		assertEquals(controlLoopGuard1.hashCode(), controlLoopGuard2.hashCode());
-		
-		controlLoopGuard1.setGuards(guardPolicies);
-		assertFalse(controlLoopGuard1.equals(controlLoopGuard2));
-		controlLoopGuard2.setGuards(guardPolicies);
-		assertTrue(controlLoopGuard1.equals(controlLoopGuard2));
-		assertEquals(controlLoopGuard1.hashCode(), controlLoopGuard2.hashCode());
-	}	
-	
-	@Test
-	public void testEqualsSameObject(){
-		ControlLoopGuard controlLoopGuard = new ControlLoopGuard();
-		assertTrue(controlLoopGuard.equals(controlLoopGuard));
-	}
-	
-	@Test
-	public void testEqualsNull(){
-		ControlLoopGuard controlLoopGuard = new ControlLoopGuard();
-		assertFalse(controlLoopGuard.equals(null));
-	}
-	
-	@Test
-	public void testEqualsInstanceOfDiffClass(){
-		ControlLoopGuard controlLoopGuard = new ControlLoopGuard();
-		assertFalse(controlLoopGuard.equals(""));
-	}
-	
-	public void test(String testFile) {
-		try (InputStream is = new FileInputStream(new File(testFile))) {
-			//
-			// Read the yaml into our Java Object
-			//
-			Yaml yaml = new Yaml(new Constructor(ControlLoopGuard.class));
-			Object obj = yaml.load(is);
-			assertNotNull(obj);
-			assertTrue(obj instanceof ControlLoopGuard);
-			dump(obj);
-			//
-			// Now dump it to a yaml string
-			//
-			DumperOptions options = new DumperOptions();
-			options.setDefaultFlowStyle(FlowStyle.BLOCK);
-			options.setPrettyFlow(true);
-			yaml = new Yaml(options);
-			String dumpedYaml = yaml.dump(obj);
-			logger.debug(dumpedYaml);
-			//
-			// Read that string back into our java object
-			//
-			Object newObject = yaml.load(dumpedYaml);
-			dump(newObject);
-			assertNotNull(newObject);
-			assertTrue(newObject instanceof ControlLoopGuard);
-			//
-			// Have to comment it out tentatively since it causes junit to fail. 
-			// Seems we cannot use assertEquals here. Need advice.
-			//
-			//assertEquals(newObject, obj);
-		} catch (FileNotFoundException e) {
-			fail(e.getLocalizedMessage());
-		} catch (IOException e) {
-			fail(e.getLocalizedMessage());
-		}
-	}
-	
-	public void dump(Object obj) {
-		logger.debug("Dumping {}", obj.getClass().getCanonicalName());
-		logger.debug("{}", obj);
-	}
+    private static final Logger logger = LoggerFactory.getLogger(ControlLoopGuardTest.class);
+    
+    @Test 
+    public void testGuardvDNS() {
+        this.test("src/test/resources/v2.0.0-guard/policy_guard_ONAP_demo_vDNS.yaml");
+    }
+
+    @Test 
+    public void testGuardvUSP() {
+        this.test("src/test/resources/v2.0.0-guard/policy_guard_appc_restart.yaml");
+    }
+
+    @Test
+    public void testConstructorControlLoopGuard(){
+        Guard guard1 = new Guard();
+        GuardPolicy guardPolicy1 = new GuardPolicy();
+        GuardPolicy guardPolicy2 = new GuardPolicy();
+        LinkedList<GuardPolicy> guardPolicies = new LinkedList<>();
+        guardPolicies.add(guardPolicy1);
+        guardPolicies.add(guardPolicy2);
+
+        ControlLoopGuard controlLoopGuard1 = new ControlLoopGuard();
+        controlLoopGuard1.setGuard(guard1);
+        controlLoopGuard1.setGuards(guardPolicies);
+        ControlLoopGuard controlLoopGuard2 = new ControlLoopGuard(controlLoopGuard1);
+
+        assertEquals(guard1, controlLoopGuard2.getGuard());
+        assertEquals(guardPolicies, controlLoopGuard2.getGuards());
+    }
+
+    @Test
+    public void testEqualsAndHashCode() {
+        Guard guard1 = new Guard();
+        GuardPolicy guardPolicy1 = new GuardPolicy();
+        GuardPolicy guardPolicy2 = new GuardPolicy();
+        LinkedList<GuardPolicy> guardPolicies = new LinkedList<>();
+        guardPolicies.add(guardPolicy1);
+        guardPolicies.add(guardPolicy2);
+
+        ControlLoopGuard controlLoopGuard1 = new ControlLoopGuard();
+        ControlLoopGuard controlLoopGuard2 = new ControlLoopGuard();
+
+        assertTrue(controlLoopGuard1.equals(controlLoopGuard2));
+        assertEquals(controlLoopGuard1.hashCode(), controlLoopGuard2.hashCode());
+
+        controlLoopGuard1.setGuard(guard1);
+        assertFalse(controlLoopGuard1.equals(controlLoopGuard2));
+        controlLoopGuard2.setGuard(guard1);
+        assertTrue(controlLoopGuard1.equals(controlLoopGuard2));
+        assertEquals(controlLoopGuard1.hashCode(), controlLoopGuard2.hashCode());
+
+        controlLoopGuard1.setGuards(guardPolicies);
+        assertFalse(controlLoopGuard1.equals(controlLoopGuard2));
+        controlLoopGuard2.setGuards(guardPolicies);
+        assertTrue(controlLoopGuard1.equals(controlLoopGuard2));
+        assertEquals(controlLoopGuard1.hashCode(), controlLoopGuard2.hashCode());
+    }
+
+    @Test
+    public void testEqualsSameObject() {
+        ControlLoopGuard controlLoopGuard = new ControlLoopGuard();
+        assertTrue(controlLoopGuard.equals(controlLoopGuard));
+    }
+
+    @Test
+    public void testEqualsNull() {
+        ControlLoopGuard controlLoopGuard = new ControlLoopGuard();
+        assertFalse(controlLoopGuard.equals(null));
+    }
+
+    @Test
+    public void testEqualsInstanceOfDiffClass() {
+        ControlLoopGuard controlLoopGuard = new ControlLoopGuard();
+        assertFalse(controlLoopGuard.equals(""));
+    }
+
+    public void test(String testFile) {
+        try (InputStream is = new FileInputStream(new File(testFile))) {
+            //
+            // Read the yaml into our Java Object
+            //
+            Yaml yaml = new Yaml(new Constructor(ControlLoopGuard.class));
+            Object obj = yaml.load(is);
+            assertNotNull(obj);
+            assertTrue(obj instanceof ControlLoopGuard);
+            dump(obj);
+            //
+            // Now dump it to a yaml string
+            //
+            DumperOptions options = new DumperOptions();
+            options.setDefaultFlowStyle(FlowStyle.BLOCK);
+            options.setPrettyFlow(true);
+            yaml = new Yaml(options);
+            String dumpedYaml = yaml.dump(obj);
+            logger.debug(dumpedYaml);
+            //
+            // Read that string back into our java object
+            //
+            Object newObject = yaml.load(dumpedYaml);
+            dump(newObject);
+            assertNotNull(newObject);
+            assertTrue(newObject instanceof ControlLoopGuard);
+            //
+            // Have to comment it out tentatively since it causes junit to fail. 
+            // Seems we cannot use assertEquals here. Need advice.
+            //
+            //assertEquals(newObject, obj);
+        } catch (FileNotFoundException e) {
+            fail(e.getLocalizedMessage());
+        } catch (IOException e) {
+            fail(e.getLocalizedMessage());
+        }
+    }
+
+    public void dump(Object obj) {
+        logger.debug("Dumping {}", obj.getClass().getCanonicalName());
+        logger.debug("{}", obj);
+    }
 }
diff --git a/controlloop/common/policy-yaml/src/test/java/org/onap/policy/controlloop/policy/guard/GuardPolicyTest.java b/controlloop/common/policy-yaml/src/test/java/org/onap/policy/controlloop/policy/guard/GuardPolicyTest.java
index 3bf801d57..d80fecf2b 100644
--- a/controlloop/common/policy-yaml/src/test/java/org/onap/policy/controlloop/policy/guard/GuardPolicyTest.java
+++ b/controlloop/common/policy-yaml/src/test/java/org/onap/policy/controlloop/policy/guard/GuardPolicyTest.java
@@ -15,6 +15,7 @@
  * limitations under the License.
  * ============LICENSE_END=========================================================
  */
+
 package org.onap.policy.controlloop.policy.guard;
 
 import static org.junit.Assert.assertEquals;
@@ -29,239 +30,241 @@ import java.util.List;
 import org.junit.Test;
 
 public class GuardPolicyTest {
-	
-	@Test
-	public void testConstructor(){
-		GuardPolicy guardPolicy = new GuardPolicy();
-		
-		assertNotNull(guardPolicy.getId());
-		assertNull(guardPolicy.getName());
-		assertNull(guardPolicy.getDescription());
-		assertNull(guardPolicy.getMatch_parameters());
-		assertNull(guardPolicy.getLimit_constraints());
-	}
-	
-	@Test
-	public void testConstructorString(){
-		String id = "guard id";
-		GuardPolicy guardPolicy = new GuardPolicy(id);
-		
-		assertEquals(id, guardPolicy.getId());
-		assertNull(guardPolicy.getName());
-		assertNull(guardPolicy.getDescription());
-		assertNull(guardPolicy.getMatch_parameters());
-		assertNull(guardPolicy.getLimit_constraints());
-	}
-		
-	@Test
-	public void testConstructorStringStringStringMatchParameters(){
-		String id = "guard id";
-		String name = "guard name";
-		String description = "guard description";
-		MatchParameters matchParameters = new MatchParameters();
-		List<Constraint> limitConstraints = new LinkedList<>();
-		limitConstraints.add(new Constraint());
-		GuardPolicy guardPolicy = new GuardPolicy(id, name, description, matchParameters);
-		
-		assertNotNull(guardPolicy.getId());
-		assertEquals(name, guardPolicy.getName());
-		assertEquals(description, guardPolicy.getDescription());
-		assertEquals(matchParameters, guardPolicy.getMatch_parameters());
-		assertNull(guardPolicy.getLimit_constraints());
-	}
-	
-	@Test
-	public void testConstructorStringMatchParametersList(){
-		String name = "guard name";
-		MatchParameters matchParameters = new MatchParameters();
-		List<Constraint> limitConstraints = new LinkedList<>();
-		limitConstraints.add(new Constraint());
-		GuardPolicy guardPolicy = new GuardPolicy(name, matchParameters, limitConstraints);
-		
-		assertNotNull(guardPolicy.getId());
-		assertEquals(name, guardPolicy.getName());
-		assertNull(guardPolicy.getDescription());
-		assertEquals(matchParameters, guardPolicy.getMatch_parameters());
-		assertEquals(limitConstraints, guardPolicy.getLimit_constraints());
-	}
-	
-	@Test
-	public void testConstructorStringStringMatchParametersList(){
-		String name = "guard name";
-		String description = "guard description";
-		MatchParameters matchParameters = new MatchParameters();
-		List<Constraint> limitConstraints = new LinkedList<>();
-		limitConstraints.add(new Constraint());
-		GuardPolicy guardPolicy = new GuardPolicy(name, description, matchParameters, limitConstraints);
-		
-		assertNotNull(guardPolicy.getId());
-		assertEquals(name, guardPolicy.getName());
-		assertEquals(description, guardPolicy.getDescription());
-		assertEquals(matchParameters, guardPolicy.getMatch_parameters());
-		assertEquals(limitConstraints, guardPolicy.getLimit_constraints());
-	}
-    
-	@Test
-	public void testConstructorStringStringStringMatchParametersList(){
-		String id = "guard id";
-		String name = "guard name";
-		String description = "guard description";
-		MatchParameters matchParameters = new MatchParameters();
-		List<Constraint> limitConstraints = new LinkedList<>();
-		limitConstraints.add(new Constraint());
-		GuardPolicy guardPolicy = new GuardPolicy(id, name, description, matchParameters, limitConstraints);
-		
-		assertEquals(id, guardPolicy.getId());
-		assertEquals(name, guardPolicy.getName());
-		assertEquals(description, guardPolicy.getDescription());
-		assertEquals(matchParameters, guardPolicy.getMatch_parameters());
-		assertEquals(limitConstraints, guardPolicy.getLimit_constraints());
-	}
-	
-	@Test
-	public void testConstructorGuardPolicy(){
-		String id = "guard id";
-		String name = "guard name";
-		String description = "guard description";
-		MatchParameters matchParameters = new MatchParameters();
-		List<Constraint> limitConstraints = new LinkedList<>();
-		limitConstraints.add(new Constraint());
-		GuardPolicy guardPolicy1 = new GuardPolicy(id, name, description, matchParameters, limitConstraints);
-		
-		GuardPolicy guardPolicy2 = new GuardPolicy(guardPolicy1);
-
-		
-		assertEquals(id, guardPolicy2.getId());
-		assertEquals(name, guardPolicy2.getName());
-		assertEquals(description, guardPolicy2.getDescription());
-		assertEquals(matchParameters, guardPolicy2.getMatch_parameters());
-		assertEquals(limitConstraints, guardPolicy2.getLimit_constraints());
-	}
-	
-	@Test
-	public void testSetAndGetId(){
-		String id = "guard id";
-		GuardPolicy guardPolicy = new GuardPolicy();
-		guardPolicy.setId(id);
-		assertEquals(id, guardPolicy.getId());
-	}
-	
-	@Test
-	public void testSetAndGetName(){
-		String name = "guard name";
-		GuardPolicy guardPolicy = new GuardPolicy();
-		guardPolicy.setName(name);
-		assertEquals(name, guardPolicy.getName());
-	}
-	
-	@Test
-	public void testSetAndGetDescription(){
-		String description = "guard description";
-		GuardPolicy guardPolicy = new GuardPolicy();
-		guardPolicy.setDescription(description);
-		assertEquals(description, guardPolicy.getDescription());
-	}
-	
-	@Test
-	public void testSetAndGetMatchParameters(){
-		MatchParameters matchParameters = new MatchParameters();
-		GuardPolicy guardPolicy = new GuardPolicy();
-		guardPolicy.setMatch_parameters(matchParameters);
-		assertEquals(matchParameters, guardPolicy.getMatch_parameters());
-	}
-	
-	@Test
-	public void testSetAndGetLimitConstraints(){
-		LinkedList<Constraint> limitConstraints = new LinkedList<>();
-		limitConstraints.add(new Constraint());
-		GuardPolicy guardPolicy = new GuardPolicy();
-		guardPolicy.setLimit_constraints(limitConstraints);
-		assertEquals(limitConstraints, guardPolicy.getLimit_constraints());
-	}
-	
-	@Test
-	public void testIsValid(){
-		GuardPolicy guardPolicy = new GuardPolicy();
-		assertFalse(guardPolicy.isValid());
-		
-		guardPolicy.setName("guard name");
-		assertTrue(guardPolicy.isValid());
-		
-		guardPolicy.setId(null);
-		assertFalse(guardPolicy.isValid());
-	}
-	
-	@Test
-	public void testToString(){
-		String id = "guard id";
-		String name = "guard name";
-		String description = "guard description";
-		MatchParameters matchParameters = new MatchParameters();
-		List<Constraint> limitConstraints = new LinkedList<>();
-		limitConstraints.add(new Constraint());
-		GuardPolicy guardPolicy = new GuardPolicy(id, name, description, matchParameters, limitConstraints);
-		
-		assertEquals(guardPolicy.toString(), "Policy [id=guard id, name=guard name, description=guard description, "
-				+ "match_parameters=MatchParameters [controlLoopName=null, actor=null, recipe=null, targets=null], "
-				+ "limitConstraints=[Constraint [freq_limit_per_target=null, time_window=null, active_time_range=null, blacklist=null]]]", guardPolicy.toString());
-	}
-	
-	@Test
-	public void testEquals(){
-		String id = "guard id";
-		String name = "guard name";
-		String description = "guard description";
-		GuardPolicy guardPolicy1 = new GuardPolicy(id);
-		GuardPolicy guardPolicy2 = new GuardPolicy();
-		assertFalse(guardPolicy1.equals(guardPolicy2));
-		
-		guardPolicy2.setId(id);
-		assertTrue(guardPolicy1.equals(guardPolicy2));
-		assertEquals(guardPolicy1.hashCode(), guardPolicy2.hashCode());
-		
-		guardPolicy1.setName(name);
-		assertFalse(guardPolicy1.equals(guardPolicy2));
-		guardPolicy2.setName(name);
-		assertTrue(guardPolicy1.equals(guardPolicy2));
-		assertEquals(guardPolicy1.hashCode(), guardPolicy2.hashCode());
-	
-		guardPolicy1.setDescription(description);
-		assertFalse(guardPolicy1.equals(guardPolicy2));
-		guardPolicy2.setDescription(description);
-		assertTrue(guardPolicy1.equals(guardPolicy2));
-		assertEquals(guardPolicy1.hashCode(), guardPolicy2.hashCode());
-
-		MatchParameters matchParameters = new MatchParameters();
-		guardPolicy1.setMatch_parameters(matchParameters);
-		assertFalse(guardPolicy1.equals(guardPolicy2));
-		guardPolicy2.setMatch_parameters(matchParameters);
-		assertTrue(guardPolicy1.equals(guardPolicy2));
-		assertEquals(guardPolicy1.hashCode(), guardPolicy2.hashCode());
-
-		LinkedList<Constraint> limitConstraints = new LinkedList<>();
-		limitConstraints.add(new Constraint());
-		guardPolicy1.setLimit_constraints(limitConstraints);
-		assertFalse(guardPolicy1.equals(guardPolicy2));
-		guardPolicy2.setLimit_constraints(limitConstraints);
-		assertTrue(guardPolicy1.equals(guardPolicy2));
-		assertEquals(guardPolicy1.hashCode(), guardPolicy2.hashCode());
-	}
-	
-	@Test
-	public void testEqualsSameObject(){
-		GuardPolicy guardPolicy = new GuardPolicy();
-		assertTrue(guardPolicy.equals(guardPolicy));
-	}
-	
-	@Test
-	public void testEqualsNull(){
-		GuardPolicy guardPolicy = new GuardPolicy();
-		assertFalse(guardPolicy.equals(null));
-	}
-	
-	@Test
-	public void testEqualsInstanceOfDiffClass(){
-		GuardPolicy guardPolicy = new GuardPolicy();
-		assertFalse(guardPolicy.equals(""));
-	}
+
+    @Test
+    public void testConstructor() {
+        GuardPolicy guardPolicy = new GuardPolicy();
+
+        assertNotNull(guardPolicy.getId());
+        assertNull(guardPolicy.getName());
+        assertNull(guardPolicy.getDescription());
+        assertNull(guardPolicy.getMatch_parameters());
+        assertNull(guardPolicy.getLimit_constraints());
+    }
+
+    @Test
+    public void testConstructorString() {
+        String id = "guard id";
+        GuardPolicy guardPolicy = new GuardPolicy(id);
+
+        assertEquals(id, guardPolicy.getId());
+        assertNull(guardPolicy.getName());
+        assertNull(guardPolicy.getDescription());
+        assertNull(guardPolicy.getMatch_parameters());
+        assertNull(guardPolicy.getLimit_constraints());
+    }
+
+    @Test
+    public void testConstructorStringStringStringMatchParameters() {
+        String id = "guard id";
+        String name = "guard name";
+        String description = "guard description";
+        MatchParameters matchParameters = new MatchParameters();
+        List<Constraint> limitConstraints = new LinkedList<>();
+        limitConstraints.add(new Constraint());
+        GuardPolicy guardPolicy = new GuardPolicy(id, name, description, matchParameters);
+
+        assertNotNull(guardPolicy.getId());
+        assertEquals(name, guardPolicy.getName());
+        assertEquals(description, guardPolicy.getDescription());
+        assertEquals(matchParameters, guardPolicy.getMatch_parameters());
+        assertNull(guardPolicy.getLimit_constraints());
+    }
+
+    @Test
+    public void testConstructorStringMatchParametersList() {
+        String name = "guard name";
+        MatchParameters matchParameters = new MatchParameters();
+        List<Constraint> limitConstraints = new LinkedList<>();
+        limitConstraints.add(new Constraint());
+        GuardPolicy guardPolicy = new GuardPolicy(name, matchParameters, limitConstraints);
+
+        assertNotNull(guardPolicy.getId());
+        assertEquals(name, guardPolicy.getName());
+        assertNull(guardPolicy.getDescription());
+        assertEquals(matchParameters, guardPolicy.getMatch_parameters());
+        assertEquals(limitConstraints, guardPolicy.getLimit_constraints());
+    }
+
+    @Test
+    public void testConstructorStringStringMatchParametersList() {
+        String name = "guard name";
+        String description = "guard description";
+        MatchParameters matchParameters = new MatchParameters();
+        List<Constraint> limitConstraints = new LinkedList<>();
+        limitConstraints.add(new Constraint());
+        GuardPolicy guardPolicy = new GuardPolicy(name, description, matchParameters, limitConstraints);
+
+        assertNotNull(guardPolicy.getId());
+        assertEquals(name, guardPolicy.getName());
+        assertEquals(description, guardPolicy.getDescription());
+        assertEquals(matchParameters, guardPolicy.getMatch_parameters());
+        assertEquals(limitConstraints, guardPolicy.getLimit_constraints());
+    }
+
+    @Test
+    public void testConstructorStringStringStringMatchParametersList() {
+        String id = "guard id";
+        String name = "guard name";
+        String description = "guard description";
+        MatchParameters matchParameters = new MatchParameters();
+        List<Constraint> limitConstraints = new LinkedList<>();
+        limitConstraints.add(new Constraint());
+        GuardPolicy guardPolicy = new GuardPolicy(id, name, description, matchParameters, limitConstraints);
+
+        assertEquals(id, guardPolicy.getId());
+        assertEquals(name, guardPolicy.getName());
+        assertEquals(description, guardPolicy.getDescription());
+        assertEquals(matchParameters, guardPolicy.getMatch_parameters());
+        assertEquals(limitConstraints, guardPolicy.getLimit_constraints());
+    }
+
+    @Test
+    public void testConstructorGuardPolicy() {
+        String id = "guard id";
+        String name = "guard name";
+        String description = "guard description";
+        MatchParameters matchParameters = new MatchParameters();
+        List<Constraint> limitConstraints = new LinkedList<>();
+        limitConstraints.add(new Constraint());
+        GuardPolicy guardPolicy1 = new GuardPolicy(id, name, description, matchParameters, limitConstraints);
+
+        GuardPolicy guardPolicy2 = new GuardPolicy(guardPolicy1);
+
+
+        assertEquals(id, guardPolicy2.getId());
+        assertEquals(name, guardPolicy2.getName());
+        assertEquals(description, guardPolicy2.getDescription());
+        assertEquals(matchParameters, guardPolicy2.getMatch_parameters());
+        assertEquals(limitConstraints, guardPolicy2.getLimit_constraints());
+    }
+
+    @Test
+    public void testSetAndGetId() {
+        String id = "guard id";
+        GuardPolicy guardPolicy = new GuardPolicy();
+        guardPolicy.setId(id);
+        assertEquals(id, guardPolicy.getId());
+    }
+
+    @Test
+    public void testSetAndGetName() {
+        String name = "guard name";
+        GuardPolicy guardPolicy = new GuardPolicy();
+        guardPolicy.setName(name);
+        assertEquals(name, guardPolicy.getName());
+    }
+
+    @Test
+    public void testSetAndGetDescription() {
+        String description = "guard description";
+        GuardPolicy guardPolicy = new GuardPolicy();
+        guardPolicy.setDescription(description);
+        assertEquals(description, guardPolicy.getDescription());
+    }
+
+    @Test
+    public void testSetAndGetMatchParameters() {
+        MatchParameters matchParameters = new MatchParameters();
+        GuardPolicy guardPolicy = new GuardPolicy();
+        guardPolicy.setMatch_parameters(matchParameters);
+        assertEquals(matchParameters, guardPolicy.getMatch_parameters());
+    }
+
+    @Test
+    public void testSetAndGetLimitConstraints() {
+        LinkedList<Constraint> limitConstraints = new LinkedList<>();
+        limitConstraints.add(new Constraint());
+        GuardPolicy guardPolicy = new GuardPolicy();
+        guardPolicy.setLimit_constraints(limitConstraints);
+        assertEquals(limitConstraints, guardPolicy.getLimit_constraints());
+    }
+
+    @Test
+    public void testIsValid() {
+        GuardPolicy guardPolicy = new GuardPolicy();
+        assertFalse(guardPolicy.isValid());
+
+        guardPolicy.setName("guard name");
+        assertTrue(guardPolicy.isValid());
+
+        guardPolicy.setId(null);
+        assertFalse(guardPolicy.isValid());
+    }
+
+    @Test
+    public void testToString() {
+        String id = "guard id";
+        String name = "guard name";
+        String description = "guard description";
+        MatchParameters matchParameters = new MatchParameters();
+        List<Constraint> limitConstraints = new LinkedList<>();
+        limitConstraints.add(new Constraint());
+        GuardPolicy guardPolicy = new GuardPolicy(id, name, description, matchParameters, limitConstraints);
+
+        assertEquals(guardPolicy.toString(), "Policy [id=guard id, name=guard name, description=guard description, "
+                + "match_parameters=MatchParameters [controlLoopName=null, actor=null, recipe=null, targets=null], "
+                + "limitConstraints=[Constraint [freq_limit_per_target=null, time_window=null, active_time_range=null,"
+                + " blacklist=null]]]",
+                guardPolicy.toString());
+    }
+
+    @Test
+    public void testEquals() {
+        String id = "guard id";
+        String name = "guard name";
+        String description = "guard description";
+        GuardPolicy guardPolicy1 = new GuardPolicy(id);
+        GuardPolicy guardPolicy2 = new GuardPolicy();
+        assertFalse(guardPolicy1.equals(guardPolicy2));
+
+        guardPolicy2.setId(id);
+        assertTrue(guardPolicy1.equals(guardPolicy2));
+        assertEquals(guardPolicy1.hashCode(), guardPolicy2.hashCode());
+
+        guardPolicy1.setName(name);
+        assertFalse(guardPolicy1.equals(guardPolicy2));
+        guardPolicy2.setName(name);
+        assertTrue(guardPolicy1.equals(guardPolicy2));
+        assertEquals(guardPolicy1.hashCode(), guardPolicy2.hashCode());
+
+        guardPolicy1.setDescription(description);
+        assertFalse(guardPolicy1.equals(guardPolicy2));
+        guardPolicy2.setDescription(description);
+        assertTrue(guardPolicy1.equals(guardPolicy2));
+        assertEquals(guardPolicy1.hashCode(), guardPolicy2.hashCode());
+
+        MatchParameters matchParameters = new MatchParameters();
+        guardPolicy1.setMatch_parameters(matchParameters);
+        assertFalse(guardPolicy1.equals(guardPolicy2));
+        guardPolicy2.setMatch_parameters(matchParameters);
+        assertTrue(guardPolicy1.equals(guardPolicy2));
+        assertEquals(guardPolicy1.hashCode(), guardPolicy2.hashCode());
+
+        LinkedList<Constraint> limitConstraints = new LinkedList<>();
+        limitConstraints.add(new Constraint());
+        guardPolicy1.setLimit_constraints(limitConstraints);
+        assertFalse(guardPolicy1.equals(guardPolicy2));
+        guardPolicy2.setLimit_constraints(limitConstraints);
+        assertTrue(guardPolicy1.equals(guardPolicy2));
+        assertEquals(guardPolicy1.hashCode(), guardPolicy2.hashCode());
+    }
+
+    @Test
+    public void testEqualsSameObject() {
+        GuardPolicy guardPolicy = new GuardPolicy();
+        assertTrue(guardPolicy.equals(guardPolicy));
+    }
+
+    @Test
+    public void testEqualsNull() {
+        GuardPolicy guardPolicy = new GuardPolicy();
+        assertFalse(guardPolicy.equals(null));
+    }
+
+    @Test
+    public void testEqualsInstanceOfDiffClass() {
+        GuardPolicy guardPolicy = new GuardPolicy();
+        assertFalse(guardPolicy.equals(""));
+    }
 }