mirror of
https://codeberg.org/Mercury-IM/Smack
synced 2024-06-15 08:04:52 +02:00
b7824f008d
Smack currently does unnecessary escaping of XML text, where it escapes e.g. '"' to '"'. This bloats the stanza size, especially if JSON payloads are involved. Fixes SMACK-892 (although there are probably still places where XmlStringBuilder.escape() is used when XmlStringBuild.text() could have been used).
223 lines
8 KiB
Java
223 lines
8 KiB
Java
/**
|
|
*
|
|
* Copyright (C) 2007 Jive Software.
|
|
*
|
|
* Licensed under the Apache License, Version 2.0 (the "License");
|
|
* you may not use this file except in compliance with the License.
|
|
* You may obtain a copy of the License at
|
|
*
|
|
* http://www.apache.org/licenses/LICENSE-2.0
|
|
*
|
|
* Unless required by applicable law or agreed to in writing, software
|
|
* distributed under the License is distributed on an "AS IS" BASIS,
|
|
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
|
* See the License for the specific language governing permissions and
|
|
* limitations under the License.
|
|
*/
|
|
package org.jivesoftware.smack.packet;
|
|
|
|
import static org.jivesoftware.smack.test.util.XmlAssertUtil.assertXmlSimilar;
|
|
import static org.junit.Assert.assertEquals;
|
|
import static org.junit.Assert.assertTrue;
|
|
|
|
import java.io.IOException;
|
|
import java.util.ArrayList;
|
|
import java.util.Collection;
|
|
import java.util.List;
|
|
|
|
import org.junit.Test;
|
|
import org.xml.sax.SAXException;
|
|
|
|
public class MessageTest {
|
|
|
|
@Test
|
|
public void setMessageTypeTest() throws IOException, SAXException {
|
|
Message.Type type = Message.Type.chat;
|
|
Message.Type type2 = Message.Type.headline;
|
|
|
|
StringBuilder controlBuilder = new StringBuilder();
|
|
controlBuilder.append("<message")
|
|
.append(" type=\"")
|
|
.append(type)
|
|
.append("\">")
|
|
.append("</message>");
|
|
String control = controlBuilder.toString();
|
|
|
|
Message messageBuildWithBuilder = StanzaBuilder.buildMessage()
|
|
.ofType(Message.Type.chat)
|
|
.build();
|
|
|
|
assertEquals(type, messageBuildWithBuilder.getType());
|
|
assertXmlSimilar(control, messageBuildWithBuilder.toXML(StreamOpen.CLIENT_NAMESPACE).toString());
|
|
|
|
controlBuilder = new StringBuilder();
|
|
controlBuilder.append("<message")
|
|
.append(" type=\"")
|
|
.append(type2)
|
|
.append("\">")
|
|
.append("</message>");
|
|
control = controlBuilder.toString();
|
|
|
|
Message messageTypeSet = StanzaBuilder.buildMessage()
|
|
.ofType(type2)
|
|
.build();
|
|
assertEquals(type2, messageTypeSet.getType());
|
|
assertXmlSimilar(control, messageTypeSet.toXML(StreamOpen.CLIENT_NAMESPACE).toString());
|
|
}
|
|
|
|
@Test(expected = NullPointerException.class)
|
|
public void setNullMessageBodyTest() {
|
|
StanzaBuilder.buildMessage()
|
|
.addBody(null, null)
|
|
.build();
|
|
}
|
|
|
|
@Test
|
|
public void setMessageSubjectTest() throws IOException, SAXException {
|
|
final String messageSubject = "This is a test of the emergency broadcast system.";
|
|
|
|
StringBuilder controlBuilder = new StringBuilder();
|
|
controlBuilder.append("<message>")
|
|
.append("<subject>")
|
|
.append(messageSubject)
|
|
.append("</subject>")
|
|
.append("</message>");
|
|
String control = controlBuilder.toString();
|
|
|
|
Message message = StanzaBuilder.buildMessage()
|
|
.setSubject(messageSubject)
|
|
.build();
|
|
assertEquals(messageSubject, message.getSubject());
|
|
assertXmlSimilar(control, message.toXML(StreamOpen.CLIENT_NAMESPACE).toString());
|
|
}
|
|
|
|
@Test
|
|
public void oneMessageBodyTest() throws IOException, SAXException {
|
|
final String messageBody = "This is a test of the emergency broadcast system.";
|
|
|
|
StringBuilder controlBuilder = new StringBuilder();
|
|
controlBuilder.append("<message>")
|
|
.append("<body>")
|
|
.append(messageBody)
|
|
.append("</body>")
|
|
.append("</message>");
|
|
String control = controlBuilder.toString();
|
|
|
|
Message message = StanzaBuilder.buildMessage()
|
|
.setBody(messageBody)
|
|
.build();
|
|
assertEquals(messageBody, message.getBody());
|
|
assertXmlSimilar(control, message.toXML(StreamOpen.CLIENT_NAMESPACE).toString());
|
|
}
|
|
|
|
@Test
|
|
public void multipleMessageBodiesTest() throws IOException, SAXException {
|
|
final String messageBody1 = "This is a test of the emergency broadcast system, 1.";
|
|
final String lang2 = "ru";
|
|
final String messageBody2 = "This is a test of the emergency broadcast system, 2.";
|
|
final String lang3 = "sp";
|
|
final String messageBody3 = "This is a test of the emergency broadcast system, 3.";
|
|
|
|
StringBuilder controlBuilder = new StringBuilder();
|
|
controlBuilder.append("<message>")
|
|
.append("<body>")
|
|
.append(messageBody1)
|
|
.append("</body>")
|
|
.append("<body xml:lang=\"")
|
|
.append(lang2)
|
|
.append("\">")
|
|
.append(messageBody2)
|
|
.append("</body>")
|
|
.append("<body xml:lang=\"")
|
|
.append(lang3)
|
|
.append("\">")
|
|
.append(messageBody3)
|
|
.append("</body>")
|
|
.append("</message>");
|
|
String control = controlBuilder.toString();
|
|
|
|
Message message = StanzaBuilder.buildMessage()
|
|
.addBody(null, messageBody1)
|
|
.addBody(lang2, messageBody2)
|
|
.addBody(lang3, messageBody3)
|
|
.build();
|
|
assertXmlSimilar(control, message.toXML(StreamOpen.CLIENT_NAMESPACE));
|
|
|
|
Collection<String> languages = message.getBodyLanguages();
|
|
List<String> controlLanguages = new ArrayList<>();
|
|
controlLanguages.add(lang2);
|
|
controlLanguages.add(lang3);
|
|
controlLanguages.removeAll(languages);
|
|
assertTrue(controlLanguages.size() == 0);
|
|
}
|
|
|
|
@Test
|
|
public void simpleMessageBodyTest() {
|
|
Message message = StanzaBuilder.buildMessage()
|
|
.setBody("test")
|
|
.build();
|
|
assertTrue(message.getBodies().size() == 1);
|
|
|
|
message = StanzaBuilder.buildMessage().build();
|
|
assertTrue(message.getBodies().size() == 0);
|
|
|
|
|
|
message = StanzaBuilder.buildMessage()
|
|
.addBody("es", "test")
|
|
.build();
|
|
assertTrue(message.getBodies().size() == 1);
|
|
}
|
|
|
|
@Test
|
|
public void setMessageThreadTest() throws IOException, SAXException {
|
|
final String messageThread = "1234";
|
|
|
|
StringBuilder controlBuilder = new StringBuilder();
|
|
controlBuilder.append("<message>")
|
|
.append("<thread>")
|
|
.append(messageThread)
|
|
.append("</thread>")
|
|
.append("</message>");
|
|
String control = controlBuilder.toString();
|
|
|
|
Message message = StanzaBuilder.buildMessage()
|
|
.setThread(messageThread)
|
|
.build();
|
|
|
|
assertEquals(messageThread, message.getThread());
|
|
assertXmlSimilar(control, message.toXML(StreamOpen.CLIENT_NAMESPACE).toString());
|
|
}
|
|
|
|
@Test
|
|
public void messageXmlLangTest() throws IOException, SAXException {
|
|
final String lang = "sp";
|
|
|
|
StringBuilder controlBuilder = new StringBuilder();
|
|
controlBuilder.append("<message")
|
|
.append(" xml:lang=\"")
|
|
.append(lang)
|
|
.append("\">")
|
|
.append("</message>");
|
|
String control = controlBuilder.toString();
|
|
|
|
Message message = StanzaBuilder.buildMessage()
|
|
.setLanguage(lang)
|
|
.build();
|
|
|
|
assertXmlSimilar(control, message.toXML(StreamOpen.CLIENT_NAMESPACE).toString());
|
|
}
|
|
|
|
/**
|
|
* Tests that only required characters are XML escaped in body.
|
|
*
|
|
* @see <a href="https://issues.igniterealtime.org/browse/SMACK-892">SMACK-892</a>
|
|
*/
|
|
@Test
|
|
public void escapeInBodyTest() {
|
|
String theFive = "\"'<>&";
|
|
Message.Body body = new Message.Body(null, theFive);
|
|
|
|
assertEquals("<body xmlns='jabber:client'>\"'<>&</body>", body.toXML().toString());
|
|
}
|
|
}
|