Add unit test for vfc-nfvo-wfengine

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

13 files changed, 52 insertions, 398 deletions

diff --git a/wfenginemgrservice/src/main/java/org/onap/workflow/common/RestClient.java b/wfenginemgrservice/src/main/java/org/onap/workflow/common/RestClient.java
index f179fe6..2eeb2fc 100644
--- a/wfenginemgrservice/src/main/java/org/onap/workflow/common/RestClient.java
+++ b/wfenginemgrservice/src/main/java/org/onap/workflow/common/RestClient.java
@@ -129,34 +129,6 @@ public class RestClient {
    * @param ip
    * @param port
    * @param url
-   * @return
-   * @throws ClientProtocolException
-   * @throws IOException
-   */
-  public static String get(String ip, int port, String url)
-      throws ClientProtocolException, IOException {
-    return executeHttp(HttpMethod.GET, ip, port, url, null).getResult();
-  }
-
-  /**
-   * 
-   * @param ip
-   * @param port
-   * @param url
-   * @return
-   * @throws ClientProtocolException
-   * @throws IOException
-   */
-  public static RestResponse delete(String ip, int port, String url)
-      throws ClientProtocolException, IOException {
-    return executeHttp(HttpMethod.GET, ip, port, url, null);
-  }
-
-  /**
-   * 
-   * @param ip
-   * @param port
-   * @param url
    * @param requestBody
    * @return
    * @throws ClientProtocolException
diff --git a/wfenginemgrservice/src/main/java/org/onap/workflow/common/ToolUtil.java b/wfenginemgrservice/src/main/java/org/onap/workflow/common/ToolUtil.java
index c148eb3..d24a787 100644
--- a/wfenginemgrservice/src/main/java/org/onap/workflow/common/ToolUtil.java
+++ b/wfenginemgrservice/src/main/java/org/onap/workflow/common/ToolUtil.java
@@ -1,11 +1,11 @@
 /**

- * Copyright (C) 2017 ZTE, Inc. and others. All rights reserved. (ZTE)

+ * 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

+ *     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,

@@ -40,18 +40,6 @@ public class ToolUtil {
     return authHeader;

   }

   

-  public static boolean isEmptyString(String val) {

-    return ((val == null || "".equals(val)) ? true : false);

-  }

-

-  public static boolean isTrimedEmptyString(String val) {

-    return ((val == null || "".equals(val.trim())) ? true : false);

-  }

-

-  public static boolean isTrimedEmptyArray(String[] val) {

-    return ((val == null || val.length == 0) ? true : false);

-  }

-  

   /**

    * @param ins

    */

diff --git a/wfenginemgrservice/src/main/java/org/onap/workflow/externalservice/service/activitiservice/ActivitiServiceConsumer.java b/wfenginemgrservice/src/main/java/org/onap/workflow/externalservice/service/activitiservice/ActivitiServiceConsumer.java
index 017cf35..593f382 100644
--- a/wfenginemgrservice/src/main/java/org/onap/workflow/externalservice/service/activitiservice/ActivitiServiceConsumer.java
+++ b/wfenginemgrservice/src/main/java/org/onap/workflow/externalservice/service/activitiservice/ActivitiServiceConsumer.java
@@ -21,7 +21,6 @@ import java.io.InputStream;
 import javax.ws.rs.core.Response;
 
 import org.apache.http.client.ClientProtocolException;
-import org.glassfish.jersey.client.ClientConfig;
 import org.onap.workflow.common.Config;
 import org.onap.workflow.common.EnumModuleUrl;
 import org.onap.workflow.common.RestClient;
@@ -34,7 +33,6 @@ import org.onap.workflow.tools.Constants;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-import com.eclipsesource.jaxrs.consumer.ConsumerFactory;
 import com.google.gson.Gson;
 
 /**
@@ -47,18 +45,6 @@ public class ActivitiServiceConsumer {
   private static final String DEPLOY_BPMNFILE_URL =
       EnumModuleUrl.ACTIVITI.getApiRootDomain() + "/repository/deployments";
 
-  private static IActivitiRestService activitiServiceProxy = null;
-
-  private static IActivitiRestService getActivitiService() {
-    if (activitiServiceProxy == null) {
-      ClientConfig config = new ClientConfig();
-      activitiServiceProxy = ConsumerFactory.createConsumer(
-          EnumModuleUrl.getBaseUrl(EnumModuleUrl.ACTIVITI), config, IActivitiRestService.class);
-
-    }
-    return activitiServiceProxy;
-  }
-
   public static RestResponse undeploybpmnfile(String deploymentId) {
     /*
      * IActivitiRestService activitiProxy = getActivitiService();
diff --git a/wfenginemgrservice/src/test/java/org/onap/workflow/common/RestClientTest.java b/wfenginemgrservice/src/test/java/org/onap/workflow/common/RestClientTest.java
index 27c3ddc..418cff6 100644
--- a/wfenginemgrservice/src/test/java/org/onap/workflow/common/RestClientTest.java
+++ b/wfenginemgrservice/src/test/java/org/onap/workflow/common/RestClientTest.java
@@ -24,13 +24,10 @@ import org.apache.http.client.methods.CloseableHttpResponse;
 import org.apache.http.impl.client.CloseableHttpClient;
 import org.apache.http.impl.client.HttpClients;
 import org.junit.After;
-import org.junit.AfterClass;
 import org.junit.Before;
-import org.junit.BeforeClass;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.mockito.Mockito;
-import org.onap.workflow.common.RestClient;
 import org.onap.workflow.common.RestClient.HttpMethod;
 import org.onap.workflow.externalservice.entity.activitientitiy.ActivitiStartProcessRequest;
 import org.powermock.api.mockito.PowerMockito;
@@ -52,6 +49,7 @@ public class RestClientTest {
   @After
   public void tearDown() throws Exception {}
 
+  @SuppressWarnings("static-access")
   @Test
   public final void testExecuteHttp() throws Exception {
     HttpEntity httpEntity = mock(HttpEntity.class);
@@ -67,6 +65,7 @@ public class RestClientTest {
     restClient.executeHttp(HttpMethod.POST, "127.0.0.1", 80, "test", httpEntity);
   }
 
+  @SuppressWarnings("static-access")
   @Test
   public final void testExecuteHttpDeleteDeploy() throws Exception {
     HttpEntity httpEntity = mock(HttpEntity.class);
@@ -80,6 +79,7 @@ public class RestClientTest {
     restClient.executeHttpDeleteDeploy(HttpMethod.DELETE, "127.0.0.1", 80, "test");
   }
 
+  @SuppressWarnings("static-access")
   @Test
   public final void testExecuteHttpStartIntance() throws Exception {
 
diff --git a/wfenginemgrservice/src/test/java/org/onap/workflow/resources/RestResponseTest.java b/wfenginemgrservice/src/test/java/org/onap/workflow/common/ToolUtilTest.java
index 18ee21a..2c6e175 100644
--- a/wfenginemgrservice/src/test/java/org/onap/workflow/resources/RestResponseTest.java
+++ b/wfenginemgrservice/src/test/java/org/onap/workflow/common/ToolUtilTest.java
@@ -13,31 +13,21 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
+package org.onap.workflow.common;
 
-package org.onap.workflow.resources;
 
-import static org.junit.Assert.*;
-
-import org.junit.After;
-import org.junit.AfterClass;
-import org.junit.Before;
-import org.junit.BeforeClass;
+import org.junit.Assert;
 import org.junit.Test;
 
-public class RestResponseTest {
-
-  @BeforeClass
-  public static void setUpBeforeClass() throws Exception {}
-
-  @AfterClass
-  public static void tearDownAfterClass() throws Exception {}
-
-  @Before
-  public void setUp() throws Exception {}
-
-  @After
-  public void tearDown() throws Exception {}
-
-
-
+/**
+ * @author 10175158
+ *
+ */
+public class ToolUtilTest {
+  @Test
+  public void testgetHeader() {
+    String actual = "Basic a2VybWl0Omtlcm1pdA==";
+    Assert.assertEquals(actual, ToolUtil.getHeader());
+  }
 }
+
diff --git a/wfenginemgrservice/src/test/java/org/onap/workflow/resources/ActivitiServiceConsumerTest.java b/wfenginemgrservice/src/test/java/org/onap/workflow/resources/ActivitiServiceConsumerTest.java
deleted file mode 100644
index e2d91f4..0000000
--- a/wfenginemgrservice/src/test/java/org/onap/workflow/resources/ActivitiServiceConsumerTest.java
+++ /dev/null
@@ -1,59 +0,0 @@
-/**
- * Copyright 2017 ZTE Corporation.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.onap.workflow.resources;
-
-import org.junit.After;
-import org.junit.AfterClass;
-import org.junit.Before;
-import org.junit.BeforeClass;
-import org.junit.Test;
-
-public class ActivitiServiceConsumerTest {
-
-  @BeforeClass
-  public static void setUpBeforeClass() throws Exception {}
-
-  @AfterClass
-  public static void tearDownAfterClass() throws Exception {}
-
-  @Before
-  public void setUp() throws Exception {}
-
-  @After
-  public void tearDown() throws Exception {}
-
-  @Test
-  public void testUndeploybpmnfile() {
-  }
-
-  @Test
-  public void testStartBpmnProcess() {
-  }
-
-  @Test
-  public void testDeleteDeployProcess() {
-  }
-
-  @Test
-  public void testStartProcess() {
-  }
-
-  @Test
-  public void testDeploybpmnfile() {
-  }
-
-}
diff --git a/wfenginemgrservice/src/test/java/org/onap/workflow/resources/EnumModuleUrlTest.java b/wfenginemgrservice/src/test/java/org/onap/workflow/resources/EnumModuleUrlTest.java
deleted file mode 100644
index 837a8bf..0000000
--- a/wfenginemgrservice/src/test/java/org/onap/workflow/resources/EnumModuleUrlTest.java
+++ /dev/null
@@ -1,55 +0,0 @@
-/**
- * Copyright 2017 ZTE Corporation.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.onap.workflow.resources;
-
-import org.junit.After;
-import org.junit.AfterClass;
-import org.junit.Before;
-import org.junit.BeforeClass;
-import org.junit.Test;
-import org.onap.workflow.common.EnumModuleUrl;
-
-public class EnumModuleUrlTest {
-
-
-  private EnumModuleUrl enumModuleUrl;
-
-  @BeforeClass
-  public static void setUpBeforeClass() throws Exception {}
-
-  @AfterClass
-  public static void tearDownAfterClass() throws Exception {}
-
-  @Before
-  public void setUp() throws Exception {
-  }
-
-  @After
-  public void tearDown() throws Exception {}
-
-  @Test
-  public final void testGetApiRootDomain() {
-   // enumModuleUrl.getApiRootDomain();
-
-  }
-
-  @Test
-  public final void testGetBaseUrl() {
-  //  enumModuleUrl.getApiRootDomain();
-  }
-
-}
diff --git a/wfenginemgrservice/src/test/java/org/onap/workflow/resources/RestClientTest.java b/wfenginemgrservice/src/test/java/org/onap/workflow/resources/RestClientTest.java
index 81d63d5..40f5793 100644
--- a/wfenginemgrservice/src/test/java/org/onap/workflow/resources/RestClientTest.java
+++ b/wfenginemgrservice/src/test/java/org/onap/workflow/resources/RestClientTest.java
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package org.onap.workflow.resources;
 
 import static org.powermock.api.mockito.PowerMockito.mock;
@@ -60,6 +59,7 @@ public class RestClientTest {
   @After
   public void tearDown() throws Exception {}
 
+  @SuppressWarnings("static-access")
   @Test
   public final void testExecuteHttp() throws Exception {
     HttpEntity httpEntity = mock(HttpEntity.class);
@@ -73,6 +73,7 @@ public class RestClientTest {
     restClient.executeHttp(HttpMethod.POST, "127.0.0.1", 80, "test", httpEntity);
   }
 
+  @SuppressWarnings("static-access")
   @Test
   public final void testExecuteHttpDeleteDeploy() throws Exception {
     HttpEntity httpEntity = mock(HttpEntity.class);
@@ -86,6 +87,7 @@ public class RestClientTest {
     restClient.executeHttpDeleteDeploy(HttpMethod.DELETE, "127.0.0.1", 80, "test");
   }
 
+  @SuppressWarnings("static-access")
   @Test
   public final void testExecuteHttpStartIntance() throws Exception {
 
diff --git a/wfenginemgrservice/src/test/java/org/onap/workflow/resources/ToolUtilTest.java b/wfenginemgrservice/src/test/java/org/onap/workflow/resources/ToolUtilTest.java
index bdc11c1..c479085 100644
--- a/wfenginemgrservice/src/test/java/org/onap/workflow/resources/ToolUtilTest.java
+++ b/wfenginemgrservice/src/test/java/org/onap/workflow/resources/ToolUtilTest.java
@@ -1,5 +1,5 @@
 /**
- * Copyright 2016-2017 ZTE Corporation.
+ * 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,17 +13,11 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
- 
 package org.onap.workflow.resources;
 
-import static org.junit.Assert.assertTrue;
 
-import org.junit.After;
-import org.junit.AfterClass;
-import org.junit.Before;
-import org.junit.BeforeClass;
+import org.junit.Assert;
 import org.junit.Test;
-import org.mockito.InjectMocks;
 import org.onap.workflow.activitiext.common.ToolUtil;
 
 /**
@@ -31,38 +25,26 @@ import org.onap.workflow.activitiext.common.ToolUtil;
  *
  */
 public class ToolUtilTest {
+  @Test
+  public void testIsEmptyString() {
+    Assert.assertEquals(true, ToolUtil.isEmptyString(null));
+    Assert.assertEquals(true, ToolUtil.isEmptyString(""));
+    Assert.assertEquals(false, ToolUtil.isEmptyString("test"));
+  }
 
-  @InjectMocks
-  private ToolUtil toolUtil;
-
-  /**
-   * @throws java.lang.Exception
-   */
-  @BeforeClass
-  public static void setUpBeforeClass() throws Exception {}
-
-  /**
-   * @throws java.lang.Exception
-   */
-  @AfterClass
-  public static void tearDownAfterClass() throws Exception {}
-
-  /**
-   * @throws java.lang.Exception
-   */
-  @Before
-  public void setUp() throws Exception {}
-
-  /**
-   * @throws java.lang.Exception
-   */
-  @After
-  public void tearDown() throws Exception {}
-
-  @SuppressWarnings("static-access")
   @Test
-  public void test() {
-    toolUtil.isEmptyString(null);
+  public void testisTrimedEmptyString() {
+    Assert.assertEquals(true, ToolUtil.isTrimedEmptyString(null));
+    Assert.assertEquals(true, ToolUtil.isTrimedEmptyString(""));
+    Assert.assertEquals(false, ToolUtil.isTrimedEmptyString("test"));
   }
 
+  @Test
+  public void testisTrimedEmptyArray() {
+    String[] originArray = new String[1];
+    originArray[0] = "122";
+    Assert.assertEquals(true, ToolUtil.isTrimedEmptyArray(null));
+    Assert.assertEquals(true, ToolUtil.isTrimedEmptyArray(new String[0]));
+    Assert.assertEquals(false, ToolUtil.isTrimedEmptyArray(originArray));
+  }
 }
diff --git a/wfenginemgrservice/src/test/java/org/onap/workflow/resources/WorkflowAppConfigTest.java b/wfenginemgrservice/src/test/java/org/onap/workflow/resources/WorkflowAppConfigTest.java
deleted file mode 100644
index 4a523d9..0000000
--- a/wfenginemgrservice/src/test/java/org/onap/workflow/resources/WorkflowAppConfigTest.java
+++ /dev/null
@@ -1,57 +0,0 @@
-/**
- * Copyright 2017 ZTE Corporation.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.onap.workflow.resources;
-
-import org.junit.After;
-import org.junit.AfterClass;
-import org.junit.Before;
-import org.junit.BeforeClass;
-import org.junit.Test;
-import org.onap.workflow.entity.MsbClientConfig;
-
-public class WorkflowAppConfigTest {
-
-  private MsbClientConfig msbClientConfig;
-
-  @BeforeClass
-  public static void setUpBeforeClass() throws Exception {}
-
-  @AfterClass
-  public static void tearDownAfterClass() throws Exception {}
-
-  @Before
-  public void setUp() throws Exception {
-    msbClientConfig = new MsbClientConfig();
-  }
-
-  @After
-  public void tearDown() throws Exception {}
-
-  @Test
-  public final void testGetMsbClientConfig() {
-    msbClientConfig.getMsbSvrIp();
-    // assertTrue("true", 1 == 1);
-  }
-
-
-  @Test
-  public final void testSetMsbClientConfig() {
-    msbClientConfig.setMsbSvrIp("127.0.0.1");
-    // assertTrue("true", 1 == 1);
-  }
-
-}
diff --git a/wfenginemgrservice/src/test/java/org/onap/workflow/resources/WorkflowAppTest.java b/wfenginemgrservice/src/test/java/org/onap/workflow/resources/WorkflowAppTest.java
deleted file mode 100644
index 56c5dc6..0000000
--- a/wfenginemgrservice/src/test/java/org/onap/workflow/resources/WorkflowAppTest.java
+++ /dev/null
@@ -1,72 +0,0 @@
-/**
- * Copyright 2017 ZTE Corporation.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.onap.workflow.resources;
-
-import static org.powermock.api.mockito.PowerMockito.mock;
-
-import org.junit.After;
-import org.junit.AfterClass;
-import org.junit.Before;
-import org.junit.BeforeClass;
-import org.junit.Test;
-import org.onap.workflow.WorkflowApp;
-import org.onap.workflow.WorkflowAppConfig;
-
-import io.dropwizard.setup.Environment;
-
-public class WorkflowAppTest {
-
-  @BeforeClass
-  public static void setUpBeforeClass() throws Exception {}
-
-  @AfterClass
-  public static void tearDownAfterClass() throws Exception {}
-
-  private WorkflowApp workflowApp;
-  private WorkflowAppConfig workflowAppConfig;
-  private Environment environment;
-
-  @Before
-  public void setUp() throws Exception {
-    workflowAppConfig = mock(WorkflowAppConfig.class);
-    environment = mock(Environment.class);
-    workflowApp = mock(WorkflowApp.class);
-  }
-
-  @After
-  public void tearDown() throws Exception {}
-
-  @Test
-  public void testMain() {
-
-  }
-
-  @Test
-  public void testGetName() {
-    workflowApp.getName();
-  }
-
-  @Test
-  public void testRunWorkflowAppConfigEnvironment() {
-    try {
-      workflowApp.run(workflowAppConfig, environment);
-    } catch (Exception e) {
-
-    }
-  }
-
-}
diff --git a/wfenginemgrservice/src/test/java/org/onap/workflow/resources/WorkflowInstanceWrapperTest.java b/wfenginemgrservice/src/test/java/org/onap/workflow/resources/WorkflowInstanceWrapperTest.java
index 205785b..0d08427 100644
--- a/wfenginemgrservice/src/test/java/org/onap/workflow/resources/WorkflowInstanceWrapperTest.java
+++ b/wfenginemgrservice/src/test/java/org/onap/workflow/resources/WorkflowInstanceWrapperTest.java
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package org.onap.workflow.resources;
 
 import static org.powermock.api.mockito.PowerMockito.mock;
@@ -59,13 +58,8 @@ public class WorkflowInstanceWrapperTest {
   public void tearDown() throws Exception {}
 
   @Test
-  public final void testGetInstance() {
-    // fail("Not yet implemented"); // TODO
-  }
-
-  @Test
   public final void testDeployBpmnFile() throws Exception {
-    
+
     InputStream fileInputStream = mock(InputStream.class);
     FormDataContentDisposition f = mock(FormDataContentDisposition.class);
     String filename = "test";
@@ -80,8 +74,8 @@ public class WorkflowInstanceWrapperTest {
   }
 
   @Test
-  public final void testUndeployBpmnFile() {
-
+  public final void testUndeployBpmnFile() throws Exception {
+    WorkflowInstanceWrapper.getInstance().undeployBpmnFile(null);
   }
 
   @Test
diff --git a/wfenginemgrservice/src/test/java/org/onap/workflow/resources/RestClientUtilsTest.java b/wfenginemgrservice/src/test/java/org/onap/workflow/tools/RequestParametersTest.java
index f79df4a..782ee84 100644
--- a/wfenginemgrservice/src/test/java/org/onap/workflow/resources/RestClientUtilsTest.java
+++ b/wfenginemgrservice/src/test/java/org/onap/workflow/tools/RequestParametersTest.java
@@ -13,34 +13,17 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
+package org.onap.workflow.tools;
 
-package org.onap.workflow.resources;
-
-import static org.junit.Assert.*;
-
-import org.junit.After;
-import org.junit.AfterClass;
-import org.junit.Before;
-import org.junit.BeforeClass;
 import org.junit.Test;
 
-public class RestClientUtilsTest {
-
-  @BeforeClass
-  public static void setUpBeforeClass() throws Exception {}
-
-  @AfterClass
-  public static void tearDownAfterClass() throws Exception {}
-
-  @Before
-  public void setUp() throws Exception {}
-
-  @After
-  public void tearDown() throws Exception {}
-
+/**
+ *
+ */
+public class RequestParametersTest {
   @Test
-  public void testBuildMultipartRequest() {
-    //fail("Not yet implemented");
+  public void testToString(){
+    RequestParameters result = new RequestParameters();
+    result.toString();
   }
-
 }