From 0c81e4d7919e1bec2fc4f16bbfe419c21e7ecc1e Mon Sep 17 00:00:00 2001
From: Artem Bilan <abilan@pivotal.io>
Date: Thu, 9 Mar 2017 17:37:20 -0500
Subject: [PATCH] Add `@DirtiesContext` to test classes

---
 .../aws/config/xml/S3InboundChannelAdapterParserTests.java      | 2 ++
 .../integration/aws/config/xml/S3MessageHandlerParserTests.java | 2 ++
 .../config/xml/S3StreamingInboundChannelAdapterParserTests.java | 2 ++
 .../aws/config/xml/SnsInboundChannelAdapterParserTests.java     | 2 ++
 .../aws/config/xml/SnsOutboundChannelAdapterParserTests.java    | 2 ++
 .../config/xml/SqsMessageDrivenChannelAdapterParserTests.java   | 2 ++
 .../aws/config/xml/SqsMessageHandlerParserTests.java            | 2 ++
 .../aws/inbound/SqsMessageDrivenChannelAdapterTests.java        | 2 ++
 .../aws/outbound/AbstractSqsMessageHandlerTests.java            | 2 ++
 .../integration/aws/outbound/KinesisMessageHandlerTests.java    | 2 ++
 10 files changed, 20 insertions(+)

diff --git a/src/test/java/org/springframework/integration/aws/config/xml/S3InboundChannelAdapterParserTests.java b/src/test/java/org/springframework/integration/aws/config/xml/S3InboundChannelAdapterParserTests.java
index e4047c5..03052f8 100644
--- a/src/test/java/org/springframework/integration/aws/config/xml/S3InboundChannelAdapterParserTests.java
+++ b/src/test/java/org/springframework/integration/aws/config/xml/S3InboundChannelAdapterParserTests.java
@@ -38,6 +38,7 @@ import org.springframework.integration.file.remote.session.SessionFactory;
 import org.springframework.integration.file.remote.synchronizer.AbstractInboundFileSynchronizer;
 import org.springframework.integration.test.util.TestUtils;
 import org.springframework.messaging.MessageChannel;
+import org.springframework.test.annotation.DirtiesContext;
 import org.springframework.test.context.ContextConfiguration;
 import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
 import org.springframework.util.ReflectionUtils;
@@ -47,6 +48,7 @@ import org.springframework.util.ReflectionUtils;
  */
 @RunWith(SpringJUnit4ClassRunner.class)
 @ContextConfiguration
+@DirtiesContext
 public class S3InboundChannelAdapterParserTests {
 
 	@Autowired
diff --git a/src/test/java/org/springframework/integration/aws/config/xml/S3MessageHandlerParserTests.java b/src/test/java/org/springframework/integration/aws/config/xml/S3MessageHandlerParserTests.java
index 4ae0cf6..eeeda9c 100644
--- a/src/test/java/org/springframework/integration/aws/config/xml/S3MessageHandlerParserTests.java
+++ b/src/test/java/org/springframework/integration/aws/config/xml/S3MessageHandlerParserTests.java
@@ -33,6 +33,7 @@ import org.springframework.integration.expression.ExpressionUtils;
 import org.springframework.integration.test.util.TestUtils;
 import org.springframework.messaging.MessageChannel;
 import org.springframework.messaging.MessageHandler;
+import org.springframework.test.annotation.DirtiesContext;
 import org.springframework.test.context.ContextConfiguration;
 import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
 
@@ -45,6 +46,7 @@ import com.amazonaws.services.s3.transfer.internal.S3ProgressListener;
  */
 @RunWith(SpringJUnit4ClassRunner.class)
 @ContextConfiguration
+@DirtiesContext
 public class S3MessageHandlerParserTests {
 
 	@Autowired
diff --git a/src/test/java/org/springframework/integration/aws/config/xml/S3StreamingInboundChannelAdapterParserTests.java b/src/test/java/org/springframework/integration/aws/config/xml/S3StreamingInboundChannelAdapterParserTests.java
index 1c2a2f1..0681b17 100644
--- a/src/test/java/org/springframework/integration/aws/config/xml/S3StreamingInboundChannelAdapterParserTests.java
+++ b/src/test/java/org/springframework/integration/aws/config/xml/S3StreamingInboundChannelAdapterParserTests.java
@@ -34,6 +34,7 @@ import org.springframework.integration.file.remote.session.SessionFactory;
 import org.springframework.integration.file.remote.synchronizer.AbstractInboundFileSynchronizer;
 import org.springframework.integration.test.util.TestUtils;
 import org.springframework.messaging.MessageChannel;
+import org.springframework.test.annotation.DirtiesContext;
 import org.springframework.test.context.ContextConfiguration;
 import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
 import org.springframework.util.ReflectionUtils;
@@ -43,6 +44,7 @@ import org.springframework.util.ReflectionUtils;
  */
 @RunWith(SpringJUnit4ClassRunner.class)
 @ContextConfiguration
+@DirtiesContext
 public class S3StreamingInboundChannelAdapterParserTests {
 
 	@Autowired
diff --git a/src/test/java/org/springframework/integration/aws/config/xml/SnsInboundChannelAdapterParserTests.java b/src/test/java/org/springframework/integration/aws/config/xml/SnsInboundChannelAdapterParserTests.java
index 8d9cc49..b0049e7 100644
--- a/src/test/java/org/springframework/integration/aws/config/xml/SnsInboundChannelAdapterParserTests.java
+++ b/src/test/java/org/springframework/integration/aws/config/xml/SnsInboundChannelAdapterParserTests.java
@@ -27,6 +27,7 @@ import org.springframework.integration.aws.inbound.SnsInboundChannelAdapter;
 import org.springframework.integration.channel.NullChannel;
 import org.springframework.integration.test.util.TestUtils;
 import org.springframework.messaging.MessageChannel;
+import org.springframework.test.annotation.DirtiesContext;
 import org.springframework.test.context.ContextConfiguration;
 import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
 
@@ -37,6 +38,7 @@ import com.amazonaws.services.sns.AmazonSNS;
  */
 @RunWith(SpringJUnit4ClassRunner.class)
 @ContextConfiguration
+@DirtiesContext
 public class SnsInboundChannelAdapterParserTests {
 
 	@Autowired
diff --git a/src/test/java/org/springframework/integration/aws/config/xml/SnsOutboundChannelAdapterParserTests.java b/src/test/java/org/springframework/integration/aws/config/xml/SnsOutboundChannelAdapterParserTests.java
index f4e95bd..816b3b2 100644
--- a/src/test/java/org/springframework/integration/aws/config/xml/SnsOutboundChannelAdapterParserTests.java
+++ b/src/test/java/org/springframework/integration/aws/config/xml/SnsOutboundChannelAdapterParserTests.java
@@ -33,6 +33,7 @@ import org.springframework.integration.handler.advice.RequestHandlerRetryAdvice;
 import org.springframework.integration.test.util.TestUtils;
 import org.springframework.messaging.MessageChannel;
 import org.springframework.messaging.MessageHandler;
+import org.springframework.test.annotation.DirtiesContext;
 import org.springframework.test.context.ContextConfiguration;
 import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
 
@@ -43,6 +44,7 @@ import com.amazonaws.services.sns.AmazonSNS;
  */
 @RunWith(SpringJUnit4ClassRunner.class)
 @ContextConfiguration
+@DirtiesContext
 public class SnsOutboundChannelAdapterParserTests {
 
 	@Autowired
diff --git a/src/test/java/org/springframework/integration/aws/config/xml/SqsMessageDrivenChannelAdapterParserTests.java b/src/test/java/org/springframework/integration/aws/config/xml/SqsMessageDrivenChannelAdapterParserTests.java
index 3cb5a42..e8b565a 100644
--- a/src/test/java/org/springframework/integration/aws/config/xml/SqsMessageDrivenChannelAdapterParserTests.java
+++ b/src/test/java/org/springframework/integration/aws/config/xml/SqsMessageDrivenChannelAdapterParserTests.java
@@ -38,6 +38,7 @@ import org.springframework.integration.test.util.TestUtils;
 import org.springframework.messaging.MessageChannel;
 import org.springframework.messaging.core.DestinationResolutionException;
 import org.springframework.messaging.core.DestinationResolver;
+import org.springframework.test.annotation.DirtiesContext;
 import org.springframework.test.context.ContextConfiguration;
 import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
 
@@ -49,6 +50,7 @@ import com.amazonaws.services.sqs.AmazonSQS;
  */
 @RunWith(SpringJUnit4ClassRunner.class)
 @ContextConfiguration
+@DirtiesContext
 public class SqsMessageDrivenChannelAdapterParserTests {
 
 	@Autowired
diff --git a/src/test/java/org/springframework/integration/aws/config/xml/SqsMessageHandlerParserTests.java b/src/test/java/org/springframework/integration/aws/config/xml/SqsMessageHandlerParserTests.java
index 5783fd4..4fe9f28 100644
--- a/src/test/java/org/springframework/integration/aws/config/xml/SqsMessageHandlerParserTests.java
+++ b/src/test/java/org/springframework/integration/aws/config/xml/SqsMessageHandlerParserTests.java
@@ -28,6 +28,7 @@ import org.springframework.integration.endpoint.EventDrivenConsumer;
 import org.springframework.integration.test.util.TestUtils;
 import org.springframework.messaging.MessageChannel;
 import org.springframework.messaging.MessageHandler;
+import org.springframework.test.annotation.DirtiesContext;
 import org.springframework.test.context.ContextConfiguration;
 import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
 
@@ -38,6 +39,7 @@ import com.amazonaws.services.sqs.AmazonSQS;
  */
 @RunWith(SpringJUnit4ClassRunner.class)
 @ContextConfiguration
+@DirtiesContext
 public class SqsMessageHandlerParserTests {
 
 	@Autowired
diff --git a/src/test/java/org/springframework/integration/aws/inbound/SqsMessageDrivenChannelAdapterTests.java b/src/test/java/org/springframework/integration/aws/inbound/SqsMessageDrivenChannelAdapterTests.java
index 4081529..d821b97 100644
--- a/src/test/java/org/springframework/integration/aws/inbound/SqsMessageDrivenChannelAdapterTests.java
+++ b/src/test/java/org/springframework/integration/aws/inbound/SqsMessageDrivenChannelAdapterTests.java
@@ -38,6 +38,7 @@ import org.springframework.integration.test.util.TestUtils;
 import org.springframework.messaging.MessageChannel;
 import org.springframework.messaging.PollableChannel;
 import org.springframework.messaging.support.GenericMessage;
+import org.springframework.test.annotation.DirtiesContext;
 import org.springframework.test.context.ContextConfiguration;
 import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
 
@@ -55,6 +56,7 @@ import com.amazonaws.services.sqs.model.ReceiveMessageResult;
  */
 @RunWith(SpringJUnit4ClassRunner.class)
 @ContextConfiguration
+@DirtiesContext
 public class SqsMessageDrivenChannelAdapterTests {
 
 	@Autowired
diff --git a/src/test/java/org/springframework/integration/aws/outbound/AbstractSqsMessageHandlerTests.java b/src/test/java/org/springframework/integration/aws/outbound/AbstractSqsMessageHandlerTests.java
index f770393..f8c76d1 100644
--- a/src/test/java/org/springframework/integration/aws/outbound/AbstractSqsMessageHandlerTests.java
+++ b/src/test/java/org/springframework/integration/aws/outbound/AbstractSqsMessageHandlerTests.java
@@ -31,6 +31,7 @@ import org.springframework.messaging.Message;
 import org.springframework.messaging.MessageChannel;
 import org.springframework.messaging.MessageHandlingException;
 import org.springframework.messaging.support.MessageBuilder;
+import org.springframework.test.annotation.DirtiesContext;
 
 import com.amazonaws.services.sqs.AmazonSQS;
 import com.amazonaws.services.sqs.model.SendMessageRequest;
@@ -43,6 +44,7 @@ import com.amazonaws.services.sqs.model.SendMessageRequest;
  * @author Rahul Pilani
  * @author Artem Bilan
  */
+@DirtiesContext
 public abstract class AbstractSqsMessageHandlerTests {
 
 	@Autowired
diff --git a/src/test/java/org/springframework/integration/aws/outbound/KinesisMessageHandlerTests.java b/src/test/java/org/springframework/integration/aws/outbound/KinesisMessageHandlerTests.java
index e0cdefe..271f245 100644
--- a/src/test/java/org/springframework/integration/aws/outbound/KinesisMessageHandlerTests.java
+++ b/src/test/java/org/springframework/integration/aws/outbound/KinesisMessageHandlerTests.java
@@ -44,6 +44,7 @@ import org.springframework.messaging.MessageHandler;
 import org.springframework.messaging.MessageHandlingException;
 import org.springframework.messaging.support.GenericMessage;
 import org.springframework.messaging.support.MessageBuilder;
+import org.springframework.test.annotation.DirtiesContext;
 import org.springframework.test.context.junit4.SpringRunner;
 
 import com.amazonaws.handlers.AsyncHandler;
@@ -59,6 +60,7 @@ import com.amazonaws.services.kinesis.model.PutRecordsResult;
  * @since 1.1
  */
 @RunWith(SpringRunner.class)
+@DirtiesContext
 public class KinesisMessageHandlerTests {
 
 	@Autowired