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

BATCH-1532: fix integration tests to work with Spring 3

Browse Source
This commit is contained in:
Josh Long
2011-03-21 06:12:37 -07:00
committed by Dave Syer
parent 539c403031
commit 0a77a5b4ed
2 changed files with 14 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
spring-batch-infrastructure-tests/src/test/java/org/springframework/batch/item/xml/XStreamMarshallingTests.java
View File

@@ -4,12 +4,15 @@ import org.springframework.batch.item.xml.domain.Trade;
import org.springframework.oxm.Marshaller;
import org.springframework.oxm.xstream.XStreamMarshaller;
import java.util.Collections;
public class XStreamMarshallingTests extends
AbstractStaxEventWriterItemWriterTests {
protected Marshaller getMarshaller() throws Exception {
XStreamMarshaller marshaller = new XStreamMarshaller();
marshaller.addAlias("trade", Trade.class);
// marshaller.addAlias("trade", Trade.class);
marshaller.setAliases(Collections.singletonMap("trade", Trade.class));
//in XStreamMarshaller.marshalSaxHandlers() method is used SaxWriter, which is configured
//to include enclosing document (SaxWriter.includeEnclosingDocument is always set to TRUE)
return marshaller;

12
spring-batch-infrastructure-tests/src/test/java/org/springframework/batch/item/xml/XStreamUnmarshallingTests.java
View File

@@ -1,6 +1,8 @@
package org.springframework.batch.item.xml;
import java.math.BigDecimal;
import java.util.HashMap;
import java.util.Map;
import org.springframework.batch.item.xml.domain.Trade;
import org.springframework.oxm.Unmarshaller;
@@ -10,10 +12,16 @@ public class XStreamUnmarshallingTests extends AbstractStaxEventReaderItemReader
protected Unmarshaller getUnmarshaller() throws Exception {
XStreamMarshaller unmarshaller = new XStreamMarshaller();
unmarshaller.addAlias("trade", Trade.class);
Map<String,Class> aliasesMap = new HashMap<String,Class>();
aliasesMap.put("trade", Trade.class);
aliasesMap.put("isin", String.class);
aliasesMap.put("customer", String.class);
aliasesMap.put("price", BigDecimal.class);
/*unmarshaller.addAlias("trade", Trade.class);
unmarshaller.addAlias("isin", String.class);
unmarshaller.addAlias("customer", String.class);
unmarshaller.addAlias("price", BigDecimal.class);
unmarshaller.addAlias("price", BigDecimal.class);*/
unmarshaller.setAliases(aliasesMap);
return unmarshaller;
}