File Cleanup - Scripting to Twitter

spring-integration-scripting/src/test/java/org/springframework/integration/scripting/config/jsr223/Jsr223ServiceActivatorTests.java

@@ -16,6 +16,8 @@
 
 package org.springframework.integration.scripting.config.jsr223;
 
+import static org.hamcrest.Matchers.containsString;
+import static org.hamcrest.Matchers.startsWith;
 import static org.junit.Assert.assertFalse;
 import static org.junit.Assert.assertNull;
 import static org.junit.Assert.assertThat;
@@ -26,18 +28,17 @@ import java.util.Date;
 import java.util.HashMap;
 import java.util.Map;
 
-import org.hamcrest.Matchers;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 
 import org.springframework.beans.BeansException;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.context.support.ClassPathXmlApplicationContext;
-import org.springframework.messaging.Message;
-import org.springframework.messaging.MessageChannel;
 import org.springframework.integration.channel.QueueChannel;
 import org.springframework.integration.scripting.ScriptVariableGenerator;
 import org.springframework.integration.support.MessageBuilder;
+import org.springframework.messaging.Message;
+import org.springframework.messaging.MessageChannel;
 import org.springframework.test.context.ContextConfiguration;
 import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
 
@@ -132,13 +133,13 @@ public class Jsr223ServiceActivatorTests {
 		}
 		String payload = (String) replyChannel.receive(0).getPayload();
 
-		assertThat(payload, Matchers.startsWith("inline-test-1 - FOO"));
+		assertThat(payload, startsWith("inline-test-1 - FOO"));
 
 		payload = (String) replyChannel.receive(0).getPayload();
-		assertThat(payload, Matchers.startsWith("inline-test-2 - FOO"));
+		assertThat(payload, startsWith("inline-test-2 - FOO"));
 
 		payload = (String) replyChannel.receive(0).getPayload();
-		assertThat(payload, Matchers.startsWith("inline-test-3 - FOO"));
+		assertThat(payload, startsWith("inline-test-3 - FOO"));
 		assertTrue(payload.substring(payload.indexOf(":") + 1).matches(".+\\d{2}:\\d{2}:\\d{2}.+"));
 
 		assertNull(replyChannel.receive(0));
@@ -148,26 +149,30 @@ public class Jsr223ServiceActivatorTests {
 	@Test
 	public void variablesAndScriptVariableGenerator() throws Exception {
 		try {
-			new ClassPathXmlApplicationContext("Jsr223ServiceActivatorTests-fail-withgenerator-context.xml", this.getClass());
+			new ClassPathXmlApplicationContext("Jsr223ServiceActivatorTests-fail-withgenerator-context.xml",
+					this.getClass()).close();
 			fail("BeansException expected.");
 		}
 		catch (BeansException e) {
-			assertThat(e.getMessage(), Matchers.containsString("'script-variable-generator' and 'variable' sub-elements are mutually exclusive."));
+			assertThat(e.getMessage(),
+					containsString("'script-variable-generator' and 'variable' sub-elements are mutually exclusive."));
 		}
 	}
 
 	@Test
 	public void testDuplicateVariable() throws Exception {
 		try {
-			new ClassPathXmlApplicationContext("Jsr223ServiceActivatorTests-fail-duplicated-variable-context.xml", this.getClass());
+			new ClassPathXmlApplicationContext("Jsr223ServiceActivatorTests-fail-duplicated-variable-context.xml",
+					this.getClass()).close();
 			fail("BeansException expected.");
 		}
 		catch (BeansException e) {
-			assertThat(e.getMessage(), Matchers.containsString("Duplicated variable: foo"));
+			assertThat(e.getMessage(), containsString("Duplicated variable: foo"));
 		}
 	}
 
 	public static class SampleScriptVariSource implements ScriptVariableGenerator {
+		@Override
 		public Map<String, Object> generateScriptVariables(Message<?> message) {
 			Map<String, Object> variables = new HashMap<String, Object>();
 			variables.put("foo", "foo");

spring-integration-sftp/src/test/java/org/springframework/integration/sftp/TestInboundSftp.java

@@ -1,35 +0,0 @@
-/*
- * Copyright 2002-2016 the original author or authors.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.springframework.integration.sftp;
-
-import org.springframework.context.support.ClassPathXmlApplicationContext;
-
-/**
- * @author Josh Long
- * @author Gary Russell
- */
-public class TestInboundSftp {
-
-	private TestInboundSftp() {
-		super();
-	}
-
-	static public void main(String[] args) throws Throwable {
-		ClassPathXmlApplicationContext classPathXmlApplicationContext = new ClassPathXmlApplicationContext("TestInboundSftp.xml");
-		classPathXmlApplicationContext.start();
-	}
-}

spring-integration-sftp/src/test/java/org/springframework/integration/sftp/config/SftpInboundOutboundSanitySample.java

@@ -16,17 +16,17 @@
 
 package org.springframework.integration.sftp.config;
 
+import static org.junit.Assert.assertTrue;
+
 import java.io.File;
 
 import org.junit.Ignore;
 import org.junit.Test;
-import org.springframework.context.ApplicationContext;
+
 import org.springframework.context.support.ClassPathXmlApplicationContext;
 import org.springframework.messaging.MessageChannel;
 import org.springframework.messaging.support.GenericMessage;
 
-import static org.junit.Assert.assertTrue;
-
 /**
  * @author Oleg Zhurakousy
  * @author Gunnar Hillert
@@ -55,18 +55,20 @@ public class SftpInboundOutboundSanitySample {
 			fileB.delete();
 		}
 
-		new ClassPathXmlApplicationContext("SftpInboundReceiveSample-ignored.xml", this.getClass());
+		ClassPathXmlApplicationContext context = new ClassPathXmlApplicationContext(
+				"SftpInboundReceiveSample-ignored.xml", this.getClass());
 		Thread.sleep(5000);
 		fileA = new File("local-test-dir/a.test");
 		fileB = new File("local-test-dir/b.test");
 		assertTrue(fileA.exists());
 		assertTrue(fileB.exists());
+		context.close();
 	}
 
 	@Test
 	@Ignore
 	public void testOutbound() throws Exception {
-		ApplicationContext ac =
+		ClassPathXmlApplicationContext ac =
 			new ClassPathXmlApplicationContext("SftpOutboundTransferSample-ignored.xml", this.getClass());
 		File fileA = new File("local-test-dir/a.test");
 		File fileB = new File("local-test-dir/b.test");
@@ -78,5 +80,7 @@ public class SftpInboundOutboundSanitySample {
 		fileB = new File("remote-target-dir/b.test-foo");
 		assertTrue(fileA.exists());
 		assertTrue(fileB.exists());
+		ac.close();
 	}
+
 }

spring-integration-sftp/src/test/java/org/springframework/integration/sftp/config/SftpMessageHistoryTests.java

@@ -19,21 +19,25 @@ package org.springframework.integration.sftp.config;
 import static org.junit.Assert.assertEquals;
 
 import org.junit.Test;
-import org.springframework.context.ApplicationContext;
+
 import org.springframework.context.support.ClassPathXmlApplicationContext;
 import org.springframework.integration.endpoint.SourcePollingChannelAdapter;
 
 /**
  * @author Oleg Zhurakousky
  * @author Gunnar Hillert
+ * @author Gary Russell
  */
 public class SftpMessageHistoryTests {
 
 	@Test
 	public void testMessageHistoryCompliance() {
-		ApplicationContext ac = new ClassPathXmlApplicationContext("MessageHistory-context.xml", SftpMessageHistoryTests.class);
+		ClassPathXmlApplicationContext ac = new ClassPathXmlApplicationContext("MessageHistory-context.xml",
+				SftpMessageHistoryTests.class);
 		SourcePollingChannelAdapter spca = ac.getBean("sftpAdapter", SourcePollingChannelAdapter.class);
 		assertEquals("sftpAdapter", spca.getComponentName());
 		assertEquals("sftp:inbound-channel-adapter", spca.getComponentType());
+		ac.close();
 	}
+
 }

spring-integration-sftp/src/test/java/org/springframework/integration/sftp/filters/SftpPersistentAcceptOnceFileListFilterTests.java

@@ -64,6 +64,7 @@ public class SftpPersistentAcceptOnceFileListFilterTests {
 		assertEquals("baz", now.get(1).getFilename());
 		now = filter.filterFiles(files);
 		assertEquals(0, now.size());
+		filter.close();
 	}
 
 	@Test
@@ -82,6 +83,7 @@ public class SftpPersistentAcceptOnceFileListFilterTests {
 		assertEquals(2, now.size());
 		assertEquals("foo", now.get(0).getFilename());
 		assertEquals("bar", now.get(1).getFilename());
+		filter.close();
 	}
 
 }

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

@@ -46,7 +46,6 @@ import org.mockito.stubbing.Answer;
 
 import org.springframework.beans.DirectFieldAccessor;
 import org.springframework.beans.factory.BeanFactory;
-import org.springframework.context.ApplicationContext;
 import org.springframework.context.support.ClassPathXmlApplicationContext;
 import org.springframework.expression.common.LiteralExpression;
 import org.springframework.integration.file.DefaultFileNameGenerator;
@@ -163,17 +162,20 @@ public class SftpOutboundTests {
 		File destFile = new File(targetDir, srcFile.getName());
 		destFile.deleteOnExit();
 
-		ApplicationContext context = new ClassPathXmlApplicationContext("SftpOutboundInsideChainTests-context.xml", getClass());
+		ClassPathXmlApplicationContext context = new ClassPathXmlApplicationContext(
+				"SftpOutboundInsideChainTests-context.xml", getClass());
 
 		MessageChannel channel = context.getBean("outboundChannelAdapterInsideChain", MessageChannel.class);
 
 		channel.send(new GenericMessage<File>(srcFile));
 		assertTrue("destination file was not created", destFile.exists());
+		context.close();
 	}
 
 	@Test //INT-2275
 	public void testFtpOutboundGatewayInsideChain() throws Exception {
-		ApplicationContext context = new ClassPathXmlApplicationContext("SftpOutboundInsideChainTests-context.xml", getClass());
+		ClassPathXmlApplicationContext context = new ClassPathXmlApplicationContext(
+				"SftpOutboundInsideChainTests-context.xml", getClass());
 
 		MessageChannel channel = context.getBean("outboundGatewayInsideChain", MessageChannel.class);
 
@@ -191,6 +193,7 @@ public class SftpOutboundTests {
 		for (FileInfo<?> remoteFile : remoteFiles) {
 			assertTrue(files.contains(remoteFile.getFilename()));
 		}
+		context.close();
 	}
 
 	@Test //INT-2954

spring-integration-sftp/src/test/resources/TestInboundSftp.xml

@@ -1,61 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<!--
-  ~ Copyright 2010 the original author or authors
-  ~
-  ~     Licensed under the Apache License, Version 2.0 (the "License");
-  ~     you may not use this file except in compliance with the License.
-  ~     You may obtain a copy of the License at
-  ~
-  ~         http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~     Unless required by applicable law or agreed to in writing, software
-  ~     distributed under the License is distributed on an "AS IS" BASIS,
-  ~     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~     See the License for the specific language governing permissions and
-  ~     limitations under the License.
-  -->
-
-<beans:beans
-		xmlns="http://www.springframework.org/schema/integration"
-		xmlns:beans="http://www.springframework.org/schema/beans"
-		xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-		xmlns:p="http://www.springframework.org/schema/p"
-		xmlns:context="http://www.springframework.org/schema/context"
-		xmlns:util="http://www.springframework.org/schema/util"
-		xmlns:tool="http://www.springframework.org/schema/tool"
-		xmlns:lang="http://www.springframework.org/schema/lang"
-		xmlns:sftp="http://www.springframework.org/schema/integration/sftp"
-		xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd
-						http://www.springframework.org/schema/integration http://www.springframework.org/schema/integration/spring-integration.xsd
-					 	http://www.springframework.org/schema/context http://www.springframework.org/schema/context/spring-context.xsd
-                        http://www.springframework.org/schema/util http://www.springframework.org/schema/util/spring-util.xsd
-						http://www.springframework.org/schema/tool http://www.springframework.org/schema/tool/spring-tool.xsd
-						http://www.springframework.org/schema/lang http://www.springframework.org/schema/lang/spring-lang.xsd
-						http://www.springframework.org/schema/integration/sftp http://www.springframework.org/schema/integration/sftp/spring-integration-sftp.xsd">
-
-	<context:component-scan base-package="org.springframework.integration.sftp"/>
-
-	<context:property-placeholder
-			location="file://${user.home}/Desktop/sftp.properties"
-			ignore-unresolvable="true"/>
-
-	<channel id="inboundFilesChannel"/>
-
-	<sftp:inbound-channel-adapter
-			key-file="${sftp.key}"
-			remote-directory="${sftp.remote-dir}"
-			channel="inboundFilesChannel"
-			filename-pattern=".*?jpg"
-			username="${sftp.username}"
-			auto-create-directories="true"
-			auto-delete-remote-files-on-sync="true"
-			host="${sftp.host}">
-		<poller>
-			<interval-trigger interval="1000" time-unit="MILLISECONDS"/>
-		</poller>
-	</sftp:inbound-channel-adapter>
-
-	<service-activator ref="sftpAnnouncer" input-channel="inboundFilesChannel"/>
-
-</beans:beans>

spring-integration-sftp/src/test/resources/TestOutboundSftp.xml

@@ -1,52 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-  ~ Copyright 2010 the original author or authors
-  ~
-  ~     Licensed under the Apache License, Version 2.0 (the "License");
-  ~     you may not use this file except in compliance with the License.
-  ~     You may obtain a copy of the License at
-  ~
-  ~         http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~     Unless required by applicable law or agreed to in writing, software
-  ~     distributed under the License is distributed on an "AS IS" BASIS,
-  ~     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~     See the License for the specific language governing permissions and
-  ~     limitations under the License.
-  -->
-
-<beans:beans
-		xmlns="http://www.springframework.org/schema/integration"
-		xmlns:beans="http://www.springframework.org/schema/beans"
-		xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-		xmlns:p="http://www.springframework.org/schema/p"
-		xmlns:context="http://www.springframework.org/schema/context"
-		xmlns:util="http://www.springframework.org/schema/util"
-		xmlns:tool="http://www.springframework.org/schema/tool"
-		xmlns:lang="http://www.springframework.org/schema/lang"
-		xmlns:sftp="http://www.springframework.org/schema/integration/sftp"
-		xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd
-						http://www.springframework.org/schema/integration http://www.springframework.org/schema/integration/spring-integration.xsd
-					 	http://www.springframework.org/schema/context http://www.springframework.org/schema/context/spring-context.xsd
-                        http://www.springframework.org/schema/util http://www.springframework.org/schema/util/spring-util.xsd
-						http://www.springframework.org/schema/tool http://www.springframework.org/schema/tool/spring-tool.xsd
-						http://www.springframework.org/schema/lang http://www.springframework.org/schema/lang/spring-lang.xsd
-						http://www.springframework.org/schema/integration/sftp
-						 http://www.springframework.org/schema/integration/sftp/spring-integration-sftp.xsd">
-
-	<context:component-scan base-package="org.springframework.integration.sftp"/>
-
-	<channel id="inboundFilesChannel"/>
-
-	<sftp:outbound-channel-adapter
-			key-file="/home/user/user.pem"
-			remote-directory="/home/ubuntu/remote_mount_key"
-			auto-create-directories="true"
-			channel="inboundFilesChannel"
-			username="ubuntu"
-			host="siteonec2usingubuntuami.com"
-			/>
-
-	<service-activator input-channel="inboundFilesChannel" ref="sftpAnnouncer"/>
-
-</beans:beans>

spring-integration-stream/src/test/java/org/springframework/integration/stream/config/ConsoleInboundChannelAdapterParserTests.java

@@ -72,6 +72,7 @@ public class ConsoleInboundChannelAdapterParserTests {
 		Message<?> message = source.receive();
 		assertNotNull(message);
 		assertEquals("foo", message.getPayload());
+		context.close();
 	}
 
 	@Test
@@ -92,14 +93,15 @@ public class ConsoleInboundChannelAdapterParserTests {
 		Message<?> message = source.receive();
 		assertNotNull(message);
 		assertEquals("foo", message.getPayload());
+		context.close();
 	}
 
 	@Test
 	public void testConsoleSourceWithInvalidCharset() {
 		BeanCreationException beanCreationException = null;
 		try {
-			new ClassPathXmlApplicationContext(
-					"invalidConsoleInboundChannelAdapterParserTests.xml", ConsoleInboundChannelAdapterParserTests.class);
+			new ClassPathXmlApplicationContext("invalidConsoleInboundChannelAdapterParserTests.xml",
+					ConsoleInboundChannelAdapterParserTests.class).close();
 		}
 		catch (BeanCreationException e) {
 			beanCreationException = e;

spring-integration-stream/src/test/java/org/springframework/integration/stream/config/ConsoleOutboundChannelAdapterParserTests.java

@@ -33,17 +33,18 @@ import java.util.List;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.mockito.Mockito;
+
 import org.springframework.beans.DirectFieldAccessor;
 import org.springframework.beans.factory.BeanCreationException;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Qualifier;
 import org.springframework.context.support.ClassPathXmlApplicationContext;
-import org.springframework.messaging.MessageChannel;
-import org.springframework.messaging.MessageHandler;
 import org.springframework.integration.handler.MessageHandlerChain;
-import org.springframework.messaging.support.GenericMessage;
 import org.springframework.integration.stream.CharacterStreamWritingMessageHandler;
 import org.springframework.integration.test.util.TestUtils;
+import org.springframework.messaging.MessageChannel;
+import org.springframework.messaging.MessageHandler;
+import org.springframework.messaging.support.GenericMessage;
 import org.springframework.test.context.ContextConfiguration;
 import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
 
@@ -127,8 +128,8 @@ public class ConsoleOutboundChannelAdapterParserTests {
 	public void stdoutAdapterWithInvalidCharset() {
 		BeanCreationException beanCreationException = null;
 		try {
-			new ClassPathXmlApplicationContext(
-					"invalidConsoleOutboundChannelAdapterParserTests.xml", ConsoleOutboundChannelAdapterParserTests.class);
+			new ClassPathXmlApplicationContext("invalidConsoleOutboundChannelAdapterParserTests.xml",
+					ConsoleOutboundChannelAdapterParserTests.class).close();
 		}
 		catch (BeanCreationException e) {
 			beanCreationException = e;

spring-integration-syslog/src/test/java/org/springframework/integration/syslog/config/SyslogReceivingChannelAdapterParserTests.java

@@ -164,19 +164,21 @@ public class SyslogReceivingChannelAdapterParserTests {
 	@Test
 	public void testPortOnUdpChild() {
 		try {
-			new ClassPathXmlApplicationContext(this.getClass().getSimpleName() + "-fail1-context.xml", this.getClass());
+			new ClassPathXmlApplicationContext(this.getClass().getSimpleName() + "-fail1-context.xml", this.getClass())
+					.close();
 			fail("Expected exception");
 		}
 		catch (BeanDefinitionParsingException e) {
 			assertTrue(e.getMessage().startsWith(
-					"Configuration problem: When child element 'udp-attributes' is present, 'port' must be defined there"));
+				"Configuration problem: When child element 'udp-attributes' is present, 'port' must be defined there"));
 		}
 	}
 
 	@Test
 	public void testPortWithTCPFactory() {
 		try {
-			new ClassPathXmlApplicationContext(this.getClass().getSimpleName() + "-fail2-context.xml", this.getClass());
+			new ClassPathXmlApplicationContext(this.getClass().getSimpleName() + "-fail2-context.xml", this.getClass())
+					.close();
 			fail("Expected exception");
 		}
 		catch (BeanCreationException e) {
@@ -187,7 +189,8 @@ public class SyslogReceivingChannelAdapterParserTests {
 	@Test
 	public void testUdpChildWithTcp() {
 		try {
-			new ClassPathXmlApplicationContext(this.getClass().getSimpleName() + "-fail3-context.xml", this.getClass());
+			new ClassPathXmlApplicationContext(this.getClass().getSimpleName() + "-fail3-context.xml", this.getClass())
+					.close();
 			fail("Expected exception");
 		}
 		catch (BeanCreationException e) {
@@ -200,11 +203,13 @@ public class SyslogReceivingChannelAdapterParserTests {
 	@Test
 	public void testUDPWithTCPFactory() {
 		try {
-			new ClassPathXmlApplicationContext(this.getClass().getSimpleName() + "-fail4-context.xml", this.getClass());
+			new ClassPathXmlApplicationContext(this.getClass().getSimpleName() + "-fail4-context.xml", this.getClass())
+					.close();
 			fail("Expected exception");
 		}
 		catch (BeanCreationException e) {
-			assertEquals("Cannot specifiy 'connection-factory' unless the protocol is 'tcp'", e.getCause().getMessage());
+			assertEquals("Cannot specifiy 'connection-factory' unless the protocol is 'tcp'",
+					e.getCause().getMessage());
 		}
 	}
 

spring-integration-twitter/src/test/java/org/springframework/integration/twitter/config/TestReceivingMessageSourceParser-context.xml

@@ -23,28 +23,28 @@
 
 	<channel id="inbound_mentions"/>
 
-    <twitter:mentions-inbound-channel-adapter id="mentionAdapter"
-    					twitter-template="twitter"
-    					channel="inbound_mentions"
-    					page-size="23"
-    					auto-startup="false">
-    	<poller fixed-rate="5000" max-messages-per-poll="3"/>
-    </twitter:mentions-inbound-channel-adapter>
+	<twitter:mentions-inbound-channel-adapter id="mentionAdapter"
+						twitter-template="twitter"
+						channel="inbound_mentions"
+						page-size="23"
+						auto-startup="false">
+		<poller fixed-rate="5000" max-messages-per-poll="3"/>
+	</twitter:mentions-inbound-channel-adapter>
 
-    <twitter:dm-inbound-channel-adapter id="dmAdapter"
-    					twitter-template="twitter"
-    					channel="inbound_mentions"
-    					page-size="45"
-    					auto-startup="false">
-    	<poller fixed-rate="5000" max-messages-per-poll="3"/>
-    </twitter:dm-inbound-channel-adapter>
-    <twitter:inbound-channel-adapter id="updateAdapter"
-    					twitter-template="twitter"
-    					channel="inbound_mentions"
-    					page-size="67"
-    					auto-startup="false">
-    	<poller fixed-rate="5000" max-messages-per-poll="3"/>
-    </twitter:inbound-channel-adapter>
+	<twitter:dm-inbound-channel-adapter id="dmAdapter"
+						twitter-template="twitter"
+						channel="inbound_mentions"
+						page-size="45"
+						auto-startup="false">
+		<poller fixed-rate="5000" max-messages-per-poll="3"/>
+	</twitter:dm-inbound-channel-adapter>
+	<twitter:inbound-channel-adapter id="updateAdapter"
+						twitter-template="twitter"
+						channel="inbound_mentions"
+						page-size="67"
+						auto-startup="false">
+		<poller fixed-rate="5000" max-messages-per-poll="3"/>
+	</twitter:inbound-channel-adapter>
 
 </beans:beans>
 

spring-integration-twitter/src/test/java/org/springframework/integration/twitter/config/TestSendingMessageHandlerParser-context.xml

@@ -23,7 +23,7 @@
 
 	<channel id="inbound_mentions"/>
 
-   <channel id="inputChannel"/>
+	<channel id="inputChannel"/>
 
 	<twitter:dm-outbound-channel-adapter id="dmAdapter" order="23"
 										 twitter-template="twitter"

spring-integration-twitter/src/test/java/org/springframework/integration/twitter/config/TestSendingMessageHandlerParserTests.java

@@ -68,7 +68,8 @@ public class TestSendingMessageHandlerParserTests {
 	@Test
 	public void testInt2718FailForOutboundAdapterWithRequestHandlerAdviceChainWithinChainConfig() {
 		try {
-			new ClassPathXmlApplicationContext("OutboundAdapterWithRHACWithinChain-fail-context.xml", this.getClass());
+			new ClassPathXmlApplicationContext("OutboundAdapterWithRHACWithinChain-fail-context.xml", this.getClass())
+					.close();
 			fail("Expected BeanDefinitionParsingException");
 		}
 		catch (BeansException e) {

spring-integration-twitter/src/test/java/org/springframework/integration/twitter/ignored/TestSendingUpdatesUsingNamespace-context.xml

@@ -17,7 +17,7 @@
 						http://www.springframework.org/schema/lang http://www.springframework.org/schema/lang/spring-lang.xsd
 						http://www.springframework.org/schema/integration/twitter http://www.springframework.org/schema/integration/twitter/spring-integration-twitter.xsd">
 
-   <context:property-placeholder
+	<context:property-placeholder
 			location="classpath:twitter.receiver.properties"
 			ignore-unresolvable="true"/>