From a3ecbf2809619914e571f347e777869adcfc3574 Mon Sep 17 00:00:00 2001 From: Arjen Poutsma Date: Wed, 6 Jun 2007 03:00:15 +0000 Subject: [PATCH] Fixed various MTOM issues. --- .../org/springframework/oxm/jaxb/Jaxb2MarshallerTest.java | 2 +- .../org/springframework/oxm/jaxb/Jaxb2UnmarshallerTest.java | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/oxm-tiger/src/test/java/org/springframework/oxm/jaxb/Jaxb2MarshallerTest.java b/oxm-tiger/src/test/java/org/springframework/oxm/jaxb/Jaxb2MarshallerTest.java index 9850a7d9..2d2e0a21 100644 --- a/oxm-tiger/src/test/java/org/springframework/oxm/jaxb/Jaxb2MarshallerTest.java +++ b/oxm-tiger/src/test/java/org/springframework/oxm/jaxb/Jaxb2MarshallerTest.java @@ -205,7 +205,7 @@ public class Jaxb2MarshallerTest extends XMLTestCase { Resource logo = new ClassPathResource("spring-ws.png", getClass()); DataHandler dataHandler = new DataHandler(new FileDataSource(logo.getFile())); - expect(mimeContainer.isXopPackage()).andReturn(true); + expect(mimeContainer.convertToXopPackage()).andReturn(true); mimeContainer.addAttachment(isA(String.class), isA(DataHandler.class)); expectLastCall().times(3); diff --git a/oxm-tiger/src/test/java/org/springframework/oxm/jaxb/Jaxb2UnmarshallerTest.java b/oxm-tiger/src/test/java/org/springframework/oxm/jaxb/Jaxb2UnmarshallerTest.java index 2eb722b5..62394311 100644 --- a/oxm-tiger/src/test/java/org/springframework/oxm/jaxb/Jaxb2UnmarshallerTest.java +++ b/oxm-tiger/src/test/java/org/springframework/oxm/jaxb/Jaxb2UnmarshallerTest.java @@ -122,10 +122,10 @@ public class Jaxb2UnmarshallerTest extends TestCase { expect(mimeContainer.isXopPackage()).andReturn(true); expect(mimeContainer.getAttachment( - "cid:6b76528d-7a9c-4def-8e13-095ab89e9bb7@http://springframework.org/spring-ws")) + "<6b76528d-7a9c-4def-8e13-095ab89e9bb7@http://springframework.org/spring-ws>")) .andReturn(dataHandler); expect(mimeContainer.getAttachment( - "cid:99bd1592-0521-41a2-9688-a8bfb40192fb@http://springframework.org/spring-ws")) + "<99bd1592-0521-41a2-9688-a8bfb40192fb@http://springframework.org/spring-ws>")) .andReturn(dataHandler); expect(mimeContainer.getAttachment("696cfb9a-4d2d-402f-bb5c-59fa69e7f0b3@spring-ws.png")) .andReturn(dataHandler);