mirror of
https://codeberg.org/Mercury-IM/Smack
synced 2025-09-10 18:59:41 +02:00
Added support for multiple message bodies and language on the message. SMACK-99
git-svn-id: http://svn.igniterealtime.org/svn/repos/smack/trunk@8113 b35dd754-fafc-0310-a699-88a17e54d16e
This commit is contained in:
Alex Wenckus
alex
parent
985bc79aca
commit
8e08a8ba4a
11 changed files with 926 additions and 42 deletions
244
test-unit/org/jivesoftware/smack/packet/MessageTest.java
Normal file
244
test-unit/org/jivesoftware/smack/packet/MessageTest.java
Normal file
|
|
@ -0,0 +1,244 @@
|
|||
/**
|
||||
* $Revision:$
|
||||
* $Date:$
|
||||
*
|
||||
* Copyright (C) 2007 Jive Software. All rights reserved.
|
||||
* This software is the proprietary information of Jive Software. Use is subject to license terms.
|
||||
*/
|
||||
package org.jivesoftware.smack.packet;
|
||||
|
||||
import static org.custommonkey.xmlunit.XMLAssert.*;
|
||||
import org.xml.sax.SAXException;
|
||||
import org.junit.Test;
|
||||
|
||||
import java.io.IOException;
|
||||
import java.util.Collection;
|
||||
import java.util.List;
|
||||
import java.util.ArrayList;
|
||||
|
||||
/**
|
||||
*
|
||||
*/
|
||||
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 messageTypeInConstructor = new Message(null, Message.Type.chat);
|
||||
messageTypeInConstructor.setPacketID(Packet.ID_NOT_AVAILABLE);
|
||||
assertEquals(type, messageTypeInConstructor.getType());
|
||||
assertXMLEqual(control, messageTypeInConstructor.toXML());
|
||||
|
||||
controlBuilder = new StringBuilder();
|
||||
controlBuilder.append("<message")
|
||||
.append(" type=\"")
|
||||
.append(type2)
|
||||
.append("\">")
|
||||
.append("</message>");
|
||||
control = controlBuilder.toString();
|
||||
|
||||
Message messageTypeSet = getNewMessage();
|
||||
messageTypeSet.setType(type2);
|
||||
assertEquals(type2, messageTypeSet.getType());
|
||||
assertXMLEqual(control, messageTypeSet.toXML());
|
||||
}
|
||||
|
||||
@Test(expected=IllegalArgumentException.class)
|
||||
public void setMessageTypeNullTest() {
|
||||
Message message = getNewMessage();
|
||||
message.setType(null);
|
||||
}
|
||||
|
||||
@Test(expected=NullPointerException.class)
|
||||
public void setNullMessageBodyTest() {
|
||||
Message message = getNewMessage();
|
||||
message.addBody(null, null);
|
||||
}
|
||||
|
||||
@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 = getNewMessage();
|
||||
message.setSubject(messageSubject);
|
||||
|
||||
assertEquals(messageSubject, message.getSubject());
|
||||
assertXMLEqual(control, message.toXML());
|
||||
}
|
||||
|
||||
@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 = getNewMessage();
|
||||
message.setBody(messageBody);
|
||||
|
||||
assertEquals(messageBody, message.getBody());
|
||||
assertXMLEqual(control, message.toXML());
|
||||
}
|
||||
|
||||
@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 = getNewMessage();
|
||||
message.addBody(null, messageBody1);
|
||||
message.addBody(lang2, messageBody2);
|
||||
message.addBody(lang3, messageBody3);
|
||||
assertXMLEqual(control, message.toXML());
|
||||
|
||||
Collection<String> languages = message.getBodyLanguages();
|
||||
List<String> controlLanguages = new ArrayList<String>();
|
||||
controlLanguages.add(lang2);
|
||||
controlLanguages.add(lang3);
|
||||
controlLanguages.removeAll(languages);
|
||||
assertTrue(controlLanguages.size() == 0);
|
||||
}
|
||||
|
||||
@Test
|
||||
public void removeMessageBodyTest() {
|
||||
Message message = getNewMessage();
|
||||
message.setBody("test");
|
||||
assertTrue(message.getBodies().size() == 1);
|
||||
|
||||
message.setBody(null);
|
||||
assertTrue(message.getBodies().size() == 0);
|
||||
|
||||
assertFalse(message.removeBody("sp"));
|
||||
|
||||
Message.Body body = message.addBody("es", "test");
|
||||
assertTrue(message.getBodies().size() == 1);
|
||||
|
||||
message.removeBody(body);
|
||||
assertTrue(message.getBodies().size() == 0);
|
||||
}
|
||||
|
||||
@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 = getNewMessage();
|
||||
message.setThread(messageThread);
|
||||
|
||||
assertEquals(messageThread, message.getThread());
|
||||
assertXMLEqual(control, message.toXML());
|
||||
}
|
||||
|
||||
@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 = getNewMessage();
|
||||
message.setLanguage(lang);
|
||||
|
||||
assertXMLEqual(control, message.toXML());
|
||||
}
|
||||
|
||||
@Test
|
||||
public void messageEqualityTest() {
|
||||
Message message = getNewMessage();
|
||||
assertTrue(message.equals(message));
|
||||
//noinspection ObjectEqualsNull
|
||||
assertFalse(message.equals(null));
|
||||
assertFalse(message.equals("test"));
|
||||
Message message2 = getNewMessage();
|
||||
|
||||
assertTrue(message.equals(message2));
|
||||
|
||||
message.setTo("joe@shmoe.com");
|
||||
assertFalse(message.equals(message2));
|
||||
message2.setTo("joe@shmoe.com");
|
||||
|
||||
message.setSubject("subject");
|
||||
assertFalse(message.equals(message2));
|
||||
message2.setSubject("subject");
|
||||
|
||||
message.setThread("thread");
|
||||
assertFalse(message.equals(message2));
|
||||
message2.setThread("thread");
|
||||
|
||||
message.setBody("body1");
|
||||
assertFalse(message.equals(message2));
|
||||
message2.setBody("body1");
|
||||
|
||||
message.setLanguage("language");
|
||||
assertFalse(message.equals(message2));
|
||||
message2.setLanguage("language");
|
||||
|
||||
message.setType(Message.Type.chat);
|
||||
assertFalse(message.equals(message2));
|
||||
message2.setType(Message.Type.chat);
|
||||
|
||||
assertTrue(message.equals(message2));
|
||||
}
|
||||
|
||||
private static Message getNewMessage() {
|
||||
Message message = new Message();
|
||||
message.setPacketID(Packet.ID_NOT_AVAILABLE);
|
||||
return message;
|
||||
}
|
||||
}
|
||||
186
test-unit/org/jivesoftware/smack/packet/PresenceTest.java
Normal file
186
test-unit/org/jivesoftware/smack/packet/PresenceTest.java
Normal file
|
|
@ -0,0 +1,186 @@
|
|||
/**
|
||||
* $Revision:$
|
||||
* $Date:$
|
||||
*
|
||||
* Copyright (C) 2007 Jive Software. All rights reserved.
|
||||
* This software is the proprietary information of Jive Software. Use is subject to license terms.
|
||||
*/
|
||||
package org.jivesoftware.smack.packet;
|
||||
|
||||
import org.junit.Test;
|
||||
import static org.junit.Assert.*;
|
||||
import static org.custommonkey.xmlunit.XMLAssert.assertXMLEqual;
|
||||
import org.xml.sax.SAXException;
|
||||
import static junit.framework.Assert.assertEquals;
|
||||
|
||||
import java.io.IOException;
|
||||
|
||||
/**
|
||||
*
|
||||
*/
|
||||
public class PresenceTest {
|
||||
@Test
|
||||
public void setPresenceTypeTest() throws IOException, SAXException {
|
||||
Presence.Type type = Presence.Type.unavailable;
|
||||
Presence.Type type2 = Presence.Type.subscribe;
|
||||
|
||||
StringBuilder controlBuilder = new StringBuilder();
|
||||
controlBuilder.append("<presence")
|
||||
.append(" type=\"")
|
||||
.append(type)
|
||||
.append("\">")
|
||||
.append("</presence>");
|
||||
String control = controlBuilder.toString();
|
||||
|
||||
Presence presenceTypeInConstructor = new Presence(type);
|
||||
presenceTypeInConstructor.setPacketID(Packet.ID_NOT_AVAILABLE);
|
||||
assertEquals(type, presenceTypeInConstructor.getType());
|
||||
assertXMLEqual(control, presenceTypeInConstructor.toXML());
|
||||
|
||||
controlBuilder = new StringBuilder();
|
||||
controlBuilder.append("<presence")
|
||||
.append(" type=\"")
|
||||
.append(type2)
|
||||
.append("\">")
|
||||
.append("</presence>");
|
||||
control = controlBuilder.toString();
|
||||
|
||||
Presence presenceTypeSet = getNewPresence();
|
||||
presenceTypeSet.setType(type2);
|
||||
assertEquals(type2, presenceTypeSet.getType());
|
||||
assertXMLEqual(control, presenceTypeSet.toXML());
|
||||
}
|
||||
|
||||
@Test(expected=NullPointerException.class)
|
||||
public void setNullPresenceTypeTest() {
|
||||
getNewPresence().setType(null);
|
||||
}
|
||||
|
||||
@Test
|
||||
public void isPresenceAvailableTest() {
|
||||
Presence presence = getNewPresence();
|
||||
presence.setType(Presence.Type.available);
|
||||
assertTrue(presence.isAvailable());
|
||||
|
||||
presence.setType(Presence.Type.unavailable);
|
||||
assertFalse(presence.isAvailable());
|
||||
}
|
||||
|
||||
@Test
|
||||
public void setPresenceStatusTest() throws IOException, SAXException {
|
||||
final String status = "This is a test of the emergency broadcast system.";
|
||||
|
||||
StringBuilder controlBuilder = new StringBuilder();
|
||||
controlBuilder.append("<presence>")
|
||||
.append("<status>")
|
||||
.append(status)
|
||||
.append("</status>")
|
||||
.append("</presence>");
|
||||
String control = controlBuilder.toString();
|
||||
|
||||
Presence presence = getNewPresence();
|
||||
presence.setStatus(status);
|
||||
|
||||
assertEquals(status, presence.getStatus());
|
||||
assertXMLEqual(control, presence.toXML());
|
||||
}
|
||||
|
||||
@Test
|
||||
public void setPresencePriorityTest() throws IOException, SAXException {
|
||||
final int priority = 10;
|
||||
|
||||
StringBuilder controlBuilder = new StringBuilder();
|
||||
controlBuilder.append("<presence>")
|
||||
.append("<priority>")
|
||||
.append(priority)
|
||||
.append("</priority>")
|
||||
.append("</presence>");
|
||||
String control = controlBuilder.toString();
|
||||
|
||||
Presence presence = getNewPresence();
|
||||
presence.setPriority(priority);
|
||||
|
||||
assertEquals(priority, presence.getPriority());
|
||||
assertXMLEqual(control, presence.toXML());
|
||||
}
|
||||
|
||||
@Test(expected=IllegalArgumentException.class)
|
||||
public void setIllegalPriorityTest() {
|
||||
getNewPresence().setPriority(Integer.MIN_VALUE);
|
||||
}
|
||||
|
||||
@Test
|
||||
public void setPresenceModeTest() throws IOException, SAXException {
|
||||
Presence.Mode mode1 = Presence.Mode.dnd;
|
||||
final int priority = 10;
|
||||
final String status = "This is a test of the emergency broadcast system.";
|
||||
Presence.Mode mode2 = Presence.Mode.chat;
|
||||
|
||||
StringBuilder controlBuilder = new StringBuilder();
|
||||
controlBuilder.append("<presence>")
|
||||
.append("<status>")
|
||||
.append(status)
|
||||
.append("</status>")
|
||||
.append("<priority>")
|
||||
.append(priority)
|
||||
.append("</priority>")
|
||||
.append("<show>")
|
||||
.append(mode1)
|
||||
.append("</show>")
|
||||
.append("</presence>");
|
||||
String control = controlBuilder.toString();
|
||||
|
||||
Presence presenceModeInConstructor = new Presence(Presence.Type.available, status, priority,
|
||||
mode1);
|
||||
presenceModeInConstructor.setPacketID(Packet.ID_NOT_AVAILABLE);
|
||||
assertEquals(mode1, presenceModeInConstructor.getMode());
|
||||
assertXMLEqual(control, presenceModeInConstructor.toXML());
|
||||
|
||||
controlBuilder = new StringBuilder();
|
||||
controlBuilder.append("<presence>")
|
||||
.append("<show>")
|
||||
.append(mode2)
|
||||
.append("</show>")
|
||||
.append("</presence>");
|
||||
control = controlBuilder.toString();
|
||||
|
||||
Presence presenceModeSet = getNewPresence();
|
||||
presenceModeSet.setMode(mode2);
|
||||
assertEquals(mode2, presenceModeSet.getMode());
|
||||
assertXMLEqual(control, presenceModeSet.toXML());
|
||||
}
|
||||
|
||||
@Test
|
||||
public void isModeAwayTest() {
|
||||
Presence presence = getNewPresence();
|
||||
presence.setMode(Presence.Mode.away);
|
||||
assertTrue(presence.isAway());
|
||||
|
||||
presence.setMode(Presence.Mode.chat);
|
||||
assertFalse(presence.isAway());
|
||||
}
|
||||
|
||||
@Test
|
||||
public void presenceXmlLangTest() throws IOException, SAXException {
|
||||
final String lang = "sp";
|
||||
|
||||
StringBuilder controlBuilder = new StringBuilder();
|
||||
controlBuilder.append("<presence")
|
||||
.append(" xml:lang=\"")
|
||||
.append(lang)
|
||||
.append("\">")
|
||||
.append("</presence>");
|
||||
String control = controlBuilder.toString();
|
||||
|
||||
Presence presence = getNewPresence();
|
||||
presence.setLanguage(lang);
|
||||
|
||||
assertXMLEqual(control, presence.toXML());
|
||||
}
|
||||
|
||||
private static Presence getNewPresence() {
|
||||
Presence presence = new Presence(Presence.Type.available);
|
||||
presence.setPacketID(Packet.ID_NOT_AVAILABLE);
|
||||
return presence;
|
||||
}
|
||||
}
|
||||
Loading…
Add table
Add a link
Reference in a new issue