From 97a36d127d1997144607e79330cbfdf2d953f5bb Mon Sep 17 00:00:00 2001 From: Jeremy Grelle Date: Fri, 5 Mar 2010 23:04:54 +0000 Subject: [PATCH] Making test (for INT-1001) more flexible to accommodate JVM differences on CI machine. --- .../json/OutboundJsonMessageMapperTests.java | 18 ++++++++++-------- 1 file changed, 10 insertions(+), 8 deletions(-) diff --git a/org.springframework.integration/src/test/java/org/springframework/integration/json/OutboundJsonMessageMapperTests.java b/org.springframework.integration/src/test/java/org/springframework/integration/json/OutboundJsonMessageMapperTests.java index ec016fdc75..30cd94499a 100644 --- a/org.springframework.integration/src/test/java/org/springframework/integration/json/OutboundJsonMessageMapperTests.java +++ b/org.springframework.integration/src/test/java/org/springframework/integration/json/OutboundJsonMessageMapperTests.java @@ -11,7 +11,6 @@ import org.codehaus.jackson.JsonToken; import org.codehaus.jackson.map.ObjectMapper; import org.junit.Test; import org.springframework.integration.core.Message; -import org.springframework.integration.core.MessageHeaders; import org.springframework.integration.message.MessageBuilder; @@ -23,11 +22,13 @@ public class OutboundJsonMessageMapperTests { @Test public void testFromMessageWithHeadersAndStringPayload() throws Exception { Message testMessage = MessageBuilder.withPayload("myPayloadStuff").build(); - String expected = "{\"headers\":{\"$timestamp\":"+testMessage.getHeaders().getTimestamp()+ - ",\"$history\":[],\"$id\":\""+testMessage.getHeaders().getId()+"\"},\"payload\":\"myPayloadStuff\"}"; OutboundJsonMessageMapper mapper = new OutboundJsonMessageMapper(); 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 @@ -43,12 +44,13 @@ public class OutboundJsonMessageMapperTests { @Test public void testFromMessageWithHeadersAndBeanPayload() throws Exception { TestBean payload = new TestBean(); - Message testMessage = MessageBuilder.withPayload(payload).setHeader(MessageHeaders.TIMESTAMP, new Long(1234)).setHeader(MessageHeaders.ID, "myUniqueId").build(); - String expectedHeaders = "\"headers\":{\"$timestamp\":"+testMessage.getHeaders().getTimestamp()+ - ",\"$history\":[],\"$id\":\""+testMessage.getHeaders().getId()+"\""; + Message testMessage = MessageBuilder.withPayload(payload).build(); OutboundJsonMessageMapper mapper = new OutboundJsonMessageMapper(); 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); assertEquals(payload, parsedPayload); }