X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?a=blobdiff_plain;f=opendaylight%2Fmd-sal%2Fsal-rest-connector%2Fsrc%2Ftest%2Fjava%2Forg%2Fopendaylight%2Fcontroller%2Fsal%2Frestconf%2Fimpl%2Fcnsn%2Fto%2Fxml%2Ftest%2FCnSnToXmlNotExistingLeafTypeTest.java;h=4218a69d3b9821562b3a38bb7a5a87ac85470e0e;hb=ded776339aa23cdd5fadc0b8cc393172120572c6;hp=a2fc138b519e0e53af179074c27f84e37ad33e86;hpb=6eb461f54fe6705b07f34b6cee197ea968de4991;p=controller.git diff --git a/opendaylight/md-sal/sal-rest-connector/src/test/java/org/opendaylight/controller/sal/restconf/impl/cnsn/to/xml/test/CnSnToXmlNotExistingLeafTypeTest.java b/opendaylight/md-sal/sal-rest-connector/src/test/java/org/opendaylight/controller/sal/restconf/impl/cnsn/to/xml/test/CnSnToXmlNotExistingLeafTypeTest.java index a2fc138b51..4218a69d3b 100644 --- a/opendaylight/md-sal/sal-rest-connector/src/test/java/org/opendaylight/controller/sal/restconf/impl/cnsn/to/xml/test/CnSnToXmlNotExistingLeafTypeTest.java +++ b/opendaylight/md-sal/sal-rest-connector/src/test/java/org/opendaylight/controller/sal/restconf/impl/cnsn/to/xml/test/CnSnToXmlNotExistingLeafTypeTest.java @@ -1,3 +1,10 @@ +/* + * Copyright (c) 2014 Cisco Systems, Inc. and others. All rights reserved. + * + * This program and the accompanying materials are made available under the + * terms of the Eclipse Public License v1.0 which accompanies this distribution, + * and is available at http://www.eclipse.org/legal/epl-v10.html + */ package org.opendaylight.controller.sal.restconf.impl.cnsn.to.xml.test; import static org.junit.Assert.assertNotNull; @@ -31,15 +38,16 @@ public class CnSnToXmlNotExistingLeafTypeTest { @Test public void incorrectTopLevelElementTest() { - String xmlOutput = null; + boolean nullPointerExceptionRaised = false; try { - xmlOutput = TestUtils.writeCompNodeWithSchemaContextToOutput(prepareCompositeNode(), + TestUtils.writeCompNodeWithSchemaContextToOutput(prepareCompositeNode(), (Set) Collections.EMPTY_SET, prepareDataSchemaNode(), StructuredDataToXmlProvider.INSTANCE); } catch (WebApplicationException | IOException e) { LOG.error("WebApplicationException or IOException was raised"); + } catch (NullPointerException e) { + nullPointerExceptionRaised = true; } - assertNotNull(xmlOutput); - assertTrue(xmlOutput.contains("any value")); + assertTrue(nullPointerExceptionRaised); } @@ -62,8 +70,7 @@ public class CnSnToXmlNotExistingLeafTypeTest { leafBuild.setConfiguration(true); contBuild.addChildNode(leafBuild); - return contBuild.build(null); - + return contBuild.build(); } }