From 3f29879ecaac6e4141e448a8d64173d0825f3c27 Mon Sep 17 00:00:00 2001 From: David Solin Date: Wed, 24 Aug 2016 08:35:08 -0500 Subject: [PATCH] Test fixes --- src/test/java/net/schmizz/sshj/sftp/PacketReaderTest.java | 2 ++ src/test/java/net/schmizz/sshj/sftp/SFTPClientTest.java | 5 ++++- 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/src/test/java/net/schmizz/sshj/sftp/PacketReaderTest.java b/src/test/java/net/schmizz/sshj/sftp/PacketReaderTest.java index 37507f1d..234a520e 100644 --- a/src/test/java/net/schmizz/sshj/sftp/PacketReaderTest.java +++ b/src/test/java/net/schmizz/sshj/sftp/PacketReaderTest.java @@ -15,6 +15,7 @@ */ package net.schmizz.sshj.sftp; +import net.schmizz.sshj.common.LoggerFactory; import net.schmizz.sshj.common.SSHException; import net.schmizz.sshj.connection.channel.direct.Session.Subsystem; import org.junit.Before; @@ -43,6 +44,7 @@ public class PacketReaderTest { engine = Mockito.mock(SFTPEngine.class); subsystem = Mockito.mock(Subsystem.class); + Mockito.when(engine.getLoggerFactory()).thenReturn(LoggerFactory.DEFAULT); Mockito.when(engine.getSubsystem()).thenReturn(subsystem); Mockito.when(subsystem.getInputStream()).thenReturn(pipedin); diff --git a/src/test/java/net/schmizz/sshj/sftp/SFTPClientTest.java b/src/test/java/net/schmizz/sshj/sftp/SFTPClientTest.java index 349f0eec..eb6dfaae 100644 --- a/src/test/java/net/schmizz/sshj/sftp/SFTPClientTest.java +++ b/src/test/java/net/schmizz/sshj/sftp/SFTPClientTest.java @@ -20,12 +20,13 @@ import org.junit.Test; import java.io.IOException; +import net.schmizz.sshj.common.LoggerFactory; + import static net.schmizz.sshj.sftp.PathHelper.DEFAULT_PATH_SEPARATOR; import static org.mockito.Mockito.*; public class SFTPClientTest { private final SFTPEngine sftpEngine = mock(SFTPEngine.class); - private final SFTPClient client = new SFTPClient(sftpEngine); @Before public void setPathHelper() throws Exception { @@ -39,6 +40,7 @@ public class SFTPClientTest { } }, DEFAULT_PATH_SEPARATOR); when(sftpEngine.getPathHelper()).thenReturn(helper); + when(sftpEngine.getLoggerFactory()).thenReturn(LoggerFactory.DEFAULT); } @Before @@ -49,6 +51,7 @@ public class SFTPClientTest { @Test public void doesNotTryToCreateDirectoryTwiceWhenPathHasTrailingSeparator() throws Exception { + SFTPClient client = new SFTPClient(sftpEngine); client.mkdirs("/folder/directory/"); verify(sftpEngine, times(1)).makeDir("/folder/directory"); }