| @@ -59,6 +59,7 @@ public class XmlTransformer { | |||||
| Marshaller m = JAXB_CONTEXT.createMarshaller(); | Marshaller m = JAXB_CONTEXT.createMarshaller(); | ||||
| m.setProperty(Marshaller.JAXB_FORMATTED_OUTPUT, true); | m.setProperty(Marshaller.JAXB_FORMATTED_OUTPUT, true); | ||||
| m.setProperty(CharacterEscapeHandler.class.getName(), CHAR_ESCAPE_HANDLER); | m.setProperty(CharacterEscapeHandler.class.getName(), CHAR_ESCAPE_HANDLER); | ||||
| m.setProperty(Marshaller.JAXB_FRAGMENT, true); | |||||
| m.marshal(object, writer); | m.marshal(object, writer); | ||||
| } | } | ||||
| @@ -13,8 +13,7 @@ public class WxCpXmlOutImageMessageTest { | |||||
| m.setFromUserName("from"); | m.setFromUserName("from"); | ||||
| m.setToUserName("to"); | m.setToUserName("to"); | ||||
| String expected = "<?xml version=\"1.0\" encoding=\"UTF-8\" standalone=\"yes\"?>" | |||||
| + "<xml>" | |||||
| String expected = "<xml>" | |||||
| + "<ToUserName><![CDATA[to]]></ToUserName>" | + "<ToUserName><![CDATA[to]]></ToUserName>" | ||||
| + "<FromUserName><![CDATA[from]]></FromUserName>" | + "<FromUserName><![CDATA[from]]></FromUserName>" | ||||
| + "<CreateTime>1122</CreateTime>" | + "<CreateTime>1122</CreateTime>" | ||||
| @@ -27,8 +26,7 @@ public class WxCpXmlOutImageMessageTest { | |||||
| public void testBuild() { | public void testBuild() { | ||||
| WxCpXmlOutImageMessage m = WxCpXmlOutMessage.IMAGE().mediaId("ddfefesfsdfef").fromUser("from").toUser("to").build(); | WxCpXmlOutImageMessage m = WxCpXmlOutMessage.IMAGE().mediaId("ddfefesfsdfef").fromUser("from").toUser("to").build(); | ||||
| String expected = "<?xml version=\"1.0\" encoding=\"UTF-8\" standalone=\"yes\"?>" | |||||
| + "<xml>" | |||||
| String expected = "<xml>" | |||||
| + "<ToUserName><![CDATA[to]]></ToUserName>" | + "<ToUserName><![CDATA[to]]></ToUserName>" | ||||
| + "<FromUserName><![CDATA[from]]></FromUserName>" | + "<FromUserName><![CDATA[from]]></FromUserName>" | ||||
| + "<CreateTime>1122</CreateTime>" | + "<CreateTime>1122</CreateTime>" | ||||
| @@ -19,8 +19,7 @@ public class WxCpXmlOutNewsMessageTest { | |||||
| item.setUrl("url"); | item.setUrl("url"); | ||||
| m.addArticle(item); | m.addArticle(item); | ||||
| m.addArticle(item); | m.addArticle(item); | ||||
| String expected = "<?xml version=\"1.0\" encoding=\"UTF-8\" standalone=\"yes\"?>" | |||||
| + "<xml>" | |||||
| String expected = "<xml>" | |||||
| + "<ToUserName><![CDATA[toUser]]></ToUserName>" | + "<ToUserName><![CDATA[toUser]]></ToUserName>" | ||||
| + "<FromUserName><![CDATA[fromUser]]></FromUserName>" | + "<FromUserName><![CDATA[fromUser]]></FromUserName>" | ||||
| + "<CreateTime>1122</CreateTime>" | + "<CreateTime>1122</CreateTime>" | ||||
| @@ -58,8 +57,7 @@ public class WxCpXmlOutNewsMessageTest { | |||||
| .addArticle(item) | .addArticle(item) | ||||
| .addArticle(item) | .addArticle(item) | ||||
| .build(); | .build(); | ||||
| String expected = "<?xml version=\"1.0\" encoding=\"UTF-8\" standalone=\"yes\"?>" | |||||
| + "<xml>" | |||||
| String expected = "<xml>" | |||||
| + "<ToUserName><![CDATA[toUser]]></ToUserName>" | + "<ToUserName><![CDATA[toUser]]></ToUserName>" | ||||
| + "<FromUserName><![CDATA[fromUser]]></FromUserName>" | + "<FromUserName><![CDATA[fromUser]]></FromUserName>" | ||||
| + "<CreateTime>1122</CreateTime>" | + "<CreateTime>1122</CreateTime>" | ||||
| @@ -13,8 +13,7 @@ public class WxCpXmlOutTextMessageTest { | |||||
| m.setFromUserName("from"); | m.setFromUserName("from"); | ||||
| m.setToUserName("to"); | m.setToUserName("to"); | ||||
| String expected = "<?xml version=\"1.0\" encoding=\"UTF-8\" standalone=\"yes\"?>" | |||||
| + "<xml>" | |||||
| String expected = "<xml>" | |||||
| + "<ToUserName><![CDATA[to]]></ToUserName>" | + "<ToUserName><![CDATA[to]]></ToUserName>" | ||||
| + "<FromUserName><![CDATA[from]]></FromUserName>" | + "<FromUserName><![CDATA[from]]></FromUserName>" | ||||
| + "<CreateTime>1122</CreateTime>" | + "<CreateTime>1122</CreateTime>" | ||||
| @@ -27,8 +26,7 @@ public class WxCpXmlOutTextMessageTest { | |||||
| public void testBuild() { | public void testBuild() { | ||||
| WxCpXmlOutTextMessage m = WxCpXmlOutMessage.TEXT().content("content").fromUser("from").toUser("to").build(); | WxCpXmlOutTextMessage m = WxCpXmlOutMessage.TEXT().content("content").fromUser("from").toUser("to").build(); | ||||
| String expected = "<?xml version=\"1.0\" encoding=\"UTF-8\" standalone=\"yes\"?>" | |||||
| + "<xml>" | |||||
| String expected = "<xml>" | |||||
| + "<ToUserName><![CDATA[to]]></ToUserName>" | + "<ToUserName><![CDATA[to]]></ToUserName>" | ||||
| + "<FromUserName><![CDATA[from]]></FromUserName>" | + "<FromUserName><![CDATA[from]]></FromUserName>" | ||||
| + "<CreateTime>1122</CreateTime>" | + "<CreateTime>1122</CreateTime>" | ||||
| @@ -15,8 +15,7 @@ public class WxCpXmlOutVideoMessageTest { | |||||
| m.setFromUserName("fromUser"); | m.setFromUserName("fromUser"); | ||||
| m.setToUserName("toUser"); | m.setToUserName("toUser"); | ||||
| String expected = "<?xml version=\"1.0\" encoding=\"UTF-8\" standalone=\"yes\"?>" | |||||
| + "<xml>" | |||||
| String expected = "<xml>" | |||||
| + "<ToUserName><![CDATA[toUser]]></ToUserName>" | + "<ToUserName><![CDATA[toUser]]></ToUserName>" | ||||
| + "<FromUserName><![CDATA[fromUser]]></FromUserName>" | + "<FromUserName><![CDATA[fromUser]]></FromUserName>" | ||||
| + "<CreateTime>1122</CreateTime>" | + "<CreateTime>1122</CreateTime>" | ||||
| @@ -39,8 +38,7 @@ public class WxCpXmlOutVideoMessageTest { | |||||
| .title("title") | .title("title") | ||||
| .description("ddfff") | .description("ddfff") | ||||
| .build(); | .build(); | ||||
| String expected = "<?xml version=\"1.0\" encoding=\"UTF-8\" standalone=\"yes\"?>" | |||||
| + "<xml>" | |||||
| String expected = "<xml>" | |||||
| + "<ToUserName><![CDATA[toUser]]></ToUserName>" | + "<ToUserName><![CDATA[toUser]]></ToUserName>" | ||||
| + "<FromUserName><![CDATA[fromUser]]></FromUserName>" | + "<FromUserName><![CDATA[fromUser]]></FromUserName>" | ||||
| + "<CreateTime>1122</CreateTime>" | + "<CreateTime>1122</CreateTime>" | ||||
| @@ -13,8 +13,7 @@ public class WxCpXmlOutVoiceMessageTest { | |||||
| m.setFromUserName("from"); | m.setFromUserName("from"); | ||||
| m.setToUserName("to"); | m.setToUserName("to"); | ||||
| String expected = "<?xml version=\"1.0\" encoding=\"UTF-8\" standalone=\"yes\"?>" | |||||
| + "<xml>" | |||||
| String expected = "<xml>" | |||||
| + "<ToUserName><![CDATA[to]]></ToUserName>" | + "<ToUserName><![CDATA[to]]></ToUserName>" | ||||
| + "<FromUserName><![CDATA[from]]></FromUserName>" | + "<FromUserName><![CDATA[from]]></FromUserName>" | ||||
| + "<CreateTime>1122</CreateTime>" | + "<CreateTime>1122</CreateTime>" | ||||
| @@ -27,8 +26,7 @@ public class WxCpXmlOutVoiceMessageTest { | |||||
| public void testBuild() { | public void testBuild() { | ||||
| WxCpXmlOutVoiceMessage m = WxCpXmlOutMessage.VOICE().mediaId("ddfefesfsdfef").fromUser("from").toUser("to").build(); | WxCpXmlOutVoiceMessage m = WxCpXmlOutMessage.VOICE().mediaId("ddfefesfsdfef").fromUser("from").toUser("to").build(); | ||||
| String expected = "<?xml version=\"1.0\" encoding=\"UTF-8\" standalone=\"yes\"?>" | |||||
| + "<xml>" | |||||
| String expected = "<xml>" | |||||
| + "<ToUserName><![CDATA[to]]></ToUserName>" | + "<ToUserName><![CDATA[to]]></ToUserName>" | ||||
| + "<FromUserName><![CDATA[from]]></FromUserName>" | + "<FromUserName><![CDATA[from]]></FromUserName>" | ||||
| + "<CreateTime>1122</CreateTime>" | + "<CreateTime>1122</CreateTime>" | ||||
| @@ -56,6 +56,7 @@ public class XmlTransformer { | |||||
| Marshaller m = JAXB_CONTEXT.createMarshaller(); | Marshaller m = JAXB_CONTEXT.createMarshaller(); | ||||
| m.setProperty(Marshaller.JAXB_FORMATTED_OUTPUT, true); | m.setProperty(Marshaller.JAXB_FORMATTED_OUTPUT, true); | ||||
| m.setProperty(CharacterEscapeHandler.class.getName(), CHAR_ESCAPE_HANDLER); | m.setProperty(CharacterEscapeHandler.class.getName(), CHAR_ESCAPE_HANDLER); | ||||
| m.setProperty(Marshaller.JAXB_FRAGMENT, true); | |||||
| m.marshal(object, writer); | m.marshal(object, writer); | ||||
| } | } | ||||
| @@ -13,8 +13,7 @@ public class WxMpXmlOutImageMessageTest { | |||||
| m.setFromUserName("from"); | m.setFromUserName("from"); | ||||
| m.setToUserName("to"); | m.setToUserName("to"); | ||||
| String expected = "<?xml version=\"1.0\" encoding=\"UTF-8\" standalone=\"yes\"?>" | |||||
| + "<xml>" | |||||
| String expected = "<xml>" | |||||
| + "<ToUserName><![CDATA[to]]></ToUserName>" | + "<ToUserName><![CDATA[to]]></ToUserName>" | ||||
| + "<FromUserName><![CDATA[from]]></FromUserName>" | + "<FromUserName><![CDATA[from]]></FromUserName>" | ||||
| + "<CreateTime>1122</CreateTime>" | + "<CreateTime>1122</CreateTime>" | ||||
| @@ -27,8 +26,7 @@ public class WxMpXmlOutImageMessageTest { | |||||
| public void testBuild() { | public void testBuild() { | ||||
| WxMpMpXmlOutImageMessage m = WxMpXmlOutMessage.IMAGE().mediaId("ddfefesfsdfef").fromUser("from").toUser("to").build(); | WxMpMpXmlOutImageMessage m = WxMpXmlOutMessage.IMAGE().mediaId("ddfefesfsdfef").fromUser("from").toUser("to").build(); | ||||
| String expected = "<?xml version=\"1.0\" encoding=\"UTF-8\" standalone=\"yes\"?>" | |||||
| + "<xml>" | |||||
| String expected = "<xml>" | |||||
| + "<ToUserName><![CDATA[to]]></ToUserName>" | + "<ToUserName><![CDATA[to]]></ToUserName>" | ||||
| + "<FromUserName><![CDATA[from]]></FromUserName>" | + "<FromUserName><![CDATA[from]]></FromUserName>" | ||||
| + "<CreateTime>1122</CreateTime>" | + "<CreateTime>1122</CreateTime>" | ||||
| @@ -17,8 +17,7 @@ public class WxXmlOutMusicMessageTest { | |||||
| m.setFromUserName("fromUser"); | m.setFromUserName("fromUser"); | ||||
| m.setToUserName("toUser"); | m.setToUserName("toUser"); | ||||
| String expected = "<?xml version=\"1.0\" encoding=\"UTF-8\" standalone=\"yes\"?>" | |||||
| + "<xml>" | |||||
| String expected = "<xml>" | |||||
| + "<ToUserName><![CDATA[toUser]]></ToUserName>" | + "<ToUserName><![CDATA[toUser]]></ToUserName>" | ||||
| + "<FromUserName><![CDATA[fromUser]]></FromUserName>" | + "<FromUserName><![CDATA[fromUser]]></FromUserName>" | ||||
| + "<CreateTime>1122</CreateTime>" | + "<CreateTime>1122</CreateTime>" | ||||
| @@ -45,8 +44,7 @@ public class WxXmlOutMusicMessageTest { | |||||
| .musicUrl("musicUrl") | .musicUrl("musicUrl") | ||||
| .thumbMediaId("thumbMediaId") | .thumbMediaId("thumbMediaId") | ||||
| .build(); | .build(); | ||||
| String expected = "<?xml version=\"1.0\" encoding=\"UTF-8\" standalone=\"yes\"?>" | |||||
| + "<xml>" | |||||
| String expected = "<xml>" | |||||
| + "<ToUserName><![CDATA[toUser]]></ToUserName>" | + "<ToUserName><![CDATA[toUser]]></ToUserName>" | ||||
| + "<FromUserName><![CDATA[fromUser]]></FromUserName>" | + "<FromUserName><![CDATA[fromUser]]></FromUserName>" | ||||
| + "<CreateTime>1122</CreateTime>" | + "<CreateTime>1122</CreateTime>" | ||||
| @@ -19,8 +19,7 @@ public class WxXmlOutNewsMessageTest { | |||||
| item.setUrl("url"); | item.setUrl("url"); | ||||
| m.addArticle(item); | m.addArticle(item); | ||||
| m.addArticle(item); | m.addArticle(item); | ||||
| String expected = "<?xml version=\"1.0\" encoding=\"UTF-8\" standalone=\"yes\"?>" | |||||
| + "<xml>" | |||||
| String expected = "<xml>" | |||||
| + "<ToUserName><![CDATA[toUser]]></ToUserName>" | + "<ToUserName><![CDATA[toUser]]></ToUserName>" | ||||
| + "<FromUserName><![CDATA[fromUser]]></FromUserName>" | + "<FromUserName><![CDATA[fromUser]]></FromUserName>" | ||||
| + "<CreateTime>1122</CreateTime>" | + "<CreateTime>1122</CreateTime>" | ||||
| @@ -58,8 +57,7 @@ public class WxXmlOutNewsMessageTest { | |||||
| .addArticle(item) | .addArticle(item) | ||||
| .addArticle(item) | .addArticle(item) | ||||
| .build(); | .build(); | ||||
| String expected = "<?xml version=\"1.0\" encoding=\"UTF-8\" standalone=\"yes\"?>" | |||||
| + "<xml>" | |||||
| String expected = "<xml>" | |||||
| + "<ToUserName><![CDATA[toUser]]></ToUserName>" | + "<ToUserName><![CDATA[toUser]]></ToUserName>" | ||||
| + "<FromUserName><![CDATA[fromUser]]></FromUserName>" | + "<FromUserName><![CDATA[fromUser]]></FromUserName>" | ||||
| + "<CreateTime>1122</CreateTime>" | + "<CreateTime>1122</CreateTime>" | ||||
| @@ -13,8 +13,7 @@ public class WxXmlOutTextMessageTest { | |||||
| m.setFromUserName("from"); | m.setFromUserName("from"); | ||||
| m.setToUserName("to"); | m.setToUserName("to"); | ||||
| String expected = "<?xml version=\"1.0\" encoding=\"UTF-8\" standalone=\"yes\"?>" | |||||
| + "<xml>" | |||||
| String expected = "<xml>" | |||||
| + "<ToUserName><![CDATA[to]]></ToUserName>" | + "<ToUserName><![CDATA[to]]></ToUserName>" | ||||
| + "<FromUserName><![CDATA[from]]></FromUserName>" | + "<FromUserName><![CDATA[from]]></FromUserName>" | ||||
| + "<CreateTime>1122</CreateTime>" | + "<CreateTime>1122</CreateTime>" | ||||
| @@ -27,8 +26,7 @@ public class WxXmlOutTextMessageTest { | |||||
| public void testBuild() { | public void testBuild() { | ||||
| WxMpXmlOutTextMessage m = WxMpXmlOutMessage.TEXT().content("content").fromUser("from").toUser("to").build(); | WxMpXmlOutTextMessage m = WxMpXmlOutMessage.TEXT().content("content").fromUser("from").toUser("to").build(); | ||||
| String expected = "<?xml version=\"1.0\" encoding=\"UTF-8\" standalone=\"yes\"?>" | |||||
| + "<xml>" | |||||
| String expected = "<xml>" | |||||
| + "<ToUserName><![CDATA[to]]></ToUserName>" | + "<ToUserName><![CDATA[to]]></ToUserName>" | ||||
| + "<FromUserName><![CDATA[from]]></FromUserName>" | + "<FromUserName><![CDATA[from]]></FromUserName>" | ||||
| + "<CreateTime>1122</CreateTime>" | + "<CreateTime>1122</CreateTime>" | ||||
| @@ -15,8 +15,7 @@ public class WxXmlOutVideoMessageTest { | |||||
| m.setFromUserName("fromUser"); | m.setFromUserName("fromUser"); | ||||
| m.setToUserName("toUser"); | m.setToUserName("toUser"); | ||||
| String expected = "<?xml version=\"1.0\" encoding=\"UTF-8\" standalone=\"yes\"?>" | |||||
| + "<xml>" | |||||
| String expected = "<xml>" | |||||
| + "<ToUserName><![CDATA[toUser]]></ToUserName>" | + "<ToUserName><![CDATA[toUser]]></ToUserName>" | ||||
| + "<FromUserName><![CDATA[fromUser]]></FromUserName>" | + "<FromUserName><![CDATA[fromUser]]></FromUserName>" | ||||
| + "<CreateTime>1122</CreateTime>" | + "<CreateTime>1122</CreateTime>" | ||||
| @@ -39,8 +38,7 @@ public class WxXmlOutVideoMessageTest { | |||||
| .title("title") | .title("title") | ||||
| .description("ddfff") | .description("ddfff") | ||||
| .build(); | .build(); | ||||
| String expected = "<?xml version=\"1.0\" encoding=\"UTF-8\" standalone=\"yes\"?>" | |||||
| + "<xml>" | |||||
| String expected = "<xml>" | |||||
| + "<ToUserName><![CDATA[toUser]]></ToUserName>" | + "<ToUserName><![CDATA[toUser]]></ToUserName>" | ||||
| + "<FromUserName><![CDATA[fromUser]]></FromUserName>" | + "<FromUserName><![CDATA[fromUser]]></FromUserName>" | ||||
| + "<CreateTime>1122</CreateTime>" | + "<CreateTime>1122</CreateTime>" | ||||
| @@ -13,8 +13,7 @@ public class WxXmlOutVoiceMessageTest { | |||||
| m.setFromUserName("from"); | m.setFromUserName("from"); | ||||
| m.setToUserName("to"); | m.setToUserName("to"); | ||||
| String expected = "<?xml version=\"1.0\" encoding=\"UTF-8\" standalone=\"yes\"?>" | |||||
| + "<xml>" | |||||
| String expected = "<xml>" | |||||
| + "<ToUserName><![CDATA[to]]></ToUserName>" | + "<ToUserName><![CDATA[to]]></ToUserName>" | ||||
| + "<FromUserName><![CDATA[from]]></FromUserName>" | + "<FromUserName><![CDATA[from]]></FromUserName>" | ||||
| + "<CreateTime>1122</CreateTime>" | + "<CreateTime>1122</CreateTime>" | ||||
| @@ -27,8 +26,7 @@ public class WxXmlOutVoiceMessageTest { | |||||
| public void testBuild() { | public void testBuild() { | ||||
| WxMpXmlOutVoiceMessage m = WxMpXmlOutMessage.VOICE().mediaId("ddfefesfsdfef").fromUser("from").toUser("to").build(); | WxMpXmlOutVoiceMessage m = WxMpXmlOutMessage.VOICE().mediaId("ddfefesfsdfef").fromUser("from").toUser("to").build(); | ||||
| String expected = "<?xml version=\"1.0\" encoding=\"UTF-8\" standalone=\"yes\"?>" | |||||
| + "<xml>" | |||||
| String expected = "<xml>" | |||||
| + "<ToUserName><![CDATA[to]]></ToUserName>" | + "<ToUserName><![CDATA[to]]></ToUserName>" | ||||
| + "<FromUserName><![CDATA[from]]></FromUserName>" | + "<FromUserName><![CDATA[from]]></FromUserName>" | ||||
| + "<CreateTime>1122</CreateTime>" | + "<CreateTime>1122</CreateTime>" | ||||