Change-Id: Ib46e0db064e5a834aa45a4d7448430992afcfd21
Issue-id: VFC-445
Signed-off-by: Zhaoxing <meng.zhaoxing1@zte.com.cn>
echo "download activiti-extension ${VERSION}"
#curl "${CURLPROXY}" -m 600 -O -J -L "${NEXUS_REPOS_URL}/service/local/artifact/maven/content?r=${NEXUSREPONAME}&g=org.onap.vfc.nfvo.wfengine&a=activiti-extension&e=jar&v=${VERSION}"
echo "download activiti-extension ${VERSION}"
#curl "${CURLPROXY}" -m 600 -O -J -L "${NEXUS_REPOS_URL}/service/local/artifact/maven/content?r=${NEXUSREPONAME}&g=org.onap.vfc.nfvo.wfengine&a=activiti-extension&e=jar&v=${VERSION}"
-wget -O activiti-extension.jar "${NEXUS_REPOS_URL}/service/local/artifact/maven/content?r=${NEXUSREPONAME}&g=org.onap.vfc.nfvo.wfengine&a=activiti-extension&e=jar&v=${VERSION}"
+#wget -O activiti-extension.jar "${NEXUS_REPOS_URL}/service/local/artifact/maven/content?r=${NEXUSREPONAME}&g=org.onap.vfc.nfvo.wfengine&a=activiti-extension&e=jar&v=${VERSION}"
+wget -O activiti-extension.jar "${NEXUS_REPOS_URL}/service/local/artifact/maven/content?r=snapshots&g=org.onap.vfc.nfvo.wfengine&a=activiti-extension&e=jar&v=1.0.0-SNAPSHOT"
rm -Rf ./temp/
mkdir -p ./temp/WEB-INF/lib/
cp -f activiti-extension*.jar ./temp/WEB-INF/lib/activiti-extension.jar
rm -Rf ./temp/
mkdir -p ./temp/WEB-INF/lib/
cp -f activiti-extension*.jar ./temp/WEB-INF/lib/activiti-extension.jar
rm -f ./bin/workflow-engine-mgr-service*.jar
echo "${CURLPROXY}" -m 300 -O -J -L "${NEXUS_REPOS_URL}/service/local/artifact/maven/content?r=${NEXUSREPONAME}&g=org.onap.vfc.nfvo.wfengine&a=workflow-engine-mgr-service&e=jar&v=${VERSION}" LATEST
#curl "${CURLPROXY}" -m 300 -O -J -L "${NEXUS_REPOS_URL}/service/local/artifact/maven/content?r=${NEXUSREPONAME}&g=org.onap.vfc.nfvo.wfengine&a=workflow-engine-mgr-service&e=jar&v=${VERSION}"
rm -f ./bin/workflow-engine-mgr-service*.jar
echo "${CURLPROXY}" -m 300 -O -J -L "${NEXUS_REPOS_URL}/service/local/artifact/maven/content?r=${NEXUSREPONAME}&g=org.onap.vfc.nfvo.wfengine&a=workflow-engine-mgr-service&e=jar&v=${VERSION}" LATEST
#curl "${CURLPROXY}" -m 300 -O -J -L "${NEXUS_REPOS_URL}/service/local/artifact/maven/content?r=${NEXUSREPONAME}&g=org.onap.vfc.nfvo.wfengine&a=workflow-engine-mgr-service&e=jar&v=${VERSION}"
-wget -O workflow-engine-mgr-service.jar "${NEXUS_REPOS_URL}/service/local/artifact/maven/content?r=${NEXUSREPONAME}&g=org.onap.vfc.nfvo.wfengine&a=workflow-engine-mgr-service&e=jar&v=${VERSION}"
+#wget -O workflow-engine-mgr-service.jar "${NEXUS_REPOS_URL}/service/local/artifact/maven/content?r=${NEXUSREPONAME}&g=org.onap.vfc.nfvo.wfengine&a=workflow-engine-mgr-service&e=jar&v=${VERSION}"
+wget -O workflow-engine-mgr-service.jar "${NEXUS_REPOS_URL}/service/local/artifact/maven/content?r=snapshots&g=org.onap.vfc.nfvo.wfengine&a=workflow-engine-mgr-service&e=jar&v=1.0.0-SNAPSHOT"
mv workflow-engine-mgr-service*.jar ./bin/workflow-engine-mgr-service.jar
function build_image {
mv workflow-engine-mgr-service*.jar ./bin/workflow-engine-mgr-service.jar
function build_image {
package org.onap.workflow.externalservice.service.activitiservice;\r
\r
import static org.mockito.Mockito.mock;\r
package org.onap.workflow.externalservice.service.activitiservice;\r
\r
import static org.mockito.Mockito.mock;\r
+import static org.powermock.api.mockito.PowerMockito.when;\r
+import java.io.FileInputStream;\r
import java.io.IOException;\r
import java.io.InputStream;\r
\r
import org.apache.http.client.ClientProtocolException;\r
import org.junit.Assert;\r
import org.junit.Test;\r
import java.io.IOException;\r
import java.io.InputStream;\r
\r
import org.apache.http.client.ClientProtocolException;\r
import org.junit.Assert;\r
import org.junit.Test;\r
+import org.mockito.Mockito;\r
import org.onap.workflow.WorkflowAppConfig;\r
import org.onap.workflow.common.Config;\r
import org.onap.workflow.common.RestClient;\r
import org.onap.workflow.WorkflowAppConfig;\r
import org.onap.workflow.common.Config;\r
import org.onap.workflow.common.RestClient;\r
workflowAppConfig.setMsbClientConfig(msbClientConfig);\r
Config.setWorkflowAppConfig(workflowAppConfig);\r
InputStream ins = mock(InputStream.class);\r
workflowAppConfig.setMsbClientConfig(msbClientConfig);\r
Config.setWorkflowAppConfig(workflowAppConfig);\r
InputStream ins = mock(InputStream.class);\r
+ // Byte b[]=(Byte) mock(Byte.class);\r
+ when(ins.read(Mockito.anyObject())).thenReturn(-21);\r
ActivitiDeployResponse result = ActivitiServiceConsumer.deploybpmnfile(ins, "result");\r
Assert.assertTrue(result == null);\r
RestClient.isTest = false;\r
ActivitiDeployResponse result = ActivitiServiceConsumer.deploybpmnfile(ins, "result");\r
Assert.assertTrue(result == null);\r
RestClient.isTest = false;\r
package org.onap.workflow.resources;\r
\r
import static org.powermock.api.mockito.PowerMockito.mock;\r
package org.onap.workflow.resources;\r
\r
import static org.powermock.api.mockito.PowerMockito.mock;\r
+import static org.powermock.api.mockito.PowerMockito.when;\r
\r
import java.io.InputStream;\r
\r
\r
import java.io.InputStream;\r
\r
import org.junit.Assert;\r
import org.junit.Before;\r
import org.junit.Test;\r
import org.junit.Assert;\r
import org.junit.Before;\r
import org.junit.Test;\r
+import org.mockito.Mockito;\r
import org.onap.workflow.common.RestClient;\r
import org.onap.workflow.common.RestResponse;\r
import org.onap.workflow.entity.StartProcessRequest;\r
import org.onap.workflow.common.RestClient;\r
import org.onap.workflow.common.RestResponse;\r
import org.onap.workflow.entity.StartProcessRequest;\r
InputStream fileInputStream = mock(InputStream.class);\r
FormDataContentDisposition f = mock(FormDataContentDisposition.class);\r
String filename = "test";\r
InputStream fileInputStream = mock(InputStream.class);\r
FormDataContentDisposition f = mock(FormDataContentDisposition.class);\r
String filename = "test";\r
+ when(fileInputStream.read(Mockito.anyObject())).thenReturn(-21);\r
Response reponse = workflowInstanceWrapper.deployBpmnFile(filename, fileInputStream, f);\r
Assert.assertEquals(Response.Status.INTERNAL_SERVER_ERROR.getStatusCode(), reponse.getStatus());\r
RestClient.isTest = false;\r
Response reponse = workflowInstanceWrapper.deployBpmnFile(filename, fileInputStream, f);\r
Assert.assertEquals(Response.Status.INTERNAL_SERVER_ERROR.getStatusCode(), reponse.getStatus());\r
RestClient.isTest = false;\r
import static org.powermock.api.mockito.PowerMockito.mock;\r
import static org.powermock.api.mockito.PowerMockito.when;\r
\r
import static org.powermock.api.mockito.PowerMockito.mock;\r
import static org.powermock.api.mockito.PowerMockito.when;\r
\r
+import java.io.IOException;\r
import java.io.InputStream;\r
\r
import javax.ws.rs.core.Response;\r
import java.io.InputStream;\r
\r
import javax.ws.rs.core.Response;\r
FormDataContentDisposition fileDetail = mock(FormDataContentDisposition.class);\r
\r
Response result = Response.ok("success").build();\r
FormDataContentDisposition fileDetail = mock(FormDataContentDisposition.class);\r
\r
Response result = Response.ok("success").build();\r
+ // when(fileInputStream.read()).thenReturn(-1);\r
+ try {\r
+ when(fileInputStream.read(Mockito.anyObject())).thenReturn(-21);\r
+ } catch (IOException e) {\r
+ // TODO Auto-generated catch block\r
+ e.printStackTrace();\r
+ }\r
+\r
when(workflowInstanceWrapper.deployBpmnFile(Mockito.anyString(), Mockito.anyObject(), Mockito.anyObject())).thenReturn(result);\r
\r
assertThat(workflowResource.deployBpmnFile(fileInputStream,fileDetail), is(result));\r
when(workflowInstanceWrapper.deployBpmnFile(Mockito.anyString(), Mockito.anyObject(), Mockito.anyObject())).thenReturn(result);\r
\r
assertThat(workflowResource.deployBpmnFile(fileInputStream,fileDetail), is(result));\r