Fix the docker build error for vfc-nfvo-wfengine

Change-Id: Ib46e0db064e5a834aa45a4d7448430992afcfd21
Issue-id: VFC-445
Signed-off-by: Zhaoxing <meng.zhaoxing1@zte.com.cn>

diff --git a/activiti-extension/src/main/docker/activiti-docker-build_image.sh b/activiti-extension/src/main/docker/activiti-docker-build_image.sh
index 94bc305..4235c18 100644 (file)
--- a/activiti-extension/src/main/docker/activiti-docker-build_image.sh
+++ b/activiti-extension/src/main/docker/activiti-docker-build_image.sh
@@ -103,7 +103,8 @@ mv activiti-5.22.0/wars/activiti-rest.war .
 
 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 

diff --git a/wfenginemgrservice/src/main/docker/wfenginemgrservice-docker-build_image.sh b/wfenginemgrservice/src/main/docker/wfenginemgrservice-docker-build_image.sh
index b4cdc47..c3d321e 100644 (file)
--- a/wfenginemgrservice/src/main/docker/wfenginemgrservice-docker-build_image.sh
+++ b/wfenginemgrservice/src/main/docker/wfenginemgrservice-docker-build_image.sh
@@ -76,7 +76,8 @@ echo "CURLPROXY=${CURLPROXY}"
 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 {

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 e644626..af90c41 100644 (file)
--- 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
@@ -16,13 +16,16 @@
 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
 \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 org.mockito.Mockito;\r
 import org.onap.workflow.WorkflowAppConfig;\r
 import org.onap.workflow.common.Config;\r
 import org.onap.workflow.common.RestClient;\r
@@ -95,6 +98,8 @@ public class ActivitiServiceConsumerTest {
     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

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 ea84226..487051f 100644 (file)
--- a/wfenginemgrservice/src/test/java/org/onap/workflow/resources/WorkflowInstanceWrapperTest.java
+++ b/wfenginemgrservice/src/test/java/org/onap/workflow/resources/WorkflowInstanceWrapperTest.java
@@ -16,6 +16,7 @@
 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
@@ -25,6 +26,7 @@ import org.glassfish.jersey.media.multipart.FormDataContentDisposition;
 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
@@ -46,6 +48,7 @@ public class WorkflowInstanceWrapperTest {
     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

diff --git a/wfenginemgrservice/src/test/java/org/onap/workflow/resources/WorkflowResourceTest.java b/wfenginemgrservice/src/test/java/org/onap/workflow/resources/WorkflowResourceTest.java
index e7d6523..7d8b194 100644 (file)
--- a/wfenginemgrservice/src/test/java/org/onap/workflow/resources/WorkflowResourceTest.java
+++ b/wfenginemgrservice/src/test/java/org/onap/workflow/resources/WorkflowResourceTest.java
@@ -21,6 +21,7 @@ import static org.hamcrest.MatcherAssert.assertThat;
 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
@@ -55,7 +56,14 @@ public class WorkflowResourceTest {
                FormDataContentDisposition fileDetail = mock(FormDataContentDisposition.class);\r
                \r
                Response result = Response.ok("success").build();\r
-               \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