From 8f2000d6bdc174964714f6538737beacb6354063 Mon Sep 17 00:00:00 2001 From: Murali-P Date: Tue, 14 Feb 2017 20:10:52 +0530 Subject: Add new UT Test cases Resolved:VNFSDK-21 Function test base code Change-Id: I8cf9d4af86488b47971fc854f926b63230e19371 Signed-off-by: Murali-P --- .../vnfsdk/functest/util/RestResponseUtil.java | 2 +- .../exception/VnfSdkFuncTestExceptionTest.java | 41 +++++++++++++ .../entity/ServiceRegisterEntityTest.java | 17 ++++++ .../openo/vnfsdk/functest/util/TestGsonUtil.java | 40 +++++++++++++ .../org/openo/vnfsdk/functests/FileUtilTest.java | 68 ++++++++++++++++++++++ .../vnfsdk/functests/VnfSdkFuncTestAppTest.java | 18 +++++- 6 files changed, 184 insertions(+), 2 deletions(-) create mode 100644 vnf-sdk-function-test/src/test/java/org/openo/vnfsdk/functest/exception/VnfSdkFuncTestExceptionTest.java create mode 100644 vnf-sdk-function-test/src/test/java/org/openo/vnfsdk/functest/util/TestGsonUtil.java create mode 100644 vnf-sdk-function-test/src/test/java/org/openo/vnfsdk/functests/FileUtilTest.java diff --git a/vnf-sdk-function-test/src/main/java/org/openo/vnfsdk/functest/util/RestResponseUtil.java b/vnf-sdk-function-test/src/main/java/org/openo/vnfsdk/functest/util/RestResponseUtil.java index 6b40ed2..317f957 100644 --- a/vnf-sdk-function-test/src/main/java/org/openo/vnfsdk/functest/util/RestResponseUtil.java +++ b/vnf-sdk-function-test/src/main/java/org/openo/vnfsdk/functest/util/RestResponseUtil.java @@ -35,7 +35,7 @@ public class RestResponseUtil { public static Response getErrorResponse(Object obj) { if(obj != null) { - return Response.status(Response.Status.INTERNAL_SERVER_ERROR).entity(obj).build(); + return Response.status(Response.Status.INTERNAL_SERVER_ERROR).entity(GsonUtil.objectToString(obj)).build(); } else { return Response.serverError().build(); } diff --git a/vnf-sdk-function-test/src/test/java/org/openo/vnfsdk/functest/exception/VnfSdkFuncTestExceptionTest.java b/vnf-sdk-function-test/src/test/java/org/openo/vnfsdk/functest/exception/VnfSdkFuncTestExceptionTest.java new file mode 100644 index 0000000..a54247d --- /dev/null +++ b/vnf-sdk-function-test/src/test/java/org/openo/vnfsdk/functest/exception/VnfSdkFuncTestExceptionTest.java @@ -0,0 +1,41 @@ +/* + * Copyright 2017 Huawei Technologies Co., Ltd. + * + * 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.openo.vnfsdk.functest.exception; + +import org.junit.Before; +import org.junit.Test; + +public class VnfSdkFuncTestExceptionTest { + + private VnfSdkFuncTestException sdkFuncTestException; + + @Before + public void setup() { + sdkFuncTestException = new VnfSdkFuncTestException(); + } + + @Test + public void testSetErrorCode() { + sdkFuncTestException.setErrorCode("1001"); + } + + @Test + public void testSetErrorMsg() { + sdkFuncTestException.setErrorMsg("message"); + + } +} diff --git a/vnf-sdk-function-test/src/test/java/org/openo/vnfsdk/functest/externalservice/entity/ServiceRegisterEntityTest.java b/vnf-sdk-function-test/src/test/java/org/openo/vnfsdk/functest/externalservice/entity/ServiceRegisterEntityTest.java index 17b37a7..3cb5823 100644 --- a/vnf-sdk-function-test/src/test/java/org/openo/vnfsdk/functest/externalservice/entity/ServiceRegisterEntityTest.java +++ b/vnf-sdk-function-test/src/test/java/org/openo/vnfsdk/functest/externalservice/entity/ServiceRegisterEntityTest.java @@ -39,4 +39,21 @@ public class ServiceRegisterEntityTest { } + @Test + public void testSetVersion() { + serviceRegistry.setVersion("5.6"); + + } + + @Test + public void testSetProtocol() { + serviceRegistry.setProtocol("http"); + } + + @Test + public void testSetVisualRange() { + serviceRegistry.setVisualRange("range"); + + } + } diff --git a/vnf-sdk-function-test/src/test/java/org/openo/vnfsdk/functest/util/TestGsonUtil.java b/vnf-sdk-function-test/src/test/java/org/openo/vnfsdk/functest/util/TestGsonUtil.java new file mode 100644 index 0000000..99fa46d --- /dev/null +++ b/vnf-sdk-function-test/src/test/java/org/openo/vnfsdk/functest/util/TestGsonUtil.java @@ -0,0 +1,40 @@ +/* + * Copyright 2017 Huawei Technologies Co., Ltd. + * + * 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.openo.vnfsdk.functest.util; + +import static org.junit.Assert.assertNotNull; +import static org.junit.Assert.assertTrue; + +import org.junit.Test; + +public class TestGsonUtil { + + @Test + public void testGenerateId() { + assertNotNull(GsonUtil.generateId()); + } + + @Test + public void testIsNotEmpty() { + assertTrue(GsonUtil.isNotEmpty("junittestcase")); + } + + @Test + public void testGetNowTime() { + assertNotNull(GsonUtil.getNowTime()); + } +} diff --git a/vnf-sdk-function-test/src/test/java/org/openo/vnfsdk/functests/FileUtilTest.java b/vnf-sdk-function-test/src/test/java/org/openo/vnfsdk/functests/FileUtilTest.java new file mode 100644 index 0000000..2124924 --- /dev/null +++ b/vnf-sdk-function-test/src/test/java/org/openo/vnfsdk/functests/FileUtilTest.java @@ -0,0 +1,68 @@ +/* + * Copyright 2017 Huawei Technologies Co., Ltd. + * + * 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.openo.vnfsdk.functests; + +import static org.junit.Assert.assertNotNull; +import static org.junit.Assert.assertTrue; + +import java.io.File; +import java.io.IOException; +import java.util.ArrayList; + +import org.junit.Test; +import org.openo.vnfsdk.functest.FileUtil; + +public class FileUtilTest { + + private String createDirPath = "C:/Users/Administrator/Desktop/Unzip"; + + private String deleteDirPath = "D:/deletefolder"; + + private String zipFileName = "src/test/resources/RobotScript.zip"; + + private String extractZip = "D:/Test/AA"; + + private String getDirectory = "D:/Test/AA"; + + @Test + public void testCreateDirectory() { + assertTrue(FileUtil.createDirectory(createDirPath)); + } + + @Test + public void testDeleteFile() { + assertTrue(FileUtil.deleteFile(new File(deleteDirPath))); + } + + @Test + public void testUnzip() throws IOException { + ArrayList files = FileUtil.unzip(zipFileName, extractZip); + assertNotNull(files); + } + + @Test + public void testGetDirectory() { + String[] getDirectories = FileUtil.getDirectory(getDirectory); + assertNotNull(getDirectories); + } + + @Test + public void testConvertZipFiletoByteArray() { + byte[] byteArrayFile = FileUtil.convertZipFiletoByteArray(zipFileName); + assertNotNull(byteArrayFile); + } +} diff --git a/vnf-sdk-function-test/src/test/java/org/openo/vnfsdk/functests/VnfSdkFuncTestAppTest.java b/vnf-sdk-function-test/src/test/java/org/openo/vnfsdk/functests/VnfSdkFuncTestAppTest.java index b149812..e4873a1 100644 --- a/vnf-sdk-function-test/src/test/java/org/openo/vnfsdk/functests/VnfSdkFuncTestAppTest.java +++ b/vnf-sdk-function-test/src/test/java/org/openo/vnfsdk/functests/VnfSdkFuncTestAppTest.java @@ -16,10 +16,26 @@ package org.openo.vnfsdk.functests; +import org.junit.Before; +import org.mockito.Mock; import org.openo.vnfsdk.functest.VnfSdkFuncTestApp; +import org.openo.vnfsdk.functest.VnfSdkFuncTestAppConfiguration; + +import io.dropwizard.setup.Environment; public class VnfSdkFuncTestAppTest { - VnfSdkFuncTestApp vnfSdkFuncTestApp; + private VnfSdkFuncTestApp vnfSdkFuncTestApp; + + private Environment environment; + + @Mock + VnfSdkFuncTestAppConfiguration configuartion; + + @Before + public void setup() { + vnfSdkFuncTestApp = new VnfSdkFuncTestApp(); + + } } -- cgit 1.2.3-korg