Fix remaining checkstyle

Lots of formatting, missing javadoc, distance from use,
imports must be explicit, ordering of methods.

Fixed some abbreviation problems in classes and renamed
JUnit tests to fix this.

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

12 files changed, 526 insertions, 478 deletions

diff --git a/controlloop/common/model-impl/vfc/src/test/java/org/onap/policy/vfc/TestDemo.java b/controlloop/common/model-impl/vfc/src/test/java/org/onap/policy/vfc/TestDemo.java
index 69d3d5838..a5f40f30e 100644
--- a/controlloop/common/model-impl/vfc/src/test/java/org/onap/policy/vfc/TestDemo.java
+++ b/controlloop/common/model-impl/vfc/src/test/java/org/onap/policy/vfc/TestDemo.java
@@ -1,6 +1,7 @@
 /*-
  * ============LICENSE_START=======================================================
  * Copyright (C) 2017 Intel Corp. All rights reserved.
+ * Modifications Copyright (C) 2018 AT&T Corporation. 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.
@@ -66,7 +67,7 @@ public class TestDemo {
         responseDescriptor.setErrorCode(null);
         responseDescriptor.setResponseId("11");
 
-	    response.getResponseDescriptor().setResponseHistoryList(new LinkedList<>());
+        response.getResponseDescriptor().setResponseHistoryList(new LinkedList<>());
         response.getResponseDescriptor().getResponseHistoryList().add(responseDescriptor);
 
         body = Serialization.gsonPretty.toJson(response);
diff --git a/controlloop/common/model-impl/vfc/src/test/java/org/onap/policy/vfc/TestVFCHealActionVmInfo.java b/controlloop/common/model-impl/vfc/src/test/java/org/onap/policy/vfc/TestVFCHealActionVmInfo.java
deleted file mode 100644
index ab57f6415..000000000
--- a/controlloop/common/model-impl/vfc/src/test/java/org/onap/policy/vfc/TestVFCHealActionVmInfo.java
+++ /dev/null
@@ -1,45 +0,0 @@
-/*-
- * ============LICENSE_START=======================================================
- * vfc
- * ================================================================================
- * Copyright (C) 2018 Ericsson. All rights reserved.
- * ================================================================================
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * 
- *      http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- * ============LICENSE_END=========================================================
- */
-
-package org.onap.policy.vfc;
-
-import static org.junit.Assert.*;
-
-import org.junit.Test;
-
-public class TestVFCHealActionVmInfo {
-
-	@Test
-	public void testVFCHealActionVmInfo() {
-		VFCHealActionVmInfo actionInfo = new VFCHealActionVmInfo();
-		assertNotNull(actionInfo);
-		assertNotEquals(0, actionInfo.hashCode());
-		
-		String vmid = "ECity";
-		actionInfo.setVmid(vmid);
-		assertEquals(vmid, actionInfo.getVmid());
-		
-		String vmName = "Emerald City";
-		actionInfo.setVmname(vmName);
-		assertEquals(vmName, actionInfo.getVmname());
-		
-		assertNotEquals(0, actionInfo.hashCode());
-	}
-}
diff --git a/controlloop/common/model-impl/vfc/src/test/java/org/onap/policy/vfc/TestVFCManager.java b/controlloop/common/model-impl/vfc/src/test/java/org/onap/policy/vfc/TestVFCManager.java
deleted file mode 100644
index fa2a1ee9f..000000000
--- a/controlloop/common/model-impl/vfc/src/test/java/org/onap/policy/vfc/TestVFCManager.java
+++ /dev/null
@@ -1,275 +0,0 @@
-/*-
- * ============LICENSE_START=======================================================
- * vfc
- * ================================================================================
- * Copyright (C) 2018 Ericsson, AT&T. All rights reserved.
- * ================================================================================
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * 
- *      http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- * ============LICENSE_END=========================================================
- */
-package org.onap.policy.vfc;
-
-import static org.junit.Assert.*;
-import static org.mockito.ArgumentMatchers.anyMap;
-import static org.mockito.ArgumentMatchers.anyString;
-import static org.mockito.ArgumentMatchers.eq;
-import static org.mockito.ArgumentMatchers.startsWith;
-import static org.mockito.Mockito.*;
-
-import java.util.ArrayList;
-import java.util.List;
-import java.util.UUID;
-
-import org.drools.core.WorkingMemory;
-import org.junit.After;
-import org.junit.Before;
-import org.junit.BeforeClass;
-import org.junit.Test;
-import org.onap.policy.drools.system.PolicyEngine;
-import org.onap.policy.rest.RESTManager;
-import org.onap.policy.rest.RESTManager.Pair;
-import org.onap.policy.vfc.util.Serialization;
-
-public class TestVFCManager {
-	private static WorkingMemory mockedWorkingMemory;
-
-	private RESTManager   mockedRESTManager;
-
-	private Pair<Integer, String> httpResponsePutOK;
-	private Pair<Integer, String> httpResponseGetOK;
-	private Pair<Integer, String> httpResponseBadResponse;
-	private Pair<Integer, String> httpResponseErr;
-
-	private VFCRequest  request;
-	private VFCResponse response;
-
-	@BeforeClass
-	public static void beforeTestVFCManager() {
-		mockedWorkingMemory = mock(WorkingMemory.class);
-	}
-
-	@Before
-	public void setupMockedRest() {
-		mockedRESTManager   = mock(RESTManager.class);
-
-		httpResponsePutOK       = mockedRESTManager.new Pair<>(202, Serialization.gsonPretty.toJson(response));
-		httpResponseGetOK       = mockedRESTManager.new Pair<>(200, Serialization.gsonPretty.toJson(response));
-		httpResponseBadResponse = mockedRESTManager.new Pair<>(202, Serialization.gsonPretty.toJson(null));
-		httpResponseErr         = mockedRESTManager.new Pair<>(200, null);
-	}
-
-	@Before
-	public void createRequestAndResponse() {
-		VFCHealActionVmInfo actionInfo = new VFCHealActionVmInfo();
-		actionInfo.setVmid("TheWizard");
-		actionInfo.setVmname("The Wizard of Oz");
-
-		VFCHealAdditionalParams additionalParams = new VFCHealAdditionalParams();
-		additionalParams.setAction("Go Home");
-		additionalParams.setActionInfo(actionInfo);
-
-		VFCHealRequest healRequest = new VFCHealRequest();
-		healRequest.setAdditionalParams(additionalParams);
-		healRequest.setCause("WestWitch");
-		healRequest.setVnfInstanceId("EmeraldCity");
-
-		UUID requestId = UUID.randomUUID();
-		request = new VFCRequest();
-		request.setHealRequest(healRequest);
-		request.setNSInstanceId("Dorothy");
-		request.setRequestId(requestId);
-
-		List<VFCResponseDescriptor> responseHistoryList = new ArrayList<>();;
-
-		VFCResponseDescriptor responseDescriptor = new VFCResponseDescriptor();
-		responseDescriptor.setErrorCode("1234");
-		responseDescriptor.setProgress("Follow The Yellow Brick Road");
-		responseDescriptor.setResponseHistoryList(responseHistoryList);
-		responseDescriptor.setResponseId(UUID.randomUUID().toString());
-		responseDescriptor.setStatus("finished");
-		responseDescriptor.setStatusDescription("There's no place like home");
-
-		response = new VFCResponse();
-		response.setJobId("1234");
-		response.setRequestId(request.getRequestId().toString());
-		response.setResponseDescriptor(responseDescriptor);
-	}
-
-    @After
-    public void tearDown() {
-        PolicyEngine.manager.getEnvironment().remove("vfc.password");
-        PolicyEngine.manager.getEnvironment().remove("vfc.username");
-        PolicyEngine.manager.getEnvironment().remove("vfc.url");
-    }
-
-	@Test
-	public void testVFCInitiation() {
-		try {
-			new VFCManager(null, null);
-			fail("test should throw an exception here");
-		}
-		catch (IllegalArgumentException e) {
-			assertEquals("the parameters \"wm\" and \"request\" on the VFCManager constructor may not be null", e.getMessage());
-		}
-
-		try {
-			new VFCManager(mockedWorkingMemory, null);
-			fail("test should throw an exception here");
-		}
-		catch (IllegalArgumentException e) {
-			assertEquals("the parameters \"wm\" and \"request\" on the VFCManager constructor may not be null", e.getMessage());
-		}
-
-		try {
-			new VFCManager(mockedWorkingMemory, request);
-			fail("test should throw an exception here");
-		}
-		catch (IllegalArgumentException e) {
-			assertEquals("The value of policy engine manager environment property \"vfc.url\" may not be null", e.getMessage());
-		}
-        
-        // add url; username & password are not required
-		PolicyEngine.manager.getEnvironment().put("vfc.url", "http://somewhere.over.the.rainbow");
-        new VFCManager(mockedWorkingMemory, request);
-
-        // url & username, but no password
-		PolicyEngine.manager.getEnvironment().put("vfc.username", "Dorothy");
-
-		// url, username, and password
-		PolicyEngine.manager.getEnvironment().put("vfc.password", "Toto");
-		new VFCManager(mockedWorkingMemory, request);
-	}
-
-	@Test
-	public void testVFCExecutionException() throws InterruptedException {
-		PolicyEngine.manager.getEnvironment().put("vfc.url", "http://somewhere.over.the.rainbow");
-		PolicyEngine.manager.getEnvironment().put("vfc.username", "Dorothy");
-		PolicyEngine.manager.getEnvironment().put("vfc.password", "Exception");
-
-		VFCManager manager = new VFCManager(mockedWorkingMemory, request);
-		manager.setRestManager(mockedRESTManager);
-
-		Thread managerThread = new Thread(manager);
-		managerThread.start();
-
-		when(mockedRESTManager.post(startsWith("http://somewhere.over.the.rainbow"), eq("Dorothy"), eq("Exception"), anyMap(), anyString(), anyString()))
-		.thenThrow(new RuntimeException("OzException"));
-
-		while (managerThread.isAlive()) {
-			Thread.sleep(100);
-		}
-
-		PolicyEngine.manager.getEnvironment().remove("vfc.password");
-		PolicyEngine.manager.getEnvironment().remove("vfc.username");
-		PolicyEngine.manager.getEnvironment().remove("vfc.url");
-	}
-
-	@Test
-	public void testVFCExecutionNull() throws InterruptedException {
-		PolicyEngine.manager.getEnvironment().put("vfc.url", "http://somewhere.over.the.rainbow");
-		PolicyEngine.manager.getEnvironment().put("vfc.username", "Dorothy");
-		PolicyEngine.manager.getEnvironment().put("vfc.password", "Null");
-
-		VFCManager manager = new VFCManager(mockedWorkingMemory, request);
-		manager.setRestManager(mockedRESTManager);
-
-		Thread managerThread = new Thread(manager);
-		managerThread.start();
-
-		when(mockedRESTManager.post(startsWith("http://somewhere.over.the.rainbow"), eq("Dorothy"), eq("Null"), anyMap(), anyString(), anyString()))
-		.thenReturn(null);
-
-		while (managerThread.isAlive()) {
-			Thread.sleep(100);
-		}
-
-		PolicyEngine.manager.getEnvironment().remove("vfc.password");
-		PolicyEngine.manager.getEnvironment().remove("vfc.username");
-		PolicyEngine.manager.getEnvironment().remove("vfc.url");
-	}
-
-	@Test
-	public void testVFCExecutionError0() throws InterruptedException {
-		PolicyEngine.manager.getEnvironment().put("vfc.url", "http://somewhere.over.the.rainbow");
-		PolicyEngine.manager.getEnvironment().put("vfc.username", "Dorothy");
-		PolicyEngine.manager.getEnvironment().put("vfc.password", "Error0");
-
-		VFCManager manager = new VFCManager(mockedWorkingMemory, request);
-		manager.setRestManager(mockedRESTManager);
-
-		Thread managerThread = new Thread(manager);
-		managerThread.start();
-
-		when(mockedRESTManager.post(startsWith("http://somewhere.over.the.rainbow"), eq("Dorothy"), eq("Error0"), anyMap(), anyString(), anyString()))
-		.thenReturn(httpResponseErr);
-
-		while (managerThread.isAlive()) {
-			Thread.sleep(100);
-		}
-
-		PolicyEngine.manager.getEnvironment().remove("vfc.password");
-		PolicyEngine.manager.getEnvironment().remove("vfc.username");
-		PolicyEngine.manager.getEnvironment().remove("vfc.url");
-	}
-
-	@Test
-	public void testVFCExecutionBadResponse() throws InterruptedException {
-		PolicyEngine.manager.getEnvironment().put("vfc.url", "http://somewhere.over.the.rainbow");
-		PolicyEngine.manager.getEnvironment().put("vfc.username", "Dorothy");
-		PolicyEngine.manager.getEnvironment().put("vfc.password", "BadResponse");
-
-		VFCManager manager = new VFCManager(mockedWorkingMemory, request);
-		manager.setRestManager(mockedRESTManager);
-
-		Thread managerThread = new Thread(manager);
-		managerThread.start();
-
-		when(mockedRESTManager.post(startsWith("http://somewhere.over.the.rainbow"), eq("Dorothy"), eq("OK"), anyMap(), anyString(), anyString()))
-		.thenReturn(httpResponseBadResponse);
-
-		while (managerThread.isAlive()) {
-			Thread.sleep(100);
-		}
-
-		PolicyEngine.manager.getEnvironment().remove("vfc.password");
-		PolicyEngine.manager.getEnvironment().remove("vfc.username");
-		PolicyEngine.manager.getEnvironment().remove("vfc.url");
-	}
-
-	@Test
-	public void testVFCExecutionOK() throws InterruptedException {
-		PolicyEngine.manager.getEnvironment().put("vfc.url", "http://somewhere.over.the.rainbow");
-		PolicyEngine.manager.getEnvironment().put("vfc.username", "Dorothy");
-		PolicyEngine.manager.getEnvironment().put("vfc.password", "OK");
-
-		VFCManager manager = new VFCManager(mockedWorkingMemory, request);
-		manager.setRestManager(mockedRESTManager);
-
-		Thread managerThread = new Thread(manager);
-		managerThread.start();
-
-		when(mockedRESTManager.post(startsWith("http://somewhere.over.the.rainbow"), eq("Dorothy"), eq("OK"), anyMap(), anyString(), anyString()))
-		.thenReturn(httpResponsePutOK);
-
-		when(mockedRESTManager.get(endsWith("1234"), eq("Dorothy"), eq("OK"), anyMap()))
-		.thenReturn(httpResponseGetOK);
-
-		while (managerThread.isAlive()) {
-			Thread.sleep(100);
-		}
-
-		PolicyEngine.manager.getEnvironment().remove("vfc.password");
-		PolicyEngine.manager.getEnvironment().remove("vfc.username");
-		PolicyEngine.manager.getEnvironment().remove("vfc.url");
-	}
-}
diff --git a/controlloop/common/model-impl/vfc/src/test/java/org/onap/policy/vfc/TestVFCResponseDescriptor.java b/controlloop/common/model-impl/vfc/src/test/java/org/onap/policy/vfc/TestVFCResponseDescriptor.java
deleted file mode 100644
index a2b59dd20..000000000
--- a/controlloop/common/model-impl/vfc/src/test/java/org/onap/policy/vfc/TestVFCResponseDescriptor.java
+++ /dev/null
@@ -1,64 +0,0 @@
-/*-
- * ============LICENSE_START=======================================================
- * vfc
- * ================================================================================
- * Copyright (C) 2018 Ericsson. All rights reserved.
- * ================================================================================
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * 
- *      http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- * ============LICENSE_END=========================================================
- */
-
-package org.onap.policy.vfc;
-
-import static org.junit.Assert.*;
-
-import java.util.ArrayList;
-import java.util.List;
-
-import org.junit.Test;
-
-public class TestVFCResponseDescriptor {
-
-	@Test
-	public void testVFCResponseDescriptor() {
-		VFCResponseDescriptor descriptor = new VFCResponseDescriptor();
-		assertNotNull(descriptor);
-		assertNotEquals(0, descriptor.hashCode());
-
-		String errorCode = "WitchIsDead";
-		descriptor.setErrorCode(errorCode);
-		assertEquals(errorCode, descriptor.getErrorCode());
-		
-		String progress = "Visited Wizard";
-		descriptor.setProgress(progress);
-		assertEquals(progress, descriptor.getProgress());
-		
-		List<VFCResponseDescriptor> responseHistoryList = new ArrayList<>();
-		descriptor.setResponseHistoryList(responseHistoryList);
-		assertEquals(responseHistoryList, descriptor.getResponseHistoryList());
-		
-		String responseId = "WishHard";
-		descriptor.setResponseId(responseId);
-		assertEquals(responseId, descriptor.getResponseId());
-		
-		String status = "Back in Kansas";
-		descriptor.setStatus(status);
-		assertEquals(status, descriptor.getStatus());
-		
-		String statusDescription = "Back on the prairie";
-		descriptor.setStatusDescription(statusDescription);
-		assertEquals(statusDescription, descriptor.getStatusDescription());
-		
-		assertNotEquals(0, descriptor.hashCode());
-	}
-}
diff --git a/controlloop/common/model-impl/vfc/src/test/java/org/onap/policy/vfc/TestVFCResponse.java b/controlloop/common/model-impl/vfc/src/test/java/org/onap/policy/vfc/TestVfcHealActionVmInfo.java
index 36591a910..55f9ab8d5 100644
--- a/controlloop/common/model-impl/vfc/src/test/java/org/onap/policy/vfc/TestVFCResponse.java
+++ b/controlloop/common/model-impl/vfc/src/test/java/org/onap/policy/vfc/TestVfcHealActionVmInfo.java
@@ -3,6 +3,7 @@
  * vfc
  * ================================================================================
  * Copyright (C) 2018 Ericsson. All rights reserved.
+ * Modifications Copyright (C) 2018 AT&T Corporation. 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.
@@ -20,30 +21,28 @@
 
 package org.onap.policy.vfc;
 
-import static org.junit.Assert.*;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertNotEquals;
+import static org.junit.Assert.assertNotNull;
 
 import org.junit.Test;
 
-public class TestVFCResponse {
-
-	@Test
-	public void testVFCResponse() {
-		VFCResponse response = new VFCResponse();
-		assertNotNull(response);
-		assertNotEquals(0, response.hashCode());
-
-		String jobId = "GetToOz";
-		response.setJobId(jobId);
-		assertEquals(jobId, response.getJobId());
-		
-		String requestId = "Get Home";
-		response.setRequestId(requestId);
-		assertEquals(requestId, response.getRequestId());
-		
-		VFCResponseDescriptor responseDescriptor = new VFCResponseDescriptor();
-		response.setResponseDescriptor(responseDescriptor);
-		assertEquals(responseDescriptor, response.getResponseDescriptor());
-		
-		assertNotEquals(0, response.hashCode());
-	}
+public class TestVfcHealActionVmInfo {
+
+    @Test
+    public void testVfcHealActionVmInfo() {
+        VFCHealActionVmInfo actionInfo = new VFCHealActionVmInfo();
+        assertNotNull(actionInfo);
+        assertNotEquals(0, actionInfo.hashCode());
+
+        String vmid = "ECity";
+        actionInfo.setVmid(vmid);
+        assertEquals(vmid, actionInfo.getVmid());
+
+        String vmName = "Emerald City";
+        actionInfo.setVmname(vmName);
+        assertEquals(vmName, actionInfo.getVmname());
+
+        assertNotEquals(0, actionInfo.hashCode());
+    }
 }
diff --git a/controlloop/common/model-impl/vfc/src/test/java/org/onap/policy/vfc/TestVFCHealRequest.java b/controlloop/common/model-impl/vfc/src/test/java/org/onap/policy/vfc/TestVfcHealAdditionalParams.java
index 5a78bfb0c..b74fe1a93 100644
--- a/controlloop/common/model-impl/vfc/src/test/java/org/onap/policy/vfc/TestVFCHealRequest.java
+++ b/controlloop/common/model-impl/vfc/src/test/java/org/onap/policy/vfc/TestVfcHealAdditionalParams.java
@@ -3,6 +3,7 @@
  * vfc
  * ================================================================================
  * Copyright (C) 2018 Ericsson. All rights reserved.
+ * Modifications Copyright (C) 2018 AT&T Corporation. 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.
@@ -20,30 +21,28 @@
 
 package org.onap.policy.vfc;
 
-import static org.junit.Assert.*;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertNotEquals;
+import static org.junit.Assert.assertNotNull;
 
 import org.junit.Test;
 
-public class TestVFCHealRequest {
-
-	@Test
-	public void testVFCHealRequest() {
-		VFCHealRequest request = new VFCHealRequest();
-		assertNotNull(request);
-		assertNotEquals(0, request.hashCode());
-		
-		String vnfInstanceId = "Go To Oz";
-		request.setVnfInstanceId(vnfInstanceId);
-		assertEquals(vnfInstanceId, request.getVnfInstanceId());
-		
-		String cause = "West Witch";
-		request.setCause(cause);
-		assertEquals(cause, request.getCause());
-		
-		VFCHealAdditionalParams additionalParams= new VFCHealAdditionalParams();
-		request.setAdditionalParams(additionalParams);
-		assertEquals(additionalParams, request.getAdditionalParams());
-		
-		assertNotEquals(0, request.hashCode());
-	}
+public class TestVfcHealAdditionalParams {
+
+    @Test
+    public void testVfcHealAdditionalParameters() {
+        VFCHealAdditionalParams additionalParams = new VFCHealAdditionalParams();
+        assertNotNull(additionalParams);
+        assertNotEquals(0, additionalParams.hashCode());
+
+        String action = "Go Home";
+        additionalParams.setAction(action);
+        assertEquals(action, additionalParams.getAction());
+
+        VFCHealActionVmInfo actionInfo = new VFCHealActionVmInfo();
+        additionalParams.setActionInfo(actionInfo );
+        assertEquals(actionInfo, additionalParams.getActionInfo());
+
+        assertNotEquals(0, additionalParams.hashCode());
+    }
 }
diff --git a/controlloop/common/model-impl/vfc/src/test/java/org/onap/policy/vfc/TestVfcHealRequest.java b/controlloop/common/model-impl/vfc/src/test/java/org/onap/policy/vfc/TestVfcHealRequest.java
new file mode 100644
index 000000000..4c442bc2c
--- /dev/null
+++ b/controlloop/common/model-impl/vfc/src/test/java/org/onap/policy/vfc/TestVfcHealRequest.java
@@ -0,0 +1,52 @@
+/*-
+ * ============LICENSE_START=======================================================
+ * vfc
+ * ================================================================================
+ * Copyright (C) 2018 Ericsson. All rights reserved.
+ * Modifications Copyright (C) 2018 AT&T Corporation. All rights reserved.
+ * ================================================================================
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * 
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ * ============LICENSE_END=========================================================
+ */
+
+package org.onap.policy.vfc;
+
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertNotEquals;
+import static org.junit.Assert.assertNotNull;
+
+import org.junit.Test;
+
+public class TestVfcHealRequest {
+
+    @Test
+    public void testVfcHealRequest() {
+        VFCHealRequest request = new VFCHealRequest();
+        assertNotNull(request);
+        assertNotEquals(0, request.hashCode());
+
+        String vnfInstanceId = "Go To Oz";
+        request.setVnfInstanceId(vnfInstanceId);
+        assertEquals(vnfInstanceId, request.getVnfInstanceId());
+
+        String cause = "West Witch";
+        request.setCause(cause);
+        assertEquals(cause, request.getCause());
+
+        VFCHealAdditionalParams additionalParams = new VFCHealAdditionalParams();
+        request.setAdditionalParams(additionalParams);
+        assertEquals(additionalParams, request.getAdditionalParams());
+
+        assertNotEquals(0, request.hashCode());
+    }
+}
diff --git a/controlloop/common/model-impl/vfc/src/test/java/org/onap/policy/vfc/TestVfcManager.java b/controlloop/common/model-impl/vfc/src/test/java/org/onap/policy/vfc/TestVfcManager.java
new file mode 100644
index 000000000..9913d39b8
--- /dev/null
+++ b/controlloop/common/model-impl/vfc/src/test/java/org/onap/policy/vfc/TestVfcManager.java
@@ -0,0 +1,303 @@
+/*-
+ * ============LICENSE_START=======================================================
+ * vfc
+ * ================================================================================
+ * Copyright (C) 2018 Ericsson, AT&T. All rights reserved.
+ * Modifications Copyright (C) 2018 AT&T Corporation. All rights reserved.
+ * ================================================================================
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * 
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ * ============LICENSE_END=========================================================
+ */
+
+package org.onap.policy.vfc;
+
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.fail;
+
+import static org.mockito.ArgumentMatchers.anyMap;
+import static org.mockito.ArgumentMatchers.anyString;
+import static org.mockito.ArgumentMatchers.endsWith;
+import static org.mockito.ArgumentMatchers.eq;
+import static org.mockito.ArgumentMatchers.startsWith;
+import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.when;
+
+import java.util.ArrayList;
+import java.util.List;
+import java.util.UUID;
+
+import org.drools.core.WorkingMemory;
+import org.junit.After;
+import org.junit.Before;
+import org.junit.BeforeClass;
+import org.junit.Test;
+import org.onap.policy.drools.system.PolicyEngine;
+import org.onap.policy.rest.RESTManager;
+import org.onap.policy.rest.RESTManager.Pair;
+import org.onap.policy.vfc.util.Serialization;
+
+public class TestVfcManager {
+    private static WorkingMemory mockedWorkingMemory;
+
+    private RESTManager   mockedRestManager;
+
+    private Pair<Integer, String> httpResponsePutOk;
+    private Pair<Integer, String> httpResponseGetOk;
+    private Pair<Integer, String> httpResponseBadResponse;
+    private Pair<Integer, String> httpResponseErr;
+
+    private VFCRequest  request;
+    private VFCResponse response;
+
+    @BeforeClass
+    public static void beforeTestVfcManager() {
+        mockedWorkingMemory = mock(WorkingMemory.class);
+    }
+
+    /**
+     * Set up the mocked REST manager.
+     */
+    @Before
+    public void setupMockedRest() {
+        mockedRestManager   = mock(RESTManager.class);
+
+        httpResponsePutOk       = mockedRestManager.new Pair<>(202, Serialization.gsonPretty.toJson(response));
+        httpResponseGetOk       = mockedRestManager.new Pair<>(200, Serialization.gsonPretty.toJson(response));
+        httpResponseBadResponse = mockedRestManager.new Pair<>(202, Serialization.gsonPretty.toJson(null));
+        httpResponseErr         = mockedRestManager.new Pair<>(200, null);
+    }
+
+    /**
+     * Create the request and response before.
+     */
+    @Before
+    public void createRequestAndResponse() {
+        VFCHealActionVmInfo actionInfo = new VFCHealActionVmInfo();
+        actionInfo.setVmid("TheWizard");
+        actionInfo.setVmname("The Wizard of Oz");
+
+        VFCHealAdditionalParams additionalParams = new VFCHealAdditionalParams();
+        additionalParams.setAction("Go Home");
+        additionalParams.setActionInfo(actionInfo);
+
+        VFCHealRequest healRequest = new VFCHealRequest();
+        healRequest.setAdditionalParams(additionalParams);
+        healRequest.setCause("WestWitch");
+        healRequest.setVnfInstanceId("EmeraldCity");
+
+        final UUID requestId = UUID.randomUUID();
+        request = new VFCRequest();
+        request.setHealRequest(healRequest);
+        request.setNSInstanceId("Dorothy");
+        request.setRequestId(requestId);
+
+        List<VFCResponseDescriptor> responseHistoryList = new ArrayList<>();;
+
+        VFCResponseDescriptor responseDescriptor = new VFCResponseDescriptor();
+        responseDescriptor.setErrorCode("1234");
+        responseDescriptor.setProgress("Follow The Yellow Brick Road");
+        responseDescriptor.setResponseHistoryList(responseHistoryList);
+        responseDescriptor.setResponseId(UUID.randomUUID().toString());
+        responseDescriptor.setStatus("finished");
+        responseDescriptor.setStatusDescription("There's no place like home");
+
+        response = new VFCResponse();
+        response.setJobId("1234");
+        response.setRequestId(request.getRequestId().toString());
+        response.setResponseDescriptor(responseDescriptor);
+    }
+
+    /**
+     * Remove the environnment.
+     */
+    @After
+    public void tearDown() {
+        PolicyEngine.manager.getEnvironment().remove("vfc.password");
+        PolicyEngine.manager.getEnvironment().remove("vfc.username");
+        PolicyEngine.manager.getEnvironment().remove("vfc.url");
+    }
+
+    @Test
+    public void testVfcInitiation() {
+        try {
+            new VFCManager(null, null);
+            fail("test should throw an exception here");
+        }
+        catch (IllegalArgumentException e) {
+            assertEquals("the parameters \"wm\" and \"request\" on the VFCManager constructor may not be null", 
+                    e.getMessage());
+        }
+
+        try {
+            new VFCManager(mockedWorkingMemory, null);
+            fail("test should throw an exception here");
+        }
+        catch (IllegalArgumentException e) {
+            assertEquals("the parameters \"wm\" and \"request\" on the VFCManager constructor may not be null", 
+                    e.getMessage());
+        }
+
+        try {
+            new VFCManager(mockedWorkingMemory, request);
+            fail("test should throw an exception here");
+        }
+        catch (IllegalArgumentException e) {
+            assertEquals("The value of policy engine manager environment property \"vfc.url\" may not be null", 
+                    e.getMessage());
+        }
+
+        // add url; username & password are not required
+        PolicyEngine.manager.getEnvironment().put("vfc.url", "http://somewhere.over.the.rainbow");
+        new VFCManager(mockedWorkingMemory, request);
+
+        // url & username, but no password
+        PolicyEngine.manager.getEnvironment().put("vfc.username", "Dorothy");
+
+        // url, username, and password
+        PolicyEngine.manager.getEnvironment().put("vfc.password", "Toto");
+        new VFCManager(mockedWorkingMemory, request);
+    }
+
+    @Test
+    public void testVfcExecutionException() throws InterruptedException {
+        PolicyEngine.manager.getEnvironment().put("vfc.url", "http://somewhere.over.the.rainbow");
+        PolicyEngine.manager.getEnvironment().put("vfc.username", "Dorothy");
+        PolicyEngine.manager.getEnvironment().put("vfc.password", "Exception");
+
+        VFCManager manager = new VFCManager(mockedWorkingMemory, request);
+        manager.setRestManager(mockedRestManager);
+
+        Thread managerThread = new Thread(manager);
+        managerThread.start();
+
+        when(mockedRestManager.post(
+            startsWith("http://somewhere.over.the.rainbow"),
+            eq("Dorothy"),
+            eq("Exception"),
+            anyMap(),
+            anyString(),
+            anyString()))
+            .thenThrow(new RuntimeException("OzException"));
+
+        while (managerThread.isAlive()) {
+            Thread.sleep(100);
+        }
+
+        PolicyEngine.manager.getEnvironment().remove("vfc.password");
+        PolicyEngine.manager.getEnvironment().remove("vfc.username");
+        PolicyEngine.manager.getEnvironment().remove("vfc.url");
+    }
+
+    @Test
+    public void testVfcExecutionNull() throws InterruptedException {
+        PolicyEngine.manager.getEnvironment().put("vfc.url", "http://somewhere.over.the.rainbow");
+        PolicyEngine.manager.getEnvironment().put("vfc.username", "Dorothy");
+        PolicyEngine.manager.getEnvironment().put("vfc.password", "Null");
+
+        VFCManager manager = new VFCManager(mockedWorkingMemory, request);
+        manager.setRestManager(mockedRestManager);
+
+        Thread managerThread = new Thread(manager);
+        managerThread.start();
+
+        when(mockedRestManager.post(startsWith("http://somewhere.over.the.rainbow"), 
+                eq("Dorothy"), eq("Null"), anyMap(), anyString(), anyString()))
+                .thenReturn(null);
+
+        while (managerThread.isAlive()) {
+            Thread.sleep(100);
+        }
+
+        PolicyEngine.manager.getEnvironment().remove("vfc.password");
+        PolicyEngine.manager.getEnvironment().remove("vfc.username");
+        PolicyEngine.manager.getEnvironment().remove("vfc.url");
+    }
+
+    @Test
+    public void testVfcExecutionError0() throws InterruptedException {
+        PolicyEngine.manager.getEnvironment().put("vfc.url", "http://somewhere.over.the.rainbow");
+        PolicyEngine.manager.getEnvironment().put("vfc.username", "Dorothy");
+        PolicyEngine.manager.getEnvironment().put("vfc.password", "Error0");
+
+        VFCManager manager = new VFCManager(mockedWorkingMemory, request);
+        manager.setRestManager(mockedRestManager);
+
+        Thread managerThread = new Thread(manager);
+        managerThread.start();
+
+        when(mockedRestManager.post(startsWith("http://somewhere.over.the.rainbow"), 
+                eq("Dorothy"), eq("Error0"), anyMap(), anyString(), anyString()))
+                .thenReturn(httpResponseErr);
+
+        while (managerThread.isAlive()) {
+            Thread.sleep(100);
+        }
+
+        PolicyEngine.manager.getEnvironment().remove("vfc.password");
+        PolicyEngine.manager.getEnvironment().remove("vfc.username");
+        PolicyEngine.manager.getEnvironment().remove("vfc.url");
+    }
+
+    @Test
+    public void testVfcExecutionBadResponse() throws InterruptedException {
+        PolicyEngine.manager.getEnvironment().put("vfc.url", "http://somewhere.over.the.rainbow");
+        PolicyEngine.manager.getEnvironment().put("vfc.username", "Dorothy");
+        PolicyEngine.manager.getEnvironment().put("vfc.password", "BadResponse");
+
+        VFCManager manager = new VFCManager(mockedWorkingMemory, request);
+        manager.setRestManager(mockedRestManager);
+
+        Thread managerThread = new Thread(manager);
+        managerThread.start();
+
+        when(mockedRestManager.post(startsWith("http://somewhere.over.the.rainbow"), 
+                eq("Dorothy"), eq("OK"), anyMap(), anyString(), anyString()))
+                .thenReturn(httpResponseBadResponse);
+
+        while (managerThread.isAlive()) {
+            Thread.sleep(100);
+        }
+
+        PolicyEngine.manager.getEnvironment().remove("vfc.password");
+        PolicyEngine.manager.getEnvironment().remove("vfc.username");
+        PolicyEngine.manager.getEnvironment().remove("vfc.url");
+    }
+
+    @Test
+    public void testVfcExecutionOk() throws InterruptedException {
+        PolicyEngine.manager.getEnvironment().put("vfc.url", "http://somewhere.over.the.rainbow");
+        PolicyEngine.manager.getEnvironment().put("vfc.username", "Dorothy");
+        PolicyEngine.manager.getEnvironment().put("vfc.password", "OK");
+
+        VFCManager manager = new VFCManager(mockedWorkingMemory, request);
+        manager.setRestManager(mockedRestManager);
+
+        Thread managerThread = new Thread(manager);
+        managerThread.start();
+
+        when(mockedRestManager.post(startsWith("http://somewhere.over.the.rainbow"), 
+                eq("Dorothy"), eq("OK"), anyMap(), anyString(), anyString()))
+                .thenReturn(httpResponsePutOk);
+
+        when(mockedRestManager.get(endsWith("1234"), eq("Dorothy"), eq("OK"), anyMap()))
+            .thenReturn(httpResponseGetOk);
+
+        while (managerThread.isAlive()) {
+            Thread.sleep(100);
+        }
+
+        PolicyEngine.manager.getEnvironment().remove("vfc.password");
+        PolicyEngine.manager.getEnvironment().remove("vfc.username");
+        PolicyEngine.manager.getEnvironment().remove("vfc.url");
+    }
+}
diff --git a/controlloop/common/model-impl/vfc/src/test/java/org/onap/policy/vfc/TestVFCRequest.java b/controlloop/common/model-impl/vfc/src/test/java/org/onap/policy/vfc/TestVfcRequest.java
index 64307fec8..0ec5d7d82 100644
--- a/controlloop/common/model-impl/vfc/src/test/java/org/onap/policy/vfc/TestVFCRequest.java
+++ b/controlloop/common/model-impl/vfc/src/test/java/org/onap/policy/vfc/TestVfcRequest.java
@@ -3,6 +3,7 @@
  * vfc
  * ================================================================================
  * Copyright (C) 2018 Ericsson. All rights reserved.
+ * Modifications Copyright (C) 2018 AT&T Corporation. 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.
@@ -20,32 +21,34 @@
 
 package org.onap.policy.vfc;
 
-import static org.junit.Assert.*;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertNotEquals;
+import static org.junit.Assert.assertNotNull;
 
 import java.util.UUID;
 
 import org.junit.Test;
 
-public class TestVFCRequest {
-
-	@Test
-	public void testVFCRequest() {
-		VFCRequest request = new VFCRequest();
-		assertNotNull(request);
-		assertNotEquals(0, request.hashCode());
-		
-		String nsInstanceId = "Dorothy";
-		request.setNSInstanceId(nsInstanceId);
-		assertEquals(nsInstanceId, request.getNSInstanceId());
-		
-		UUID requestId = UUID.randomUUID();
-		request.setRequestId(requestId);
-		assertEquals(requestId, request.getRequestId());
-		
-		VFCHealRequest healRequest = new VFCHealRequest();
-		request.setHealRequest(healRequest);
-		assertEquals(healRequest, request.getHealRequest());
-		
-		assertNotEquals(0, request.hashCode());
-	}
+public class TestVfcRequest {
+
+    @Test
+    public void testVfcRequest() {
+        VFCRequest request = new VFCRequest();
+        assertNotNull(request);
+        assertNotEquals(0, request.hashCode());
+
+        String nsInstanceId = "Dorothy";
+        request.setNSInstanceId(nsInstanceId);
+        assertEquals(nsInstanceId, request.getNSInstanceId());
+
+        UUID requestId = UUID.randomUUID();
+        request.setRequestId(requestId);
+        assertEquals(requestId, request.getRequestId());
+
+        VFCHealRequest healRequest = new VFCHealRequest();
+        request.setHealRequest(healRequest);
+        assertEquals(healRequest, request.getHealRequest());
+
+        assertNotEquals(0, request.hashCode());
+    }
 }
diff --git a/controlloop/common/model-impl/vfc/src/test/java/org/onap/policy/vfc/TestVFCHealAdditionalParams.java b/controlloop/common/model-impl/vfc/src/test/java/org/onap/policy/vfc/TestVfcResponse.java
index 7fa8fd741..698459ad2 100644
--- a/controlloop/common/model-impl/vfc/src/test/java/org/onap/policy/vfc/TestVFCHealAdditionalParams.java
+++ b/controlloop/common/model-impl/vfc/src/test/java/org/onap/policy/vfc/TestVfcResponse.java
@@ -3,6 +3,7 @@
  * vfc
  * ================================================================================
  * Copyright (C) 2018 Ericsson. All rights reserved.
+ * Modifications Copyright (C) 2018 AT&T Corporation. 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.
@@ -20,26 +21,32 @@
 
 package org.onap.policy.vfc;
 
-import static org.junit.Assert.*;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertNotEquals;
+import static org.junit.Assert.assertNotNull;
 
 import org.junit.Test;
 
-public class TestVFCHealAdditionalParams {
-
-	@Test
-	public void testVFCHealAdditionalParameters() {
-		VFCHealAdditionalParams additionalParams = new VFCHealAdditionalParams();
-		assertNotNull(additionalParams);
-		assertNotEquals(0, additionalParams.hashCode());
-		
-		String action = "Go Home";
-		additionalParams.setAction(action);
-		assertEquals(action, additionalParams.getAction());
-		
-		VFCHealActionVmInfo actionInfo = new VFCHealActionVmInfo();
-		additionalParams.setActionInfo(actionInfo );
-		assertEquals(actionInfo, additionalParams.getActionInfo());
-		
-		assertNotEquals(0, additionalParams.hashCode());
-	}
+public class TestVfcResponse {
+
+    @Test
+    public void testVfcResponse() {
+        VFCResponse response = new VFCResponse();
+        assertNotNull(response);
+        assertNotEquals(0, response.hashCode());
+
+        String jobId = "GetToOz";
+        response.setJobId(jobId);
+        assertEquals(jobId, response.getJobId());
+
+        String requestId = "Get Home";
+        response.setRequestId(requestId);
+        assertEquals(requestId, response.getRequestId());
+
+        VFCResponseDescriptor responseDescriptor = new VFCResponseDescriptor();
+        response.setResponseDescriptor(responseDescriptor);
+        assertEquals(responseDescriptor, response.getResponseDescriptor());
+
+        assertNotEquals(0, response.hashCode());
+    }
 }
diff --git a/controlloop/common/model-impl/vfc/src/test/java/org/onap/policy/vfc/TestVfcResponseDescriptor.java b/controlloop/common/model-impl/vfc/src/test/java/org/onap/policy/vfc/TestVfcResponseDescriptor.java
new file mode 100644
index 000000000..927306fd8
--- /dev/null
+++ b/controlloop/common/model-impl/vfc/src/test/java/org/onap/policy/vfc/TestVfcResponseDescriptor.java
@@ -0,0 +1,67 @@
+/*-
+ * ============LICENSE_START=======================================================
+ * vfc
+ * ================================================================================
+ * Copyright (C) 2018 Ericsson. All rights reserved.
+ * Modifications Copyright (C) 2018 AT&T Corporation. All rights reserved.
+ * ================================================================================
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * 
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ * ============LICENSE_END=========================================================
+ */
+
+package org.onap.policy.vfc;
+
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertNotEquals;
+import static org.junit.Assert.assertNotNull;
+
+import java.util.ArrayList;
+import java.util.List;
+
+import org.junit.Test;
+
+public class TestVfcResponseDescriptor {
+
+    @Test
+    public void testVfcResponseDescriptor() {
+        VFCResponseDescriptor descriptor = new VFCResponseDescriptor();
+        assertNotNull(descriptor);
+        assertNotEquals(0, descriptor.hashCode());
+
+        String errorCode = "WitchIsDead";
+        descriptor.setErrorCode(errorCode);
+        assertEquals(errorCode, descriptor.getErrorCode());
+
+        String progress = "Visited Wizard";
+        descriptor.setProgress(progress);
+        assertEquals(progress, descriptor.getProgress());
+
+        List<VFCResponseDescriptor> responseHistoryList = new ArrayList<>();
+        descriptor.setResponseHistoryList(responseHistoryList);
+        assertEquals(responseHistoryList, descriptor.getResponseHistoryList());
+
+        String responseId = "WishHard";
+        descriptor.setResponseId(responseId);
+        assertEquals(responseId, descriptor.getResponseId());
+
+        String status = "Back in Kansas";
+        descriptor.setStatus(status);
+        assertEquals(status, descriptor.getStatus());
+
+        String statusDescription = "Back on the prairie";
+        descriptor.setStatusDescription(statusDescription);
+        assertEquals(statusDescription, descriptor.getStatusDescription());
+
+        assertNotEquals(0, descriptor.hashCode());
+    }
+}
diff --git a/controlloop/common/model-impl/vfc/src/test/java/org/onap/policy/vfc/util/TestSerialization.java b/controlloop/common/model-impl/vfc/src/test/java/org/onap/policy/vfc/util/TestSerialization.java
index 3c4f6154e..b66806213 100644
--- a/controlloop/common/model-impl/vfc/src/test/java/org/onap/policy/vfc/util/TestSerialization.java
+++ b/controlloop/common/model-impl/vfc/src/test/java/org/onap/policy/vfc/util/TestSerialization.java
@@ -3,6 +3,7 @@
  * vfc
  * ================================================================================
  * Copyright (C) 2018 Ericsson. All rights reserved.
+ * Modifications Copyright (C) 2018 AT&T Corporation. 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.
@@ -20,14 +21,14 @@
 
 package org.onap.policy.vfc.util;
 
-import static org.junit.Assert.*;
+import static org.junit.Assert.assertNotNull;
 
 import org.junit.Test;
 
 public class TestSerialization {
 
-	@Test
-	public void test() {
-		assertNotNull(Serialization.gsonPretty);
-	}
+    @Test
+    public void test() {
+        assertNotNull(Serialization.gsonPretty);
+    }
 }