Improve UT for SO

Improve UT for SO by adding exception cases.

Change-Id: I81f1be245e92f8bdac67a3e08cedbdde3a7ca166
Issue-ID: SO-369
Signed-off-by: subhash kumar singh <subhash.kumar.singh@huawei.com>

diff --git a/adapters/mso-vnf-adapter/src/test/java/org/openecomp/mso/adapters/vnf/MsoVnfCloudifyAdapterImplTest.java b/adapters/mso-vnf-adapter/src/test/java/org/openecomp/mso/adapters/vnf/MsoVnfCloudifyAdapterImplTest.java
index a773d13..98c40a4 100644 (file)
--- a/adapters/mso-vnf-adapter/src/test/java/org/openecomp/mso/adapters/vnf/MsoVnfCloudifyAdapterImplTest.java
+++ b/adapters/mso-vnf-adapter/src/test/java/org/openecomp/mso/adapters/vnf/MsoVnfCloudifyAdapterImplTest.java
@@ -3,6 +3,7 @@
  * ONAP - SO\r
  * ================================================================================\r
  * Copyright (C) 2018 AT&T Intellectual Property. All rights reserved.\r
+ * Copyright (C) 2018 Huawei Intellectual Property. All rights reserved.\r
  * ================================================================================\r
  * Licensed under the Apache License, Version 2.0 (the "License");\r
  * you may not use this file except in compliance with the License.\r
@@ -20,16 +21,77 @@
 \r
 package org.openecomp.mso.adapters.vnf;\r
 \r
-import java.util.HashMap;\r
-import java.util.Map;\r
-import javax.xml.ws.Holder;\r
 import org.junit.Test;\r
-import org.openecomp.mso.adapters.vnf.MsoVnfCloudifyAdapterImpl;\r
+import org.openecomp.mso.adapters.vnf.exceptions.VnfException;\r
 import org.openecomp.mso.entity.MsoRequest;\r
 import org.openecomp.mso.openstack.beans.VnfRollback;\r
+import org.openecomp.mso.properties.MsoPropertiesException;\r
+\r
+import javax.xml.ws.Holder;\r
+import java.util.HashMap;\r
+import java.util.Map;\r
 \r
 public class MsoVnfCloudifyAdapterImplTest {\r
 \r
+       @Test(expected = NullPointerException.class)\r
+    public void queryVnfNullPointerExceptionTest() throws Exception {\r
+        MsoVnfCloudifyAdapterImpl instance = new MsoVnfCloudifyAdapterImpl();\r
+        MsoRequest msoRequest = new MsoRequest();\r
+        msoRequest.setRequestId("12345");\r
+        msoRequest.setServiceInstanceId("12345");\r
+\r
+        instance.queryVnf("siteid", "1234", "vfname",\r
+                msoRequest, new Holder<>(), new Holder<>(), new Holder<>(),\r
+                new Holder<>());\r
+    }\r
+\r
+       @Test(expected = VnfException.class)\r
+    public void deleteVnfVnfExceptionTest() throws Exception {\r
+        MsoVnfCloudifyAdapterImpl instance = new MsoVnfCloudifyAdapterImpl();\r
+        MsoRequest msoRequest = new MsoRequest();\r
+        msoRequest.setRequestId("12345");\r
+        msoRequest.setServiceInstanceId("12345");\r
+\r
+        instance.deleteVnf("12344", "234", "vnfname", msoRequest);\r
+\r
+    }\r
+\r
+       @Test\r
+       public void rollbackVnf() throws Exception {\r
+               MsoVnfCloudifyAdapterImpl instance = new MsoVnfCloudifyAdapterImpl();\r
+               MsoRequest msoRequest = new MsoRequest();\r
+               msoRequest.setRequestId("12345");\r
+               msoRequest.setServiceInstanceId("12345");\r
+\r
+        VnfRollback vnfRollback = new VnfRollback();\r
+        vnfRollback.setModelCustomizationUuid("1234");\r
+        vnfRollback.setVfModuleStackId("2134");\r
+        vnfRollback.setVnfId("123");\r
+        vnfRollback.setModelCustomizationUuid("1234");\r
+\r
+        instance.rollbackVnf(vnfRollback);\r
+       }\r
+\r
+       @Test(expected = VnfException.class)\r
+       public void createVfModuleVnfException() throws Exception {\r
+               MsoVnfCloudifyAdapterImpl instance = new MsoVnfCloudifyAdapterImpl();\r
+               MsoRequest msoRequest = new MsoRequest();\r
+               msoRequest.setRequestId("12345");\r
+               msoRequest.setServiceInstanceId("12345");\r
+\r
+               instance.createVfModule("123", "123", "vf", "v1", "module-005", "create", "3245", "234", "123", new HashMap<>(), true, true, msoRequest, new Holder<>(), new Holder<>(), new Holder<>());\r
+       }\r
+\r
+       @Test(expected = VnfException.class)\r
+       public void updateVfModuleVnfException() throws Exception {\r
+               MsoVnfCloudifyAdapterImpl instance = new MsoVnfCloudifyAdapterImpl();\r
+               MsoRequest msoRequest = new MsoRequest();\r
+               msoRequest.setRequestId("12345");\r
+               msoRequest.setServiceInstanceId("12345");\r
+\r
+               instance.updateVfModule("123", "1234", "fw", "v2", "vnf1", "create", "123", "12", "233", "234", new HashMap<>(), msoRequest, new Holder<>(), new Holder<>());\r
+       }\r
+\r
        @Test\r
        public void healthCheckVNFTest() {\r
                MsoVnfCloudifyAdapterImpl instance = new MsoVnfCloudifyAdapterImpl();\r