From da675ef4d11d68ad537390ce99bb4eb5bd7d1bbb Mon Sep 17 00:00:00 2001 From: Zhaoxing Date: Fri, 13 Oct 2017 15:23:14 +0800 Subject: Fix the docker build error for vfc-nfvo-wfengine Change-Id: I136cd06f9b71fa6d51f25cfb2a00cb1d29fbe31c Issue-id: VFC-445 Signed-off-by: Zhaoxing --- .../org/onap/workflow/common/RestClientTest.java | 294 ++++++++++++++------- .../onap/workflow/common/RestClientUtilsTest.java | 112 ++++---- .../ActivitiServiceConsumerTest.java | 254 +++++++----------- .../resources/WorkflowInstanceWrapperTest.java | 171 ++++++------ 4 files changed, 428 insertions(+), 403 deletions(-) (limited to 'wfenginemgrservice/src/test/java/org/onap') diff --git a/wfenginemgrservice/src/test/java/org/onap/workflow/common/RestClientTest.java b/wfenginemgrservice/src/test/java/org/onap/workflow/common/RestClientTest.java index 418cff6..691577a 100644 --- a/wfenginemgrservice/src/test/java/org/onap/workflow/common/RestClientTest.java +++ b/wfenginemgrservice/src/test/java/org/onap/workflow/common/RestClientTest.java @@ -1,100 +1,194 @@ -/** - * 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.common; - -import static org.powermock.api.mockito.PowerMockito.mock; - -import org.apache.http.HttpEntity; -import org.apache.http.HttpHost; -import org.apache.http.HttpRequest; -import org.apache.http.client.methods.CloseableHttpResponse; -import org.apache.http.impl.client.CloseableHttpClient; -import org.apache.http.impl.client.HttpClients; -import org.junit.After; -import org.junit.Before; -import org.junit.Test; -import org.junit.runner.RunWith; -import org.mockito.Mockito; -import org.onap.workflow.common.RestClient.HttpMethod; -import org.onap.workflow.externalservice.entity.activitientitiy.ActivitiStartProcessRequest; -import org.powermock.api.mockito.PowerMockito; -import org.powermock.core.classloader.annotations.PowerMockIgnore; -import org.powermock.core.classloader.annotations.PrepareForTest; -import org.powermock.modules.junit4.PowerMockRunner; - - -@PrepareForTest({RestClient.class, HttpClients.class}) -@RunWith(PowerMockRunner.class) -@PowerMockIgnore("javax.net.ssl.*") -public class RestClientTest { - private RestClient restClient; - @Before - public void setUp() throws Exception { - restClient = new RestClient(); - } - - @After - public void tearDown() throws Exception {} - - @SuppressWarnings("static-access") - @Test - public final void testExecuteHttp() throws Exception { - HttpEntity httpEntity = mock(HttpEntity.class); - PowerMockito.mockStatic(HttpClients.class); - CloseableHttpClient tt = mock(CloseableHttpClient.class); - CloseableHttpResponse reponse = mock(CloseableHttpResponse.class); - - PowerMockito.when(HttpClients.createDefault()).thenReturn(tt); - PowerMockito.when(tt.execute(Mockito.any(HttpHost.class), Mockito.any(HttpRequest.class))) - .thenReturn(reponse); - PowerMockito.when(reponse.getEntity()).thenReturn(httpEntity); - - restClient.executeHttp(HttpMethod.POST, "127.0.0.1", 80, "test", httpEntity); - } - - @SuppressWarnings("static-access") - @Test - public final void testExecuteHttpDeleteDeploy() throws Exception { - HttpEntity httpEntity = mock(HttpEntity.class); - PowerMockito.mockStatic(HttpClients.class); - CloseableHttpClient tt = mock(CloseableHttpClient.class); - CloseableHttpResponse reponse = mock(CloseableHttpResponse.class); - PowerMockito.when(HttpClients.createDefault()).thenReturn(tt); - PowerMockito.when(tt.execute(Mockito.any(HttpHost.class), Mockito.any(HttpRequest.class))) - .thenReturn(reponse); - PowerMockito.when(reponse.getEntity()).thenReturn(httpEntity); - restClient.executeHttpDeleteDeploy(HttpMethod.DELETE, "127.0.0.1", 80, "test"); - } - - @SuppressWarnings("static-access") - @Test - public final void testExecuteHttpStartIntance() throws Exception { - - ActivitiStartProcessRequest activitiStartProcessRequest = - mock(ActivitiStartProcessRequest.class); - - HttpEntity httpEntity = mock(HttpEntity.class); - PowerMockito.mockStatic(HttpClients.class); - CloseableHttpClient tt = mock(CloseableHttpClient.class); - CloseableHttpResponse reponse = mock(CloseableHttpResponse.class); - PowerMockito.when(HttpClients.createDefault()).thenReturn(tt); - PowerMockito.when(tt.execute(Mockito.any(HttpHost.class), Mockito.any(HttpRequest.class))) - .thenReturn(reponse); - PowerMockito.when(reponse.getEntity()).thenReturn(httpEntity); - restClient.executeHttpStartIntance(HttpMethod.POST, "127.0.0.1", 80, "test",activitiStartProcessRequest); - - } -} +/** + * 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.common; + +import static org.powermock.api.mockito.PowerMockito.mock; + +import java.io.IOException; + +import org.apache.http.HttpEntity; +import org.apache.http.HttpHost; +import org.apache.http.HttpRequest; +import org.apache.http.StatusLine; +import org.apache.http.client.ClientProtocolException; +import org.apache.http.client.methods.CloseableHttpResponse; +import org.apache.http.conn.ClientConnectionManager; +import org.apache.http.impl.client.CloseableHttpClient; +import org.apache.http.impl.client.HttpClients; +import org.apache.http.params.HttpParams; +import org.apache.http.protocol.HttpContext; +import org.junit.Assert; +import org.junit.Test; +import org.junit.runner.RunWith; +import org.mockito.Mockito; +import org.onap.workflow.WorkflowAppConfig; +import org.onap.workflow.common.RestClient.HttpMethod; +import org.onap.workflow.entity.MsbClientConfig; +import org.onap.workflow.externalservice.entity.activitientitiy.ActivitiStartProcessRequest; +import org.powermock.api.mockito.PowerMockito; +import org.powermock.core.classloader.annotations.PrepareForTest; +import org.powermock.modules.junit4.PowerMockRunner; + + +@PrepareForTest({HttpClients.class}) +@RunWith(PowerMockRunner.class) +public class RestClientTest { + @Test + public void testExecuteHttp() throws Exception { + HttpEntity httpEntity = mock(HttpEntity.class); + PowerMockito.mockStatic(HttpClients.class); + CloseableHttpClient httpclient = mock(CloseableHttpClient.class); + PowerMockito.when(HttpClients.createDefault()).thenReturn(httpclient); + PowerMockito.when(httpclient.execute(Mockito.any(HttpHost.class), Mockito.any(HttpRequest.class))) + .thenThrow(new IOException()); + try{ + RestClient.executeHttp(HttpMethod.POST, "127.0.0.1", 80, "test", httpEntity); + }catch(IOException e){ + Assert.assertTrue(true); + } + } + + @Test + public void testExecuteHttpException() throws Exception { + HttpEntity httpEntity = mock(HttpEntity.class); + PowerMockito.mockStatic(HttpClients.class); + CloseableHttpClient tt = mock(CloseableHttpClient.class); + CloseableHttpResponse reponse = mock(CloseableHttpResponse.class); + StatusLine sl = mock(StatusLine.class); + PowerMockito.when(HttpClients.createDefault()).thenReturn(tt); + PowerMockito.when(tt.execute(Mockito.any(HttpHost.class), Mockito.any(HttpRequest.class))) + .thenReturn(reponse); + PowerMockito.when(reponse.getEntity()).thenReturn(httpEntity); + PowerMockito.when(reponse.getStatusLine()).thenReturn(sl); + RestClient.executeHttp(HttpMethod.POST, "127.0.0.1", 80, "test", httpEntity); + + WorkflowAppConfig workflowconfig = makeWorkFlowConfig("127.0.0.1", 80); + Config.setWorkflowAppConfig(workflowconfig); + RestClient.executeHttp(HttpMethod.POST, null, null, "test", httpEntity); + } + + private WorkflowAppConfig makeWorkFlowConfig(String msbSvrIp, int msbSvrPort) { + MsbClientConfig msbClientConfig = new MsbClientConfig(); + msbClientConfig.setMsbSvrIp(msbSvrIp); + msbClientConfig.setMsbSvrPort(msbSvrPort); + WorkflowAppConfig workflowconfig = new WorkflowAppConfig(); + workflowconfig.setMsbClientConfig(msbClientConfig); + return workflowconfig; + } + + @Test + public void testExecuteHttpDeleteDeploy() throws Exception { + HttpEntity httpEntity = mock(HttpEntity.class); + PowerMockito.mockStatic(HttpClients.class); + CloseableHttpClient tt = mock(CloseableHttpClient.class); + CloseableHttpResponse reponse = mock(CloseableHttpResponse.class); + PowerMockito.when(HttpClients.createDefault()).thenReturn(tt); + PowerMockito.when(tt.execute(Mockito.any(HttpHost.class), Mockito.any(HttpRequest.class))) + .thenReturn(reponse); + PowerMockito.when(reponse.getEntity()).thenReturn(httpEntity); + RestClient.executeHttpDeleteDeploy(HttpMethod.DELETE, "127.0.0.1", 80, "test"); + + WorkflowAppConfig workflowconfig = makeWorkFlowConfig("127.0.0.1", 80); + Config.setWorkflowAppConfig(workflowconfig); + RestClient.executeHttpDeleteDeploy(HttpMethod.DELETE, null, null, "test"); + } + + @Test + public void testExecuteHttpStartIntance() throws Exception { + ActivitiStartProcessRequest activitiStartProcessRequest = + mock(ActivitiStartProcessRequest.class); + + HttpEntity httpEntity = mock(HttpEntity.class); + PowerMockito.mockStatic(HttpClients.class); + CloseableHttpClient tt = mock(CloseableHttpClient.class); + CloseableHttpResponse reponse = mock(CloseableHttpResponse.class); + PowerMockito.when(HttpClients.createDefault()).thenReturn(tt); + PowerMockito.when(tt.execute(Mockito.any(HttpHost.class), Mockito.any(HttpRequest.class))) + .thenReturn(reponse); + PowerMockito.when(reponse.getEntity()).thenReturn(httpEntity); + RestClient.executeHttpStartIntance(HttpMethod.POST, "127.0.0.1", 80, "test",activitiStartProcessRequest); + + WorkflowAppConfig workflowconfig = makeWorkFlowConfig("127.0.0.1", 80); + Config.setWorkflowAppConfig(workflowconfig); + RestClient.executeHttpStartIntance(HttpMethod.POST, null, null, "test", activitiStartProcessRequest); + } + + @Test + public void testgetRequest() { + HttpRequest request = RestClient.getRequest(HttpMethod.GET, "/test/", null); + Assert.assertTrue (request.getRequestLine().getMethod().equals(HttpMethod.GET.toString())); + request = RestClient.getRequest(HttpMethod.POST, "/test/", null); + Assert.assertTrue (request.getRequestLine().getMethod().equals(HttpMethod.POST.toString())); + request = RestClient.getRequest(HttpMethod.DELETE, "/test/", null); + Assert.assertTrue (request.getRequestLine().getMethod().equals(HttpMethod.DELETE.toString())); + request = RestClient.getRequest(HttpMethod.PUT, "/test/", null); + Assert.assertTrue (request.getRequestLine().getMethod().equals(HttpMethod.PUT.toString())); + try { + request = RestClient.getRequest(null, "/test/", null); + } catch (NullPointerException e) { + Assert.assertTrue (true); + } + } + + @Test + public void testPost() throws Exception { + HttpEntity httpEntity = mock(HttpEntity.class); + PowerMockito.mockStatic(HttpClients.class); + CloseableHttpClient tt = mock(CloseableHttpClient.class); + CloseableHttpResponse reponse = mock(CloseableHttpResponse.class); + + PowerMockito.when(HttpClients.createDefault()).thenReturn(tt); + PowerMockito.when(tt.execute(Mockito.any(HttpHost.class), Mockito.any(HttpRequest.class))) + .thenReturn(reponse); + PowerMockito.when(reponse.getEntity()).thenReturn(httpEntity); + WorkflowAppConfig workflowconfig = makeWorkFlowConfig("127.0.0.1", 80); + Config.setWorkflowAppConfig(workflowconfig); + RestClient.post("127.0.0.1", 80, "test", null); + RestClient.post("127.0.0.1", 80, "test"); + } + + @Test + public void testCloseHttpClient(){ + Assert.assertTrue(RestClient.closeHttpClient(mock(CloseableHttpClient.class))); + Assert.assertTrue(RestClient.closeHttpClient(null)); + Assert.assertFalse(RestClient.closeHttpClient(new CloseableHttpClientTest())); + } + + public class CloseableHttpClientTest extends CloseableHttpClient{ + @Override + public void close() throws IOException { + throw new IOException(); + } + + @Override + protected CloseableHttpResponse doExecute(HttpHost target, HttpRequest request, + HttpContext context) throws IOException, ClientProtocolException { + return null; + } + + @SuppressWarnings("deprecation") + @Override + public HttpParams getParams() { + return null; + } + + @SuppressWarnings("deprecation") + @Override + public ClientConnectionManager getConnectionManager() { + return null; + } + } +} diff --git a/wfenginemgrservice/src/test/java/org/onap/workflow/common/RestClientUtilsTest.java b/wfenginemgrservice/src/test/java/org/onap/workflow/common/RestClientUtilsTest.java index fc7317e..238c102 100644 --- a/wfenginemgrservice/src/test/java/org/onap/workflow/common/RestClientUtilsTest.java +++ b/wfenginemgrservice/src/test/java/org/onap/workflow/common/RestClientUtilsTest.java @@ -1,56 +1,56 @@ -/** - * 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.common; - -import java.io.File; -import java.io.FileInputStream; -import java.io.InputStream; - -import org.apache.http.HttpEntity; -import org.apache.http.entity.ContentType; -import org.junit.Assert; -import org.junit.Test; - -/** - * - */ -public class RestClientUtilsTest { - - @Test - public void testbuildMultipartRequest() { - String filePath = System.getProperty("java.io.tmpdir"); - String fileName = "testfile"; - File file = new File(filePath + File.separator + fileName); - InputStream is = null; - try { - if (!file.exists()) { - file.createNewFile(); - } - is = new FileInputStream(file); - HttpEntity httpentity = RestClientUtils.buildMultipartRequest(is, fileName); - Assert.assertTrue(httpentity.getContentType().getValue() - .indexOf(ContentType.MULTIPART_FORM_DATA.getMimeType()) > -1); - } catch (Exception e) { - assert (false); - } finally { - ToolUtil.closeInputStream(is); - if (file.exists()) { - file.delete(); - } - } - } -} +/** + * 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.common; + +import java.io.File; +import java.io.FileInputStream; +import java.io.InputStream; + +import org.apache.http.HttpEntity; +import org.apache.http.entity.ContentType; +import org.junit.Assert; +import org.junit.Test; + +/** + * + */ +public class RestClientUtilsTest { + + @Test + public void testbuildMultipartRequest() { + String filePath = System.getProperty("java.io.tmpdir"); + String fileName = "testfile"; + File file = new File(filePath + File.separator + fileName); + InputStream is = null; + try { + if (!file.exists()) { + file.createNewFile(); + } + is = new FileInputStream(file); + HttpEntity httpentity = RestClientUtils.buildMultipartRequest(is, fileName); + Assert.assertTrue(httpentity.getContentType().getValue() + .indexOf(ContentType.MULTIPART_FORM_DATA.getMimeType()) > -1); + } catch (Exception e) { + Assert.assertFalse (false); + } finally { + ToolUtil.closeInputStream(is); + if (file.exists()) { + file.delete(); + } + } + } +} diff --git a/wfenginemgrservice/src/test/java/org/onap/workflow/externalservice/service/activitiservice/ActivitiServiceConsumerTest.java b/wfenginemgrservice/src/test/java/org/onap/workflow/externalservice/service/activitiservice/ActivitiServiceConsumerTest.java index f9dd990..e644626 100644 --- a/wfenginemgrservice/src/test/java/org/onap/workflow/externalservice/service/activitiservice/ActivitiServiceConsumerTest.java +++ b/wfenginemgrservice/src/test/java/org/onap/workflow/externalservice/service/activitiservice/ActivitiServiceConsumerTest.java @@ -1,153 +1,103 @@ -/** - * 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.externalservice.service.activitiservice; - -import com.google.gson.Gson; -import org.apache.http.HttpEntity; -import org.junit.Before; -import org.junit.Test; -import org.junit.runner.RunWith; -import org.onap.workflow.WorkflowAppConfig; -import org.onap.workflow.common.Config; -import org.onap.workflow.common.RestClient; -import org.onap.workflow.common.RestResponse; -import org.onap.workflow.entity.MsbClientConfig; -import org.onap.workflow.externalservice.entity.activitientitiy.ActivitiDeployResponse; -import org.onap.workflow.externalservice.entity.activitientitiy.ActivitiStartProcessRequest; -import org.powermock.core.classloader.annotations.PrepareForTest; -import org.powermock.modules.junit4.PowerMockRunner; - -import java.io.IOException; -import java.io.InputStream; - -import static org.hamcrest.core.Is.is; -import static org.junit.Assert.assertThat; -import static org.mockito.Matchers.*; -import static org.mockito.Mockito.mock; -import static org.powermock.api.mockito.PowerMockito.mockStatic; -import static org.powermock.api.mockito.PowerMockito.when; - -@PrepareForTest({RestClient.class, Config.class}) -@RunWith(PowerMockRunner.class) -public class ActivitiServiceConsumerTest { - - @Before - public void setUp() throws Exception { - mockStatic(RestClient.class); - } - - @Test - public void undeploybpmnfile() throws Exception { - - RestResponse restResponse = mock(RestResponse.class); - when(RestClient.post(anyString(), any(Integer.class), anyString())) - .thenReturn(restResponse); - - RestResponse response = ActivitiServiceConsumer.undeploybpmnfile("22"); - - assertThat(response, is(restResponse)); - } - - @Test - public void startBpmnProcess() throws Exception { - RestResponse restResponse = mock(RestResponse.class); - when(RestClient.post(anyString(), any(Integer.class), anyString(), - any(ActivitiStartProcessRequest.class))) - .thenReturn(restResponse); - - RestResponse response = ActivitiServiceConsumer.startBpmnProcess( - mock(ActivitiStartProcessRequest.class)); - - assertThat(response, is(restResponse)); - } - - @Test - public void testDeleteDeployProcess() throws Exception { - RestResponse restResponse = mock(RestResponse.class); - when(RestClient.post(anyString(), any(Integer.class), anyString())) - .thenReturn(restResponse); - - RestResponse response = ActivitiServiceConsumer.deleteDeployProcess("22"); - - assertThat(response, is(restResponse)); - } - - @Test - public void testDeleteDeployProcessReturnNull() throws Exception { - when(RestClient.post(anyString(), any(Integer.class), anyString())) - .thenThrow(new IOException()); - - RestResponse response = ActivitiServiceConsumer.deleteDeployProcess("22"); - - assertThat(response, is((RestResponse) null)); - } - - @Test - public void testStartProcessShouldReturnResponse() throws Exception { - RestResponse restResponse = mock(RestResponse.class); - when(RestClient.post(anyString(), any(Integer.class), anyString(), - any(ActivitiStartProcessRequest.class))) - .thenReturn(restResponse); - - RestResponse response = ActivitiServiceConsumer.startProcess( - mock(ActivitiStartProcessRequest.class)); - - assertThat(response, is(restResponse)); - } - - @Test - public void testStartProcessShouldReturnNull() throws Exception { - when(RestClient.post(anyString(), any(Integer.class), anyString(), - any(ActivitiStartProcessRequest.class))) - .thenThrow(new IOException()); - - RestResponse response = ActivitiServiceConsumer.startProcess( - mock(ActivitiStartProcessRequest.class)); - - assertThat(response, is((RestResponse) null)); - } - - @Test - public void deploybpmnfile() throws Exception { - mockStatic(Config.class); - WorkflowAppConfig workflowAppConfig = mock(WorkflowAppConfig.class); - MsbClientConfig msbClientConfig = new MsbClientConfig(); - msbClientConfig.setMsbSvrPort(2); - msbClientConfig.setMsbSvrIp("127.0.0.1"); - - when(workflowAppConfig.getMsbClientConfig()).thenReturn(msbClientConfig); - when(Config.getWorkflowAppConfig()).thenReturn(workflowAppConfig); - - RestResponse restResponse = mock(RestResponse.class); - - ActivitiDeployResponse activitiDeployResponse = new ActivitiDeployResponse(); - activitiDeployResponse.setId("2"); - activitiDeployResponse.setUrl("xxxx"); - activitiDeployResponse.setDeploymentTime("22"); - - when(restResponse.getStatusCode()).thenReturn(200); - when(restResponse.getResult()).thenReturn(new Gson().toJson(activitiDeployResponse)); - when(RestClient.post(anyString(), anyInt(), anyString(), - any(HttpEntity.class))) - .thenReturn(restResponse); - - InputStream ins = mock(InputStream.class); - ActivitiDeployResponse result = ActivitiServiceConsumer.deploybpmnfile(ins, "result"); - - assertThat(result.getId(), is(activitiDeployResponse.getId())); - } - +/** + * 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.externalservice.service.activitiservice; + +import static org.mockito.Mockito.mock; + +import java.io.IOException; +import java.io.InputStream; + +import org.apache.http.client.ClientProtocolException; +import org.junit.Assert; +import org.junit.Test; +import org.onap.workflow.WorkflowAppConfig; +import org.onap.workflow.common.Config; +import org.onap.workflow.common.RestClient; +import org.onap.workflow.common.RestResponse; +import org.onap.workflow.entity.MsbClientConfig; +import org.onap.workflow.externalservice.entity.activitientitiy.ActivitiDeployResponse; +import org.onap.workflow.externalservice.entity.activitientitiy.ActivitiStartProcessRequest; + +public class ActivitiServiceConsumerTest { + @Test + public void undeploybpmnfile() throws ClientProtocolException, IOException { + RestClient.isTest = true; + RestResponse response = ActivitiServiceConsumer.undeploybpmnfile("22"); + Assert.assertTrue(response != null); + RestClient.isTest = false; + } + + @Test + public void startBpmnProcess() throws Exception { + RestClient.isTest = true; + RestResponse response = + ActivitiServiceConsumer.startBpmnProcess(mock(ActivitiStartProcessRequest.class)); + Assert.assertTrue(response != null); + RestClient.isTest = false; + } + + @Test + public void testDeleteDeployProcess() throws Exception { + RestClient.isTest = true; + RestResponse response = ActivitiServiceConsumer.deleteDeployProcess("22"); + Assert.assertTrue(response != null); + RestClient.isTest = false; + } + + @Test + public void testDeleteDeployProcessReturnNull() throws Exception { + RestClient.isTest = false; + RestResponse response = ActivitiServiceConsumer.deleteDeployProcess("22"); + if (response != null) { + Assert.assertTrue(response.getResult() == null); + } else { + Assert.assertTrue(response == null); + } + } + + @Test + public void testStartProcessShouldReturnResponse() throws Exception { + RestClient.isTest = true; + RestResponse response = + ActivitiServiceConsumer.startProcess(mock(ActivitiStartProcessRequest.class)); + Assert.assertTrue(response != null); + RestClient.isTest = false; + } + + @Test + public void testStartProcessShouldReturnNull() { + RestClient.isTest = false; + RestResponse response = + ActivitiServiceConsumer.startProcess(mock(ActivitiStartProcessRequest.class)); + Assert.assertTrue(response.getResult() == null); + } + + @Test + public void deploybpmnfile() throws Exception { + RestClient.isTest = true; + WorkflowAppConfig workflowAppConfig = new WorkflowAppConfig(); + MsbClientConfig msbClientConfig = new MsbClientConfig(); + msbClientConfig.setMsbSvrPort(2); + msbClientConfig.setMsbSvrIp("127.0.0.1"); + workflowAppConfig.setMsbClientConfig(msbClientConfig); + Config.setWorkflowAppConfig(workflowAppConfig); + InputStream ins = mock(InputStream.class); + ActivitiDeployResponse result = ActivitiServiceConsumer.deploybpmnfile(ins, "result"); + Assert.assertTrue(result == null); + RestClient.isTest = false; + } + } \ No newline at end of file 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; + } + +} -- cgit 1.2.3-korg