Fixup accidental push

7bb5a9a41b90dae65ee238c7a58ccfe9eb5d8387 was pushed directly by accident
and it requires a fixup. This patch provides that fixup.

Change-Id: I85c9a2cf322139cf2a84fe98bc7ba8e9e648d2a1
Signed-off-by: Robert Varga <robert.varga@pantheon.tech>

diff --git a/netconf/callhome-protocol/src/test/java/org/opendaylight/netconf/callhome/protocol/NetconfCallHomeServerTest.java b/netconf/callhome-protocol/src/test/java/org/opendaylight/netconf/callhome/protocol/NetconfCallHomeServerTest.java
index bb6e07a71a346e5f712f4f3556b76b94942596ec..2f13d80fceae1e5f898bf14cc6002f0fbd03935f 100644 (file)
--- a/netconf/callhome-protocol/src/test/java/org/opendaylight/netconf/callhome/protocol/NetconfCallHomeServerTest.java
+++ b/netconf/callhome-protocol/src/test/java/org/opendaylight/netconf/callhome/protocol/NetconfCallHomeServerTest.java
@@ -12,7 +12,6 @@ import static org.mockito.ArgumentMatchers.any;
 import static org.mockito.Mockito.doNothing;
 import static org.mockito.Mockito.doReturn;
 import static org.mockito.Mockito.mock;
-import static org.mockito.Mockito.spy;
 import static org.mockito.Mockito.times;
 import static org.mockito.Mockito.verify;
 
@@ -47,7 +46,6 @@ public class NetconfCallHomeServerTest {
     private static EventLoopGroup EVENT_LOOP_GROUP;
     private static InetSocketAddress MOCK_ADDRESS;
 
-    private SshClient mockSshClient;
     @Mock
     private CallHomeAuthorizationProvider mockCallHomeAuthProv;
     @Mock
@@ -76,7 +74,6 @@ public class NetconfCallHomeServerTest {
 
     @Before
     public void setup() {
-        mockSshClient = spy(SshClient.setUpDefaultClient());
         mockCallHomeAuthProv = mock(CallHomeAuthorizationProvider.class);
         mockAuth = mock(CallHomeAuthorization.class);
         mockFactory = mock(CallHomeSessionContext.Factory.class);
@@ -86,8 +83,8 @@ public class NetconfCallHomeServerTest {
         Map<String, String> props = new HashMap<>();
         props.put("nio-workers", "1");
         doReturn(EVENT_LOOP_GROUP).when(mockFactory).getNettyGroup();
-        instance = new NetconfCallHomeServer(
-            mockSshClient, mockCallHomeAuthProv, mockFactory, MOCK_ADDRESS, mockStatusRecorder);
+        instance = new NetconfCallHomeServer(SshClient.setUpDefaultClient(), mockCallHomeAuthProv, mockFactory,
+            MOCK_ADDRESS, mockStatusRecorder);
     }
 
     @Test
@@ -165,15 +162,18 @@ public class NetconfCallHomeServerTest {
         // given
         IoAcceptor mockAcceptor = mock(IoAcceptor.class);
         IoServiceFactory mockMinaFactory = mock(IoServiceFactory.class);
-
         doReturn(mockAcceptor).when(mockMinaFactory).createAcceptor(any(IoHandler.class));
         doNothing().when(mockAcceptor).bind(any(SocketAddress.class));
-        instance = new NetconfCallHomeServer(
-                mockSshClient, mockCallHomeAuthProv, mockFactory, MOCK_ADDRESS, mockStatusRecorder, mockMinaFactory);
+        SshClient mockClient = mock(SshClient.class);
+        doNothing().when(mockClient).start();
+        doNothing().when(mockClient).setServerKeyVerifier(any());
+        doNothing().when(mockClient).addSessionListener(any());
+        NetconfCallHomeServer server = new NetconfCallHomeServer(
+                mockClient, mockCallHomeAuthProv, mockFactory, MOCK_ADDRESS, mockStatusRecorder, mockMinaFactory);
         // when
-        instance.bind();
+        server.bind();
         // then
-        verify(mockSshClient, times(1)).start();
+        verify(mockClient, times(1)).start();
         verify(mockAcceptor, times(1)).bind(MOCK_ADDRESS);
     }
 }

diff --git a/plugins/sal-netconf-connector/pom.xml b/plugins/sal-netconf-connector/pom.xml
index de2e63ebdd5be46203099bae7d0e48a2d8b9aeaa..9bc3e519e0154362eec48b073eef434b562b8383 100644 (file)
--- a/plugins/sal-netconf-connector/pom.xml
+++ b/plugins/sal-netconf-connector/pom.xml
@@ -135,6 +135,13 @@
       <groupId>org.opendaylight.yangtools</groupId>
       <artifactId>yang-test-util</artifactId>
     </dependency>
+
+    <!-- FIXME: needed for NetconfDeviceCommunicatorTest -->
+    <dependency>
+      <groupId>org.mockito</groupId>
+      <artifactId>mockito-subclass</artifactId>
+      <scope>test</scope>
+    </dependency>
   </dependencies>
 
   <scm>