diff options
38 files changed, 1357 insertions, 324 deletions
diff --git a/activiti-extension/src/main/java/org/onap/workflow/activitiext/common/EnumModuleUrl.java b/activiti-extension/src/main/java/org/onap/workflow/activitiext/common/EnumModuleUrl.java index efc4dff..a380ffd 100644 --- a/activiti-extension/src/main/java/org/onap/workflow/activitiext/common/EnumModuleUrl.java +++ b/activiti-extension/src/main/java/org/onap/workflow/activitiext/common/EnumModuleUrl.java @@ -1,5 +1,5 @@ /** - * Copyright 2017 [ZTE] and others. + * 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. diff --git a/activiti-extension/src/main/java/org/onap/workflow/activitiext/common/Parameter.java b/activiti-extension/src/main/java/org/onap/workflow/activitiext/common/Parameter.java index 6aa97a0..bbb8c7c 100644 --- a/activiti-extension/src/main/java/org/onap/workflow/activitiext/common/Parameter.java +++ b/activiti-extension/src/main/java/org/onap/workflow/activitiext/common/Parameter.java @@ -1,28 +1,20 @@ /** - * Copyright 2017 [ZTE] and others. + * 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 + * 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 + * 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. + * 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 com.fasterxml.jackson.annotation.JsonIgnoreProperties; - -import lombok.AllArgsConstructor; -import lombok.Data; -import lombok.NoArgsConstructor; - -@Data -@NoArgsConstructor -@AllArgsConstructor -@JsonIgnoreProperties(ignoreUnknown = true) public class Parameter { private String position; @@ -30,4 +22,35 @@ public class Parameter { private String name; private String value; private String valueSource; + public String getPosition() { + return position; + } + public void setPosition(String position) { + this.position = position; + } + public String getType() { + return type; + } + public void setType(String type) { + this.type = type; + } + public String getName() { + return name; + } + public void setName(String name) { + this.name = name; + } + public String getValue() { + return value; + } + public void setValue(String value) { + this.value = value; + } + public String getValueSource() { + return valueSource; + } + public void setValueSource(String valueSource) { + this.valueSource = valueSource; + } + } diff --git a/activiti-extension/src/main/java/org/onap/workflow/activitiext/common/RestInfo.java b/activiti-extension/src/main/java/org/onap/workflow/activitiext/common/RestInfo.java index 18c376b..16e28f1 100644 --- a/activiti-extension/src/main/java/org/onap/workflow/activitiext/common/RestInfo.java +++ b/activiti-extension/src/main/java/org/onap/workflow/activitiext/common/RestInfo.java @@ -15,16 +15,6 @@ */ package org.onap.workflow.activitiext.common; -import com.fasterxml.jackson.annotation.JsonIgnoreProperties; - -import lombok.AllArgsConstructor; -import lombok.Data; -import lombok.NoArgsConstructor; - -@Data -@NoArgsConstructor -@AllArgsConstructor -@JsonIgnoreProperties(ignoreUnknown = true) public class RestInfo { private String name; @@ -36,5 +26,59 @@ public class RestInfo { private String contentType; private String requestBody; private String realUri; + public String getName() { + return name; + } + public void setName(String name) { + this.name = name; + } + public String getVersion() { + return version; + } + public void setVersion(String version) { + this.version = version; + } + public String getUrl() { + return url; + } + public void setUrl(String url) { + this.url = url; + } + public String getPath() { + return path; + } + public void setPath(String path) { + this.path = path; + } + public String getMethod() { + return method; + } + public void setMethod(String method) { + this.method = method; + } + public String getAccept() { + return accept; + } + public void setAccept(String accept) { + this.accept = accept; + } + public String getContentType() { + return contentType; + } + public void setContentType(String contentType) { + this.contentType = contentType; + } + public String getRequestBody() { + return requestBody; + } + public void setRequestBody(String requestBody) { + this.requestBody = requestBody; + } + public String getRealUri() { + return realUri; + } + public void setRealUri(String realUri) { + this.realUri = realUri; + } } diff --git a/activiti-extension/src/main/java/org/onap/workflow/activitiext/restservicetask/HighLevelRestApi.java b/activiti-extension/src/main/java/org/onap/workflow/activitiext/restservicetask/HighLevelRestApi.java index cd8517b..268443a 100644 --- a/activiti-extension/src/main/java/org/onap/workflow/activitiext/restservicetask/HighLevelRestApi.java +++ b/activiti-extension/src/main/java/org/onap/workflow/activitiext/restservicetask/HighLevelRestApi.java @@ -186,7 +186,7 @@ public class HighLevelRestApi { return responseMessage; } - private static void setAcceptHeader(HttpMethodBase method, String value) { + public static void setAcceptHeader(HttpMethodBase method, String value) { if (StringUtils.isNotEmpty(value)) { if(value.startsWith("[")&&value.endsWith("]")){ value = value.substring(1, value.length()-1); @@ -196,7 +196,7 @@ public class HighLevelRestApi { } } - private static void setContentTypeHeader(HttpMethodBase method, String value) { + public static void setContentTypeHeader(HttpMethodBase method, String value) { if (StringUtils.isNotEmpty(value)) { if(value.startsWith("[")&&value.endsWith("]")){ value = value.substring(1, value.length()-1); diff --git a/activiti-extension/src/main/java/org/onap/workflow/activitiext/restservicetask/HttpResponseMessage.java b/activiti-extension/src/main/java/org/onap/workflow/activitiext/restservicetask/HttpResponseMessage.java index ac80b50..ebe2735 100644 --- a/activiti-extension/src/main/java/org/onap/workflow/activitiext/restservicetask/HttpResponseMessage.java +++ b/activiti-extension/src/main/java/org/onap/workflow/activitiext/restservicetask/HttpResponseMessage.java @@ -1,15 +1,17 @@ /** - * Copyright 2017 [ZTE] and others. + * 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 + * 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 + * 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. + * 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; @@ -17,39 +19,24 @@ import java.io.Serializable; import com.alibaba.fastjson.JSON; -/** - */ public class HttpResponseMessage implements Serializable { - + private int statusCode; private JSON responseBody; - - - /** - * @return the statusCode - */ + public int getStatusCode() { - return this.statusCode; + return statusCode; } - - /** - * @param statusCode the statusCode to set - */ - protected void setStatusCode(int statusCode) { + + public void setStatusCode(int statusCode) { this.statusCode = statusCode; } - - /** - * @return the responseBody - */ + public JSON getResponseBody() { - return this.responseBody; + return responseBody; } - - /** - * @param responseBody the responseBody to set - */ - protected void setResponseBody(JSON responseBody) { + + public void setResponseBody(JSON responseBody) { this.responseBody = responseBody; } @@ -57,5 +44,5 @@ public class HttpResponseMessage implements Serializable { public String toString() { return "{statusCode=" + statusCode + ", responseBody=" + responseBody.toJSONString() + "}"; } - + } diff --git a/activiti-extension/src/main/java/org/onap/workflow/activitiext/restservicetask/HttpUtil.java b/activiti-extension/src/main/java/org/onap/workflow/activitiext/restservicetask/HttpUtil.java index 0acab5f..ea84ce3 100644 --- a/activiti-extension/src/main/java/org/onap/workflow/activitiext/restservicetask/HttpUtil.java +++ b/activiti-extension/src/main/java/org/onap/workflow/activitiext/restservicetask/HttpUtil.java @@ -76,7 +76,7 @@ public class HttpUtil implements JavaDelegate { *
* @param execution
*/
- public void executeMethod(DelegateExecution execution) throws Exception {
+ public boolean executeMethod(DelegateExecution execution) throws Exception {
// get rest task information
RestInfo restInfo = new RestInfo();
@@ -108,6 +108,8 @@ public class HttpUtil implements JavaDelegate { // inject the result to variable
execution.setVariable(execution.getCurrentActivityId(), msg);
+
+ return true;
}
/**
@@ -306,7 +308,7 @@ public class HttpUtil implements JavaDelegate { * @param restInfo
* @return
*/
- private static String compeleteUri(RestInfo restInfo) {
+ public static String compeleteUri(RestInfo restInfo) {
String publishUrl = "";
try {
@@ -333,7 +335,7 @@ public class HttpUtil implements JavaDelegate { * @param expStr
* @return
*/
- private static Queue<String> parseExpressionToQueue(String expStr) {
+ public static Queue<String> parseExpressionToQueue(String expStr) {
Queue<String> queue = new LinkedList<String>();
diff --git a/activiti-extension/src/main/java/org/onap/workflow/activitiext/restservicetask/LowLevelRestApi.java b/activiti-extension/src/main/java/org/onap/workflow/activitiext/restservicetask/LowLevelRestApi.java index 25dc873..b3303bd 100644 --- a/activiti-extension/src/main/java/org/onap/workflow/activitiext/restservicetask/LowLevelRestApi.java +++ b/activiti-extension/src/main/java/org/onap/workflow/activitiext/restservicetask/LowLevelRestApi.java @@ -1,15 +1,17 @@ /** - * Copyright 2017 [ZTE] and others. + * 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 + * 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 + * 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. + * 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; diff --git a/activiti-extension/src/main/java/org/onap/workflow/activitiext/restservicetask/PropertyUtil.java b/activiti-extension/src/main/java/org/onap/workflow/activitiext/restservicetask/PropertyUtil.java index 48e2ab6..ff4c30a 100644 --- a/activiti-extension/src/main/java/org/onap/workflow/activitiext/restservicetask/PropertyUtil.java +++ b/activiti-extension/src/main/java/org/onap/workflow/activitiext/restservicetask/PropertyUtil.java @@ -1,15 +1,17 @@ /**
- * Copyright 2017 [ZTE] and others.
+ * 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
+ * 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
+ * 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.
+ * 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;
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 d7b0e57..f3cdd84 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,5 +1,5 @@ /** - * Copyright 2017 [ZTE] and others. + * 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. diff --git a/activiti-extension/src/test/java/org/onap/workflow/activitiext/restservicetask/GsonUtilTest.java b/activiti-extension/src/test/java/org/onap/workflow/activitiext/restservicetask/GsonUtilTest.java new file mode 100644 index 0000000..c7a756a --- /dev/null +++ b/activiti-extension/src/test/java/org/onap/workflow/activitiext/restservicetask/GsonUtilTest.java @@ -0,0 +1,73 @@ +/** + * 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 static org.powermock.api.mockito.PowerMockito.mock; + +import org.activiti.engine.delegate.DelegateExecution; +import org.activiti.engine.impl.persistence.entity.ExecutionEntity; +import org.junit.Test; + +import com.google.gson.JsonArray; +import com.google.gson.JsonObject; +import com.google.gson.JsonParser; + +public class GsonUtilTest { + + @Test + public void testFormatJsonObject(){ + + DelegateExecution executionEntity = mock(ExecutionEntity.class); + String json = "{'value':{'progress':{'value':'60','valueSource':'String'},'errcode':{'value':'200','valueSource':'Variable'},'desc':{'value':'','valueSource':'String'}},'valueSource':'Definition'}"; + JsonObject obj = new JsonParser().parse(json).getAsJsonObject(); + String result = "{'value':{'progress':'60','errcode':'','desc':''}}"; + JsonObject resObj = new JsonParser().parse(result).getAsJsonObject(); + + assertThat(GsonUtil.formatJsonObject(null, obj, executionEntity), is(resObj)); + + } + + @Test + public void testFormatJsonArray(){ + + DelegateExecution executionEntity = mock(ExecutionEntity.class); + + String json = "[{'progress':{'value':'60','valueSource':'String'}}]"; + JsonArray array = new JsonParser().parse(json).getAsJsonArray(); + + String result = "[{'progress':'60'}]"; + JsonArray resArray = new JsonParser().parse(result).getAsJsonArray(); + + assertThat(GsonUtil.formatJsonArray(array, executionEntity), is(resArray)); + + } + + @Test + public void testGetValue(){ + + DelegateExecution executionEntity = mock(ExecutionEntity.class); + + String json = "{'value':'60','valueSource':'String'}"; + JsonObject obj = new JsonParser().parse(json).getAsJsonObject(); + + String result = "60"; + + assertThat(GsonUtil.getValue(obj, executionEntity), is(result)); + } + +} 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 7e791f7..0f20a1e 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,4 +1,4 @@ -/* +/** * Copyright 2017 ZTE Corporation. * * Licensed under the Apache License, Version 2.0 (the "License"); @@ -18,129 +18,176 @@ 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({HighLevelRestApi.class,LowLevelRestApi.class}) +@PrepareForTest({LowLevelRestApi.class}) @RunWith(PowerMockRunner.class) public class HighLevelRestApiTest { - - private HighLevelRestApi highLevelRestApi; - - @Before - public void setUp() { - highLevelRestApi = new HighLevelRestApi(); - } - - @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/csars"; - String acceptValue = "application/json"; - String contentTypeValue = "application/json"; - - HighLevelRestApi.Get(uri, acceptValue, contentTypeValue); - assertThat(HighLevelRestApi.Get(uri, acceptValue, contentTypeValue), is(msg)); - } catch (Exception e) { - // TODO Auto-generated catch block - e.printStackTrace(); - } - } - - @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/csars"; - String requestBody = "{'type':'NFAR'}"; - String acceptValue = "application/json"; - String contentTypeValue = "application/json"; - - assertThat(HighLevelRestApi.Post(uri, requestBody, acceptValue, contentTypeValue), is(msg)); - } catch (Exception e) { - // TODO Auto-generated catch block - e.printStackTrace(); - } - } - - @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) { - // TODO Auto-generated catch block - e.printStackTrace(); - } - } - - @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) { - // TODO Auto-generated catch block - e.printStackTrace(); - } - } - - @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)); - } - + + 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); + } + } + } 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 new file mode 100644 index 0000000..befcf3f --- /dev/null +++ b/activiti-extension/src/test/java/org/onap/workflow/activitiext/restservicetask/HttpResponseMessageTest.java @@ -0,0 +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)); + } +} 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 b117b97..2852e29 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 @@ -19,95 +19,135 @@ 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.junit.runner.RunWith; -import org.mockito.Mockito; import org.onap.workflow.activitiext.common.Parameter; 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({HighLevelRestApi.class}) -@RunWith(PowerMockRunner.class) +import com.alibaba.fastjson.JSON; + public class HttpUtilTest { - private HttpUtil httpUtil; - - @Before - public void setUp() { - httpUtil = new HttpUtil(); - } - - @Test - public void testExecute(){ - - DelegateExecution executionEntity = mock(ExecutionEntity.class); - - HttpUtil httpUtil1 = mock(HttpUtil.class);; - try { - httpUtil1.execute(executionEntity); - - Assert.assertTrue(true); - } catch (Exception e) { - // TODO Auto-generated catch block - e.printStackTrace(); - Assert.assertTrue(false); - } - } - - @Test - public void testExecuteMethod() { - - DelegateExecution executionEntity = mock(ExecutionEntity.class); - HttpUtil httpUtil1 = mock(HttpUtil.class);; - try { - - PowerMockito.when(executionEntity.getCurrentActivityId()).thenReturn("1111"); - - HttpResponseMessage msg = new HttpResponseMessage(); - msg.setStatusCode(200); - msg.setResponseBody(null); - PowerMockito.mockStatic(HighLevelRestApi.class); - PowerMockito.when(HighLevelRestApi.invoke(Mockito.anyObject())).thenReturn(msg); - - httpUtil1.executeMethod(executionEntity); - Assert.assertTrue(true); - } catch (Exception e) { - e.printStackTrace(); - Assert.assertTrue(false); - } - } - - @Test - public void testHandleParam(){ - - 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) { - // TODO Auto-generated catch block - e.printStackTrace(); - Assert.assertTrue(true); - } - - } + 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)); + } } diff --git a/activiti-extension/src/test/java/org/onap/workflow/activitiext/restservicetask/LowLevelRestApiTest.java b/activiti-extension/src/test/java/org/onap/workflow/activitiext/restservicetask/LowLevelRestApiTest.java new file mode 100644 index 0000000..863cc37 --- /dev/null +++ b/activiti-extension/src/test/java/org/onap/workflow/activitiext/restservicetask/LowLevelRestApiTest.java @@ -0,0 +1,37 @@ +/** + * 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 org.apache.commons.httpclient.HttpMethod; +import org.junit.Assert; +import org.junit.Test; +import org.powermock.api.mockito.PowerMockito; + +public class LowLevelRestApiTest { + + @Test + public void testExecuteHttpMethod(){ + + try { + HttpMethod method = PowerMockito.mock(HttpMethod.class); + LowLevelRestApi.executeHttpMethod(method); + + Assert.assertTrue(false); + } catch (Exception e) { + Assert.assertTrue(true); + } + } +} diff --git a/wfenginemgrservice/src/main/java/org/onap/workflow/common/EnumModuleUrl.java b/wfenginemgrservice/src/main/java/org/onap/workflow/common/EnumModuleUrl.java index 00f10d8..120e3de 100644 --- a/wfenginemgrservice/src/main/java/org/onap/workflow/common/EnumModuleUrl.java +++ b/wfenginemgrservice/src/main/java/org/onap/workflow/common/EnumModuleUrl.java @@ -1,5 +1,5 @@ /**
- * Copyright 2017 [ZTE] and others.
+ * 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.
@@ -13,6 +13,7 @@ * See the License for the specific language governing permissions and
* limitations under the License.
*/
+
package org.onap.workflow.common;
public enum EnumModuleUrl {
diff --git a/wfenginemgrservice/src/main/java/org/onap/workflow/common/RestResponse.java b/wfenginemgrservice/src/main/java/org/onap/workflow/common/RestResponse.java index 21467bf..f55387b 100644 --- a/wfenginemgrservice/src/main/java/org/onap/workflow/common/RestResponse.java +++ b/wfenginemgrservice/src/main/java/org/onap/workflow/common/RestResponse.java @@ -15,17 +15,24 @@ */ package org.onap.workflow.common; -import lombok.AllArgsConstructor; -import lombok.Data; -import lombok.NoArgsConstructor; -import com.fasterxml.jackson.annotation.JsonIgnoreProperties; - -@Data -@NoArgsConstructor -@AllArgsConstructor -@JsonIgnoreProperties(ignoreUnknown = true) public class RestResponse { + public int getStatusCode() { + return statusCode; + } + + public void setStatusCode(int statusCode) { + this.statusCode = statusCode; + } + + public String getResult() { + return result; + } + + public void setResult(String result) { + this.result = result; + } + private int statusCode; private String result; diff --git a/wfenginemgrservice/src/main/java/org/onap/workflow/entity/DeployBpmnFileResponse.java b/wfenginemgrservice/src/main/java/org/onap/workflow/entity/DeployBpmnFileResponse.java index 6a1920e..bb6fcbb 100644 --- a/wfenginemgrservice/src/main/java/org/onap/workflow/entity/DeployBpmnFileResponse.java +++ b/wfenginemgrservice/src/main/java/org/onap/workflow/entity/DeployBpmnFileResponse.java @@ -15,15 +15,33 @@ */ package org.onap.workflow.entity; -import lombok.AllArgsConstructor; -import lombok.Data; -import lombok.NoArgsConstructor; -@Data -@NoArgsConstructor -@AllArgsConstructor public class DeployBpmnFileResponse { + public int getStatus() { + return status; + } + public void setStatus(int status) { + this.status = status; + } + public String getMessage() { + return message; + } + public void setMessage(String message) { + this.message = message; + } + public String getDeployedId() { + return deployedId; + } + public void setDeployedId(String deployedId) { + this.deployedId = deployedId; + } + public String getProcessId() { + return processId; + } + public void setProcessId(String processId) { + this.processId = processId; + } private int status; private String message; private String deployedId; diff --git a/wfenginemgrservice/src/main/java/org/onap/workflow/entity/MsbClientConfig.java b/wfenginemgrservice/src/main/java/org/onap/workflow/entity/MsbClientConfig.java index e73c4f2..4867bd6 100644 --- a/wfenginemgrservice/src/main/java/org/onap/workflow/entity/MsbClientConfig.java +++ b/wfenginemgrservice/src/main/java/org/onap/workflow/entity/MsbClientConfig.java @@ -16,11 +16,21 @@ package org.onap.workflow.entity;
-import lombok.Data;
-@Data
public class MsbClientConfig {
- private String msbSvrIp;
+ public String getMsbSvrIp() {
+ return msbSvrIp;
+ }
+ public void setMsbSvrIp(String msbSvrIp) {
+ this.msbSvrIp = msbSvrIp;
+ }
+ public Integer getMsbSvrPort() {
+ return msbSvrPort;
+ }
+ public void setMsbSvrPort(Integer msbSvrPort) {
+ this.msbSvrPort = msbSvrPort;
+ }
+ private String msbSvrIp;
private Integer msbSvrPort;
}
diff --git a/wfenginemgrservice/src/main/java/org/onap/workflow/entity/StartProcessRequest.java b/wfenginemgrservice/src/main/java/org/onap/workflow/entity/StartProcessRequest.java index cddaa09..3258722 100644 --- a/wfenginemgrservice/src/main/java/org/onap/workflow/entity/StartProcessRequest.java +++ b/wfenginemgrservice/src/main/java/org/onap/workflow/entity/StartProcessRequest.java @@ -17,17 +17,19 @@ package org.onap.workflow.entity; import java.util.Map; -import lombok.AllArgsConstructor; -import lombok.Data; -import lombok.NoArgsConstructor; - -import com.fasterxml.jackson.annotation.JsonIgnoreProperties; - -@Data -@NoArgsConstructor -@AllArgsConstructor -@JsonIgnoreProperties(ignoreUnknown = true) public class StartProcessRequest { + public String getProcessDefinitionKey() { + return processDefinitionKey; + } + public void setProcessDefinitionKey(String processDefinitionKey) { + this.processDefinitionKey = processDefinitionKey; + } + public Map<String, String> getParams() { + return params; + } + public void setParams(Map<String, String> params) { + this.params = params; + } private String processDefinitionKey; private Map<String, String> params; } diff --git a/wfenginemgrservice/src/main/java/org/onap/workflow/externalservice/entity/activitientitiy/ActivitiDeployResponse.java b/wfenginemgrservice/src/main/java/org/onap/workflow/externalservice/entity/activitientitiy/ActivitiDeployResponse.java index 5ad3d12..71b3bd0 100644 --- a/wfenginemgrservice/src/main/java/org/onap/workflow/externalservice/entity/activitientitiy/ActivitiDeployResponse.java +++ b/wfenginemgrservice/src/main/java/org/onap/workflow/externalservice/entity/activitientitiy/ActivitiDeployResponse.java @@ -15,10 +15,27 @@ */
package org.onap.workflow.externalservice.entity.activitientitiy;
-import lombok.Data;
-@Data
+
public class ActivitiDeployResponse {
+ public String getId() {
+ return id;
+ }
+ public void setId(String id) {
+ this.id = id;
+ }
+ public String getDeploymentTime() {
+ return deploymentTime;
+ }
+ public void setDeploymentTime(String deploymentTime) {
+ this.deploymentTime = deploymentTime;
+ }
+ public String getUrl() {
+ return url;
+ }
+ public void setUrl(String url) {
+ this.url = url;
+ }
private String id;
private String deploymentTime;
private String url;
diff --git a/wfenginemgrservice/src/main/java/org/onap/workflow/externalservice/entity/activitientitiy/ActivitiStartProcessRequest.java b/wfenginemgrservice/src/main/java/org/onap/workflow/externalservice/entity/activitientitiy/ActivitiStartProcessRequest.java index ae7edf1..a925c2f 100644 --- a/wfenginemgrservice/src/main/java/org/onap/workflow/externalservice/entity/activitientitiy/ActivitiStartProcessRequest.java +++ b/wfenginemgrservice/src/main/java/org/onap/workflow/externalservice/entity/activitientitiy/ActivitiStartProcessRequest.java @@ -16,10 +16,21 @@ package org.onap.workflow.externalservice.entity.activitientitiy;
-import lombok.Data;
-@Data
+
public class ActivitiStartProcessRequest {
+ public String getProcessDefinitionKey() {
+ return processDefinitionKey;
+ }
+ public void setProcessDefinitionKey(String processDefinitionKey) {
+ this.processDefinitionKey = processDefinitionKey;
+ }
+ public ActivitiStartProcessRequestParam[] getVariables() {
+ return variables;
+ }
+ public void setVariables(ActivitiStartProcessRequestParam[] variables) {
+ this.variables = variables;
+ }
private String processDefinitionKey;
private ActivitiStartProcessRequestParam[] variables;
}
diff --git a/wfenginemgrservice/src/main/java/org/onap/workflow/externalservice/entity/activitientitiy/ActivitiStartProcessRequestParam.java b/wfenginemgrservice/src/main/java/org/onap/workflow/externalservice/entity/activitientitiy/ActivitiStartProcessRequestParam.java index 35dc487..7ca54dd 100644 --- a/wfenginemgrservice/src/main/java/org/onap/workflow/externalservice/entity/activitientitiy/ActivitiStartProcessRequestParam.java +++ b/wfenginemgrservice/src/main/java/org/onap/workflow/externalservice/entity/activitientitiy/ActivitiStartProcessRequestParam.java @@ -1,5 +1,5 @@ /**
- * Copyright 2017 [ZTE] and others.
+ * 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.
@@ -13,15 +13,26 @@ * See the License for the specific language governing permissions and
* limitations under the License.
*/
+
package org.onap.workflow.externalservice.entity.activitientitiy;
-import lombok.Data;
/**
*
*/
-@Data
public class ActivitiStartProcessRequestParam {
+ public String getName() {
+ return name;
+ }
+ public void setName(String name) {
+ this.name = name;
+ }
+ public String getValue() {
+ return value;
+ }
+ public void setValue(String value) {
+ this.value = value;
+ }
private String name;
private String value;
}
diff --git a/wfenginemgrservice/src/main/java/org/onap/workflow/tools/RequestParameters.java b/wfenginemgrservice/src/main/java/org/onap/workflow/tools/RequestParameters.java index b8e76d8..8fc79ff 100644 --- a/wfenginemgrservice/src/main/java/org/onap/workflow/tools/RequestParameters.java +++ b/wfenginemgrservice/src/main/java/org/onap/workflow/tools/RequestParameters.java @@ -16,15 +16,19 @@ package org.onap.workflow.tools;
-import lombok.Data;
/**
* @author 10175158
*
*/
-@Data
public class RequestParameters {
+ public boolean isCasCade() {
+ return casCade;
+ }
+ public void setCasCade(boolean casCade) {
+ this.casCade = casCade;
+ }
protected boolean casCade;
@Override
public String toString() {
diff --git a/wfenginemgrservice/src/test/java/org/onap/workflow/WorkflowAppConfigTest.java b/wfenginemgrservice/src/test/java/org/onap/workflow/WorkflowAppConfigTest.java new file mode 100644 index 0000000..aa24996 --- /dev/null +++ b/wfenginemgrservice/src/test/java/org/onap/workflow/WorkflowAppConfigTest.java @@ -0,0 +1,35 @@ +/** + * Copyright 2017 ZTE Corporation. + * <p> + * 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 + * <p> + * http://www.apache.org/licenses/LICENSE-2.0 + * <p> + * 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; + +import static org.hamcrest.core.Is.is; +import static org.junit.Assert.assertThat; + +import org.junit.Test; +import org.onap.workflow.entity.MsbClientConfig; + +public class WorkflowAppConfigTest { + @Test + public void getMsbClientConfig() throws Exception { + WorkflowAppConfig workflowAppConfig = new WorkflowAppConfig(); + MsbClientConfig msbClientConfig = new MsbClientConfig(); + + workflowAppConfig.setMsbClientConfig(msbClientConfig); + + assertThat(workflowAppConfig.getMsbClientConfig(), is(msbClientConfig)); + } + +}
\ No newline at end of file diff --git a/wfenginemgrservice/src/test/java/org/onap/workflow/WorkflowAppTest.java b/wfenginemgrservice/src/test/java/org/onap/workflow/WorkflowAppTest.java new file mode 100644 index 0000000..a1ed93c --- /dev/null +++ b/wfenginemgrservice/src/test/java/org/onap/workflow/WorkflowAppTest.java @@ -0,0 +1,44 @@ +/** + * Copyright 2017 ZTE Corporation. + * <p> + * 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 + * <p> + * http://www.apache.org/licenses/LICENSE-2.0 + * <p> + * 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; + +import io.dropwizard.jersey.setup.JerseyEnvironment; +import io.dropwizard.setup.Environment; +import org.glassfish.jersey.media.multipart.MultiPartFeature; +import org.junit.Test; + +import static org.hamcrest.MatcherAssert.assertThat; +import static org.hamcrest.core.Is.is; +import static org.mockito.Mockito.*; + +public class WorkflowAppTest { + @Test + public void testRun() throws Exception { + WorkflowApp app = new WorkflowApp(); + WorkflowAppConfig config = mock(WorkflowAppConfig.class); + Environment environment = mock(Environment.class); + JerseyEnvironment jerseyEnvironment = mock(JerseyEnvironment.class); + + when(environment.jersey()).thenReturn(jerseyEnvironment); + + app.run(config, environment); + + verify(jerseyEnvironment).register(MultiPartFeature.class); + verify(jerseyEnvironment).packages("org.onap.workflow.resources"); + assertThat(app.getName(), is(" Workflow APP ")); + } + +}
\ No newline at end of file diff --git a/wfenginemgrservice/src/test/java/org/onap/workflow/common/EnumModuleUrlTest.java b/wfenginemgrservice/src/test/java/org/onap/workflow/common/EnumModuleUrlTest.java new file mode 100644 index 0000000..01028e6 --- /dev/null +++ b/wfenginemgrservice/src/test/java/org/onap/workflow/common/EnumModuleUrlTest.java @@ -0,0 +1,44 @@ +/** + * Copyright 2017 ZTE Corporation. + * <p> + * 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 + * <p> + * http://www.apache.org/licenses/LICENSE-2.0 + * <p> + * 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 org.junit.Assert; +import org.junit.Test; +import org.onap.workflow.WorkflowAppConfig; +import org.onap.workflow.entity.MsbClientConfig; + +public class EnumModuleUrlTest { + @Test + public void testEnumModel() { + String msbSvrIp = "127.0.0.1"; + WorkflowAppConfig workflowconfig = makeWorkFlowConfig(msbSvrIp); + Config.setWorkflowAppConfig(workflowconfig); + String activitiBaseUrl = EnumModuleUrl.getBaseUrl(EnumModuleUrl.ACTIVITI); + Assert.assertEquals("http://" + msbSvrIp + ":80" + EnumModuleUrl.ACTIVITI.getApiRootDomain(), + activitiBaseUrl); + } + + private WorkflowAppConfig makeWorkFlowConfig(String msbSvrIp) { + int msbSvrPort = 80; + MsbClientConfig msbClientConfig = new MsbClientConfig(); + msbClientConfig.setMsbSvrIp(msbSvrIp); + msbClientConfig.setMsbSvrPort(msbSvrPort); + WorkflowAppConfig workflowconfig = new WorkflowAppConfig(); + workflowconfig.setMsbClientConfig(msbClientConfig); + return workflowconfig; + } +}
\ No newline at end of file diff --git a/wfenginemgrservice/src/test/java/org/onap/workflow/common/RestClientUtilsTest.java b/wfenginemgrservice/src/test/java/org/onap/workflow/common/RestClientUtilsTest.java new file mode 100644 index 0000000..fc7317e --- /dev/null +++ b/wfenginemgrservice/src/test/java/org/onap/workflow/common/RestClientUtilsTest.java @@ -0,0 +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(); + } + } + } +} diff --git a/wfenginemgrservice/src/test/java/org/onap/workflow/common/RestResponseTest.java b/wfenginemgrservice/src/test/java/org/onap/workflow/common/RestResponseTest.java new file mode 100644 index 0000000..5fc8d01 --- /dev/null +++ b/wfenginemgrservice/src/test/java/org/onap/workflow/common/RestResponseTest.java @@ -0,0 +1,34 @@ +/** + * Copyright 2017 ZTE Corporation. + * <p> + * 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 + * <p> + * http://www.apache.org/licenses/LICENSE-2.0 + * <p> + * 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 org.junit.Test; + +import static org.hamcrest.core.Is.is; +import static org.junit.Assert.assertThat; + +public class RestResponseTest { + @Test + public void getStatusCode() throws Exception { + RestResponse restResponse = new RestResponse(); + restResponse.setResult("1"); + restResponse.setStatusCode(1); + + assertThat(restResponse.getResult(), is("1")); + assertThat(restResponse.getStatusCode(), is(1)); + } + +}
\ No newline at end of file diff --git a/wfenginemgrservice/src/test/java/org/onap/workflow/common/ToolUtilTest.java b/wfenginemgrservice/src/test/java/org/onap/workflow/common/ToolUtilTest.java index 2c6e175..4407a24 100644 --- a/wfenginemgrservice/src/test/java/org/onap/workflow/common/ToolUtilTest.java +++ b/wfenginemgrservice/src/test/java/org/onap/workflow/common/ToolUtilTest.java @@ -19,12 +19,29 @@ package org.onap.workflow.common; import org.junit.Assert; import org.junit.Test; +import java.io.InputStream; + +import static org.mockito.Mockito.mock; +import static org.mockito.Mockito.verify; + /** * @author 10175158 * */ public class ToolUtilTest { @Test + public void testCloseInputStream() throws Exception { + InputStream inputStream = mock(InputStream.class); + ToolUtil.closeInputStream(inputStream); + verify(inputStream).close(); + } + + @Test + public void testCloseInputStreamWhenGivenNullInputStream() throws Exception { + ToolUtil.closeInputStream(null); + } + + @Test public void testgetHeader() { String actual = "Basic a2VybWl0Omtlcm1pdA=="; Assert.assertEquals(actual, ToolUtil.getHeader()); diff --git a/wfenginemgrservice/src/test/java/org/onap/workflow/entity/DeployBpmnFileResponseTest.java b/wfenginemgrservice/src/test/java/org/onap/workflow/entity/DeployBpmnFileResponseTest.java new file mode 100644 index 0000000..fe81c86 --- /dev/null +++ b/wfenginemgrservice/src/test/java/org/onap/workflow/entity/DeployBpmnFileResponseTest.java @@ -0,0 +1,38 @@ +/** + * Copyright 2017 ZTE Corporation. + * <p> + * 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 + * <p> + * http://www.apache.org/licenses/LICENSE-2.0 + * <p> + * 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.entity; + +import org.junit.Test; + +import static org.hamcrest.CoreMatchers.is; +import static org.junit.Assert.*; + +public class DeployBpmnFileResponseTest { + @Test + public void getStatus() throws Exception { + DeployBpmnFileResponse response = new DeployBpmnFileResponse(); + response.setDeployedId("1"); + response.setMessage("1"); + response.setProcessId("1"); + response.setStatus(1); + + assertThat(response.getDeployedId(), is("1")); + assertThat(response.getMessage(), is("1")); + assertThat(response.getProcessId(), is("1")); + assertThat(response.getStatus(), is(1)); + } + +}
\ No newline at end of file diff --git a/wfenginemgrservice/src/test/java/org/onap/workflow/entity/MsbClientConfigTest.java b/wfenginemgrservice/src/test/java/org/onap/workflow/entity/MsbClientConfigTest.java new file mode 100644 index 0000000..c48a9fb --- /dev/null +++ b/wfenginemgrservice/src/test/java/org/onap/workflow/entity/MsbClientConfigTest.java @@ -0,0 +1,40 @@ +/** + * Copyright 2017 ZTE Corporation. + * <p> + * 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 + * <p> + * http://www.apache.org/licenses/LICENSE-2.0 + * <p> + * 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.entity; + +import org.junit.Test; + +import static org.hamcrest.CoreMatchers.is; +import static org.hamcrest.MatcherAssert.assertThat; + +public class MsbClientConfigTest { + @Test + public void getMsbSvrIp() throws Exception { + MsbClientConfig clientConfig = new MsbClientConfig(); + clientConfig.setMsbSvrIp("127.0.0.1"); + + assertThat(clientConfig.getMsbSvrIp(), is("127.0.0.1")); + } + + @Test + public void getMsbSvrPort() throws Exception { + MsbClientConfig clientConfig = new MsbClientConfig(); + clientConfig.setMsbSvrPort(20); + + assertThat(clientConfig.getMsbSvrPort(), is(20)); + } + +}
\ No newline at end of file diff --git a/wfenginemgrservice/src/test/java/org/onap/workflow/entity/StartProcessRequestTest.java b/wfenginemgrservice/src/test/java/org/onap/workflow/entity/StartProcessRequestTest.java new file mode 100644 index 0000000..5b35e7f --- /dev/null +++ b/wfenginemgrservice/src/test/java/org/onap/workflow/entity/StartProcessRequestTest.java @@ -0,0 +1,41 @@ +/** + * Copyright 2017 ZTE Corporation. + * <p> + * 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 + * <p> + * http://www.apache.org/licenses/LICENSE-2.0 + * <p> + * 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.entity; + +import com.google.common.collect.ImmutableMap; +import org.junit.Test; + +import java.util.Map; + +import static org.hamcrest.core.Is.is; +import static org.junit.Assert.assertThat; + +public class StartProcessRequestTest { + @Test + public void getParams() throws Exception { + StartProcessRequest request = new StartProcessRequest(); + request.setProcessDefinitionKey("1"); + Map<String, String> map = ImmutableMap.<String, String>builder() + .put("1", "1") + .build(); + request.setParams(map); + + assertThat(request.getParams(), is(map)); + assertThat(request.getProcessDefinitionKey(), is("1")); + + } + +}
\ No newline at end of file diff --git a/wfenginemgrservice/src/test/java/org/onap/workflow/externalservice/entity/activitientitiy/ActivitiDeployResponseTest.java b/wfenginemgrservice/src/test/java/org/onap/workflow/externalservice/entity/activitientitiy/ActivitiDeployResponseTest.java new file mode 100644 index 0000000..5627f11 --- /dev/null +++ b/wfenginemgrservice/src/test/java/org/onap/workflow/externalservice/entity/activitientitiy/ActivitiDeployResponseTest.java @@ -0,0 +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.externalservice.entity.activitientitiy; + + +import org.junit.Assert; +import org.junit.Test; + + +/** + * + */ +public class ActivitiDeployResponseTest { + @Test + public void testMethod() { + ActivitiDeployResponse response = new ActivitiDeployResponse(); + String id = "111id"; + String deploymentTime = "2017-10-11"; + String url = "http://127.0.0.1"; + response.setId(id); + response.setDeploymentTime(deploymentTime); + response.setUrl(url); + Assert.assertEquals(id, response.getId()); + Assert.assertEquals(deploymentTime, response.getDeploymentTime()); + Assert.assertEquals(url, response.getUrl()); + } +} diff --git a/wfenginemgrservice/src/test/java/org/onap/workflow/externalservice/entity/activitientitiy/ActivitiStartProcessRequestParamTest.java b/wfenginemgrservice/src/test/java/org/onap/workflow/externalservice/entity/activitientitiy/ActivitiStartProcessRequestParamTest.java new file mode 100644 index 0000000..a0d82ce --- /dev/null +++ b/wfenginemgrservice/src/test/java/org/onap/workflow/externalservice/entity/activitientitiy/ActivitiStartProcessRequestParamTest.java @@ -0,0 +1,34 @@ +/** + * Copyright 2017 ZTE Corporation. + * <p> + * 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 + * <p> + * http://www.apache.org/licenses/LICENSE-2.0 + * <p> + * 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.entity.activitientitiy; + +import org.junit.Test; + +import static org.hamcrest.CoreMatchers.is; +import static org.hamcrest.MatcherAssert.assertThat; + +public class ActivitiStartProcessRequestParamTest { + + @Test + public void testGetMethod() throws Exception { + ActivitiStartProcessRequestParam param = new ActivitiStartProcessRequestParam(); + param.setName("name"); + param.setValue("value"); + + assertThat(param.getName(), is("name")); + assertThat(param.getValue(), is("value")); + } +}
\ No newline at end of file diff --git a/wfenginemgrservice/src/test/java/org/onap/workflow/externalservice/entity/activitientitiy/ActivitiStartProcessRequestTest.java b/wfenginemgrservice/src/test/java/org/onap/workflow/externalservice/entity/activitientitiy/ActivitiStartProcessRequestTest.java new file mode 100644 index 0000000..13229ea --- /dev/null +++ b/wfenginemgrservice/src/test/java/org/onap/workflow/externalservice/entity/activitientitiy/ActivitiStartProcessRequestTest.java @@ -0,0 +1,38 @@ +/** + * 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.entity.activitientitiy; + +import org.junit.Assert; +import org.junit.Test; + + + +/** + * + */ +public class ActivitiStartProcessRequestTest { + + @Test + public void testMethod() { + ActivitiStartProcessRequestParam[] variables = null; + String processDefinitionKey = "test"; + ActivitiStartProcessRequest request = new ActivitiStartProcessRequest(); + request.setProcessDefinitionKey(processDefinitionKey); + request.setVariables(variables); + Assert.assertEquals(processDefinitionKey, request.getProcessDefinitionKey()); + Assert.assertSame(variables, request.getVariables()); + } +} 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 new file mode 100644 index 0000000..f9dd990 --- /dev/null +++ b/wfenginemgrservice/src/test/java/org/onap/workflow/externalservice/service/activitiservice/ActivitiServiceConsumerTest.java @@ -0,0 +1,153 @@ +/** + * Copyright 2017 ZTE Corporation. + * <p> + * 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 + * <p> + * http://www.apache.org/licenses/LICENSE-2.0 + * <p> + * 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())); + } + +}
\ No newline at end of file diff --git a/wfenginemgrservice/src/test/java/org/onap/workflow/tools/HttpDeleteWithBodyTest.java b/wfenginemgrservice/src/test/java/org/onap/workflow/tools/HttpDeleteWithBodyTest.java new file mode 100644 index 0000000..67cd8c9 --- /dev/null +++ b/wfenginemgrservice/src/test/java/org/onap/workflow/tools/HttpDeleteWithBodyTest.java @@ -0,0 +1,29 @@ +/** + * Copyright 2017 ZTE Corporation. + * <p> + * 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 + * <p> + * http://www.apache.org/licenses/LICENSE-2.0 + * <p> + * 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.tools; + + +import org.junit.Assert; +import org.junit.Test; + + +public class HttpDeleteWithBodyTest { + @Test + public void testHttpDeleteWithBody() { + HttpDeleteWithBody body = new HttpDeleteWithBody(); + Assert.assertEquals(HttpDeleteWithBody.METHOD_NAME, body.getMethod()); + } +} diff --git a/wfenginemgrservice/src/test/java/org/onap/workflow/tools/RequestParametersTest.java b/wfenginemgrservice/src/test/java/org/onap/workflow/tools/RequestParametersTest.java index 782ee84..aeeb3e3 100644 --- a/wfenginemgrservice/src/test/java/org/onap/workflow/tools/RequestParametersTest.java +++ b/wfenginemgrservice/src/test/java/org/onap/workflow/tools/RequestParametersTest.java @@ -1,12 +1,12 @@ /** * Copyright 2017 ZTE Corporation. - * + * <p> * 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 - * + * <p> + * http://www.apache.org/licenses/LICENSE-2.0 + * <p> * 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. @@ -17,13 +17,23 @@ package org.onap.workflow.tools; import org.junit.Test; +import static org.hamcrest.MatcherAssert.assertThat; +import static org.hamcrest.core.Is.is; + /** * */ public class RequestParametersTest { @Test - public void testToString(){ + public void testToString() { + RequestParameters result = new RequestParameters(); + assertThat(result.toString(), is("casCade [casCade=false]")); + } + + @Test + public void testMethod() { RequestParameters result = new RequestParameters(); - result.toString(); + result.setCasCade(true); + assertThat(result.isCasCade(), is(true)); } } |