Move NetconfMessage into netconf.api.messages

[netconf.git] / plugins / netconf-client-mdsal / src / test / java / org / opendaylight / netconf / client / mdsal / SchemalessNetconfDeviceTest.java

diff --git a/plugins/netconf-client-mdsal/src/test/java/org/opendaylight/netconf/client/mdsal/SchemalessNetconfDeviceTest.java b/plugins/netconf-client-mdsal/src/test/java/org/opendaylight/netconf/client/mdsal/SchemalessNetconfDeviceTest.java
index 981d744f60c2793d0277171c59e512c1b9fa1cf0..cda0cd21cc59986f20e695983c914e478ef10cf2 100644 (file)
--- a/plugins/netconf-client-mdsal/src/test/java/org/opendaylight/netconf/client/mdsal/SchemalessNetconfDeviceTest.java
+++ b/plugins/netconf-client-mdsal/src/test/java/org/opendaylight/netconf/client/mdsal/SchemalessNetconfDeviceTest.java
@@ -15,13 +15,12 @@ import static org.mockito.Mockito.verify;
 
 import com.google.common.collect.Lists;
 import java.net.InetSocketAddress;
-import java.util.ArrayList;
 import java.util.Collection;
 import org.junit.Test;
 import org.mockito.Mockito;
 import org.opendaylight.mdsal.dom.api.DOMNotification;
-import org.opendaylight.netconf.api.NetconfMessage;
-import org.opendaylight.netconf.api.xml.XmlNetconfConstants;
+import org.opendaylight.netconf.api.CapabilityURN;
+import org.opendaylight.netconf.api.messages.NetconfMessage;
 import org.opendaylight.netconf.client.mdsal.api.NetconfSessionPreferences;
 import org.opendaylight.netconf.client.mdsal.api.RemoteDeviceHandler;
 import org.opendaylight.netconf.client.mdsal.api.RemoteDeviceId;
@@ -42,7 +41,6 @@ public class SchemalessNetconfDeviceTest extends AbstractBaseSchemasTest {
         final SchemalessMessageTransformer messageTransformer = mock(SchemalessMessageTransformer.class);
         final RemoteDeviceId remoteDeviceId = new RemoteDeviceId("test-D",
                 InetSocketAddress.createUnresolved("localhost", 22));
-        final Throwable throwable = new Throwable();
 
         final SchemalessNetconfDevice device = new SchemalessNetconfDevice(BASE_SCHEMAS, remoteDeviceId, facade,
             messageTransformer);
@@ -61,9 +59,6 @@ public class SchemalessNetconfDeviceTest extends AbstractBaseSchemasTest {
 
         device.onRemoteSessionDown();
         verify(facade).onDeviceDisconnected();
-
-        device.onRemoteSessionFailed(throwable);
-        verify(facade).onDeviceFailed(throwable);
     }
 
     private static RemoteDeviceHandler getFacade() throws Exception {
@@ -90,16 +85,11 @@ public class SchemalessNetconfDeviceTest extends AbstractBaseSchemasTest {
 
     private static NetconfSessionPreferences getSessionCaps(final boolean addMonitor,
                                                             final Collection<String> additionalCapabilities) {
-        final ArrayList<String> capabilities = Lists.newArrayList(
-                XmlNetconfConstants.URN_IETF_PARAMS_NETCONF_BASE_1_0,
-                XmlNetconfConstants.URN_IETF_PARAMS_NETCONF_BASE_1_1);
-
+        final var capabilities = Lists.newArrayList(CapabilityURN.BASE, CapabilityURN.BASE_1_1);
         if (addMonitor) {
             capabilities.add(NetconfMessageTransformUtil.IETF_NETCONF_MONITORING.getNamespace().toString());
         }
-
         capabilities.addAll(additionalCapabilities);
-
         return NetconfSessionPreferences.fromStrings(capabilities);
     }
 }