Move TestSessionNegotiator class to separate file

Change-Id: I20ba4048cc65c40b0b1247e3412abb5c5cb6caed
Signed-off-by: Marek Gradzki <mgradzki@cisco.com>

diff --git a/netconf/netconf-netty-util/src/test/java/org/opendaylight/netconf/nettyutil/AbstractNetconfSessionNegotiatorTest.java b/netconf/netconf-netty-util/src/test/java/org/opendaylight/netconf/nettyutil/AbstractNetconfSessionNegotiatorTest.java
index a2e628366c3a9f53776e260f32ef797d74788937..0e0458dc7db30849e8c01dc1f9fdf96a6601d6fc 100644 (file)
--- a/netconf/netconf-netty-util/src/test/java/org/opendaylight/netconf/nettyutil/AbstractNetconfSessionNegotiatorTest.java
+++ b/netconf/netconf-netty-util/src/test/java/org/opendaylight/netconf/nettyutil/AbstractNetconfSessionNegotiatorTest.java
@@ -22,14 +22,12 @@ import static org.opendaylight.netconf.nettyutil.AbstractChannelInitializer.NETC
 import com.google.common.base.Optional;
 import io.netty.buffer.ByteBuf;
 import io.netty.buffer.Unpooled;
-import io.netty.channel.Channel;
 import io.netty.channel.ChannelInboundHandlerAdapter;
 import io.netty.channel.ChannelOutboundHandler;
 import io.netty.channel.ChannelOutboundHandlerAdapter;
 import io.netty.channel.embedded.EmbeddedChannel;
 import io.netty.handler.ssl.SslHandler;
 import io.netty.util.HashedWheelTimer;
-import io.netty.util.Timer;
 import io.netty.util.concurrent.Future;
 import io.netty.util.concurrent.Promise;
 import java.util.ArrayList;
@@ -41,7 +39,6 @@ import org.junit.Test;
 import org.mockito.Mock;
 import org.mockito.Mockito;
 import org.mockito.MockitoAnnotations;
-import org.opendaylight.netconf.api.NetconfDocumentedException;
 import org.opendaylight.netconf.api.NetconfSessionListener;
 import org.opendaylight.netconf.api.NetconfSessionPreferences;
 import org.opendaylight.netconf.api.messages.NetconfHelloMessage;
@@ -165,31 +162,4 @@ public class AbstractNetconfSessionNegotiatorTest {
         channel.pipeline().fireExceptionCaught(cause);
         verify(promise).setFailure(cause);
     }
-
-    private static class TestSessionNegotiator extends
-            AbstractNetconfSessionNegotiator<NetconfSessionPreferences,
-                    TestingNetconfSession, NetconfSessionListener<TestingNetconfSession>> {
-
-
-        TestSessionNegotiator(final NetconfSessionPreferences sessionPreferences,
-                              final Promise<TestingNetconfSession> promise, final Channel channel,
-                              final Timer timer,
-                              final NetconfSessionListener<TestingNetconfSession> sessionListener,
-                              final long connectionTimeoutMillis) {
-            super(sessionPreferences, promise, channel, timer, sessionListener, connectionTimeoutMillis);
-        }
-
-        @Override
-        protected TestingNetconfSession getSession(final NetconfSessionListener sessionListener, final Channel channel,
-                                               final NetconfHelloMessage message) throws NetconfDocumentedException {
-            return new TestingNetconfSession(sessionListener, channel, 0L);
-        }
-
-        @Override
-        protected void handleMessage(final NetconfHelloMessage netconfHelloMessage) throws Exception {
-
-        }
-    }
-
-
 }

diff --git a/netconf/netconf-netty-util/src/test/java/org/opendaylight/netconf/nettyutil/Netconf539Test.java b/netconf/netconf-netty-util/src/test/java/org/opendaylight/netconf/nettyutil/Netconf539Test.java
index 53fe8e6cdadff03cb983bf16abe52fb5263e6766..8f746ac63292c4c5dc26d007bc2655ddf2fa0d9d 100644 (file)
--- a/netconf/netconf-netty-util/src/test/java/org/opendaylight/netconf/nettyutil/Netconf539Test.java
+++ b/netconf/netconf-netty-util/src/test/java/org/opendaylight/netconf/nettyutil/Netconf539Test.java
@@ -14,11 +14,9 @@ import static org.opendaylight.netconf.nettyutil.AbstractChannelInitializer.NETC
 import static org.opendaylight.netconf.nettyutil.AbstractChannelInitializer.NETCONF_MESSAGE_FRAME_ENCODER;
 
 import com.google.common.base.Optional;
-import io.netty.channel.Channel;
 import io.netty.channel.ChannelInboundHandlerAdapter;
 import io.netty.channel.embedded.EmbeddedChannel;
 import io.netty.util.HashedWheelTimer;
-import io.netty.util.Timer;
 import io.netty.util.concurrent.Promise;
 import java.util.Collections;
 import org.junit.Assert;
@@ -26,7 +24,6 @@ import org.junit.Before;
 import org.junit.Test;
 import org.mockito.Mock;
 import org.mockito.MockitoAnnotations;
-import org.opendaylight.netconf.api.NetconfDocumentedException;
 import org.opendaylight.netconf.api.NetconfSessionListener;
 import org.opendaylight.netconf.api.NetconfSessionPreferences;
 import org.opendaylight.netconf.api.messages.NetconfHelloMessage;
@@ -90,30 +87,4 @@ public class Netconf539Test {
         Assert.assertTrue("ChunkedFramingMechanismEncoder was not installed in the Netconf pipeline",
             channel.pipeline().get(NETCONF_MESSAGE_FRAME_ENCODER) instanceof ChunkedFramingMechanismEncoder);
     }
-
-    private static class TestSessionNegotiator extends
-        AbstractNetconfSessionNegotiator<NetconfSessionPreferences,
-            TestingNetconfSession, NetconfSessionListener<TestingNetconfSession>> {
-
-
-        TestSessionNegotiator(final NetconfSessionPreferences sessionPreferences,
-                              final Promise<TestingNetconfSession> promise, final Channel channel,
-                              final Timer timer,
-                              final NetconfSessionListener<TestingNetconfSession> sessionListener,
-                              final long connectionTimeoutMillis) {
-            super(sessionPreferences, promise, channel, timer, sessionListener, connectionTimeoutMillis);
-        }
-
-        @Override
-        protected TestingNetconfSession getSession(final NetconfSessionListener sessionListener, final Channel channel,
-                                                   final NetconfHelloMessage message)
-            throws NetconfDocumentedException {
-            return new TestingNetconfSession(sessionListener, channel, 0L);
-        }
-
-        @Override
-        protected void handleMessage(final NetconfHelloMessage netconfHelloMessage) throws Exception {
-
-        }
-    }
 }
\ No newline at end of file

diff --git a/netconf/netconf-netty-util/src/test/java/org/opendaylight/netconf/nettyutil/TestSessionNegotiator.java b/netconf/netconf-netty-util/src/test/java/org/opendaylight/netconf/nettyutil/TestSessionNegotiator.java
new file mode 100644 (file)
index 0000000..d5e8955
--- /dev/null
+++ b/netconf/netconf-netty-util/src/test/java/org/opendaylight/netconf/nettyutil/TestSessionNegotiator.java
@@ -0,0 +1,43 @@
+/*
+ * Copyright (c) 2018 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.netconf.nettyutil;
+
+import io.netty.channel.Channel;
+import io.netty.util.Timer;
+import io.netty.util.concurrent.Promise;
+import org.opendaylight.netconf.api.NetconfDocumentedException;
+import org.opendaylight.netconf.api.NetconfSessionListener;
+import org.opendaylight.netconf.api.NetconfSessionPreferences;
+import org.opendaylight.netconf.api.messages.NetconfHelloMessage;
+
+final class TestSessionNegotiator extends
+    AbstractNetconfSessionNegotiator<NetconfSessionPreferences,
+        TestingNetconfSession, NetconfSessionListener<TestingNetconfSession>> {
+
+
+    TestSessionNegotiator(final NetconfSessionPreferences sessionPreferences,
+                          final Promise<TestingNetconfSession> promise, final Channel channel,
+                          final Timer timer,
+                          final NetconfSessionListener<TestingNetconfSession> sessionListener,
+                          final long connectionTimeoutMillis) {
+        super(sessionPreferences, promise, channel, timer, sessionListener, connectionTimeoutMillis);
+    }
+
+    @Override
+    protected TestingNetconfSession getSession(final NetconfSessionListener sessionListener, final Channel channel,
+                                               final NetconfHelloMessage message)
+        throws NetconfDocumentedException {
+        return new TestingNetconfSession(sessionListener, channel, 0L);
+    }
+
+    @Override
+    protected void handleMessage(final NetconfHelloMessage netconfHelloMessage) throws Exception {
+
+    }
+}
\ No newline at end of file