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%2FRestGetOperationTest.java;h=536d140cf1b78e05b7a3e77d38e43a32d8a1f8f4;hp=9fd5128d19b51db4c71ad3678dae982aec1b3551;hb=refs%2Fchanges%2F27%2F8927%2F3;hpb=cb210bea2ab44aa2922ed86232c9db9a10452fc0 diff --git a/opendaylight/md-sal/sal-rest-connector/src/test/java/org/opendaylight/controller/sal/restconf/impl/test/RestGetOperationTest.java b/opendaylight/md-sal/sal-rest-connector/src/test/java/org/opendaylight/controller/sal/restconf/impl/test/RestGetOperationTest.java index 9fd5128d19..536d140cf1 100644 --- a/opendaylight/md-sal/sal-rest-connector/src/test/java/org/opendaylight/controller/sal/restconf/impl/test/RestGetOperationTest.java +++ b/opendaylight/md-sal/sal-rest-connector/src/test/java/org/opendaylight/controller/sal/restconf/impl/test/RestGetOperationTest.java @@ -75,7 +75,7 @@ public class RestGetOperationTest extends JerseyTest { Object key; Object data; // List for a CompositeNode, value Object for a SimpleNode - NodeData( final Object key, final Object data ) { + NodeData(final Object key, final Object data) { this.key = key; this.data = data; } @@ -117,7 +117,7 @@ public class RestGetOperationTest extends JerseyTest { resourceConfig = resourceConfig.registerInstances(restconfImpl, StructuredDataToXmlProvider.INSTANCE, StructuredDataToJsonProvider.INSTANCE, XmlToCompositeNodeProvider.INSTANCE, JsonToCompositeNodeProvider.INSTANCE); - resourceConfig.registerClasses( RestconfDocumentedExceptionMapper.class ); + resourceConfig.registerClasses(RestconfDocumentedExceptionMapper.class); return resourceConfig; } @@ -172,19 +172,18 @@ public class RestGetOperationTest extends JerseyTest { /** * MountPoint test. URI represents mount point. * - * Slashes in URI behind mount point. lst1 element with key - * GigabitEthernet0%2F0%2F0%2F0 (GigabitEthernet0/0/0/0) is requested via - * GET HTTP operation. It is tested whether %2F character is replaced with - * simple / in InstanceIdentifier parameter in method - * {@link BrokerFacade#readConfigurationDataBehindMountPoint(MountInstance, InstanceIdentifier)} - * which is called in method {@link RestconfImpl#readConfigurationData} + * Slashes in URI behind mount point. lst1 element with key GigabitEthernet0%2F0%2F0%2F0 (GigabitEthernet0/0/0/0) is + * requested via GET HTTP operation. It is tested whether %2F character is replaced with simple / in + * InstanceIdentifier parameter in method + * {@link BrokerFacade#readConfigurationDataBehindMountPoint(MountInstance, InstanceIdentifier)} which is called in + * method {@link RestconfImpl#readConfigurationData} * * * @throws ParseException */ @Test public void getDataWithSlashesBehindMountPoint() throws UnsupportedEncodingException, URISyntaxException, - ParseException { + ParseException { InstanceIdentifier awaitedInstanceIdentifier = prepareInstanceIdentifierForList(); when( brokerFacade.readConfigurationDataBehindMountPoint(any(MountInstance.class), @@ -446,11 +445,11 @@ public class RestGetOperationTest extends JerseyTest { assertTrue( "module1-behind-mount-point in json wasn't found", prepareXmlRegex("module1-behind-mount-point", "2014-02-03", "module:1:behind:mount:point", responseBody) - .find()); + .find()); assertTrue( "module2-behind-mount-point in json wasn't found", prepareXmlRegex("module2-behind-mount-point", "2014-02-04", "module:2:behind:mount:point", responseBody) - .find()); + .find()); } @@ -486,7 +485,7 @@ public class RestGetOperationTest extends JerseyTest { assertTrue( "module1-behind-mount-point in json wasn't found", prepareXmlRegex("module1-behind-mount-point", "2014-02-03", "module:1:behind:mount:point", responseBody) - .find()); + .find()); split = responseBody.split(" paramMap = new MultivaluedHashMap<>(); - paramMap.putSingle( "depth", "1o" ); - UriInfo mockInfo = mock( UriInfo.class ); - when( mockInfo.getQueryParameters( false ) ).thenAnswer( - new Answer>() { - @Override - public MultivaluedMap answer( final InvocationOnMock invocation ) { - return paramMap; - } - } ); + final MultivaluedMap paramMap = new MultivaluedHashMap<>(); + paramMap.putSingle("depth", "1o"); + UriInfo mockInfo = mock(UriInfo.class); + when(mockInfo.getQueryParameters(false)).thenAnswer(new Answer>() { + @Override + public MultivaluedMap answer(final InvocationOnMock invocation) { + return paramMap; + } + }); - getDataWithInvalidDepthParameterTest( mockInfo ); + getDataWithInvalidDepthParameterTest(mockInfo); - paramMap.putSingle( "depth", "0" ); - getDataWithInvalidDepthParameterTest( mockInfo ); + paramMap.putSingle("depth", "0"); + getDataWithInvalidDepthParameterTest(mockInfo); - paramMap.putSingle( "depth", "-1" ); - getDataWithInvalidDepthParameterTest( mockInfo ); + paramMap.putSingle("depth", "-1"); + getDataWithInvalidDepthParameterTest(mockInfo); } - private void getDataWithInvalidDepthParameterTest( final UriInfo uriInfo ) { + private void getDataWithInvalidDepthParameterTest(final UriInfo uriInfo) { try { - restconfImpl.readConfigurationData( "nested-module:depth1-cont", uriInfo ); - fail( "Expected RestconfDocumentedException" ); - } - catch( RestconfDocumentedException e ) { - assertTrue( "Unexpected error message: " + e.getErrors().get( 0 ).getErrorMessage(), - e.getErrors().get( 0 ).getErrorMessage().contains( "depth" ) ); + restconfImpl.readConfigurationData("nested-module:depth1-cont", uriInfo); + fail("Expected RestconfDocumentedException"); + } catch (RestconfDocumentedException e) { + assertTrue("Unexpected error message: " + e.getErrors().get(0).getErrorMessage(), e.getErrors().get(0) + .getErrorMessage().contains("depth")); } } - private void verifyXMLResponse( final Response response, final NodeData nodeData ) { + private void verifyXMLResponse(final Response response, final NodeData nodeData) { - Document doc = TestUtils.loadDocumentFrom( (InputStream) response.getEntity() ); - assertNotNull( "Could not parse XML document", doc ); + Document doc = TestUtils.loadDocumentFrom((InputStream) response.getEntity()); + assertNotNull("Could not parse XML document", doc); - //System.out.println(TestUtils.getDocumentInPrintableForm( doc )); + // System.out.println(TestUtils.getDocumentInPrintableForm( doc )); - verifyContainerElement( doc.getDocumentElement(), nodeData ); + verifyContainerElement(doc.getDocumentElement(), nodeData); } @SuppressWarnings("unchecked") - private void verifyContainerElement( final Element element, final NodeData nodeData ) { + private void verifyContainerElement(final Element element, final NodeData nodeData) { - assertEquals( "Element local name", nodeData.key, element.getNodeName() ); + assertEquals("Element local name", nodeData.key, element.getNodeName()); NodeList childNodes = element.getChildNodes(); - if( nodeData.data == null ) { // empty container - assertTrue( "Expected no child elements for \"" + element.getNodeName() + "\"", - childNodes.getLength() == 0 ); + if (nodeData.data == null) { // empty container + assertTrue("Expected no child elements for \"" + element.getNodeName() + "\"", childNodes.getLength() == 0); return; } - Map expChildMap = Maps.newHashMap(); - for( NodeData expChild: (List)nodeData.data ) { - expChildMap.put( expChild.key.toString(), expChild ); + Map expChildMap = Maps.newHashMap(); + for (NodeData expChild : (List) nodeData.data) { + expChildMap.put(expChild.key.toString(), expChild); } - for( int i = 0; i < childNodes.getLength(); i++ ) { - org.w3c.dom.Node actualChild = childNodes.item( i ); - if( !( actualChild instanceof Element ) ) { + for (int i = 0; i < childNodes.getLength(); i++) { + org.w3c.dom.Node actualChild = childNodes.item(i); + if (!(actualChild instanceof Element)) { continue; } - Element actualElement = (Element)actualChild; - NodeData expChild = expChildMap.remove( actualElement.getNodeName() ); - assertNotNull( "Unexpected child element for parent \"" + element.getNodeName() + - "\": " + actualElement.getNodeName(), expChild ); - - if( expChild.data == null || expChild.data instanceof List ) { - verifyContainerElement( actualElement, expChild ); - } - else { - assertEquals( "Text content for element: " + actualElement.getNodeName(), - expChild.data, actualElement.getTextContent() ); + Element actualElement = (Element) actualChild; + NodeData expChild = expChildMap.remove(actualElement.getNodeName()); + assertNotNull( + "Unexpected child element for parent \"" + element.getNodeName() + "\": " + + actualElement.getNodeName(), expChild); + + if (expChild.data == null || expChild.data instanceof List) { + verifyContainerElement(actualElement, expChild); + } else { + assertEquals("Text content for element: " + actualElement.getNodeName(), expChild.data, + actualElement.getTextContent()); } } - if( !expChildMap.isEmpty() ) { - fail( "Missing elements for parent \"" + element.getNodeName() + - "\": " + expChildMap.keySet() ); + if (!expChildMap.isEmpty()) { + fail("Missing elements for parent \"" + element.getNodeName() + "\": " + expChildMap.keySet()); } } - private NodeData expectContainer( final String name, final NodeData... childData ) { - return new NodeData( name, Lists.newArrayList( childData ) ); + private NodeData expectContainer(final String name, final NodeData... childData) { + return new NodeData(name, Lists.newArrayList(childData)); } - private NodeData expectEmptyContainer( final String name ) { - return new NodeData( name, null ); + private NodeData expectEmptyContainer(final String name) { + return new NodeData(name, null); } - private NodeData expectLeaf( final String name, final Object value ) { - return new NodeData( name, value ); + private NodeData expectLeaf(final String name, final Object value) { + return new NodeData(name, value); } - private QName toNestedQName( final String localName ) { - return QName.create( "urn:nested:module", "2014-06-3", localName ); + private QName toNestedQName(final String localName) { + return QName.create("urn:nested:module", "2014-06-3", localName); } @SuppressWarnings("unchecked") - private CompositeNode toCompositeNode( final NodeData nodeData ) { + private CompositeNode toCompositeNode(final NodeData nodeData) { CompositeNodeBuilder builder = ImmutableCompositeNode.builder(); - builder.setQName( (QName) nodeData.key ); + builder.setQName((QName) nodeData.key); - for( NodeData child: (List)nodeData.data ) { - if( child.data instanceof List ) { - builder.add( toCompositeNode( child ) ); - } - else { - builder.addLeaf( (QName) child.key, child.data ); + for (NodeData child : (List) nodeData.data) { + if (child.data instanceof List) { + builder.add(toCompositeNode(child)); + } else { + builder.addLeaf((QName) child.key, child.data); } } return builder.toInstance(); } - private NodeData toCompositeNodeData( final QName key, final NodeData... childData ) { - return new NodeData( key, Lists.newArrayList( childData ) ); + private NodeData toCompositeNodeData(final QName key, final NodeData... childData) { + return new NodeData(key, Lists.newArrayList(childData)); } - private NodeData toSimpleNodeData( final QName key, final Object value ) { - return new NodeData( key, value ); + private NodeData toSimpleNodeData(final QName key, final Object value) { + return new NodeData(key, value); } }