Fixed healtcheck and status check execution

Also added missing licence info.

Issue-ID: SO-3768
Signed-off-by: Lukasz Rajewski <lukasz.rajewski@orange.com>
Change-Id: I0f39e6ca0e8666ac211d46228409e9c7afb3e9f9

2 files changed, 1 insertions, 15 deletions

diff --git a/so-cnf-adapter-application/src/test/java/org/onap/so/adapters/cnf/rest/CnfAdapterRestTest.java b/so-cnf-adapter-application/src/test/java/org/onap/so/adapters/cnf/rest/CnfAdapterRestTest.java
index e5c50c4..e188a64 100644
--- a/so-cnf-adapter-application/src/test/java/org/onap/so/adapters/cnf/rest/CnfAdapterRestTest.java
+++ b/so-cnf-adapter-application/src/test/java/org/onap/so/adapters/cnf/rest/CnfAdapterRestTest.java
@@ -78,20 +78,6 @@ public class CnfAdapterRestTest {
     ResponseEntity<InstanceStatusResponse> instanceStatusResponse;
 
     @Test
-    public void healthCheckTest() throws Exception {
-        HealthCheckResponse response = new HealthCheckResponse();
-        DeferredResult<HealthCheckResponse> deferredResponse = new DeferredResult<>();
-        deferredResponse.setResult(response);
-        CnfAdapterService cnfAdapterService = Mockito.mock(CnfAdapterService.class);
-        CheckInstanceRequest healthCheckRequest = Mockito.mock(CheckInstanceRequest.class);
-        Mockito.when(cnfAdapterService.healthCheck(healthCheckRequest)).thenReturn(response);
-
-        cnfAdapterRest.healthCheck(healthCheckRequest);
-
-        Assert.assertNotNull(response);
-    }
-
-    @Test
     public void createInstanceTest() throws Exception {
 
         Map<String, String> labels = new HashMap<String, String>();
diff --git a/so-cnf-adapter-application/src/test/java/org/onap/so/adapters/cnf/service/CnfAdapterServiceTest.java b/so-cnf-adapter-application/src/test/java/org/onap/so/adapters/cnf/service/CnfAdapterServiceTest.java
index 7d161bc..12c0511 100644
--- a/so-cnf-adapter-application/src/test/java/org/onap/so/adapters/cnf/service/CnfAdapterServiceTest.java
+++ b/so-cnf-adapter-application/src/test/java/org/onap/so/adapters/cnf/service/CnfAdapterServiceTest.java
@@ -69,7 +69,7 @@ public class CnfAdapterServiceTest {
     public void setUp() {
         MulticloudConfiguration multicloudConfiguration = mock(MulticloudConfiguration.class);
         doReturn("http://test.url").when(multicloudConfiguration).getMulticloudUrl();
-        cnfAdapterService = spy(new CnfAdapterService(restTemplate, healthCheckService, simpleStatusCheckService, multicloudConfiguration));
+        cnfAdapterService = spy(new CnfAdapterService(restTemplate, multicloudConfiguration));
     }