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

Making test (for INT-1001) more flexible to accommodate JVM differences on CI machine.

Browse Source
This commit is contained in:
Jeremy Grelle
2010-03-05 23:04:54 +00:00
parent 4374a3da20
commit 97a36d127d
1 changed files with 10 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
org.springframework.integration/src/test/java/org/springframework/integration/json/OutboundJsonMessageMapperTests.java
View File

@@ -11,7 +11,6 @@ import org.codehaus.jackson.JsonToken;
import org.codehaus.jackson.map.ObjectMapper; import org.codehaus.jackson.map.ObjectMapper;
import org.junit.Test; import org.junit.Test;
import org.springframework.integration.core.Message; import org.springframework.integration.core.Message;
import org.springframework.integration.core.MessageHeaders;
import org.springframework.integration.message.MessageBuilder; import org.springframework.integration.message.MessageBuilder;
@@ -23,11 +22,13 @@ public class OutboundJsonMessageMapperTests {
@Test @Test
public void testFromMessageWithHeadersAndStringPayload() throws Exception { public void testFromMessageWithHeadersAndStringPayload() throws Exception {
Message<String> testMessage = MessageBuilder.withPayload("myPayloadStuff").build(); Message<String> testMessage = MessageBuilder.withPayload("myPayloadStuff").build();
String expected = "{\"headers\":{\"$timestamp\":"+testMessage.getHeaders().getTimestamp()+
",\"$history\":[],\"$id\":\""+testMessage.getHeaders().getId()+"\"},\"payload\":\"myPayloadStuff\"}";
OutboundJsonMessageMapper mapper = new OutboundJsonMessageMapper(); OutboundJsonMessageMapper mapper = new OutboundJsonMessageMapper();
String result = mapper.fromMessage(testMessage); String result = mapper.fromMessage(testMessage);
assertEquals(expected, result); assertTrue(result.startsWith("{\"headers\":{"));
assertTrue(result.contains("\"$timestamp\":"+testMessage.getHeaders().getTimestamp()));
assertTrue(result.contains("\"$history\":[]"));
assertTrue(result.contains("\"$id\":\""+testMessage.getHeaders().getId()+"\""));
assertTrue(result.contains("\"payload\":\"myPayloadStuff\""));
} }
@Test @Test
@@ -43,12 +44,13 @@ public class OutboundJsonMessageMapperTests {
@Test @Test
public void testFromMessageWithHeadersAndBeanPayload() throws Exception { public void testFromMessageWithHeadersAndBeanPayload() throws Exception {
TestBean payload = new TestBean(); TestBean payload = new TestBean();
Message<TestBean> testMessage = MessageBuilder.withPayload(payload).setHeader(MessageHeaders.TIMESTAMP, new Long(1234)).setHeader(MessageHeaders.ID, "myUniqueId").build(); Message<TestBean> testMessage = MessageBuilder.withPayload(payload).build();
String expectedHeaders = "\"headers\":{\"$timestamp\":"+testMessage.getHeaders().getTimestamp()+
",\"$history\":[],\"$id\":\""+testMessage.getHeaders().getId()+"\"";
OutboundJsonMessageMapper mapper = new OutboundJsonMessageMapper(); OutboundJsonMessageMapper mapper = new OutboundJsonMessageMapper();
String result = mapper.fromMessage(testMessage); String result = mapper.fromMessage(testMessage);
assertTrue(result.contains(expectedHeaders)); assertTrue(result.startsWith("{\"headers\":{"));
assertTrue(result.contains("\"$timestamp\":"+testMessage.getHeaders().getTimestamp()));
assertTrue(result.contains("\"$history\":[]"));
assertTrue(result.contains("\"$id\":\""+testMessage.getHeaders().getId()+"\""));
TestBean parsedPayload = extractJsonPayloadToTestBean(result); TestBean parsedPayload = extractJsonPayloadToTestBean(result);
assertEquals(payload, parsedPayload); assertEquals(payload, parsedPayload);
} }