1 files changed, 76 insertions, 95 deletions
diff --git a/wfenginemgrservice/src/test/java/org/onap/workflow/resources/WorkflowInstanceWrapperTest.java b/wfenginemgrservice/src/test/java/org/onap/workflow/resources/WorkflowInstanceWrapperTest.java
index 0d08427..ea84226 100644
--- a/wfenginemgrservice/src/test/java/org/onap/workflow/resources/WorkflowInstanceWrapperTest.java
+++ b/wfenginemgrservice/src/test/java/org/onap/workflow/resources/WorkflowInstanceWrapperTest.java
@@ -1,95 +1,76 @@
-/**
- * Copyright 2017 ZTE Corporation.
- *
- * 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.
- */
-package org.onap.workflow.resources;
-
-import static org.powermock.api.mockito.PowerMockito.mock;
-
-import java.io.InputStream;
-
-import org.glassfish.jersey.media.multipart.FormDataContentDisposition;
-import org.junit.After;
-import org.junit.AfterClass;
-import org.junit.Before;
-import org.junit.BeforeClass;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.onap.workflow.common.RestResponse;
-import org.onap.workflow.entity.StartProcessRequest;
-import org.onap.workflow.externalservice.entity.activitientitiy.ActivitiDeployResponse;
-import org.onap.workflow.externalservice.entity.activitientitiy.ActivitiStartProcessRequest;
-import org.onap.workflow.externalservice.service.activitiservice.ActivitiServiceConsumer;
-import org.onap.workflow.wrapper.WorkflowInstanceWrapper;
-import org.powermock.api.mockito.PowerMockito;
-import org.powermock.core.classloader.annotations.PrepareForTest;
-import org.powermock.modules.junit4.PowerMockRunner;
-
-@PrepareForTest({ActivitiServiceConsumer.class})
-@RunWith(PowerMockRunner.class)
-public class WorkflowInstanceWrapperTest {
-
-  private WorkflowInstanceWrapper workflowInstanceWrapper;
-
-  @BeforeClass
-  public static void setUpBeforeClass() throws Exception {}
-
-  @AfterClass
-  public static void tearDownAfterClass() throws Exception {}
-
-  @Before
-  public void setUp() throws Exception {
-    workflowInstanceWrapper = new WorkflowInstanceWrapper();
-    PowerMockito.mockStatic(ActivitiServiceConsumer.class);// 3
-  }
-
-  @After
-  public void tearDown() throws Exception {}
-
-  @Test
-  public final void testDeployBpmnFile() throws Exception {
-
-    InputStream fileInputStream = mock(InputStream.class);
-    FormDataContentDisposition f = mock(FormDataContentDisposition.class);
-    String filename = "test";
-    ActivitiDeployResponse reponse = new ActivitiDeployResponse();
-    reponse.setId("123");
-    reponse.setUrl("http://url");
-    PowerMockito.mockStatic(ActivitiServiceConsumer.class);
-    PowerMockito.when(ActivitiServiceConsumer.deploybpmnfile(fileInputStream, filename))
-        .thenReturn(reponse);
-    workflowInstanceWrapper.deployBpmnFile(filename, fileInputStream, f);
-    // assertThat(, is(result));
-  }
-
-  @Test
-  public final void testUndeployBpmnFile() throws Exception {
-    WorkflowInstanceWrapper.getInstance().undeployBpmnFile(null);
-  }
-
-  @Test
-  public final void testStartProcess() throws Exception {
-    ActivitiStartProcessRequest startProcessRequest = new ActivitiStartProcessRequest();
-    startProcessRequest.setProcessDefinitionKey("first");
-    StartProcessRequest tt = new StartProcessRequest();
-    tt.setProcessDefinitionKey("first");
-    RestResponse reponse = new RestResponse();
-    reponse.setResult("123");
-    PowerMockito.mockStatic(ActivitiServiceConsumer.class);
-    PowerMockito.when(ActivitiServiceConsumer.startBpmnProcess(startProcessRequest))
-        .thenReturn(reponse);
-    workflowInstanceWrapper.startProcess(tt);
-  }
-
-}
+/**
+ * Copyright 2017 ZTE Corporation.
+ *
+ * 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.
+ */
+package org.onap.workflow.resources;
+
+import static org.powermock.api.mockito.PowerMockito.mock;
+
+import java.io.InputStream;
+
+import javax.ws.rs.core.Response;
+
+import org.glassfish.jersey.media.multipart.FormDataContentDisposition;
+import org.junit.Assert;
+import org.junit.Before;
+import org.junit.Test;
+import org.onap.workflow.common.RestClient;
+import org.onap.workflow.common.RestResponse;
+import org.onap.workflow.entity.StartProcessRequest;
+import org.onap.workflow.externalservice.entity.activitientitiy.ActivitiStartProcessRequest;
+import org.onap.workflow.wrapper.WorkflowInstanceWrapper;
+
+public class WorkflowInstanceWrapperTest {
+
+  private WorkflowInstanceWrapper workflowInstanceWrapper;
+
+  @Before
+  public void setUp() throws Exception {
+    workflowInstanceWrapper = new WorkflowInstanceWrapper();
+  }
+
+  @Test
+  public final void testDeployBpmnFile() throws Exception {
+    RestClient.isTest = true;
+    InputStream fileInputStream = mock(InputStream.class);
+    FormDataContentDisposition f = mock(FormDataContentDisposition.class);
+    String filename = "test";
+    Response reponse = workflowInstanceWrapper.deployBpmnFile(filename, fileInputStream, f);
+    Assert.assertEquals(Response.Status.INTERNAL_SERVER_ERROR.getStatusCode(), reponse.getStatus());
+    RestClient.isTest = false;
+  }
+
+  @Test
+  public final void testUndeployBpmnFile() throws Exception {
+    RestClient.isTest = true;
+    RestResponse response = WorkflowInstanceWrapper.getInstance().undeployBpmnFile(null);
+    if (response != null) {
+      Assert.assertTrue(response.getResult() == null);
+    }
+    RestClient.isTest = false;
+  }
+
+  @Test
+  public final void testStartProcess() throws Exception {
+    RestClient.isTest = true;
+    ActivitiStartProcessRequest startProcessRequest = new ActivitiStartProcessRequest();
+    startProcessRequest.setProcessDefinitionKey("first");
+    StartProcessRequest tt = new StartProcessRequest();
+    tt.setProcessDefinitionKey("first");
+    Response reponse = workflowInstanceWrapper.startProcess(tt);
+    Assert.assertEquals(Response.Status.OK.getStatusCode(), reponse.getStatus());
+    RestClient.isTest = false;
+  }
+
+}