Updating licenses in all files

[appc.git] / appc-dispatcher / appc-command-executor / appc-command-executor-core / src / test / java / org / openecomp / appc / executor / TestCommandExecutionTask.java

diff --git a/appc-dispatcher/appc-command-executor/appc-command-executor-core/src/test/java/org/openecomp/appc/executor/TestCommandExecutionTask.java b/appc-dispatcher/appc-command-executor/appc-command-executor-core/src/test/java/org/openecomp/appc/executor/TestCommandExecutionTask.java
index 7bf9f7c..0c7c0ba 100644 (file)
--- a/appc-dispatcher/appc-command-executor/appc-command-executor-core/src/test/java/org/openecomp/appc/executor/TestCommandExecutionTask.java
+++ b/appc-dispatcher/appc-command-executor/appc-command-executor-core/src/test/java/org/openecomp/appc/executor/TestCommandExecutionTask.java
@@ -1,9 +1,9 @@
 /*-
  * ============LICENSE_START=======================================================
- * openECOMP : APP-C
+ * APPC
  * ================================================================================
- * Copyright (C) 2017 AT&T Intellectual Property. All rights
- *                                             reserved.
+ * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
+ * Copyright (C) 2017 Amdocs
  * ================================================================================
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -17,6 +17,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  * ============LICENSE_END=========================================================
+ * ECOMP is a trademark and service mark of AT&T Intellectual Property.
  */
 
 package org.openecomp.appc.executor;
@@ -72,8 +73,6 @@ public class TestCommandExecutionTask {
        private static final String TTL_FLAG= "TTL";
        private static final String API_VERSION= "2.0.0";
        private static final String ORIGINATOR_ID= "1";
-       private LCMCommandTask executionTask;
-       private LCMReadonlyCommandTask LCMReadonlyCommandTask;
        private CommandTaskFactory factory ;
 
        private RequestHandler requestHandler;
@@ -94,7 +93,7 @@ public class TestCommandExecutionTask {
                PowerMockito.when(FrameworkUtil.getBundle(AAIService.class)).thenReturn(bundleService);
                PowerMockito.when(bundleService.getBundleContext()).thenReturn(bundleContext);
                PowerMockito.when(bundleContext.getServiceReference(AAIService.class.getName())).thenReturn(sref);
-               PowerMockito.when(bundleContext.getService(sref)).thenReturn(aaiService);
+               PowerMockito.when(bundleContext.<AAIService>getService(sref)).thenReturn(aaiService);
                PowerMockito.when(aaiService.query(anyString(),anyBoolean(),anyString(),anyString(),anyString(),anyString(),(SvcLogicContext)anyObject())).thenAnswer(new Answer<SvcLogicResource.QueryStatus>() {
                        @Override
                        public SvcLogicResource.QueryStatus answer(InvocationOnMock invocation) throws Throwable {
@@ -119,8 +118,6 @@ public class TestCommandExecutionTask {
                workflowManager = Mockito.mock(WorkFlowManager.class);
                lifecyclemanager = Mockito.mock(LifecycleManager.class );
 
-               executionTask = new LCMCommandTask(requestHandler,workflowManager,lifecyclemanager);
-               LCMReadonlyCommandTask = new LCMReadonlyCommandTask(requestHandler,workflowManager);
                factory = new CommandTaskFactory();
                factory.setLifecyclemanager(lifecyclemanager);
                factory.setWorkflowManager(workflowManager);
@@ -131,9 +128,9 @@ public class TestCommandExecutionTask {
 
        @Test
        public void testFactory(){
-               CommandTask task = factory.getExecutionTask("Configure");
+               CommandTask task = factory.getExecutionTask("Configure", null);
                assertEquals(LCMCommandTask.class,task.getClass() );
-               task = factory.getExecutionTask("Sync");
+               task = factory.getExecutionTask("Sync", null);
                assertEquals(LCMReadonlyCommandTask.class,task.getClass() );
 
        }
@@ -145,35 +142,34 @@ public class TestCommandExecutionTask {
                Mockito.doNothing().when(requestHandler).onRequestTTLEnd((RuntimeContext) anyObject(),anyBoolean());
                RuntimeContext request = pouplateCommandExecutorInput("FIREWALL", 30, "1.0", Instant.now(), API_VERSION, "11", ORIGINATOR_ID, "", VNFOperation.Configure, "1", "");
                CommandResponse response = getCommandResponse(VNFOperation.Configure, true, "11", "","1");
-               executionTask.onRequestCompletion(request, response);
+        LCMCommandTask executionTask = new LCMCommandTask(request, requestHandler,workflowManager,lifecyclemanager);
+               executionTask.onRequestCompletion(response);
        }
 
        @Test
        public void testRunGetConfig(){
-               RuntimeContext request = pouplateCommandExecutorInput("FIREWALL", 30, "1.0", Instant.now(), API_VERSION, "11", ORIGINATOR_ID, "", VNFOperation.Sync, "1", "");
-               LCMReadonlyCommandTask.setCommandRequest(request);
-               LCMReadonlyCommandTask.run();
+                   RuntimeContext request = pouplateCommandExecutorInput("FIREWALL", 30, "1.0", Instant.now(), API_VERSION, "11", ORIGINATOR_ID, "", VNFOperation.Sync, "1", "");
+        LCMReadonlyCommandTask readonlyCommandTask = new LCMReadonlyCommandTask(request, requestHandler,workflowManager);
+               readonlyCommandTask.run();
        }
 
        @Test
        public void testRun(){
-               RuntimeContext request = pouplateCommandExecutorInput("FIREWALL", 30, "1.0", Instant.now(), API_VERSION, "11", ORIGINATOR_ID, "", VNFOperation.Sync, "1", "");
-               executionTask.setCommandRequest(request);
+           RuntimeContext request = pouplateCommandExecutorInput("FIREWALL", 30, "1.0", Instant.now(), API_VERSION, "11", ORIGINATOR_ID, "", VNFOperation.Sync, "1", "");
+               LCMCommandTask executionTask = new LCMCommandTask(request, requestHandler,workflowManager,lifecyclemanager);
                executionTask.run();
        }
 
        @Test
        public void testRunNegative(){
-               RuntimeContext request = pouplateCommandExecutorInput("FIREWALL", 30, "1.0", Instant.now(), API_VERSION, "11", ORIGINATOR_ID, "", VNFOperation.Sync, "1", "");
-               executionTask.setCommandRequest(request);
+           RuntimeContext request = pouplateCommandExecutorInput("FIREWALL", 30, "1.0", Instant.now(), API_VERSION, "11", ORIGINATOR_ID, "", VNFOperation.Sync, "1", "");
+        LCMCommandTask executionTask = new LCMCommandTask(request, requestHandler,workflowManager,lifecyclemanager);
                executionTask.run();
        }
 
 
        CommandResponse getCommandResponse(VNFOperation action , boolean success, String responseId, String payload, String vnfId){
-               CommandResponse commandResponse = new CommandResponse();
                RuntimeContext runtimeContext = new RuntimeContext();
-               commandResponse.setRuntimeContext(runtimeContext);
                ResponseContext responseContext = new ResponseContext();
                runtimeContext.setResponseContext(responseContext);
                RequestContext requestContext = new RequestContext();
@@ -194,7 +190,7 @@ public class TestCommandExecutionTask {
                responseContext.setPayload(payload);
                commonHeader.setTimestamp(Instant.now());
                vnfContext.setId(vnfId);
-               return commandResponse;
+        return new CommandResponse(runtimeContext);
        }