Fix the docker build error for vfc-nfvo-wfengine

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

4 files changed, 433 insertions, 432 deletions

diff --git a/activiti-extension/src/test/java/org/onap/workflow/activitiext/common/EnumModuleUrlTest.java b/activiti-extension/src/test/java/org/onap/workflow/activitiext/common/EnumModuleUrlTest.java
index f3cdd84..6d9018e 100644
--- a/activiti-extension/src/test/java/org/onap/workflow/activitiext/common/EnumModuleUrlTest.java
+++ b/activiti-extension/src/test/java/org/onap/workflow/activitiext/common/EnumModuleUrlTest.java
@@ -1,45 +1,44 @@
-/**
- * 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.activitiext.common;
-
-
-import org.junit.Assert;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.onap.msb.sdk.discovery.common.RouteException;
-import org.onap.workflow.utils.MsbUtils;
-import org.powermock.api.mockito.PowerMockito;
-import org.powermock.core.classloader.annotations.PrepareForTest;
-import org.powermock.modules.junit4.PowerMockRunner;
-
-/**
- *
- */
-@PrepareForTest({MsbUtils.class})
-@RunWith(PowerMockRunner.class)
-public class EnumModuleUrlTest {
-  @Test
-  public void testGetBaseUrl() {
-    try {
-      String baseUrl = "http://127.0.0.1:80";
-      PowerMockito.mockStatic(MsbUtils.class);
-      PowerMockito.when(MsbUtils.getServiceAddress("catalog", "v1")).thenReturn(baseUrl);
-      Assert.assertEquals(baseUrl, EnumModuleUrl.getBaseUrl(ServiceType.catalog));
-    } catch (RouteException e) {
-      assert (false);
-    }
-  }
-}
+/**

+ * 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.activitiext.common;

+

+

+import org.junit.Assert;

+import org.junit.Test;

+import org.junit.runner.RunWith;

+import org.onap.workflow.utils.MsbUtils;

+import org.powermock.api.mockito.PowerMockito;

+import org.powermock.core.classloader.annotations.PrepareForTest;

+import org.powermock.modules.junit4.PowerMockRunner;

+

+/**

+ *

+ */

+@PrepareForTest({MsbUtils.class})

+@RunWith(PowerMockRunner.class)

+public class EnumModuleUrlTest {

+  @Test

+  public void testGetBaseUrl() {

+    try {

+      String baseUrl = "http://127.0.0.1:80";

+      PowerMockito.mockStatic(MsbUtils.class);

+      PowerMockito.when(MsbUtils.getServiceAddress("catalog", "v1")).thenReturn(baseUrl);

+      Assert.assertEquals(baseUrl, EnumModuleUrl.getBaseUrl(ServiceType.catalog));

+    } catch (Exception e) {

+      assert (false);

+    }

+  }

+}

diff --git a/activiti-extension/src/test/java/org/onap/workflow/activitiext/restservicetask/HighLevelRestApiTest.java b/activiti-extension/src/test/java/org/onap/workflow/activitiext/restservicetask/HighLevelRestApiTest.java
index 0f20a1e..2cc438a 100644
--- a/activiti-extension/src/test/java/org/onap/workflow/activitiext/restservicetask/HighLevelRestApiTest.java
+++ b/activiti-extension/src/test/java/org/onap/workflow/activitiext/restservicetask/HighLevelRestApiTest.java
@@ -1,193 +1,185 @@
-/**
- * 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.activitiext.restservicetask;
-
-import static org.hamcrest.CoreMatchers.is;
-import static org.hamcrest.MatcherAssert.assertThat;
-
-import org.apache.commons.httpclient.HttpMethodBase;
-import org.apache.commons.httpclient.NameValuePair;
-import org.apache.commons.httpclient.methods.GetMethod;
-import org.junit.Before;
-import org.junit.Test;
-import org.junit.Assert;
-import org.junit.runner.RunWith;
-import org.mockito.Mockito;
-import org.onap.workflow.activitiext.common.RestInfo;
-import org.powermock.api.mockito.PowerMockito;
-import org.powermock.core.classloader.annotations.PrepareForTest;
-import org.powermock.modules.junit4.PowerMockRunner;
-
-@PrepareForTest({LowLevelRestApi.class})
-@RunWith(PowerMockRunner.class)
-public class HighLevelRestApiTest {
-
-  private HighLevelRestApi highLevelRestApi;
-
-  @Before
-  public void setUp() {
-    highLevelRestApi = new HighLevelRestApi();
-  }
-
-  @Test
-  public void testInvoke() {
-
-    try {
-      RestInfo info = new RestInfo();
-      info.setMethod("GET");
-      info.setName("name");
-      info.setPath("/catalog/v1");
-      info.setUrl("csars");
-      info.setRealUri("");
-      info.setVersion("v1");
-
-      HttpResponseMessage msg = new HttpResponseMessage();
-      msg.setStatusCode(200);
-      msg.setResponseBody(null);
-      PowerMockito.mockStatic(LowLevelRestApi.class);
-      PowerMockito.when(LowLevelRestApi.executeHttpMethod(Mockito.anyObject())).thenReturn(msg);
-
-      assertThat(HighLevelRestApi.invoke(info), is(msg));;
-    } catch (Exception e) {
-      assert (false);
-    }
-  }
-
-  @Test
-  public void testGet() {
-
-    try {
-      HttpResponseMessage msg = new HttpResponseMessage();
-      msg.setStatusCode(200);
-      msg.setResponseBody(null);
-      PowerMockito.mockStatic(LowLevelRestApi.class);
-      PowerMockito.when(LowLevelRestApi.executeHttpMethod(Mockito.anyObject())).thenReturn(msg);
-
-      String uri = "10.74.148.107/openoapi/catalog/v1/dbtest?id=5";
-      String acceptValue = "application/json";
-      String contentTypeValue = "application/json";
-
-      assertThat(HighLevelRestApi.Get(uri, acceptValue, contentTypeValue), is(msg));
-    } catch (Exception e) {
-      assert (false);
-    }
-  }
-
-  @Test
-  public void testPost() {
-
-    try {
-      HttpResponseMessage msg = new HttpResponseMessage();
-      msg.setStatusCode(200);
-      msg.setResponseBody(null);
-      PowerMockito.mockStatic(LowLevelRestApi.class);
-      PowerMockito.when(LowLevelRestApi.executeHttpMethod(Mockito.anyObject())).thenReturn(msg);
-
-      String uri = "10.74.148.107/openoapi/catalog/v1/dbtest?id=5";
-      String requestBody = "{'type':'NFAR'}";
-      String acceptValue = "application/json";
-      String contentTypeValue = "application/json";
-
-      assertThat(HighLevelRestApi.Post(uri, requestBody, acceptValue, contentTypeValue), is(msg));
-    } catch (Exception e) {
-      assert (false);
-    }
-  }
-
-  @Test
-  public void testDelete() {
-
-    try {
-      HttpResponseMessage msg = new HttpResponseMessage();
-      msg.setStatusCode(200);
-      msg.setResponseBody(null);
-      PowerMockito.mockStatic(LowLevelRestApi.class);
-      PowerMockito.when(LowLevelRestApi.executeHttpMethod(Mockito.anyObject())).thenReturn(msg);
-
-      String uri = "10.74.148.107/openoapi/catalog/v1/csars/aa1bc611c9fbc08247d5ea71fd67ec3f";
-      String acceptValue = "application/json";
-      String contentTypeValue = "application/json";
-
-      assertThat(HighLevelRestApi.Delete(uri, acceptValue, contentTypeValue), is(msg));
-    } catch (Exception e) {
-      assert (false);
-    }
-  }
-
-  @Test
-  public void testPut() {
-
-    try {
-      HttpResponseMessage msg = new HttpResponseMessage();
-      msg.setStatusCode(200);
-      msg.setResponseBody(null);
-      PowerMockito.mockStatic(LowLevelRestApi.class);
-      PowerMockito.when(LowLevelRestApi.executeHttpMethod(Mockito.anyObject())).thenReturn(msg);
-
-      String uri = "10.74.148.107/openoapi/catalog/v1/csars";
-      String requestBody = "{'type':'NFAR'}";
-      String acceptValue = "application/json";
-      String contentTypeValue = "application/json";
-
-      assertThat(HighLevelRestApi.Put(uri, requestBody, acceptValue, contentTypeValue), is(msg));
-    } catch (Exception e) {
-      assert (false);
-    }
-  }
-
-  @SuppressWarnings("static-access")
-  @Test
-  public void testCreateNameValuePairArrayFromQuery() {
-    NameValuePair[] pair = new NameValuePair[2];
-    NameValuePair p1 = new NameValuePair();
-    p1.setName("name");
-    p1.setValue("liuyao");
-    NameValuePair p2 = new NameValuePair();
-    p2.setName("pwd");
-    p2.setValue("zte");
-
-    pair[0] = p1;
-    pair[1] = p2;
-
-    String query = "name=liuyao&pwd=zte";
-
-    assertThat(highLevelRestApi.createNameValuePairArrayFromQuery(query), is(pair));
-  }
-
-  @Test
-  public void testSetAcceptHeader() {
-    try {
-      HttpMethodBase method = new GetMethod();
-      HighLevelRestApi.setAcceptHeader(method, "[application/json]");
-      Assert.assertTrue(true);
-    } catch (Exception e) {
-      Assert.assertTrue(false);
-    }
-  }
-
-  @Test
-  public void testSetContentTypeHeader() {
-
-    try {
-      HttpMethodBase method = new GetMethod();
-      HighLevelRestApi.setContentTypeHeader(method, "[application/json]");
-      Assert.assertTrue(true);
-    } catch (Exception e) {
-      Assert.assertTrue(false);
-    }
-  }
-
-}
+/**

+ * 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.activitiext.restservicetask;

+

+import static org.hamcrest.CoreMatchers.is;

+import static org.hamcrest.MatcherAssert.assertThat;

+

+import org.apache.commons.httpclient.HttpMethodBase;

+import org.apache.commons.httpclient.NameValuePair;

+import org.apache.commons.httpclient.methods.GetMethod;

+import org.junit.Assert;

+import org.junit.Test;

+import org.junit.runner.RunWith;

+import org.mockito.Mockito;

+import org.onap.workflow.activitiext.common.RestInfo;

+import org.powermock.api.mockito.PowerMockito;

+import org.powermock.core.classloader.annotations.PrepareForTest;

+import org.powermock.modules.junit4.PowerMockRunner;

+

+@PrepareForTest({LowLevelRestApi.class})

+@RunWith(PowerMockRunner.class)

+public class HighLevelRestApiTest {

+

+  @Test

+  public void testInvoke() {

+

+    try {

+      RestInfo info = new RestInfo();

+      info.setMethod("GET");

+      info.setName("name");

+      info.setPath("/catalog/v1");

+      info.setUrl("csars");

+      info.setRealUri("");

+      info.setVersion("v1");

+

+      HttpResponseMessage msg = new HttpResponseMessage();

+      msg.setStatusCode(200);

+      msg.setResponseBody(null);

+      PowerMockito.mockStatic(LowLevelRestApi.class);

+      PowerMockito.when(LowLevelRestApi.executeHttpMethod(Mockito.anyObject())).thenReturn(msg);

+

+      assertThat(HighLevelRestApi.invoke(info), is(msg));;

+    } catch (Exception e) {

+      assert (false);

+    }

+  }

+

+  @Test

+  public void testGet() {

+

+    try {

+      HttpResponseMessage msg = new HttpResponseMessage();

+      msg.setStatusCode(200);

+      msg.setResponseBody(null);

+      PowerMockito.mockStatic(LowLevelRestApi.class);

+      PowerMockito.when(LowLevelRestApi.executeHttpMethod(Mockito.anyObject())).thenReturn(msg);

+

+      String uri = "10.74.148.107/openoapi/catalog/v1/dbtest?id=5";

+      String acceptValue = "application/json";

+      String contentTypeValue = "application/json";

+

+      assertThat(HighLevelRestApi.Get(uri, acceptValue, contentTypeValue), is(msg));

+    } catch (Exception e) {

+      assert (false);

+    }

+  }

+

+  @Test

+  public void testPost() {

+

+    try {

+      HttpResponseMessage msg = new HttpResponseMessage();

+      msg.setStatusCode(200);

+      msg.setResponseBody(null);

+      PowerMockito.mockStatic(LowLevelRestApi.class);

+      PowerMockito.when(LowLevelRestApi.executeHttpMethod(Mockito.anyObject())).thenReturn(msg);

+

+      String uri = "10.74.148.107/openoapi/catalog/v1/dbtest?id=5";

+      String requestBody = "{'type':'NFAR'}";

+      String acceptValue = "application/json";

+      String contentTypeValue = "application/json";

+

+      assertThat(HighLevelRestApi.Post(uri, requestBody, acceptValue, contentTypeValue), is(msg));

+    } catch (Exception e) {

+      assert (false);

+    }

+  }

+

+  @Test

+  public void testDelete() {

+

+    try {

+      HttpResponseMessage msg = new HttpResponseMessage();

+      msg.setStatusCode(200);

+      msg.setResponseBody(null);

+      PowerMockito.mockStatic(LowLevelRestApi.class);

+      PowerMockito.when(LowLevelRestApi.executeHttpMethod(Mockito.anyObject())).thenReturn(msg);

+

+      String uri = "10.74.148.107/openoapi/catalog/v1/csars/aa1bc611c9fbc08247d5ea71fd67ec3f";

+      String acceptValue = "application/json";

+      String contentTypeValue = "application/json";

+

+      assertThat(HighLevelRestApi.Delete(uri, acceptValue, contentTypeValue), is(msg));

+    } catch (Exception e) {

+      assert (false);

+    }

+  }

+

+  @Test

+  public void testPut() {

+

+    try {

+      HttpResponseMessage msg = new HttpResponseMessage();

+      msg.setStatusCode(200);

+      msg.setResponseBody(null);

+      PowerMockito.mockStatic(LowLevelRestApi.class);

+      PowerMockito.when(LowLevelRestApi.executeHttpMethod(Mockito.anyObject())).thenReturn(msg);

+

+      String uri = "10.74.148.107/openoapi/catalog/v1/csars";

+      String requestBody = "{'type':'NFAR'}";

+      String acceptValue = "application/json";

+      String contentTypeValue = "application/json";

+

+      assertThat(HighLevelRestApi.Put(uri, requestBody, acceptValue, contentTypeValue), is(msg));

+    } catch (Exception e) {

+      assert (false);

+    }

+  }

+

+  @SuppressWarnings("static-access")

+  @Test

+  public void testCreateNameValuePairArrayFromQuery() {

+    NameValuePair[] pair = new NameValuePair[2];

+    NameValuePair p1 = new NameValuePair();

+    p1.setName("name");

+    p1.setValue("liuyao");

+    NameValuePair p2 = new NameValuePair();

+    p2.setName("pwd");

+    p2.setValue("zte");

+

+    pair[0] = p1;

+    pair[1] = p2;

+

+    String query = "name=liuyao&pwd=zte";

+

+    assertThat(HighLevelRestApi.createNameValuePairArrayFromQuery(query), is(pair));

+  }

+

+  @Test

+  public void testSetAcceptHeader() {

+    try {

+      HttpMethodBase method = new GetMethod();

+      HighLevelRestApi.setAcceptHeader(method, "[application/json]");

+      Assert.assertTrue(true);

+    } catch (Exception e) {

+      Assert.assertTrue(false);

+    }

+  }

+

+  @Test

+  public void testSetContentTypeHeader() {

+

+    try {

+      HttpMethodBase method = new GetMethod();

+      HighLevelRestApi.setContentTypeHeader(method, "[application/json]");

+      Assert.assertTrue(true);

+    } catch (Exception e) {

+      Assert.assertTrue(false);

+    }

+  }

+

+}

diff --git a/activiti-extension/src/test/java/org/onap/workflow/activitiext/restservicetask/HttpResponseMessageTest.java b/activiti-extension/src/test/java/org/onap/workflow/activitiext/restservicetask/HttpResponseMessageTest.java
index befcf3f..92ddfc3 100644
--- a/activiti-extension/src/test/java/org/onap/workflow/activitiext/restservicetask/HttpResponseMessageTest.java
+++ b/activiti-extension/src/test/java/org/onap/workflow/activitiext/restservicetask/HttpResponseMessageTest.java
@@ -1,41 +1,41 @@
-/**
- * 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.activitiext.restservicetask;
-
-import static org.hamcrest.CoreMatchers.is;
-import static org.hamcrest.MatcherAssert.assertThat;
-
-import org.junit.Test;
-
-import com.alibaba.fastjson.JSON;
-
-public class HttpResponseMessageTest {
-
-	@Test
-	public void testToString(){
-		
-		String json = "{'name':'robert'}";
-		JSON obj = (JSON) JSON.parse(json);
-		
-		HttpResponseMessage msg = new HttpResponseMessage();
-		msg.setStatusCode(200);
-		msg.setResponseBody(obj);
-		
-		String result = "{statusCode=200, responseBody={\"name\":\"robert\"}}";
-		
-		assertThat(msg.toString(), is(result));
-	}
-}
+/**

+ * 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.activitiext.restservicetask;

+

+import static org.hamcrest.CoreMatchers.is;

+import static org.hamcrest.MatcherAssert.assertThat;

+

+import org.junit.Test;

+

+import com.alibaba.fastjson.JSON;

+

+public class HttpResponseMessageTest {

+

+	@Test

+	public void testToString(){

+		

+		String json = "{'name':'robert'}";

+		JSON obj = (JSON) JSON.parse(json);

+		

+		HttpResponseMessage msg = new HttpResponseMessage();

+		msg.setStatusCode(200);

+		msg.setResponseBody(obj);

+

+		String result = "{statusCode=" + msg.getStatusCode() + ", responseBody=" + msg.getResponseBody() + "}";

+

+		assertThat(msg.toString(), is(result));

+	}

+}

diff --git a/activiti-extension/src/test/java/org/onap/workflow/activitiext/restservicetask/HttpUtilTest.java b/activiti-extension/src/test/java/org/onap/workflow/activitiext/restservicetask/HttpUtilTest.java
index 2852e29..1e7c893 100644
--- a/activiti-extension/src/test/java/org/onap/workflow/activitiext/restservicetask/HttpUtilTest.java
+++ b/activiti-extension/src/test/java/org/onap/workflow/activitiext/restservicetask/HttpUtilTest.java
@@ -1,153 +1,163 @@
-/**
- * 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.activitiext.restservicetask;
-
-import static org.powermock.api.mockito.PowerMockito.mock;
-
-import org.activiti.engine.ActivitiException;
-import org.activiti.engine.delegate.DelegateExecution;
-import org.activiti.engine.delegate.Expression;
-import org.activiti.engine.impl.persistence.entity.ExecutionEntity;
-import org.junit.Assert;
-import org.junit.Before;
-import org.junit.Test;
-import org.onap.workflow.activitiext.common.Parameter;
-import org.onap.workflow.activitiext.common.RestInfo;
-import org.powermock.api.mockito.PowerMockito;
-
-import com.alibaba.fastjson.JSON;
-
-public class HttpUtilTest {
-
-  private HttpUtil httpUtil;
-
-  @Before
-  public void setUp() {
-    httpUtil = new HttpUtil();
-  }
-
-  @Test
-  public void testExecute() {
-
-    try {
-      DelegateExecution executionEntity = mock(ExecutionEntity.class);
-      HttpUtil httpUtil1 = mock(HttpUtil.class);
-      PowerMockito.when(httpUtil1.executeMethod(executionEntity)).thenReturn(true);
-      httpUtil1.execute(executionEntity);
-      Assert.assertTrue(true);
-    } catch (Exception e) {
-      Assert.assertTrue(false);
-    }
-  }
-
-  @Test
-  public void testExecuteMethod() {
-
-    DelegateExecution executionEntity = mock(ExecutionEntity.class);
-    try {
-      PowerMockito.when(executionEntity.getCurrentActivityId()).thenReturn("1111");
-      HttpResponseMessage msg = new HttpResponseMessage();
-      msg.setStatusCode(200);
-      msg.setResponseBody(null);
-      httpUtil.executeMethod(executionEntity);
-      Assert.assertTrue(false);
-    } catch (Exception e) {
-      Assert.assertTrue(true);
-    }
-  }
-
-  @Test
-  public void testHandleParam1() {
-
-    try {
-      DelegateExecution executionEntity = mock(ExecutionEntity.class);
-      Parameter param = new Parameter();
-      param.setName("id");
-      param.setPosition("path");
-      param.setType("");
-      param.setValue("abc");
-
-      RestInfo info = new RestInfo();
-      info.setMethod("GET");
-      info.setName("name");
-      info.setPath("/catalog/v1");
-      info.setRealUri("");
-      info.setUrl("csars");
-      info.setVersion("v1");
-
-      httpUtil.handleParam(executionEntity, param, info);
-      Assert.assertTrue(true);
-    } catch (ActivitiException e) {
-      Assert.assertTrue(true);
-    }
-
-  }
-
-  @Test
-  public void testHandleParam2() {
-    try {
-      DelegateExecution executionEntity = mock(ExecutionEntity.class);
-      Parameter param = new Parameter();
-      param.setName("id");
-      param.setPosition("query");
-      param.setType("");
-      param.setValue("abc");
-
-      RestInfo info = new RestInfo();
-      info.setMethod("GET");
-      info.setName("name");
-      info.setPath("/catalog/v1");
-      info.setRealUri("");
-      info.setUrl("csars");
-      info.setVersion("v1");
-
-      httpUtil.handleParam(executionEntity, param, info);
-      Assert.assertTrue(true);
-    } catch (ActivitiException e) {
-      Assert.assertTrue(true);
-    }
-
-  }
-
-  @Test
-  public void testGetValue() {
-    DelegateExecution executionEntity = mock(ExecutionEntity.class);
-    Expression expression = mock(Expression.class);
-    Object res = new String("result");
-
-    PowerMockito.when(expression.getValue(executionEntity)).thenReturn(res);
-
-    Assert.assertEquals(res, httpUtil.getValue(expression, executionEntity));
-  }
-
-  @SuppressWarnings("static-access")
-  @Test
-  public void testParsePlanExpression() {
-
-    String exp = "[node0].[responseBody].[id]";
-    String json = "{'id':'123'}";
-    JSON obj = (JSON) JSON.parse(json);
-    HttpResponseMessage msg = new HttpResponseMessage();
-    msg.setStatusCode(200);
-    msg.setResponseBody(obj);
-
-    DelegateExecution executionEntity = mock(ExecutionEntity.class);
-
-    PowerMockito.when(executionEntity.getVariable("node0")).thenReturn(msg);
-
-    Assert.assertEquals("123", httpUtil.parsePlanExpression(exp, executionEntity));
-  }
-}
+/**

+ * 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.activitiext.restservicetask;

+

+import static org.powermock.api.mockito.PowerMockito.mock;

+

+import org.activiti.engine.ActivitiException;

+import org.activiti.engine.delegate.DelegateExecution;

+import org.activiti.engine.delegate.Expression;

+import org.activiti.engine.impl.persistence.entity.ExecutionEntity;

+import org.junit.Assert;

+import org.junit.Before;

+import org.junit.Test;

+import org.onap.workflow.activitiext.common.Parameter;

+import org.onap.workflow.activitiext.common.RestInfo;

+import org.powermock.api.mockito.PowerMockito;

+

+import com.alibaba.fastjson.JSON;

+

+public class HttpUtilTest {

+

+  private HttpUtil httpUtil;

+

+  @Before

+  public void setUp() {

+    httpUtil = new HttpUtil();

+  }

+

+  @Test

+  public void testExecuteMethod() {

+

+    DelegateExecution executionEntity = mock(ExecutionEntity.class);

+    try {

+      PowerMockito.when(executionEntity.getCurrentActivityId()).thenReturn("1111");

+      HttpResponseMessage msg = new HttpResponseMessage();

+      msg.setStatusCode(200);

+      msg.setResponseBody(null);

+      httpUtil.execute(executionEntity);

+      Assert.assertTrue(false);

+    } catch (Exception e) {

+      Assert.assertTrue(true);

+    }

+  }

+

+  @Test

+  public void testHandleParam1() {

+

+    try {

+      DelegateExecution executionEntity = mock(ExecutionEntity.class);

+      Parameter param = new Parameter();

+      param.setName("id");

+      param.setPosition("path");

+      param.setType("");

+      param.setValue("abc");

+

+      RestInfo info = new RestInfo();

+      info.setMethod("GET");

+      info.setName("name");

+      info.setPath("/catalog/v1");

+      info.setRealUri("");

+      info.setUrl("csars");

+      info.setVersion("v1");

+

+      httpUtil.handleParam(executionEntity, param, info);

+      Assert.assertTrue(true);

+    } catch (ActivitiException e) {

+      Assert.assertTrue(true);

+    }

+

+  }

+

+  @Test

+  public void testHandleParam2() {

+    try {

+      DelegateExecution executionEntity = mock(ExecutionEntity.class);

+      Parameter param = new Parameter();

+      param.setName("id");

+      param.setPosition("query");

+      param.setType("");

+      param.setValue("abc");

+

+      RestInfo info = new RestInfo();

+      info.setMethod("GET");

+      info.setName("name");

+      info.setPath("/catalog/v1");

+      info.setRealUri("");

+      info.setUrl("csars");

+      info.setVersion("v1");

+

+      httpUtil.handleParam(executionEntity, param, info);

+      Assert.assertTrue(true);

+    } catch (ActivitiException e) {

+      Assert.assertTrue(true);

+    }

+  }

+  

+  @Test

+  public void testHandleParam3() {

+    try {

+      DelegateExecution executionEntity = mock(ExecutionEntity.class);

+      Parameter param = new Parameter();

+      param.setName("id");

+      param.setPosition("body");

+      param.setType("");

+      param.setValue("{'value':{'progress':{'value':'60','valueSource':'String'},'errcode':{'value':'200','valueSource':'Variable'},'desc':{'value':'','valueSource':'String'}},'valueSource':'Definition'}");

+

+      RestInfo info = new RestInfo();

+      info.setMethod("GET");

+      info.setName("name");

+      info.setPath("/catalog/v1");

+      info.setRealUri("");

+      info.setUrl("csars");

+      info.setVersion("v1");

+

+      httpUtil.handleParam(executionEntity, param, info);

+      Assert.assertTrue(true);

+    } catch (ActivitiException e) {

+      Assert.assertTrue(true);

+    }

+  }

+

+  @Test

+  public void testGetValue() {

+    DelegateExecution executionEntity = mock(ExecutionEntity.class);

+    Expression expression = mock(Expression.class);

+    Object res = new String("result");

+

+    PowerMockito.when(expression.getValue(executionEntity)).thenReturn(res);

+

+    Assert.assertEquals(res, httpUtil.getValue(expression, executionEntity));

+  }

+

+  @SuppressWarnings("static-access")

+  @Test

+  public void testParsePlanExpression() {

+

+    String exp = "[node0].[responseBody].[id]";

+    String json = "{'id':'123'}";

+    JSON obj = (JSON) JSON.parse(json);

+    HttpResponseMessage msg = new HttpResponseMessage();

+    msg.setStatusCode(200);

+    msg.setResponseBody(obj);

+

+    DelegateExecution executionEntity = mock(ExecutionEntity.class);

+

+    PowerMockito.when(executionEntity.getVariable("node0")).thenReturn(msg);

+

+    Assert.assertEquals("123", httpUtil.parsePlanExpression(exp, executionEntity));

+  }

+}