Spring/spring-integration
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'buildSrc'

Browse Source 
Added 'buildSrc' directory as a git submodule to be shared across
all Spring open-source projects. This eliminates the need to maintain
custom Gradle code within Spring Integration directly.

For a brief introduction to git submodules, see
    http://speirs.org/blog/2009/5/11/understanding-git-submodules.html

And of course the official documentation is at
    http://www.kernel.org/pub/software/scm/git/docs/git-submodule.html
    https://git.wiki.kernel.org/index.php/GitSubmoduleTutorial

Conflicts:
	spring-integration-twitter/src/main/java/org/springframework/integration/twitter/core/Twitter4jTemplate.java
	spring-integration-twitter/src/test/java/org/springframework/integration/twitter/inbound/SearchReceivingMessageSourceTests.java
This commit is contained in:
Chris Beams
2010-11-11 16:26:53 -08:00
parent c57280c173 37d4acb877
commit bd5a3d190b
60 changed files with 86 additions and 1963 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
spring-integration-twitter/src/test/java/org/springframework/integration/twitter/config/TestReceivingMessageSourceParserTests.java
View File

@@ -54,19 +54,16 @@ public class TestReceivingMessageSourceParserTests {
public static class TwitterTemplateFactoryBean implements FactoryBean<TwitterOperations>{
@Override
public TwitterOperations getObject() throws Exception {
TwitterOperations oper = mock(TwitterOperations.class);
when(oper.getProfileId()).thenReturn("kermit");
return oper;
}
@Override
public Class<?> getObjectType() {
return TwitterOperations.class;
}
@Override
public boolean isSingleton() {
return true;
}

3
spring-integration-twitter/src/test/java/org/springframework/integration/twitter/core/Twitter4jTemplateTests.java
View File

@@ -133,9 +133,6 @@ public class Twitter4jTemplateTests {
List<Tweet> tweets = results.getTweets();
assertNotNull(tweets);
assertEquals(3, tweets.size());
assertTrue(tweets.get(0) instanceof Tweet);
assertTrue(tweets.get(1) instanceof Tweet);
assertTrue(tweets.get(2) instanceof Tweet);
}
}

2
spring-integration-twitter/src/test/java/org/springframework/integration/twitter/inbound/DirectMessageReceivingMessageSourceTests.java
View File

@@ -225,12 +225,10 @@ public class DirectMessageReceivingMessageSourceTests {
@SuppressWarnings({ "rawtypes", "serial" })
public static class SampleResoponceList extends ArrayList implements ResponseList {
@Override
public RateLimitStatus getRateLimitStatus() {
return mock(RateLimitStatus.class);
}
@Override
public RateLimitStatus getFeatureSpecificRateLimitStatus() {
return mock(RateLimitStatus.class);
}

4
spring-integration-twitter/src/test/java/org/springframework/integration/twitter/inbound/SearchReceivingMessageSourceTests.java
View File

@@ -18,7 +18,6 @@ package org.springframework.integration.twitter.inbound;
import org.junit.Ignore;
import org.junit.Test;
import org.springframework.beans.factory.support.DefaultListableBeanFactory;
import org.springframework.integration.Message;
import org.springframework.integration.MessagingException;
@@ -29,8 +28,9 @@ import org.springframework.integration.twitter.core.Tweet;
import org.springframework.integration.twitter.core.Twitter4jTemplate;
import org.springframework.scheduling.concurrent.ThreadPoolTaskScheduler;
/**
* @author ozhurakousky
* @author Oleg Zhurakousky
*/
public class SearchReceivingMessageSourceTests {

2
spring-integration-twitter/src/test/java/org/springframework/integration/twitter/inbound/TimelineReceivingMessageSourceTests.java
View File

@@ -224,12 +224,10 @@ public class TimelineReceivingMessageSourceTests {
@SuppressWarnings({ "rawtypes", "serial" })
public static class SampleResoponceList extends ArrayList implements ResponseList {
@Override
public RateLimitStatus getRateLimitStatus() {
return mock(RateLimitStatus.class);
}
@Override
public RateLimitStatus getFeatureSpecificRateLimitStatus() {
return mock(RateLimitStatus.class);
}