X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?a=blobdiff_plain;f=restconf%2Fsal-rest-connector%2Fsrc%2Ftest%2Fjava%2Forg%2Fopendaylight%2Fcontroller%2Fsal%2Frestconf%2Fimpl%2Ftest%2FInvokeRpcMethodTest.java;h=ec0a666fb4e01f5fc9a1cb53ced222275de2ed23;hb=56502011b5105fee20ce11ca743b4a79316ed594;hp=fea433254a89b8e255cda6eb6b5656daeafa54b1;hpb=8f381a390a956759a6cfeede40f13e3e2825bbdd;p=netconf.git diff --git a/restconf/sal-rest-connector/src/test/java/org/opendaylight/controller/sal/restconf/impl/test/InvokeRpcMethodTest.java b/restconf/sal-rest-connector/src/test/java/org/opendaylight/controller/sal/restconf/impl/test/InvokeRpcMethodTest.java index fea433254a..ec0a666fb4 100644 --- a/restconf/sal-rest-connector/src/test/java/org/opendaylight/controller/sal/restconf/impl/test/InvokeRpcMethodTest.java +++ b/restconf/sal-rest-connector/src/test/java/org/opendaylight/controller/sal/restconf/impl/test/InvokeRpcMethodTest.java @@ -126,7 +126,7 @@ public class InvokeRpcMethodTest { } - private NormalizedNodeContext prepareDomPayload() { + private static NormalizedNodeContext prepareDomPayload() { final SchemaContext schema = controllerContext.getGlobalSchema(); final Module rpcModule = schema.findModuleByName("invoke-rpc-module", null); assertNotNull(rpcModule); @@ -142,21 +142,25 @@ public class InvokeRpcMethodTest { } assertNotNull(rpcInputSchemaNode); - final DataContainerNodeAttrBuilder container = Builders.containerBuilder(rpcInputSchemaNode); + final DataContainerNodeAttrBuilder container = + Builders.containerBuilder(rpcInputSchemaNode); final QName contQName = QName.create(rpcModule.getQNameModule(), "cont"); final DataSchemaNode contSchemaNode = rpcInputSchemaNode.getDataChildByName(contQName); assertTrue(contSchemaNode instanceof ContainerSchemaNode); - final DataContainerNodeAttrBuilder contNode = Builders.containerBuilder((ContainerSchemaNode) contSchemaNode); + final DataContainerNodeAttrBuilder contNode = + Builders.containerBuilder((ContainerSchemaNode) contSchemaNode); final QName lfQName = QName.create(rpcModule.getQNameModule(), "lf"); final DataSchemaNode lfSchemaNode = ((ContainerSchemaNode) contSchemaNode).getDataChildByName(lfQName); assertTrue(lfSchemaNode instanceof LeafSchemaNode); - final LeafNode lfNode = (Builders.leafBuilder((LeafSchemaNode) lfSchemaNode).withValue("any value")).build(); + final LeafNode lfNode = + (Builders.leafBuilder((LeafSchemaNode) lfSchemaNode).withValue("any value")).build(); 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 @@ -178,16 +182,16 @@ public class InvokeRpcMethodTest { fail("Expected an exception to be thrown."); } catch (final RestconfDocumentedException e) { verifyRestconfDocumentedException(e, 0, ErrorType.APPLICATION, ErrorTag.OPERATION_NOT_SUPPORTED, - Optional. absent(), Optional. absent()); + Optional.absent(), Optional.absent()); } } - void verifyRestconfDocumentedException(final RestconfDocumentedException e, final int index, + void verifyRestconfDocumentedException(final RestconfDocumentedException restDocumentedException, final int index, final ErrorType expErrorType, final ErrorTag expErrorTag, final Optional expErrorMsg, final Optional expAppTag) { RestconfError actual = null; try { - actual = e.getErrors().get(index); + actual = restDocumentedException.getErrors().get(index); } catch (final ArrayIndexOutOfBoundsException ex) { fail("RestconfError not found at index " + index); } @@ -208,9 +212,9 @@ public class InvokeRpcMethodTest { @Test public void testInvokeRpcWithNoPayloadRpc_FailWithRpcError() { final List rpcErrors = Arrays.asList( - RpcResultBuilder.newError( RpcError.ErrorType.TRANSPORT, "bogusTag", "foo" ), - RpcResultBuilder.newWarning( RpcError.ErrorType.RPC, "in-use", "bar", - "app-tag", null, null ) ); + RpcResultBuilder.newError(RpcError.ErrorType.TRANSPORT, "bogusTag", "foo"), + RpcResultBuilder.newWarning(RpcError.ErrorType.RPC, "in-use", "bar", + "app-tag", null, null)); final DOMRpcResult resutl = new DefaultDOMRpcResult(rpcErrors); final CheckedFuture future = Futures.immediateCheckedFuture(resutl); @@ -228,7 +232,7 @@ public class InvokeRpcMethodTest { fail("Expected an exception to be thrown."); } catch (final RestconfDocumentedException e) { verifyRestconfDocumentedException(e, 0, ErrorType.TRANSPORT, ErrorTag.OPERATION_FAILED, Optional.of("foo"), - Optional. absent()); + Optional.absent()); verifyRestconfDocumentedException(e, 1, ErrorType.RPC, ErrorTag.IN_USE, Optional.of("bar"), Optional.of("app-tag")); } @@ -244,7 +248,7 @@ public class InvokeRpcMethodTest { final SchemaPath path = SchemaPath.create(true, qname); final BrokerFacade brokerFacade = mock(BrokerFacade.class); - when(brokerFacade.invokeRpc(eq(path), any (NormalizedNode.class))).thenReturn(future); + when(brokerFacade.invokeRpc(eq(path), any(NormalizedNode.class))).thenReturn(future); this.restconfImpl.setBroker(brokerFacade); @@ -262,7 +266,7 @@ public class InvokeRpcMethodTest { fail("Expected an exception"); } catch (final RestconfDocumentedException e) { verifyRestconfDocumentedException(e, 0, ErrorType.PROTOCOL, ErrorTag.INVALID_VALUE, - Optional. absent(), Optional. absent()); + Optional.absent(), Optional.absent()); } } @@ -273,7 +277,7 @@ public class InvokeRpcMethodTest { fail("Expected an exception"); } catch (final RestconfDocumentedException e) { verifyRestconfDocumentedException(e, 0, ErrorType.RPC, ErrorTag.UNKNOWN_ELEMENT, - Optional. absent(), Optional. absent()); + Optional.absent(), Optional.absent()); } } @@ -309,7 +313,8 @@ public class InvokeRpcMethodTest { final DataContainerNodeAttrBuilder 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); @@ -330,7 +335,7 @@ public class InvokeRpcMethodTest { fail("Expected an exception."); } catch (final RestconfDocumentedException e) { verifyRestconfDocumentedException(e, 0, ErrorType.PROTOCOL, ErrorTag.INVALID_VALUE, - Optional. absent(), Optional. absent()); + Optional.absent(), Optional.absent()); } } @@ -383,10 +388,8 @@ public class InvokeRpcMethodTest { } /** - * * Tests calling of RestConfImpl method invokeRpc. In the method there is searched rpc in remote schema context. * This rpc is then executed. - * * I wasn't able to simulate calling of rpc on remote device therefore this testing method raise method when rpc is * invoked. */