(S)FTP tests: Add missed @DirtiesContext

Related to: https://build.spring.io/browse/INT-MASTERSPRING40-826/

If we don't close application context on the embedded (S)FTP server,
we my still have some session opened in other tests, which would cause
some unexpected behavior like extra `SessionClosedEvent` in the
test for FTP events

Author: artembilan

spring-integration-ftp/src/test/java/org/springframework/integration/ftp/session/FtpRemoteFileTemplateTests.java

@@ -17,7 +17,7 @@
 package org.springframework.integration.ftp.session;
 
 import static org.assertj.core.api.Assertions.assertThat;
-import static org.assertj.core.api.Assertions.fail;
+import static org.assertj.core.api.Assertions.assertThatExceptionOfType;
 import static org.mockito.Mockito.mock;
 import static org.mockito.Mockito.when;
 
@@ -46,8 +46,8 @@
 import org.springframework.integration.util.SimplePool;
 import org.springframework.messaging.MessagingException;
 import org.springframework.messaging.support.GenericMessage;
-import org.springframework.test.context.ContextConfiguration;
-import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
+import org.springframework.test.annotation.DirtiesContext;
+import org.springframework.test.context.junit4.SpringRunner;
 
 /**
  * @author Gary Russell
@@ -56,8 +56,8 @@
  * @since 4.1
  *
  */
-@ContextConfiguration
-@RunWith(SpringJUnit4ClassRunner.class)
+@RunWith(SpringRunner.class)
+@DirtiesContext
 public class FtpRemoteFileTemplateTests extends FtpTestSupport {
 
 	@Autowired
@@ -112,13 +112,9 @@ public void testFileCloseOnBadConnect() throws Exception {
 		FileOutputStream fileOutputStream = new FileOutputStream(file);
 		fileOutputStream.write("foo".getBytes());
 		fileOutputStream.close();
-		try {
-			template.send(new GenericMessage<>(file));
-			fail("exception expected");
-		}
-		catch (MessagingException e) {
-			assertThat(e.getCause().getMessage()).isEqualTo("bar");
-		}
+		assertThatExceptionOfType(MessagingException.class)
+				.isThrownBy(() -> template.send(new GenericMessage<>(file)))
+				.withStackTraceContaining("bar");
 		File newFile = new File(System.getProperty("java.io.tmpdir"), UUID.randomUUID().toString());
 		assertThat(file.renameTo(newFile)).isTrue();
 		file.delete();

spring-integration-sftp/src/test/java/org/springframework/integration/sftp/outbound/SftpServerOutboundTests.java

@@ -17,6 +17,7 @@
 package org.springframework.integration.sftp.outbound;
 
 import static org.assertj.core.api.Assertions.assertThat;
+import static org.assertj.core.api.Assertions.assertThatExceptionOfType;
 import static org.assertj.core.api.Assertions.fail;
 import static org.mockito.Mockito.spy;
 import static org.mockito.Mockito.verify;
@@ -66,8 +67,8 @@
 import org.springframework.messaging.MessagingException;
 import org.springframework.messaging.PollableChannel;
 import org.springframework.messaging.support.GenericMessage;
-import org.springframework.test.context.ContextConfiguration;
-import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
+import org.springframework.test.annotation.DirtiesContext;
+import org.springframework.test.context.junit4.SpringRunner;
 import org.springframework.util.FileCopyUtils;
 
 import com.jcraft.jsch.ChannelSftp;
@@ -76,10 +77,11 @@
 /**
  * @author Artem Bilan
  * @author Gary Russell
+ *
  * @since 3.0
  */
-@ContextConfiguration
-@RunWith(SpringJUnit4ClassRunner.class)
+@RunWith(SpringRunner.class)
+@DirtiesContext
 public class SftpServerOutboundTests extends SftpTestSupport {
 
 	@Autowired
@@ -165,17 +167,11 @@ public void testInt2866LocalDirectoryExpressionGET() {
 
 	@Test
 	public void testInt2866InvalidLocalDirectoryExpression() {
-		try {
-			this.invalidDirExpression.send(new GenericMessage<Object>("sftpSource/ sftpSource1.txt"));
-			fail("Exception expected.");
-		}
-		catch (Exception e) {
-			Throwable cause = e.getCause();
-			assertThat(cause).isNotNull();
-			cause = cause.getCause();
-			assertThat(cause).isInstanceOf(IllegalArgumentException.class);
-			assertThat(cause.getMessage()).startsWith("Failed to make local directory");
-		}
+		assertThatExceptionOfType(Exception.class)
+				.isThrownBy(() ->
+						this.invalidDirExpression.send(new GenericMessage<Object>("sftpSource/ sftpSource1.txt")))
+				.withRootCauseInstanceOf(IllegalArgumentException.class)
+				.withMessageContaining("Failed to make local directory");
 	}
 
 	@Test
@@ -190,15 +186,12 @@ public void testInt2866LocalDirectoryExpressionMGET() {
 
 		assertThat(localFiles).hasSizeGreaterThan(0);
 
-		boolean assertedModified = false;
 		for (File file : localFiles) {
 			assertThat(file.getPath().replaceAll(Matcher.quoteReplacement(File.separator), "/")).contains(dir);
 			if (file.getPath().contains("localTarget1")) {
-				assertedModified = assertPreserved(modified, file);
+				assertPreserved(modified, file);
 			}
 		}
-		assertThat(assertedModified).isTrue();
-
 		dir = "sftpSource/subSftpSource/";
 		this.inboundMGet.send(new GenericMessage<Object>(dir + "*.txt"));
 		result = this.output.receive(1000);
@@ -225,14 +218,12 @@ public void testInt3172LocalDirectoryExpressionMGETRecursive() throws IOExceptio
 		List<File> localFiles = (List<File>) result.getPayload();
 		assertThat(localFiles).hasSize(3);
 
-		boolean assertedModified = false;
 		for (File file : localFiles) {
 			assertThat(file.getPath().replaceAll(Matcher.quoteReplacement(File.separator), "/")).contains(dir);
 			if (file.getPath().contains("localTarget1")) {
-				assertedModified = assertPreserved(modified, file);
+				assertPreserved(modified, file);
 			}
 		}
-		assertThat(assertedModified).isTrue();
 		assertThat(localFiles.get(2).getPath().replaceAll(Matcher.quoteReplacement(File.separator), "/"))
 				.contains(dir + "subSftpSource");
 
@@ -270,10 +261,9 @@ private long setModifiedOnSource1() {
 		return modified;
 	}
 
-	private boolean assertPreserved(long modified, File file) {
+	private void assertPreserved(long modified, File file) {
 		assertThat(Math.abs(file.lastModified() - modified))
 				.as("lastModified wrong by " + (modified - file.lastModified())).isLessThan(1_000);
-		return true;
 	}
 
 	@Test
@@ -480,7 +470,7 @@ public void testInt3088MPutRecursive() {
 		while (output.receive(0) != null) {
 			// drain
 		}
-		this.inboundMPutRecursive.send(new GenericMessage<File>(getSourceLocalDirectory()));
+		this.inboundMPutRecursive.send(new GenericMessage<>(getSourceLocalDirectory()));
 		@SuppressWarnings("unchecked")
 		Message<List<String>> out = (Message<List<String>>) this.output.receive(1000);
 		assertThat(out).isNotNull();
@@ -504,7 +494,7 @@ public void testInt3088MPutRecursiveFiltered() {
 		while (output.receive(0) != null) {
 			// drain
 		}
-		this.inboundMPutRecursiveFiltered.send(new GenericMessage<File>(getSourceLocalDirectory()));
+		this.inboundMPutRecursiveFiltered.send(new GenericMessage<>(getSourceLocalDirectory()));
 		@SuppressWarnings("unchecked")
 		Message<List<String>> out = (Message<List<String>>) this.output.receive(1000);
 		assertThat(out).isNotNull();
@@ -559,7 +549,7 @@ public void testStream() {
 
 	@Test
 	public void testMessageSessionCallback() {
-		this.inboundCallback.send(new GenericMessage<String>("foo"));
+		this.inboundCallback.send(new GenericMessage<>("foo"));
 		Message<?> receive = this.output.receive(10000);
 		assertThat(receive).isNotNull();
 		assertThat(receive.getPayload()).isEqualTo("FOO");
@@ -576,7 +566,7 @@ private static final class TestMessageSessionCallback
 			implements MessageSessionCallback<LsEntry, Object> {
 
 		@Override
-		public Object doInSession(Session<ChannelSftp.LsEntry> session, Message<?> requestMessage) throws IOException {
+		public Object doInSession(Session<ChannelSftp.LsEntry> session, Message<?> requestMessage) {
 			return ((String) requestMessage.getPayload()).toUpperCase();
 		}
 
@@ -627,6 +617,7 @@ public MessageChannel eventChannel() {
 				return true;
 			};
 		}
+
 	}
 
 }