From c3380ac9b776403a34c125ea1b82de26360025e7 Mon Sep 17 00:00:00 2001 From: Josh Long Date: Sat, 23 Oct 2010 15:24:41 -0700 Subject: [PATCH] reran all live integration tests to verify the twitter adapters work with the new domain models and threading support. --- ...AbstractInboundTwitterEndpointSupport.java | 6 ++-- ...oundDirectMessageStatusMessageHandler.java | 3 +- .../twitter/TestRecievingUsingNamespace.java | 30 +++++++++++-------- .../twitter/TestSendingDMsUsingNamespace.java | 5 ++-- ...stSendingUpdatesUsingNamespace-context.xml | 6 ++-- .../TestSendingUpdatesUsingNamespace.java | 7 ++--- 6 files changed, 30 insertions(+), 27 deletions(-) diff --git a/spring-integration-twitter/src/main/java/org/springframework/integration/twitter/AbstractInboundTwitterEndpointSupport.java b/spring-integration-twitter/src/main/java/org/springframework/integration/twitter/AbstractInboundTwitterEndpointSupport.java index bd08087349..45f512445b 100644 --- a/spring-integration-twitter/src/main/java/org/springframework/integration/twitter/AbstractInboundTwitterEndpointSupport.java +++ b/spring-integration-twitter/src/main/java/org/springframework/integration/twitter/AbstractInboundTwitterEndpointSupport.java @@ -61,9 +61,11 @@ public abstract class AbstractInboundTwitterEndpointSupport extends MessagePr protected Twitter twitter; private final Object markerGuard = new Object(); private final Object apiPermitGuard = new Object(); + private final HistoryWritingMessagePostProcessor historyWritingPostProcessor = new HistoryWritingMessagePostProcessor(); - protected Executor taskExecutor; - protected int poolSize = 1; + + protected Executor taskExecutor; + protected int poolSize = 1; public void setPoolSize(int poolSize) { this.poolSize = poolSize; diff --git a/spring-integration-twitter/src/main/java/org/springframework/integration/twitter/OutboundDirectMessageStatusMessageHandler.java b/spring-integration-twitter/src/main/java/org/springframework/integration/twitter/OutboundDirectMessageStatusMessageHandler.java index 9fbfcc100a..ca614f7f4a 100644 --- a/spring-integration-twitter/src/main/java/org/springframework/integration/twitter/OutboundDirectMessageStatusMessageHandler.java +++ b/spring-integration-twitter/src/main/java/org/springframework/integration/twitter/OutboundDirectMessageStatusMessageHandler.java @@ -34,8 +34,7 @@ public class OutboundDirectMessageStatusMessageHandler extends AbstractOutboundT protected void handleMessageInternal(Message message) throws Exception { try { String txt = (String) message.getPayload(); - Object toUser = - message.getHeaders().containsKey(TwitterHeaders.TWITTER_DM_TARGET_USER_ID) ? + Object toUser = message.getHeaders().containsKey(TwitterHeaders.TWITTER_DM_TARGET_USER_ID) ? message.getHeaders().get(TwitterHeaders.TWITTER_DM_TARGET_USER_ID) : null; diff --git a/spring-integration-twitter/src/test/java/org/springframework/integration/twitter/TestRecievingUsingNamespace.java b/spring-integration-twitter/src/test/java/org/springframework/integration/twitter/TestRecievingUsingNamespace.java index e1d5e4617c..52e81dacc9 100644 --- a/spring-integration-twitter/src/test/java/org/springframework/integration/twitter/TestRecievingUsingNamespace.java +++ b/spring-integration-twitter/src/test/java/org/springframework/integration/twitter/TestRecievingUsingNamespace.java @@ -15,8 +15,11 @@ */ package org.springframework.integration.twitter; +import org.junit.Ignore; import org.junit.Test; + import org.springframework.beans.factory.annotation.Autowired; + import org.springframework.test.context.ContextConfiguration; import org.springframework.test.context.junit4.AbstractJUnit4SpringContextTests; @@ -27,19 +30,20 @@ import org.springframework.test.context.junit4.AbstractJUnit4SpringContextTests; * @author Josh Long */ @ContextConfiguration -public class TestRecievingUsingNamespace extends AbstractJUnit4SpringContextTests { +public class TestRecievingUsingNamespace + extends AbstractJUnit4SpringContextTests { + @Autowired + private TwitterAnnouncer twitterAnnouncer; - @Autowired private TwitterAnnouncer twitterAnnouncer; + @Test + @Ignore + public void testIt() throws Throwable { + long ctr = 0; + long s = 1000; - @Test - //@Ignore - public void testIt() throws Throwable { - long ctr = 0; - long s = 1000; - - while (ctr < (s * 60 * 3)) { - Thread.sleep(s); - ctr += s; - } - } + while (ctr < (s * 60 * 3)) { + Thread.sleep(s); + ctr += s; + } + } } diff --git a/spring-integration-twitter/src/test/java/org/springframework/integration/twitter/TestSendingDMsUsingNamespace.java b/spring-integration-twitter/src/test/java/org/springframework/integration/twitter/TestSendingDMsUsingNamespace.java index 9da62af50a..6a1e14b968 100644 --- a/spring-integration-twitter/src/test/java/org/springframework/integration/twitter/TestSendingDMsUsingNamespace.java +++ b/spring-integration-twitter/src/test/java/org/springframework/integration/twitter/TestSendingDMsUsingNamespace.java @@ -27,6 +27,7 @@ import org.springframework.integration.support.MessageBuilder; import org.springframework.integration.twitter.model.Twitter4jGeoLocationImpl; import org.springframework.test.context.ContextConfiguration; import org.springframework.test.context.junit4.AbstractJUnit4SpringContextTests; +import org.springframework.util.Assert; import org.springframework.util.StringUtils; @@ -41,11 +42,11 @@ public class TestSendingDMsUsingNamespace extends AbstractJUnit4SpringContextTes @Value("#{out}") private MessageChannel channel; @Test - @Ignore + @Ignore public void testSendingATweet() throws Throwable { String dmUsr = System.getProperties().getProperty("twitter.dm.user"); - + Assert.notNull( dmUsr , "the DM user's null"); MessageBuilder mb = MessageBuilder.withPayload("'Hello world!', from the Spring Integration outbound Twitter adapter") .setHeader(TwitterHeaders.TWITTER_GEOLOCATION, new Twitter4jGeoLocationImpl(-76.226823, 23.642465)) // antarctica .setHeader(TwitterHeaders.TWITTER_DISPLAY_COORDINATES, true); diff --git a/spring-integration-twitter/src/test/java/org/springframework/integration/twitter/TestSendingUpdatesUsingNamespace-context.xml b/spring-integration-twitter/src/test/java/org/springframework/integration/twitter/TestSendingUpdatesUsingNamespace-context.xml index 758fdb830d..36c82ed5cd 100644 --- a/spring-integration-twitter/src/test/java/org/springframework/integration/twitter/TestSendingUpdatesUsingNamespace-context.xml +++ b/spring-integration-twitter/src/test/java/org/springframework/integration/twitter/TestSendingUpdatesUsingNamespace-context.xml @@ -36,9 +36,9 @@ - + mb = MessageBuilder.withPayload("test message 1") + MessageBuilder mb = MessageBuilder.withPayload("simple test demonstrating the ability to encode location information") .setHeader(TwitterHeaders.TWITTER_IN_REPLY_TO_STATUS_ID, 21927437001L) - .setHeader(TwitterHeaders.TWITTER_GEOLOCATION, - new Twitter4jGeoLocationImpl(-76.226823, 23.642465)) // antarctica + .setHeader(TwitterHeaders.TWITTER_GEOLOCATION, new Twitter4jGeoLocationImpl(-76.226823, 23.642465)) // antarctica .setHeader(TwitterHeaders.TWITTER_DISPLAY_COORDINATES, true); Message m = mb.build(); this.messagingTemplate.send(this.channel, m);