Shutdown server when port has been changed

Since a1e9ed2 the port of the SFTP
server can be changed during test. In this case the SFTP server was not
shutdown after the test, because the rule restarted it but Apache SSHD
is not designed to be restarted. See
https://issues.apache.org/jira/browse/SSHD-769

We now start a new server when the port is changed. This server is
shutdown after the test.

Author: stefanbirkner

README.md

@@ -21,7 +21,7 @@ Fake SFTP Server Rule is available from [Maven Central](http://search.maven.org/
     <dependency>
       <groupId>com.github.stefanbirkner</groupId>
       <artifactId>fake-sftp-server-rule</artifactId>
-      <version>1.1.0</version>
+      <version>1.1.1</version>
     </dependency>
 
 

pom.xml

@@ -9,7 +9,7 @@
     </parent>
 
     <artifactId>fake-sftp-server-rule</artifactId>
-    <version>1.1.1-SNAPSHOT</version>
+    <version>1.1.1</version>
     <packaging>jar</packaging>
 
     <name>Fake SFTP Server Rule</name>

src/main/java/com/github/stefanbirkner/fakesftpserver/rule/FakeSftpServerRule.java

@@ -165,8 +165,7 @@ public FakeSftpServerRule setPort(
     private void restartServer() {
         try {
             server.stop();
-            server.setPort(port);
-            server.start();
+            startServer(fileSystem);
         } catch (IOException e) {
             throw new IllegalStateException(
                 "The SFTP server cannot be restarted.",
@@ -296,12 +295,16 @@ public Statement apply(
             @Override
             public void evaluate() throws Throwable {
                 try (
-                    FileSystem fileSystem = createFileSystem();
-                    SshServer server = startServer(fileSystem)
+                    FileSystem fileSystem = createFileSystem()
                 ) {
-                    base.evaluate();
+                    startServer(fileSystem);
+                    try {
+                        base.evaluate();
+                    } finally {
+                        server.stop();
+                        server = null;
+                    }
                 } finally {
-                    server = null;
                     fileSystem = null;
                 }
             }

src/test/java/com/github/stefanbirkner/fakesftpserver/rule/FakeSftpServerRuleTest.java

@@ -589,16 +589,43 @@ public void after_an_erroneous_test_SFTP_server_is_shutdown() {
             assertConnectionToSftpServerNotPossible(sftpServer);
         }
 
+        @Test
+        public void after_a_test_first_SFTP_server_is_shutdown_when_port_was_changed_during_test() {
+            FakeSftpServerRule sftpServer = new FakeSftpServerRule()
+                .setPort(DUMMY_PORT - 1);
+            executeTestWithRule(
+                () -> sftpServer.setPort(DUMMY_PORT),
+                sftpServer
+            );
+            assertConnectionToSftpServerNotPossible(DUMMY_PORT - 1);
+        }
+
+        @Test
+        public void after_a_test_second_SFTP_server_is_shutdown_when_port_was_changed_during_test() {
+            FakeSftpServerRule sftpServer = new FakeSftpServerRule();
+            executeTestWithRule(
+                () -> sftpServer.setPort(DUMMY_PORT),
+                sftpServer
+            );
+            assertConnectionToSftpServerNotPossible(DUMMY_PORT);
+        }
+
         private void assertConnectionToSftpServerNotPossible(
             FakeSftpServerRule sftpServer
+        ) {
+            assertConnectionToSftpServerNotPossible(sftpServer.getPort());
+        }
+
+        private void assertConnectionToSftpServerNotPossible(
+            int port
         ) {
             Throwable throwable = catchThrowable(
-                () -> connectToServer(sftpServer)
+                () -> connectToServerAtPort(port)
             );
             assertThat(throwable)
                 .withFailMessage(
                     "SFTP server is still running on port %d.",
-                    sftpServer.getPort()
+                    port
                 )
                 .hasCauseInstanceOf(ConnectException.class);
         }