X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?a=blobdiff_plain;f=opendaylight%2Fnetconf%2Fconfig-netconf-connector%2Fsrc%2Ftest%2Fjava%2Forg%2Fopendaylight%2Fcontroller%2Fnetconf%2Fconfignetconfconnector%2FNetconfMappingTest.java;fp=opendaylight%2Fnetconf%2Fconfig-netconf-connector%2Fsrc%2Ftest%2Fjava%2Forg%2Fopendaylight%2Fcontroller%2Fnetconf%2Fconfignetconfconnector%2FNetconfMappingTest.java;h=d6b5e62b27b59eb60e023c64603e56474145592d;hb=5c008222efa5c0af49cf8a52881a6299b1e249dc;hp=356223515ab61951b6d5f1886465c329a092a300;hpb=7d6c45eb8cbafa91be10a66bfcdd841e74e02a4a;p=controller.git diff --git a/opendaylight/netconf/config-netconf-connector/src/test/java/org/opendaylight/controller/netconf/confignetconfconnector/NetconfMappingTest.java b/opendaylight/netconf/config-netconf-connector/src/test/java/org/opendaylight/controller/netconf/confignetconfconnector/NetconfMappingTest.java index 356223515a..d6b5e62b27 100644 --- a/opendaylight/netconf/config-netconf-connector/src/test/java/org/opendaylight/controller/netconf/confignetconfconnector/NetconfMappingTest.java +++ b/opendaylight/netconf/config-netconf-connector/src/test/java/org/opendaylight/controller/netconf/confignetconfconnector/NetconfMappingTest.java @@ -569,14 +569,14 @@ public class NetconfMappingTest extends AbstractConfigTest { commit(); } - @Test(expected = NetconfDocumentedException.class) + @Test public void testEx2() throws Exception { - discard(); + assertContainsElement(discard(), readXmlToElement("")); } - private void discard() throws ParserConfigurationException, SAXException, IOException, NetconfDocumentedException { + private Document discard() throws ParserConfigurationException, SAXException, IOException, NetconfDocumentedException { DiscardChanges discardOp = new DiscardChanges(transactionProvider, configRegistryClient, NETCONF_SESSION_ID); - executeOp(discardOp, "netconfMessages/discardChanges.xml"); + return executeOp(discardOp, "netconfMessages/discardChanges.xml"); } private void checkBinaryLeafEdited(final Document response) throws NodeTestException, SAXException, IOException {