XML parsing tests pass on non-English locales now, plus a revised exception message and some minor polishing

Issue: SPR-13136
This commit is contained in:
Juergen Hoeller
2015-06-30 16:02:17 +02:00
parent 9c3580d04e
commit 38b8262e1e
11 changed files with 51 additions and 50 deletions

View File

@@ -37,7 +37,6 @@ import java.util.Calendar;
import java.util.Date;
import java.util.Map;
import java.util.UUID;
import javax.activation.DataHandler;
import javax.activation.DataSource;
import javax.xml.XMLConstants;

View File

@@ -16,18 +16,10 @@
package org.springframework.oxm.castor;
import static junit.framework.Assert.assertEquals;
import static org.hamcrest.CoreMatchers.*;
import static org.junit.Assert.assertNotNull;
import static org.junit.Assert.assertNull;
import static org.junit.Assert.assertSame;
import static org.junit.Assert.*;
import java.io.ByteArrayInputStream;
import java.io.IOException;
import java.io.StringReader;
import java.util.concurrent.atomic.AtomicReference;
import javax.xml.transform.sax.SAXSource;
import javax.xml.transform.stream.StreamSource;
@@ -41,6 +33,13 @@ import org.springframework.oxm.AbstractUnmarshallerTests;
import org.springframework.oxm.MarshallingException;
import org.springframework.oxm.Unmarshaller;
import static junit.framework.Assert.assertEquals;
import static org.hamcrest.CoreMatchers.*;
import static org.junit.Assert.assertNotNull;
import static org.junit.Assert.assertNull;
import static org.junit.Assert.assertSame;
import static org.junit.Assert.*;
/**
* @author Arjen Poutsma
* @author Jakub Narloch

View File

@@ -74,6 +74,7 @@ public class Jaxb2MarshallerTests extends AbstractMarshallerTests {
private Flights flights;
@Override
public Marshaller createMarshaller() throws Exception {
marshaller = new Jaxb2Marshaller();
@@ -91,6 +92,7 @@ public class Jaxb2MarshallerTests extends AbstractMarshallerTests {
return flights;
}
@Test
public void marshalSAXResult() throws Exception {
ContentHandler contentHandler = mock(ContentHandler.class);