Author: davsclaus
Date: Mon Jan 18 08:30:23 2010
New Revision: 900301
URL: http://svn.apache.org/viewvc?rev=900301&view=rev
Log:
CAMEL-2373: Fixed camel-bindy tests
Modified:
camel/trunk/components/camel-bindy/src/test/java/org/apache/camel/dataformat/bindy/fix/BindyComplexOneToManyKeyValuePairUnMarshallTest.java
camel/trunk/components/camel-bindy/src/test/java/org/apache/camel/dataformat/bindy/fix/BindySimpleKeyValuePairSortedUnmarshallTest.java
camel/trunk/components/camel-bindy/src/test/java/org/apache/camel/dataformat/bindy/fix/BindySimpleKeyValuePairTabUnmarshallTest.java
camel/trunk/components/camel-bindy/src/test/java/org/apache/camel/dataformat/bindy/fix/BindySimpleKeyValuePairUnmarshallDslTest.java
camel/trunk/components/camel-bindy/src/test/java/org/apache/camel/dataformat/bindy/fix/BindySimpleKeyValuePairUnmarshallTest.java
Modified:
camel/trunk/components/camel-bindy/src/test/java/org/apache/camel/dataformat/bindy/fix/BindyComplexOneToManyKeyValuePairUnMarshallTest.java
URL:
http://svn.apache.org/viewvc/camel/trunk/components/camel-bindy/src/test/java/org/apache/camel/dataformat/bindy/fix/BindyComplexOneToManyKeyValuePairUnMarshallTest.java?rev=900301&r1=900300&r2=900301&view=diff
==============================================================================
---
camel/trunk/components/camel-bindy/src/test/java/org/apache/camel/dataformat/bindy/fix/BindyComplexOneToManyKeyValuePairUnMarshallTest.java
(original)
+++
camel/trunk/components/camel-bindy/src/test/java/org/apache/camel/dataformat/bindy/fix/BindyComplexOneToManyKeyValuePairUnMarshallTest.java
Mon Jan 18 08:30:23 2010
@@ -16,19 +16,10 @@
*/
package org.apache.camel.dataformat.bindy.fix;
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.LinkedHashMap;
-import java.util.List;
-import java.util.Map;
-
import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.dataformat.bindy.CommonBindyTest;
import org.apache.camel.dataformat.bindy.kvp.BindyKeyValuePairDataFormat;
-import org.apache.camel.dataformat.bindy.model.fix.complex.onetomany.Header;
-import org.apache.camel.dataformat.bindy.model.fix.complex.onetomany.Order;
-import org.apache.camel.dataformat.bindy.model.fix.complex.onetomany.Security;
-import org.apache.camel.dataformat.bindy.model.fix.complex.onetomany.Trailer;
+import org.junit.Assert;
import org.junit.Test;
import org.springframework.test.annotation.DirtiesContext;
import org.springframework.test.context.ContextConfiguration;
@@ -43,69 +34,18 @@
String message = "8=FIX 4.19=2034=135=049=INVMGR56=BRKR" +
"1=BE.CHM.00111=CHM0001-0158=this is a camel - bindy test" +
"22=448=BE000124567854=1"
+ "22=548=BE000987654354=2" +
"22=648=BE000999999954=3" + "10=220";
- result.expectedBodiesReceived(generateModel().toString());
+ result.expectedMessageCount(1);
template.sendBody(message);
result.assertIsSatisfied();
- }
-
- public List<Map<String, Object>> generateModel() {
-
- List<Map<String, Object>> models = new ArrayList<Map<String,
Object>>();
- // must use linked to preserve order
- Map<String, Object> model = new LinkedHashMap<String, Object>();
- List<Security> securities = new ArrayList<Security>();
-
- Header header = new Header();
- header.setBeginString("FIX 4.1");
- header.setBodyLength(20);
- header.setMsgSeqNum(1);
- header.setMsgType("0");
- header.setSendCompId("INVMGR");
- header.setTargetCompId("BRKR");
-
- Trailer trailer = new Trailer();
- trailer.setCheckSum(220);
-
- Order order = new Order();
- order.setAccount("BE.CHM.001");
- order.setClOrdId("CHM0001-01");
- order.setText("this is a camel - bindy test");
-
- // 1st security
- Security security = new Security();
- security.setIdSource("4");
- security.setSecurityCode("BE0001245678");
- security.setSide("1");
-
- securities.add(security);
-
- // 2nd security
- security = new Security();
- security.setIdSource("5");
- security.setSecurityCode("BE0009876543");
- security.setSide("2");
-
- securities.add(security);
-
- // 3rd security
- security = new Security();
- security.setIdSource("6");
- security.setSecurityCode("BE0009999999");
- security.setSide("3");
-
- securities.add(security);
-
- order.setSecurities(securities);
- order.setHeader(header);
- order.setTrailer(trailer);
-
- model.put(order.getClass().getName(), order);
- model.put(header.getClass().getName(), header);
- model.put(trailer.getClass().getName(), trailer);
- models.add(model);
- return models;
+ String body =
result.getReceivedExchanges().get(0).getIn().getBody(String.class);
+ Assert.assertTrue(body.contains("BE.CHM.001, 11: CHM0001-01, 58: this
is a camel - bindy test"));
+ Assert.assertTrue(body.contains("22: 4, 48: BE0001245678, 54: 1"));
+ Assert.assertTrue(body.contains("22: 5, 48: BE0009876543, 54: 2"));
+ Assert.assertTrue(body.contains("22: 6, 48: BE0009999999, 54: 3"));
+ Assert.assertTrue(body.contains("FIX 4.1, 9: 20, 34: 1 , 35: 0, 49:
INVMGR, 56: BRKR"));
+ Assert.assertTrue(body.contains("10: 220"));
}
public static class ContextConfig extends RouteBuilder {
Modified:
camel/trunk/components/camel-bindy/src/test/java/org/apache/camel/dataformat/bindy/fix/BindySimpleKeyValuePairSortedUnmarshallTest.java
URL:
http://svn.apache.org/viewvc/camel/trunk/components/camel-bindy/src/test/java/org/apache/camel/dataformat/bindy/fix/BindySimpleKeyValuePairSortedUnmarshallTest.java?rev=900301&r1=900300&r2=900301&view=diff
==============================================================================
---
camel/trunk/components/camel-bindy/src/test/java/org/apache/camel/dataformat/bindy/fix/BindySimpleKeyValuePairSortedUnmarshallTest.java
(original)
+++
camel/trunk/components/camel-bindy/src/test/java/org/apache/camel/dataformat/bindy/fix/BindySimpleKeyValuePairSortedUnmarshallTest.java
Mon Jan 18 08:30:23 2010
@@ -16,17 +16,10 @@
*/
package org.apache.camel.dataformat.bindy.fix;
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-
import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.dataformat.bindy.CommonBindyTest;
import org.apache.camel.dataformat.bindy.kvp.BindyKeyValuePairDataFormat;
-import org.apache.camel.dataformat.bindy.model.fix.sorted.body.Order;
-import org.apache.camel.dataformat.bindy.model.fix.sorted.header.Header;
-import org.apache.camel.dataformat.bindy.model.fix.sorted.trailer.Trailer;
+import org.junit.Assert;
import org.junit.Test;
import org.springframework.test.annotation.DirtiesContext;
import org.springframework.test.context.ContextConfiguration;
@@ -37,46 +30,14 @@
@Test
@DirtiesContext
public void testUnMarshallMessage() throws Exception {
-
result.expectedMessageCount(1);
- result.expectedBodiesReceived(generateModel().toString());
-
result.assertIsSatisfied();
- }
-
- public List<Map<String, Object>> generateModel() {
- Map<String, Object> model = new HashMap<String, Object>();
- List<Map<String, Object>> models = new ArrayList<Map<String,
Object>>();
-
- Header header = new Header();
- header.setBeginString("FIX.4.1");
- header.setBodyLength(20);
- header.setMsgSeqNum(1);
- header.setMsgType("0");
- header.setSendCompId("INVMGR");
- header.setTargetCompId("BRKR");
-
- Trailer trailer = new Trailer();
- trailer.setCheckSum(220);
-
- Order order = new Order();
- order.setAccount("BE.CHM.001");
- order.setClOrdId("CHM0001-01");
- order.setText("this is a camel - bindy test");
- order.setIDSource("4");
- order.setSecurityId("BE0001245678");
- order.setSide("1");
-
- order.setHeader(header);
- order.setTrailer(trailer);
-
- model.put(order.getClass().getName(), order);
- model.put(header.getClass().getName(), header);
- model.put(trailer.getClass().getName(), trailer);
+ String body =
result.getReceivedExchanges().get(0).getIn().getBody(String.class);
- models.add(model);
- return models;
+ Assert.assertTrue(body.contains("10: 220"));
+ Assert.assertTrue(body.contains("BE.CHM.001, 11: CHM0001-01, 22: 4,
48: BE0001245678, 54: 1, 58: this is a camel - bindy test"));
+ Assert.assertTrue(body.contains("FIX.4.1, 9: 20, 34: 1 , 35: 0, 49:
INVMGR, 56: BRKR"));
}
public static class ContextConfig extends RouteBuilder {
@@ -85,7 +46,6 @@
public void configure() {
from(URI_FILE_FIX).unmarshal(kvpBindyDataFormat).to(URI_MOCK_RESULT);
}
-
}
}
Modified:
camel/trunk/components/camel-bindy/src/test/java/org/apache/camel/dataformat/bindy/fix/BindySimpleKeyValuePairTabUnmarshallTest.java
URL:
http://svn.apache.org/viewvc/camel/trunk/components/camel-bindy/src/test/java/org/apache/camel/dataformat/bindy/fix/BindySimpleKeyValuePairTabUnmarshallTest.java?rev=900301&r1=900300&r2=900301&view=diff
==============================================================================
---
camel/trunk/components/camel-bindy/src/test/java/org/apache/camel/dataformat/bindy/fix/BindySimpleKeyValuePairTabUnmarshallTest.java
(original)
+++
camel/trunk/components/camel-bindy/src/test/java/org/apache/camel/dataformat/bindy/fix/BindySimpleKeyValuePairTabUnmarshallTest.java
Mon Jan 18 08:30:23 2010
@@ -16,17 +16,10 @@
*/
package org.apache.camel.dataformat.bindy.fix;
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-
import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.dataformat.bindy.CommonBindyTest;
import org.apache.camel.dataformat.bindy.kvp.BindyKeyValuePairDataFormat;
-import org.apache.camel.dataformat.bindy.model.fix.tab.Header;
-import org.apache.camel.dataformat.bindy.model.fix.tab.Order;
-import org.apache.camel.dataformat.bindy.model.fix.tab.Trailer;
+import org.junit.Assert;
import org.junit.Test;
import org.springframework.test.annotation.DirtiesContext;
import org.springframework.test.context.ContextConfiguration;
@@ -37,45 +30,13 @@
@Test
@DirtiesContext
public void testUnMarshallMessage() throws Exception {
-
result.expectedMessageCount(1);
- result.expectedBodiesReceived(generateModel().toString());
result.assertIsSatisfied();
- }
-
- public List<Map<String, Object>> generateModel() {
-
- List<Map<String, Object>> models = new ArrayList<Map<String,
Object>>();
- Map<String, Object> model = new HashMap<String, Object>();
-
- Header header = new Header();
- header.setBeginString("FIX.4.1");
- header.setBodyLength(20);
- header.setMsgSeqNum(1);
- header.setMsgType("0");
- header.setSendCompId("INVMGR");
- header.setTargetCompId("BRKR");
-
- Trailer trailer = new Trailer();
- trailer.setCheckSum(220);
-
- Order order = new Order();
- order.setAccount("BE.CHM.001");
- order.setClOrdId("CHM0001-01");
- order.setText("this is a camel - bindy test");
- order.setIDSource("4");
- order.setSecurityId("BE0001245678");
- order.setSide("1");
-
- order.setHeader(header);
- order.setTrailer(trailer);
-
- model.put(order.getClass().getName(), order);
- model.put(header.getClass().getName(), header);
- model.put(trailer.getClass().getName(), trailer);
- models.add(model);
- return models;
+ String body =
result.getReceivedExchanges().get(0).getIn().getBody(String.class);
+ Assert.assertTrue(body.contains("FIX.4.1, 9: 20, 34: 1 , 35: 0, 49:
INVMGR, 56: BRKR"));
+ Assert.assertTrue(body.contains("BE.CHM.001, 11: CHM0001-01, 22: 4,
48: BE0001245678, 54: 1, 58: this is a camel - bindy test"));
+ Assert.assertTrue(body.contains("10: 220"));
}
public static class ContextConfig extends RouteBuilder {
Modified:
camel/trunk/components/camel-bindy/src/test/java/org/apache/camel/dataformat/bindy/fix/BindySimpleKeyValuePairUnmarshallDslTest.java
URL:
http://svn.apache.org/viewvc/camel/trunk/components/camel-bindy/src/test/java/org/apache/camel/dataformat/bindy/fix/BindySimpleKeyValuePairUnmarshallDslTest.java?rev=900301&r1=900300&r2=900301&view=diff
==============================================================================
---
camel/trunk/components/camel-bindy/src/test/java/org/apache/camel/dataformat/bindy/fix/BindySimpleKeyValuePairUnmarshallDslTest.java
(original)
+++
camel/trunk/components/camel-bindy/src/test/java/org/apache/camel/dataformat/bindy/fix/BindySimpleKeyValuePairUnmarshallDslTest.java
Mon Jan 18 08:30:23 2010
@@ -16,17 +16,10 @@
*/
package org.apache.camel.dataformat.bindy.fix;
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-
import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.dataformat.bindy.CommonBindyTest;
-import org.apache.camel.dataformat.bindy.model.fix.simple.Header;
-import org.apache.camel.dataformat.bindy.model.fix.simple.Order;
-import org.apache.camel.dataformat.bindy.model.fix.simple.Trailer;
import org.apache.camel.model.dataformat.BindyType;
+import org.junit.Assert;
import org.junit.Test;
import org.springframework.test.annotation.DirtiesContext;
import org.springframework.test.context.ContextConfiguration;
@@ -37,44 +30,13 @@
@Test
@DirtiesContext
public void testUnMarshallMessage() throws Exception {
-
result.expectedMessageCount(1);
- result.expectedBodiesReceived(generateModel().toString());
result.assertIsSatisfied();
- }
-
- public List<Map<String, Object>> generateModel() {
- List<Map<String, Object>> models = new ArrayList<Map<String,
Object>>();
- Map<String, Object> model = new HashMap<String, Object>();
-
- Header header = new Header();
- header.setBeginString("FIX.4.1");
- header.setBodyLength(20);
- header.setMsgSeqNum(1);
- header.setMsgType("0");
- header.setSendCompId("INVMGR");
- header.setTargetCompId("BRKR");
-
- Trailer trailer = new Trailer();
- trailer.setCheckSum(220);
-
- Order order = new Order();
- order.setAccount("BE.CHM.001");
- order.setClOrdId("CHM0001-01");
- order.setText("this is a camel - bindy test");
- order.setIDSource("4");
- order.setSecurityId("BE0001245678");
- order.setSide("1");
-
- order.setHeader(header);
- order.setTrailer(trailer);
-
- model.put(order.getClass().getName(), order);
- model.put(header.getClass().getName(), header);
- model.put(trailer.getClass().getName(), trailer);
- models.add(model);
- return models;
+ String body =
result.getReceivedExchanges().get(0).getIn().getBody(String.class);
+ Assert.assertTrue(body.contains("10: 220"));
+ Assert.assertTrue(body.contains("FIX.4.1, 9: 20, 34: 1 , 35: 0, 49:
INVMGR, 56: BRKR"));
+ Assert.assertTrue(body.contains("BE.CHM.001, 11: CHM0001-01, 22: 4,
48: BE0001245678, 54: 1, 58: this is a camel - bindy test"));
}
public static class ContextConfig extends RouteBuilder {
Modified:
camel/trunk/components/camel-bindy/src/test/java/org/apache/camel/dataformat/bindy/fix/BindySimpleKeyValuePairUnmarshallTest.java
URL:
http://svn.apache.org/viewvc/camel/trunk/components/camel-bindy/src/test/java/org/apache/camel/dataformat/bindy/fix/BindySimpleKeyValuePairUnmarshallTest.java?rev=900301&r1=900300&r2=900301&view=diff
==============================================================================
---
camel/trunk/components/camel-bindy/src/test/java/org/apache/camel/dataformat/bindy/fix/BindySimpleKeyValuePairUnmarshallTest.java
(original)
+++
camel/trunk/components/camel-bindy/src/test/java/org/apache/camel/dataformat/bindy/fix/BindySimpleKeyValuePairUnmarshallTest.java
Mon Jan 18 08:30:23 2010
@@ -16,17 +16,10 @@
*/
package org.apache.camel.dataformat.bindy.fix;
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-
import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.dataformat.bindy.CommonBindyTest;
import org.apache.camel.dataformat.bindy.kvp.BindyKeyValuePairDataFormat;
-import org.apache.camel.dataformat.bindy.model.fix.simple.Header;
-import org.apache.camel.dataformat.bindy.model.fix.simple.Order;
-import org.apache.camel.dataformat.bindy.model.fix.simple.Trailer;
+import org.junit.Assert;
import org.junit.Test;
import org.springframework.test.annotation.DirtiesContext;
import org.springframework.test.context.ContextConfiguration;
@@ -37,47 +30,15 @@
@Test
@DirtiesContext
public void testUnMarshallMessage() throws Exception {
-
result.expectedMessageCount(1);
- result.expectedBodiesReceived(generateModel().toString());
result.assertIsSatisfied();
+ String body =
result.getReceivedExchanges().get(0).getIn().getBody(String.class);
+ Assert.assertTrue(body.contains("10: 220"));
+ Assert.assertTrue(body.contains("FIX.4.1, 9: 20, 34: 1 , 35: 0, 49:
INVMGR, 56: BRKR"));
+ Assert.assertTrue(body.contains("BE.CHM.001, 11: CHM0001-01, 22: 4,
48: BE0001245678, 54: 1, 58: this is a camel - bindy test"));
}
- public List<Map<String, Object>> generateModel() {
- Map<String, Object> model = new HashMap<String, Object>();
- List<Map<String, Object>> models = new ArrayList<Map<String,
Object>>();
-
- Header header = new Header();
- header.setBeginString("FIX.4.1");
- header.setBodyLength(20);
- header.setMsgSeqNum(1);
- header.setMsgType("0");
- header.setSendCompId("INVMGR");
- header.setTargetCompId("BRKR");
-
- Trailer trailer = new Trailer();
- trailer.setCheckSum(220);
-
- Order order = new Order();
- order.setAccount("BE.CHM.001");
- order.setClOrdId("CHM0001-01");
- order.setText("this is a camel - bindy test");
- order.setIDSource("4");
- order.setSecurityId("BE0001245678");
- order.setSide("1");
-
- order.setHeader(header);
- order.setTrailer(trailer);
-
- model.put(order.getClass().getName(), order);
- model.put(header.getClass().getName(), header);
- model.put(trailer.getClass().getName(), trailer);
-
- models.add(model);
- return models;
- }
-
public static class ContextConfig extends RouteBuilder {
BindyKeyValuePairDataFormat kvpBindyDataFormat = new
BindyKeyValuePairDataFormat("org.apache.camel.dataformat.bindy.model.fix.simple");
