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

The expirationDate header is now stored as a Long instead of a Date.

Browse Source
This commit is contained in:
Mark Fisher
2008-08-25 13:44:25 +00:00
parent a162156b2a
commit 50a227aaa1
7 changed files with 102 additions and 81 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
org.springframework.integration/src/test/java/org/springframework/integration/channel/QueueChannelTests.java
View File

@@ -21,7 +21,6 @@ import static org.junit.Assert.assertFalse;
import static org.junit.Assert.assertNotNull;
import static org.junit.Assert.assertTrue;
import java.util.Date;
import java.util.List;
import java.util.concurrent.CountDownLatch;
import java.util.concurrent.Executor;
@@ -224,8 +223,8 @@ public class QueueChannelTests {
QueueChannel channel = new QueueChannel(2);
long minute = 60 * 1000;
long time = System.currentTimeMillis();
Date past = new Date(time - minute);
Date future = new Date(time + minute);
long past = time - minute;
long future = time + minute;
Message<String> expiredMessage = MessageBuilder.fromPayload("test1")
.setExpirationDate(past).build();
Message<String> unexpiredMessage = MessageBuilder.fromPayload("test2")

12
org.springframework.integration/src/test/java/org/springframework/integration/message/MessageBuilderTests.java
View File

@@ -101,11 +101,19 @@ public class MessageBuilderTests {
}
@Test
public void testExpirationDate() {
Date past = new Date(System.currentTimeMillis() - (60 * 1000));
public void testExpirationDateSetAsLong() {
Long past = System.currentTimeMillis() - (60 * 1000);
Message<Integer> expiredMessage = MessageBuilder.fromPayload(1)
.setExpirationDate(past).build();
assertEquals(past, expiredMessage.getHeaders().getExpirationDate());
}
@Test
public void testExpirationDateSetAsDate() {
Long past = System.currentTimeMillis() - (60 * 1000);
Message<Integer> expiredMessage = MessageBuilder.fromPayload(1)
.setExpirationDate(new Date(past)).build();
assertEquals(past, expiredMessage.getHeaders().getExpirationDate());
}
}

6
org.springframework.integration/src/test/java/org/springframework/integration/message/selector/UnexpiredMessageSelectorTests.java
View File

@@ -19,8 +19,6 @@ package org.springframework.integration.message.selector;
import static org.junit.Assert.assertFalse;
import static org.junit.Assert.assertTrue;
import java.util.Date;
import org.junit.Test;
import org.springframework.integration.message.Message;
@@ -35,7 +33,7 @@ public class UnexpiredMessageSelectorTests {
public void testExpiredMessageRejected() {
long past = System.currentTimeMillis() - 60000;
Message<String> message = MessageBuilder.fromPayload("expired")
.setExpirationDate(new Date(past)).build();
.setExpirationDate(past).build();
UnexpiredMessageSelector selector = new UnexpiredMessageSelector();
assertFalse(selector.accept(message));
}
@@ -44,7 +42,7 @@ public class UnexpiredMessageSelectorTests {
public void testUnexpiredMessageAccepted() {
long future = System.currentTimeMillis() + 60000;
Message<String> message = MessageBuilder.fromPayload("unexpired")
.setExpirationDate(new Date(future)).build();
.setExpirationDate(future).build();
UnexpiredMessageSelector selector = new UnexpiredMessageSelector();
assertTrue(selector.accept(message));
}