From 387c2979be11e8a57d1e07f6638ec97757996bb1 Mon Sep 17 00:00:00 2001 From: Oleg Zhurakousky Date: Fri, 5 Nov 2010 16:01:55 -0400 Subject: [PATCH] INT-1553, fixed more tests, added new loguc to build metadataKey in the inbound adapters, tested new Twitter connectivity with real account --- .../inbound/AbstractTwitterMessageSource.java | 11 ++++------- .../TestReceivingUsingNamespace-context.xml | 2 +- ...InboundDirectMessageStatusEndpointTests.java | 17 +++++++---------- ...utboundDirectMessageMessageHandlerTests.java | 2 -- 4 files changed, 12 insertions(+), 20 deletions(-) diff --git a/spring-integration-twitter/src/main/java/org/springframework/integration/twitter/inbound/AbstractTwitterMessageSource.java b/spring-integration-twitter/src/main/java/org/springframework/integration/twitter/inbound/AbstractTwitterMessageSource.java index d3f0611633..cf4d6870f5 100644 --- a/spring-integration-twitter/src/main/java/org/springframework/integration/twitter/inbound/AbstractTwitterMessageSource.java +++ b/spring-integration-twitter/src/main/java/org/springframework/integration/twitter/inbound/AbstractTwitterMessageSource.java @@ -39,6 +39,7 @@ import org.springframework.util.StringUtils; import twitter4j.DirectMessage; import twitter4j.Status; import twitter4j.Twitter; +import twitter4j.http.OAuthAuthorization; /** * Abstract class that defines common operations for receiving various types of @@ -78,10 +79,6 @@ public abstract class AbstractTwitterMessageSource extends AbstractEndpoint public AbstractTwitterMessageSource(Twitter twitter){ this.twitter = twitter; } -// -// public void setConfiguration(OAuthConfiguration configuration) { -// this.configuration = configuration; -// } public void setShouldTrack(boolean shouldTrack) { this.historyWritingPostProcessor.setShouldTrack(shouldTrack); @@ -98,7 +95,7 @@ public abstract class AbstractTwitterMessageSource extends AbstractEndpoint @Override protected void onInit() throws Exception{ super.onInit(); - //Assert.notNull(this.configuration, "'configuration' can't be null"); + if (this.metadataStore == null) { // first try to look for a 'messageStore' in the context BeanFactory beanFactory = this.getBeanFactory(); @@ -122,7 +119,8 @@ public abstract class AbstractTwitterMessageSource extends AbstractEndpoint else if (logger.isWarnEnabled()) { logger.warn(this.getClass().getSimpleName() + " has no name. MetadataStore key might not be unique."); } - //metadataKeyBuilder.append(this.configuration.getConsumerKey()); + String accessToken = ((OAuthAuthorization)twitter.getAuthorization()).getOAuthAccessToken().getToken(); + metadataKeyBuilder.append(accessToken); this.metadataKey = metadataKeyBuilder.toString(); } @@ -146,7 +144,6 @@ public abstract class AbstractTwitterMessageSource extends AbstractEndpoint @Override protected void doStart(){ - //this.twitter = this.configuration.getTwitter(); Assert.notNull(this.twitter, "'twitter' instance can't be null"); historyWritingPostProcessor.setTrackableComponent(this); RateLimitStatusTrigger trigger = new RateLimitStatusTrigger(this.twitter); diff --git a/spring-integration-twitter/src/test/java/org/springframework/integration/twitter/ignored/TestReceivingUsingNamespace-context.xml b/spring-integration-twitter/src/test/java/org/springframework/integration/twitter/ignored/TestReceivingUsingNamespace-context.xml index 36e2552b78..45e21595a1 100644 --- a/spring-integration-twitter/src/test/java/org/springframework/integration/twitter/ignored/TestReceivingUsingNamespace-context.xml +++ b/spring-integration-twitter/src/test/java/org/springframework/integration/twitter/ignored/TestReceivingUsingNamespace-context.xml @@ -48,7 +48,7 @@ - + diff --git a/spring-integration-twitter/src/test/java/org/springframework/integration/twitter/inbound/InboundDirectMessageStatusEndpointTests.java b/spring-integration-twitter/src/test/java/org/springframework/integration/twitter/inbound/InboundDirectMessageStatusEndpointTests.java index b3d99c2162..e51cfd2bfc 100644 --- a/spring-integration-twitter/src/test/java/org/springframework/integration/twitter/inbound/InboundDirectMessageStatusEndpointTests.java +++ b/spring-integration-twitter/src/test/java/org/springframework/integration/twitter/inbound/InboundDirectMessageStatusEndpointTests.java @@ -19,18 +19,15 @@ package org.springframework.integration.twitter.inbound; import static org.mockito.Mockito.mock; import static org.mockito.Mockito.when; -import java.util.ArrayList; import java.util.Date; -import java.util.List; import org.junit.Before; import org.junit.Test; -import org.mockito.Mockito; +import org.springframework.integration.Message; +import org.springframework.integration.channel.QueueChannel; +import org.springframework.scheduling.concurrent.ThreadPoolTaskScheduler; import twitter4j.DirectMessage; -import twitter4j.Paging; -import twitter4j.RateLimitStatus; -import twitter4j.ResponseList; import twitter4j.Twitter; /** @@ -42,7 +39,7 @@ public class InboundDirectMessageStatusEndpointTests { private DirectMessage secondMessage; - private Twitter twitter; + private Twitter twitter = mock(Twitter.class); @Before @@ -60,12 +57,12 @@ public class InboundDirectMessageStatusEndpointTests { @Test public void testTwitterMockedUpdates() throws Exception{ // QueueChannel channel = new QueueChannel(); -// InboundDirectMessageEndpoint endpoint = new InboundDirectMessageEndpoint(); -// endpoint.setOutputChannel(channel); +// DirectMessageReceivingMessageSource endpoint = new DirectMessageReceivingMessageSource(twitter); +// //endpoint.setOutputChannel(channel); // ThreadPoolTaskScheduler scheduler = new ThreadPoolTaskScheduler(); // scheduler.afterPropertiesSet(); // endpoint.setTaskScheduler(scheduler); -// endpoint.setConfiguration(this.getTestConfigurationForDirectMessages()); +// //endpoint.setConfiguration(this.getTestConfigurationForDirectMessages()); // endpoint.setBeanName("twitterEndpoint"); // endpoint.afterPropertiesSet(); // endpoint.start(); diff --git a/spring-integration-twitter/src/test/java/org/springframework/integration/twitter/outbound/OutboundDirectMessageMessageHandlerTests.java b/spring-integration-twitter/src/test/java/org/springframework/integration/twitter/outbound/OutboundDirectMessageMessageHandlerTests.java index 33ec445f76..34353bb45d 100644 --- a/spring-integration-twitter/src/test/java/org/springframework/integration/twitter/outbound/OutboundDirectMessageMessageHandlerTests.java +++ b/spring-integration-twitter/src/test/java/org/springframework/integration/twitter/outbound/OutboundDirectMessageMessageHandlerTests.java @@ -23,11 +23,9 @@ import static org.mockito.Mockito.verify; import org.junit.Test; import org.springframework.integration.support.MessageBuilder; import org.springframework.integration.twitter.core.TwitterHeaders; -import org.springframework.integration.twitter.oauth.OAuthTwitterFactoryBean; import twitter4j.GeoLocation; import twitter4j.Twitter; -import twitter4j.http.AccessToken; /** * @author Oleg Zhurakousky