Release version 2.1.1 and roll versions

[sdnc/northbound.git] / vnfapi / provider / src / test / java / org / onap / sdnc / vnfapi / VnfApiProviderTest.java

diff --git a/vnfapi/provider/src/test/java/org/onap/sdnc/vnfapi/VnfApiProviderTest.java b/vnfapi/provider/src/test/java/org/onap/sdnc/vnfapi/VnfApiProviderTest.java
index 72c244d..458e6d4 100644 (file)
--- a/vnfapi/provider/src/test/java/org/onap/sdnc/vnfapi/VnfApiProviderTest.java
+++ b/vnfapi/provider/src/test/java/org/onap/sdnc/vnfapi/VnfApiProviderTest.java
@@ -21,11 +21,8 @@
 
 package org.onap.sdnc.vnfapi;
 
-import org.junit.Assert;
 import org.junit.Before;
-import org.junit.Test;
 import org.mockito.Mock;
-import org.mockito.Mockito;
 import org.onap.sdnc.vnfapi.util.DataBrokerUtil;
 import org.onap.sdnc.vnfapi.util.PropBuilder;
 import org.onap.sdnc.vnfapi.util.VNFSDNSvcLogicServiceClientMockUtil;
@@ -35,13 +32,6 @@ import org.opendaylight.controller.md.sal.binding.test.AbstractConcurrentDataBro
 import org.opendaylight.controller.sal.binding.api.RpcProviderRegistry;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
-import org.opendaylight.yangtools.yang.common.RpcResult;
-import org.opendaylight.yang.gen.v1.org.onap.sdnctl.vnf.rev150720.VnfInstanceTopologyOperationInput;
-import org.opendaylight.yang.gen.v1.org.onap.sdnctl.vnf.rev150720.VnfInstanceTopologyOperationOutput;
-import org.opendaylight.yang.gen.v1.org.onap.sdnctl.vnf.rev150720.VnfInstanceTopologyOperationInputBuilder;
-import org.opendaylight.yang.gen.v1.org.onap.sdnctl.vnf.rev150720.vnf.instance.request.information.VnfInstanceRequestInformation;
-import org.opendaylight.yang.gen.v1.org.onap.sdnctl.vnf.rev150720.vnf.instance.request.information.VnfInstanceRequestInformationBuilder;
-import java.util.concurrent.Future;
 
 
 public class VnfApiProviderTest extends AbstractConcurrentDataBrokerTest {
@@ -56,7 +46,6 @@ public class VnfApiProviderTest extends AbstractConcurrentDataBrokerTest {
     protected DataBrokerUtil db;
     protected VNFSDNSvcLogicServiceClientMockUtil svcClient;
 
-
     @Before
     public void setUp() throws Exception {
         svcClient = new VNFSDNSvcLogicServiceClientMockUtil(mockVNFSDNSvcLogicServiceClient);
@@ -75,76 +64,7 @@ public class VnfApiProviderTest extends AbstractConcurrentDataBrokerTest {
         }
     }
 
-
     public static PropBuilder prop(){
         return (new PropBuilder());
     }
-
-    @Test
-    public void vnfInstanceTopologyOperationInputIsNull() throws Exception {
-        VnfInstanceTopologyOperationInput input = null;
-        VnfInstanceTopologyOperationOutput result = vnfapiProvider
-                .vnfInstanceTopologyOperation(input)
-                .get()
-                .getResult();
-
-        checkVnfInstanceTopologyOperationOutput(result);
-    }
-
-
-    @Test
-    public void vnfInstanceTopologyOperationInput_VnfInstanceRequestInformationIsNull() throws Exception {
-        VnfInstanceTopologyOperationInputBuilder builder = new VnfInstanceTopologyOperationInputBuilder();
-        builder.setVnfInstanceRequestInformation(null);
-
-        VnfInstanceTopologyOperationInput input = builder.build();
-        VnfInstanceTopologyOperationOutput result = vnfapiProvider
-                .vnfInstanceTopologyOperation(input)
-                .get()
-                .getResult();
-
-        checkVnfInstanceTopologyOperationOutput(result);
-    }
-
-    @Test
-    public void vnfInstanceTopologyOperationInput_getVnfInstanceRequestInformationVnfInstanceIdIsNull() throws Exception {
-        VnfInstanceTopologyOperationInputBuilder builder = new VnfInstanceTopologyOperationInputBuilder();
-        builder.setVnfInstanceRequestInformation(new VnfInstanceRequestInformationBuilder()
-            .setVnfInstanceId(null)
-             .build());
-
-        VnfInstanceTopologyOperationInput input = builder.build();
-        VnfInstanceTopologyOperationOutput result = vnfapiProvider
-                .vnfInstanceTopologyOperation(input)
-                .get()
-                .getResult();
-
-        checkVnfInstanceTopologyOperationOutput(result);
-    }
-
-    @Test
-    public void vnfInstanceTopologyOperationInput_VnfInstanceRequestInformationVnfInstanceIdIsZero() throws Exception {
-        VnfInstanceTopologyOperationInputBuilder builder = new VnfInstanceTopologyOperationInputBuilder();
-        builder.setVnfInstanceRequestInformation(new VnfInstanceRequestInformationBuilder()
-                .setVnfInstanceId("")
-                .build());
-
-        VnfInstanceTopologyOperationInput input = builder.build();
-        VnfInstanceTopologyOperationOutput result = vnfapiProvider
-                .vnfInstanceTopologyOperation(input)
-                .get()
-                .getResult();
-
-        checkVnfInstanceTopologyOperationOutput(result);
-    }
-
-    private void checkVnfInstanceTopologyOperationOutput(VnfInstanceTopologyOperationOutput result) {
-        String expectedResponseCode = "403";
-        String expectedResponseMessage = "invalid input, null or empty vnf-instance-id";
-        String expectedAckFinalIndicator = "Y";
-
-        Assert.assertEquals(result.getResponseCode(), expectedResponseCode );
-        Assert.assertEquals(result.getResponseMessage(), expectedResponseMessage);
-        Assert.assertEquals(result.getAckFinalIndicator(), expectedAckFinalIndicator);
-    }
  }
\ No newline at end of file