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%2Foperations%2FValidateTest.java;h=b5c5dd35442704253a4b1e906ab674e0b4a19b71;hb=refs%2Fchanges%2F08%2F7608%2F9;hp=8d14e9680c3b7e121d73a90b1a93525b4f431706;hpb=a92d9d6a21a0f6ca8d2153795721f500eaf29ee9;p=controller.git

diff --git a/opendaylight/netconf/config-netconf-connector/src/test/java/org/opendaylight/controller/netconf/confignetconfconnector/operations/ValidateTest.java b/opendaylight/netconf/config-netconf-connector/src/test/java/org/opendaylight/controller/netconf/confignetconfconnector/operations/ValidateTest.java
index 8d14e9680c..b5c5dd3544 100644
--- a/opendaylight/netconf/config-netconf-connector/src/test/java/org/opendaylight/controller/netconf/confignetconfconnector/operations/ValidateTest.java
+++ b/opendaylight/netconf/config-netconf-connector/src/test/java/org/opendaylight/controller/netconf/confignetconfconnector/operations/ValidateTest.java
@@ -11,14 +11,16 @@ package org.opendaylight.controller.netconf.confignetconfconnector.operations;
 import org.junit.Test;
 import org.opendaylight.controller.config.api.ValidationException;
 import org.opendaylight.controller.netconf.api.NetconfDocumentedException;
+import org.opendaylight.controller.netconf.api.xml.XmlNetconfConstants;
 import org.opendaylight.controller.netconf.confignetconfconnector.transactions.TransactionProvider;
 import org.opendaylight.controller.netconf.util.xml.XmlElement;
-import org.opendaylight.controller.netconf.util.xml.XmlNetconfConstants;
 import org.opendaylight.controller.netconf.util.xml.XmlUtil;
 import org.w3c.dom.Element;
 
 import static org.junit.Assert.assertEquals;
-import static org.mockito.Mockito.*;
+import static org.mockito.Mockito.doNothing;
+import static org.mockito.Mockito.doThrow;
+import static org.mockito.Mockito.mock;
 
 public class ValidateTest {
 
@@ -28,7 +30,7 @@ public class ValidateTest {
     public void test() throws Exception {
         final XmlElement xml = XmlElement.fromString("<abc></abc>");
         final Validate validate = new Validate(null, null, NETCONF_SESSION_ID_FOR_REPORTING);
-        validate.handle(null, xml);
+        validate.handleWithNoSubsequentOperations(null, xml);
     }
 
     @Test(expected = NetconfDocumentedException.class)
@@ -36,14 +38,14 @@ public class ValidateTest {
         final XmlElement xml = XmlElement.fromString("<validate xmlns=\""
                 + XmlNetconfConstants.URN_IETF_PARAMS_XML_NS_NETCONF_BASE_1_0 + "\"/>");
         final Validate validate = new Validate(null, null, NETCONF_SESSION_ID_FOR_REPORTING);
-        validate.handle(null, xml);
+        validate.handleWithNoSubsequentOperations(null, xml);
     }
 
     @Test(expected = NetconfDocumentedException.class)
     public void testNoNamespace() throws Exception {
         final XmlElement xml = XmlElement.fromString("<validate/>");
         final Validate validate = new Validate(null, null, NETCONF_SESSION_ID_FOR_REPORTING);
-        validate.handle(null, xml);
+        validate.handleWithNoSubsequentOperations(null, xml);
     }
 
     @Test(expected = NetconfDocumentedException.class)
@@ -53,7 +55,7 @@ public class ValidateTest {
                 + XmlNetconfConstants.URN_IETF_PARAMS_XML_NS_NETCONF_BASE_1_0
                 + "\"><source><running></running></source></validate>");
         final Validate validate = new Validate(null, null, NETCONF_SESSION_ID_FOR_REPORTING);
-        validate.handle(null, xml);
+        validate.handleWithNoSubsequentOperations(null, xml);
     }
 
     @Test(expected = NetconfDocumentedException.class)
@@ -64,7 +66,7 @@ public class ValidateTest {
         final TransactionProvider transactionProvider = mock(TransactionProvider.class);
         doThrow(IllegalStateException.class).when(transactionProvider).validateTransaction();
         final Validate validate = new Validate(transactionProvider, null, NETCONF_SESSION_ID_FOR_REPORTING);
-        validate.handle(null, xml);
+        validate.handleWithNoSubsequentOperations(null, xml);
     }
 
     @Test(expected = NetconfDocumentedException.class)
@@ -75,7 +77,7 @@ public class ValidateTest {
         final TransactionProvider transactionProvider = mock(TransactionProvider.class);
         doThrow(ValidationException.class).when(transactionProvider).validateTransaction();
         final Validate validate = new Validate(transactionProvider, null, NETCONF_SESSION_ID_FOR_REPORTING);
-        validate.handle(null, xml);
+        validate.handleWithNoSubsequentOperations(null, xml);
     }
 
     @Test
@@ -87,7 +89,7 @@ public class ValidateTest {
         final Element okElement = XmlUtil.readXmlToElement("<ok/>");
         doNothing().when(transactionProvider).validateTransaction();
         final Validate validate = new Validate(transactionProvider, null, NETCONF_SESSION_ID_FOR_REPORTING);
-        Element ok = validate.handle(XmlUtil.newDocument(), xml);
+        Element ok = validate.handleWithNoSubsequentOperations(XmlUtil.newDocument(), xml);
         assertEquals(XmlUtil.toString(okElement), XmlUtil.toString(ok));
     }