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

INT-958: change meaning of timeout parameter in MessageGroupStore

Browse Source
This commit is contained in:
David Syer
2010-05-05 11:10:54 +00:00
parent 396da3c09a
commit 9b6d5720f8
7 changed files with 16 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
org.springframework.integration/src/test/java/org/springframework/integration/aggregator/AggregatorTests.java
View File

@@ -75,7 +75,7 @@ public class AggregatorTests {
QueueChannel replyChannel = new QueueChannel();
Message<?> message = createMessage(3, "ABC", 2, 1, replyChannel, null);
this.aggregator.handleMessage(message);
this.store.expireMessageGroups(System.currentTimeMillis() + 10000);
this.store.expireMessageGroups(-10000);
Message<?> reply = replyChannel.receive(100);
assertNull("No message should have been sent normally", reply);
Message<?> discardedMessage = discardChannel.receive(1000);
@@ -91,7 +91,7 @@ public class AggregatorTests {
Message<?> message2 = createMessage(5, "ABC", 3, 2, replyChannel, null);
this.aggregator.handleMessage(message1);
this.aggregator.handleMessage(message2);
this.store.expireMessageGroups(System.currentTimeMillis() + 10000);
this.store.expireMessageGroups(-10000);
Message<?> reply = replyChannel.receive(0);
assertNotNull("A reply message should have been received", reply);
assertEquals(15, reply.getPayload());

4
org.springframework.integration/src/test/java/org/springframework/integration/aggregator/ConcurrentAggregatorTests.java
View File

@@ -120,7 +120,7 @@ public class ConcurrentAggregatorTests {
.getCount());
Message<?> reply = replyChannel.receive(100);
assertNull("No message should have been sent normally", reply);
this.store.expireMessageGroups(System.currentTimeMillis()+10000);
this.store.expireMessageGroups(-10000);
Message<?> discardedMessage = discardChannel.receive(100);
assertNotNull("A message should have been discarded", discardedMessage);
assertEquals(message, discardedMessage);
@@ -143,7 +143,7 @@ public class ConcurrentAggregatorTests {
latch.await(300, TimeUnit.MILLISECONDS);
assertEquals("handlers should have been invoked within time limit", 0,
latch.getCount());
this.store.expireMessageGroups(System.currentTimeMillis()+10000);
this.store.expireMessageGroups(-10000);
Message<?> reply = replyChannel.receive(100);
assertNotNull("A reply message should have been received", reply);
assertEquals(15, reply.getPayload());

2
org.springframework.integration/src/test/java/org/springframework/integration/aggregator/CorrelatingMessageHandlerTests.java
View File

@@ -129,7 +129,7 @@ public class CorrelatingMessageHandlerTests {
});
Thread.sleep(20);
assertEquals(0, store.expireMessageGroups(System.currentTimeMillis()+10000));
assertEquals(0, store.expireMessageGroups(10000));
bothMessagesHandled.await();

2
org.springframework.integration/src/test/java/org/springframework/integration/aggregator/ResequencerTests.java
View File

@@ -136,7 +136,7 @@ public class ResequencerTests {
this.resequencer.setTimeout(90000);
this.resequencer.handleMessage(message1);
this.resequencer.handleMessage(message2);
assertEquals(1, store.expireMessageGroups(System.currentTimeMillis()+10000));
assertEquals(1, store.expireMessageGroups(-10000));
Message<?> reply1 = discardChannel.receive(0);
Message<?> reply2 = discardChannel.receive(0);
Message<?> reply3 = discardChannel.receive(0);

2
org.springframework.integration/src/test/java/org/springframework/integration/store/SimpleMessageStoreTests.java
View File

@@ -93,7 +93,7 @@ public class SimpleMessageStoreTests {
store.addMessageToGroup("bar", testMessage1);
assertEquals(1, store.getMessageGroup("bar").size());
store.expireMessageGroups(System.currentTimeMillis()+10000);
store.expireMessageGroups(-10000);
assertEquals("[foo]", list.toString());
assertEquals(0, store.getMessageGroup("bar").size());