X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?p=controller.git;a=blobdiff_plain;f=opendaylight%2Fmd-sal%2Fsal-rest-connector%2Fsrc%2Ftest%2Fjava%2Forg%2Fopendaylight%2Fcontroller%2Fsal%2Frestconf%2Fimpl%2Ftest%2FInvokeRpcMethodTest.java;h=731d6a2bc8e466813796643cdea0e762141cd978;hp=5b3da47c62e6d9e2fde6f8683f5ea16f9c9807e2;hb=f9a9cd1ea40d2477ccb16b03c71a87595226595a;hpb=d7d67c58c7aacbb320f6d3d43918f80ccc2808d1

diff --git a/opendaylight/md-sal/sal-rest-connector/src/test/java/org/opendaylight/controller/sal/restconf/impl/test/InvokeRpcMethodTest.java b/opendaylight/md-sal/sal-rest-connector/src/test/java/org/opendaylight/controller/sal/restconf/impl/test/InvokeRpcMethodTest.java
index 5b3da47c62..731d6a2bc8 100644
--- a/opendaylight/md-sal/sal-rest-connector/src/test/java/org/opendaylight/controller/sal/restconf/impl/test/InvokeRpcMethodTest.java
+++ b/opendaylight/md-sal/sal-rest-connector/src/test/java/org/opendaylight/controller/sal/restconf/impl/test/InvokeRpcMethodTest.java
@@ -22,7 +22,6 @@ import static org.mockito.Mockito.when;
 import com.google.common.base.Optional;
 import com.google.common.util.concurrent.CheckedFuture;
 import com.google.common.util.concurrent.Futures;
-import com.google.common.util.concurrent.ListenableFuture;
 import java.io.FileNotFoundException;
 import java.net.URI;
 import java.net.URISyntaxException;
@@ -38,12 +37,10 @@ import org.junit.Before;
 import org.junit.BeforeClass;
 import org.junit.Ignore;
 import org.junit.Test;
-import org.opendaylight.controller.md.sal.dom.api.DOMMountPoint;
 import org.opendaylight.controller.md.sal.dom.api.DOMRpcException;
 import org.opendaylight.controller.md.sal.dom.api.DOMRpcImplementationNotAvailableException;
 import org.opendaylight.controller.md.sal.dom.api.DOMRpcResult;
 import org.opendaylight.controller.md.sal.dom.spi.DefaultDOMRpcResult;
-import org.opendaylight.controller.sal.core.api.RpcProvisionRegistry;
 import org.opendaylight.controller.sal.restconf.impl.BrokerFacade;
 import org.opendaylight.controller.sal.restconf.impl.ControllerContext;
 import org.opendaylight.controller.sal.restconf.impl.InstanceIdentifierContext;
@@ -55,9 +52,7 @@ import org.opendaylight.controller.sal.restconf.impl.RestconfError.ErrorType;
 import org.opendaylight.controller.sal.restconf.impl.RestconfImpl;
 import org.opendaylight.yangtools.yang.common.QName;
 import org.opendaylight.yangtools.yang.common.RpcError;
-import org.opendaylight.yangtools.yang.common.RpcResult;
 import org.opendaylight.yangtools.yang.common.RpcResultBuilder;
-import org.opendaylight.yangtools.yang.data.api.CompositeNode;
 import org.opendaylight.yangtools.yang.data.api.YangInstanceIdentifier.NodeIdentifier;
 import org.opendaylight.yangtools.yang.data.api.schema.ContainerNode;
 import org.opendaylight.yangtools.yang.data.api.schema.LeafNode;
@@ -162,7 +157,7 @@ public class InvokeRpcMethodTest {
         contNode.withChild(lfNode);
         container.withChild(contNode.build());
 
-        return new NormalizedNodeContext(new InstanceIdentifierContext(null, rpcInputSchemaNode, null, schema), container.build());
+        return new NormalizedNodeContext(new InstanceIdentifierContext<>(null, rpcInputSchemaNode, null, schema), container.build());
     }
 
     @Test
@@ -315,7 +310,7 @@ public class InvokeRpcMethodTest {
         final DataContainerNodeAttrBuilder<NodeIdentifier, ContainerNode> containerBuilder =
                 Builders.containerBuilder(rpcInputSchemaNode);
 
-        final NormalizedNodeContext payload = new NormalizedNodeContext(new InstanceIdentifierContext(null, rpcInputSchemaNode,
+        final NormalizedNodeContext payload = new NormalizedNodeContext(new InstanceIdentifierContext<>(null, rpcInputSchemaNode,
                 null, schemaContext), containerBuilder.build());
 
         final BrokerFacade brokerFacade = mock(BrokerFacade.class);
@@ -399,48 +394,5 @@ public class InvokeRpcMethodTest {
     @Test
     @Ignore // FIXME find how to use mockito for it
     public void testMountedRpcCallNoPayload_Success() throws Exception {
-        final RpcResult<CompositeNode> rpcResult = RpcResultBuilder.<CompositeNode>success().build();
-
-        final ListenableFuture<RpcResult<CompositeNode>> mockListener = mock(ListenableFuture.class);
-        when(mockListener.get()).thenReturn(rpcResult);
-
-        final QName cancelToastQName = QName.create("namespace", "2014-05-28", "cancelToast");
-
-        final RpcDefinition mockRpc = mock(RpcDefinition.class);
-        when(mockRpc.getQName()).thenReturn(cancelToastQName);
-
-        final DOMMountPoint mockMountPoint = mock(DOMMountPoint.class);
-        final RpcProvisionRegistry mockedRpcProvisionRegistry = mock(RpcProvisionRegistry.class);
-        when(mockedRpcProvisionRegistry.invokeRpc(eq(cancelToastQName), any(CompositeNode.class))).thenReturn(mockListener);
-        when(mockMountPoint.getService(eq(RpcProvisionRegistry.class))).thenReturn(Optional.of(mockedRpcProvisionRegistry));
-        when(mockMountPoint.getSchemaContext()).thenReturn(TestUtils.loadSchemaContext("/invoke-rpc"));
-
-        final InstanceIdentifierContext mockedInstanceId = mock(InstanceIdentifierContext.class);
-        when(mockedInstanceId.getMountPoint()).thenReturn(mockMountPoint);
-
-        final ControllerContext mockedContext = mock(ControllerContext.class);
-        final String rpcNoop = "invoke-rpc-module:rpc-noop";
-        when(mockedContext.urlPathArgDecode(rpcNoop)).thenReturn(rpcNoop);
-        when(mockedContext.getRpcDefinition(rpcNoop)).thenReturn(mockRpc);
-        when(
-                mockedContext.toMountPointIdentifier(eq("opendaylight-inventory:nodes/node/"
-                        + "REMOTE_HOST/yang-ext:mount/invoke-rpc-module:rpc-noop"))).thenReturn(mockedInstanceId);
-
-        restconfImpl.setControllerContext(mockedContext);
-        try {
-            restconfImpl.invokeRpc(
-                    "opendaylight-inventory:nodes/node/REMOTE_HOST/yang-ext:mount/invoke-rpc-module:rpc-noop", "",
-                    uriInfo);
-            fail("RestconfDocumentedException wasn't raised");
-        } catch (final RestconfDocumentedException e) {
-            final List<RestconfError> errors = e.getErrors();
-            assertNotNull(errors);
-            assertEquals(1, errors.size());
-            assertEquals(ErrorType.APPLICATION, errors.iterator().next().getErrorType());
-            assertEquals(ErrorTag.OPERATION_FAILED, errors.iterator().next().getErrorTag());
-        }
-
-        // additional validation in the fact that the restconfImpl does not
-        // throw an exception.
     }
 }