From a9e45475ab81b1d7c1c8e526b37c8661bee8a510 Mon Sep 17 00:00:00 2001 From: Florian Schmaus Date: Wed, 9 May 2018 16:53:08 +0200 Subject: [PATCH] Treat just like all other extension elements in Message This turned out to be a rather large change. --- .../org/jivesoftware/smack/packet/IQ.java | 8 +- .../jivesoftware/smack/packet/Message.java | 46 +++-- .../jivesoftware/smack/packet/Presence.java | 7 +- .../org/jivesoftware/smack/packet/Stanza.java | 43 ++-- .../smack/util/PacketParserUtils.java | 21 +- .../smack/util/XmlStringBuilder.java | 6 +- .../smack/packet/MessageTest.java | 12 +- .../smack/packet/PresenceTest.java | 14 +- .../smack/util/PacketParserUtilsTest.java | 185 ++++++++++-------- .../AcknowledgedExtensionTest.java | 3 +- .../chat_markers/DisplayedExtensionTest.java | 3 +- .../chat_markers/MarkableExtensionTest.java | 2 +- .../chat_markers/ReceivedExtensionTest.java | 3 +- .../provider/SlotProviderTest.java | 9 +- .../jivesoftware/smackx/mam/PagingTest.java | 3 +- .../smackx/mam/PreferencesTest.java | 6 +- .../smackx/mam/QueryArchiveTest.java | 8 +- .../smackx/mam/ResultsLimitTest.java | 3 +- .../smackx/mam/RetrieveFormFieldsTest.java | 4 +- ...CLightAffiliationsChangeExtensionTest.java | 6 +- .../smackx/muclight/MUCLightBlockingTest.java | 9 +- ...ightConfigurationsChangeExtensionTest.java | 6 +- .../smackx/muclight/MUCLightDestroyTest.java | 4 +- .../muclight/MUCLightGetAffiliationsTest.java | 3 +- .../muclight/MUCLightGetConfigsTest.java | 3 +- .../smackx/muclight/MUCLightInfoTest.java | 5 +- .../muclight/MUCLightSetConfigsIQTest.java | 8 +- .../DisablePushNotificationsIQTest.java | 6 +- .../EnablePushNotificationsIQTest.java | 6 +- .../smackx/blocking/BlockContactsIQTest.java | 4 +- .../smackx/blocking/GetBlockingListTest.java | 3 +- .../blocking/UnblockContactsIQTest.java | 5 +- .../jivesoftware/smackx/bob/BoBIQTest.java | 5 +- .../bytestreams/ibb/packet/CloseTest.java | 3 +- .../bytestreams/ibb/packet/DataTest.java | 3 +- .../bytestreams/ibb/packet/OpenTest.java | 3 +- .../JivePropertiesExtensionTest.java | 4 +- .../MessageCorrectExtensionTest.java | 4 +- .../shim/provider/HeadersProviderTest.java | 4 +- 39 files changed, 261 insertions(+), 219 deletions(-) diff --git a/smack-core/src/main/java/org/jivesoftware/smack/packet/IQ.java b/smack-core/src/main/java/org/jivesoftware/smack/packet/IQ.java index 088705597..c963247d0 100644 --- a/smack-core/src/main/java/org/jivesoftware/smack/packet/IQ.java +++ b/smack-core/src/main/java/org/jivesoftware/smack/packet/IQ.java @@ -17,6 +17,7 @@ package org.jivesoftware.smack.packet; +import java.util.List; import java.util.Locale; import org.jivesoftware.smack.util.Objects; @@ -128,7 +129,7 @@ public abstract class IQ extends Stanza { public final XmlStringBuilder toXML(String enclosingNamespace) { XmlStringBuilder buf = new XmlStringBuilder(enclosingNamespace); buf.halfOpenElement(IQ_ELEMENT); - addCommonAttributes(buf); + addCommonAttributes(buf, enclosingNamespace); if (type == null) { buf.attribute("type", "get"); } @@ -158,9 +159,10 @@ public abstract class IQ extends Stanza { IQChildElementXmlStringBuilder iqChildElement = getIQChildElementBuilder(new IQChildElementXmlStringBuilder(this)); if (iqChildElement != null) { xml.append(iqChildElement); - XmlStringBuilder extensionsXml = getExtensionsXML(); + + List extensionsXml = getExtensions(); if (iqChildElement.isEmptyElement) { - if (extensionsXml.length() == 0) { + if (extensionsXml.isEmpty()) { xml.closeEmptyElement(); return xml; } else { diff --git a/smack-core/src/main/java/org/jivesoftware/smack/packet/Message.java b/smack-core/src/main/java/org/jivesoftware/smack/packet/Message.java index 3eb5dbf94..4c3a87ab4 100644 --- a/smack-core/src/main/java/org/jivesoftware/smack/packet/Message.java +++ b/smack-core/src/main/java/org/jivesoftware/smack/packet/Message.java @@ -66,7 +66,6 @@ public final class Message extends Stanza implements TypedCloneable { private String thread = null; private final Set subjects = new HashSet(); - private final Set bodies = new HashSet(); /** * Creates a new, "normal" message. @@ -142,7 +141,6 @@ public final class Message extends Stanza implements TypedCloneable { this.type = other.type; this.thread = other.thread; this.subjects.addAll(other.subjects); - this.bodies.addAll(other.bodies); } /** @@ -197,7 +195,7 @@ public final class Message extends Stanza implements TypedCloneable { private Subject getMessageSubject(String language) { language = determineLanguage(language); for (Subject subject : subjects) { - if (language.equals(subject.language)) { + if (Objects.equals(language, subject.language)) { return subject; } } @@ -296,7 +294,7 @@ public final class Message extends Stanza implements TypedCloneable { * @return the body of the message. */ public String getBody() { - return getBody(null); + return getBody(language); } /** @@ -331,7 +329,13 @@ public final class Message extends Stanza implements TypedCloneable { * @since 3.0.2 */ public Set getBodies() { - return Collections.unmodifiableSet(bodies); + List bodiesList = getExtensions(Body.ELEMENT, Body.NAMESPACE); + Set resultSet = new HashSet<>(bodiesList.size()); + for (ExtensionElement extensionElement : bodiesList) { + Body body = (Body) extensionElement; + resultSet.add(body); + } + return resultSet; } /** @@ -375,8 +379,11 @@ public final class Message extends Stanza implements TypedCloneable { */ public Body addBody(String language, String body) { language = determineLanguage(language); + + removeBody(language); + Body messageBody = new Body(language, body); - bodies.add(messageBody); + addExtension(messageBody); return messageBody; } @@ -406,7 +413,8 @@ public final class Message extends Stanza implements TypedCloneable { * @since 3.0.2 */ public boolean removeBody(Body body) { - return bodies.remove(body); + ExtensionElement removedElement = removeExtension(body); + return removedElement != null; } /** @@ -418,7 +426,7 @@ public final class Message extends Stanza implements TypedCloneable { public List getBodyLanguages() { Body defaultBody = getMessageBody(null); List languages = new ArrayList(); - for (Body body : bodies) { + for (Body body : getBodies()) { if (!body.equals(defaultBody)) { languages.add(body.language); } @@ -472,9 +480,9 @@ public final class Message extends Stanza implements TypedCloneable { @Override public XmlStringBuilder toXML(String enclosingNamespace) { - XmlStringBuilder buf = new XmlStringBuilder(); + XmlStringBuilder buf = new XmlStringBuilder(enclosingNamespace); buf.halfOpenElement(ELEMENT); - addCommonAttributes(buf); + enclosingNamespace = addCommonAttributes(buf, enclosingNamespace); buf.optAttribute("type", type); buf.rightAngleBracket(); @@ -490,25 +498,15 @@ public final class Message extends Stanza implements TypedCloneable { continue; buf.append(subject.toXML(null)); } - // Add the body in the default language - Body defaultBody = getMessageBody(null); - if (defaultBody != null) { - buf.element("body", defaultBody.message); - } - // Add the bodies in other languages - for (Body body : getBodies()) { - // Skip the default language - if (body.equals(defaultBody)) - continue; - buf.append(body.toXML(enclosingNamespace)); - } buf.optElement("thread", thread); // Append the error subpacket if the message type is an error. if (type == Type.error) { appendErrorIfExists(buf); } - // Add packet extensions, if any are defined. - buf.append(getExtensionsXML()); + + // Add extension elements, if any are defined. + buf.append(getExtensions(), enclosingNamespace); + buf.closeElement(ELEMENT); return buf; } diff --git a/smack-core/src/main/java/org/jivesoftware/smack/packet/Presence.java b/smack-core/src/main/java/org/jivesoftware/smack/packet/Presence.java index 3402300c6..1231bc620 100644 --- a/smack-core/src/main/java/org/jivesoftware/smack/packet/Presence.java +++ b/smack-core/src/main/java/org/jivesoftware/smack/packet/Presence.java @@ -273,9 +273,9 @@ public final class Presence extends Stanza implements TypedCloneable { @Override public XmlStringBuilder toXML(String enclosingNamespace) { - XmlStringBuilder buf = new XmlStringBuilder(); + XmlStringBuilder buf = new XmlStringBuilder(enclosingNamespace); buf.halfOpenElement(ELEMENT); - addCommonAttributes(buf); + addCommonAttributes(buf, enclosingNamespace); if (type != Type.available) { buf.attribute("type", type); } @@ -288,7 +288,8 @@ public final class Presence extends Stanza implements TypedCloneable { if (mode != null && mode != Mode.available) { buf.element("show", mode); } - buf.append(getExtensionsXML()); + + buf.append(getExtensions(), enclosingNamespace); // Add the error sub-packet, if there is one. appendErrorIfExists(buf); diff --git a/smack-core/src/main/java/org/jivesoftware/smack/packet/Stanza.java b/smack-core/src/main/java/org/jivesoftware/smack/packet/Stanza.java index e9d428092..a795ac09b 100644 --- a/smack-core/src/main/java/org/jivesoftware/smack/packet/Stanza.java +++ b/smack-core/src/main/java/org/jivesoftware/smack/packet/Stanza.java @@ -470,7 +470,15 @@ public abstract class Stanza implements TopLevelStreamElement { * @return the removed stanza extension or null. */ public ExtensionElement removeExtension(ExtensionElement extension) { - return removeExtension(extension.getElementName(), extension.getNamespace()); + String key = XmppStringUtils.generateKey(extension.getElementName(), extension.getNamespace()); + synchronized (packetExtensions) { + List list = packetExtensions.getAll(key); + boolean removed = list.remove(extension); + if (removed) { + return extension; + } + } + return null; } /** @@ -479,22 +487,6 @@ public abstract class Stanza implements TopLevelStreamElement { @Override public abstract String toString(); - /** - * Returns the extension sub-packets (including properties data) as an XML - * String, or the Empty String if there are no stanza extensions. - * - * @return the extension sub-packets as XML or the Empty String if there - * are no stanza extensions. - */ - protected final XmlStringBuilder getExtensionsXML() { - XmlStringBuilder xml = new XmlStringBuilder(); - // Add in all standard extension sub-packets. - for (ExtensionElement extension : getExtensions()) { - xml.append(extension.toXML(null)); - } - return xml; - } - /** * Returns the default language used for all messages containing localized content. * @@ -507,13 +499,26 @@ public abstract class Stanza implements TopLevelStreamElement { /** * Add to, from, id and 'xml:lang' attributes * - * @param xml + * @param xml the {@link XmlStringBuilder}. + * @param enclosingNamespace the enclosing XML namespace. + * @return the set namespace for this stanza. */ - protected void addCommonAttributes(XmlStringBuilder xml) { + protected String addCommonAttributes(XmlStringBuilder xml, String enclosingNamespace) { + String namespace; + if (enclosingNamespace == null || !enclosingNamespace.equals(StreamOpen.CLIENT_NAMESPACE) + || !enclosingNamespace.equals(StreamOpen.SERVER_NAMESPACE)) { + namespace = StreamOpen.CLIENT_NAMESPACE; + } else { + namespace = enclosingNamespace; + } + + xml.xmlnsAttribute(namespace); xml.optAttribute("to", getTo()); xml.optAttribute("from", getFrom()); xml.optAttribute("id", getStanzaId()); xml.xmllangAttribute(getLanguage()); + + return namespace; } protected void logCommonAttributes(StringBuilder sb) { diff --git a/smack-core/src/main/java/org/jivesoftware/smack/util/PacketParserUtils.java b/smack-core/src/main/java/org/jivesoftware/smack/util/PacketParserUtils.java index 8e87aebd9..8c3dad1a6 100644 --- a/smack-core/src/main/java/org/jivesoftware/smack/util/PacketParserUtils.java +++ b/smack-core/src/main/java/org/jivesoftware/smack/util/PacketParserUtils.java @@ -246,28 +246,12 @@ public class PacketParserUtils { switch (elementName) { case "subject": String xmlLangSubject = getLanguageAttribute(parser); - if (xmlLangSubject == null) { - xmlLangSubject = defaultLanguage; - } - String subject = parseElementText(parser); if (message.getSubject(xmlLangSubject) == null) { message.addSubject(xmlLangSubject, subject); } break; - case Message.BODY: - String xmlLang = getLanguageAttribute(parser); - if (xmlLang == null) { - xmlLang = defaultLanguage; - } - - String body = parseElementText(parser); - - if (message.getBody(xmlLang) == null) { - message.addBody(xmlLang, body); - } - break; case "thread": if (thread == null) { thread = parser.nextText(); @@ -290,6 +274,11 @@ public class PacketParserUtils { } message.setThread(thread); + + // TODO check for duplicate body elements. This means we need to check for duplicate xml:lang pairs and for + // situations where we have a body element with an explicit xml lang set and once where the value is inherited + // and both values are equal. + return message; } diff --git a/smack-core/src/main/java/org/jivesoftware/smack/util/XmlStringBuilder.java b/smack-core/src/main/java/org/jivesoftware/smack/util/XmlStringBuilder.java index 0f5f7e916..946a291c9 100644 --- a/smack-core/src/main/java/org/jivesoftware/smack/util/XmlStringBuilder.java +++ b/smack-core/src/main/java/org/jivesoftware/smack/util/XmlStringBuilder.java @@ -457,8 +457,12 @@ public class XmlStringBuilder implements Appendable, CharSequence, Element { } public XmlStringBuilder append(Collection elements) { + return append(elements, null); + } + + public XmlStringBuilder append(Collection elements, String enclosingNamespace) { for (Element element : elements) { - append(element.toXML(null)); + append(element.toXML(enclosingNamespace)); } return this; } diff --git a/smack-core/src/test/java/org/jivesoftware/smack/packet/MessageTest.java b/smack-core/src/test/java/org/jivesoftware/smack/packet/MessageTest.java index 73f0b5360..b2290aeef 100644 --- a/smack-core/src/test/java/org/jivesoftware/smack/packet/MessageTest.java +++ b/smack-core/src/test/java/org/jivesoftware/smack/packet/MessageTest.java @@ -49,7 +49,7 @@ public class MessageTest { Message messageTypeInConstructor = new Message(null, Message.Type.chat); messageTypeInConstructor.setStanzaId(null); assertEquals(type, messageTypeInConstructor.getType()); - assertXMLEqual(control, messageTypeInConstructor.toXML(null).toString()); + assertXMLEqual(control, messageTypeInConstructor.toXML(StreamOpen.CLIENT_NAMESPACE).toString()); controlBuilder = new StringBuilder(); controlBuilder.append("") @@ -155,7 +155,7 @@ public class PresenceTest { Presence presenceModeSet = getNewPresence(); presenceModeSet.setMode(mode2); assertEquals(mode2, presenceModeSet.getMode()); - assertXMLEqual(control, presenceModeSet.toXML(null).toString()); + assertXMLEqual(control, presenceModeSet.toXML(StreamOpen.CLIENT_NAMESPACE).toString()); } @Test @@ -183,7 +183,7 @@ public class PresenceTest { Presence presence = getNewPresence(); presence.setLanguage(lang); - assertXMLEqual(control, presence.toXML(null).toString()); + assertXMLEqual(control, presence.toXML(StreamOpen.CLIENT_NAMESPACE).toString()); } private static Presence getNewPresence() { diff --git a/smack-core/src/test/java/org/jivesoftware/smack/util/PacketParserUtilsTest.java b/smack-core/src/test/java/org/jivesoftware/smack/util/PacketParserUtilsTest.java index 2bcbf71d9..f449a9665 100644 --- a/smack-core/src/test/java/org/jivesoftware/smack/util/PacketParserUtilsTest.java +++ b/smack-core/src/test/java/org/jivesoftware/smack/util/PacketParserUtilsTest.java @@ -46,6 +46,7 @@ import org.jivesoftware.smack.test.util.TestUtils; import org.jivesoftware.smack.test.util.XmlUnitUtils; import com.jamesmurty.utils.XMLBuilder; +import org.junit.Ignore; import org.junit.Test; import org.xml.sax.SAXException; import org.xmlpull.v1.XmlPullParser; @@ -67,6 +68,7 @@ public class PacketParserUtilsTest { // message has default language, body has no language control = XMLBuilder.create("message") + .namespace(StreamOpen.CLIENT_NAMESPACE) .a("from", "romeo@montague.lit/orchard") .a("to", "juliet@capulet.lit/balcony") .a("id", "zid615d9") @@ -87,6 +89,7 @@ public class PacketParserUtilsTest { // message has non-default language, body has no language control = XMLBuilder.create("message") + .namespace(StreamOpen.CLIENT_NAMESPACE) .a("from", "romeo@montague.lit/orchard") .a("to", "juliet@capulet.lit/balcony") .a("id", "zid615d9") @@ -106,6 +109,7 @@ public class PacketParserUtilsTest { // message has no language, body has no language control = XMLBuilder.create("message") + .namespace(StreamOpen.CLIENT_NAMESPACE) .a("from", "romeo@montague.lit/orchard") .a("to", "juliet@capulet.lit/balcony") .a("id", "zid615d9") @@ -118,12 +122,13 @@ public class PacketParserUtilsTest { assertEquals(defaultLanguage, message.getBody()); assertTrue(message.getBodyLanguages().isEmpty()); - assertEquals(defaultLanguage, message.getBody(defaultLanguage)); + assertEquals(defaultLanguage, message.getBody(null)); assertNull(message.getBody(otherLanguage)); assertXMLEqual(control, message.toXML(null).toString()); // message has no language, body has default language control = XMLBuilder.create("message") + .namespace(StreamOpen.CLIENT_NAMESPACE) .a("from", "romeo@montague.lit/orchard") .a("to", "juliet@capulet.lit/balcony") .a("id", "zid615d9") @@ -135,16 +140,16 @@ public class PacketParserUtilsTest { message = PacketParserUtils.parseMessage(PacketParserUtils.getParserFor(control)); - assertEquals(defaultLanguage, message.getBody()); - assertTrue(message.getBodyLanguages().isEmpty()); + assertNull(message.getBody()); + assertFalse(message.getBodyLanguages().isEmpty()); assertEquals(defaultLanguage, message.getBody(defaultLanguage)); assertNull(message.getBody(otherLanguage)); - // body attribute xml:lang is unnecessary - assertXMLNotEqual(control, message.toXML(null).toString()); + assertXMLEqual(control, message.toXML(null).toString()); // message has no language, body has non-default language control = XMLBuilder.create("message") + .namespace(StreamOpen.CLIENT_NAMESPACE) .a("from", "romeo@montague.lit/orchard") .a("to", "juliet@capulet.lit/balcony") .a("id", "zid615d9") @@ -161,10 +166,11 @@ public class PacketParserUtilsTest { assertTrue(message.getBodyLanguages().contains(otherLanguage)); assertEquals(otherLanguage, message.getBody(otherLanguage)); assertNull(message.getBody(defaultLanguage)); - assertXMLEqual(control, message.toXML(StreamOpen.CLIENT_NAMESPACE).toString()); + assertXMLEqual(control, message.toXML(null).toString()); // message has default language, body has non-default language control = XMLBuilder.create("message") + .namespace(StreamOpen.CLIENT_NAMESPACE) .a("from", "romeo@montague.lit/orchard") .a("to", "juliet@capulet.lit/balcony") .a("id", "zid615d9") @@ -182,10 +188,11 @@ public class PacketParserUtilsTest { assertTrue(message.getBodyLanguages().contains(otherLanguage)); assertEquals(otherLanguage, message.getBody(otherLanguage)); assertNull(message.getBody(defaultLanguage)); - assertXMLEqual(control, message.toXML(StreamOpen.CLIENT_NAMESPACE).toString()); + assertXMLEqual(control, message.toXML(null).toString()); // message has non-default language, body has default language control = XMLBuilder.create("message") + .namespace(StreamOpen.CLIENT_NAMESPACE) .a("from", "romeo@montague.lit/orchard") .a("to", "juliet@capulet.lit/balcony") .a("id", "zid615d9") @@ -203,7 +210,7 @@ public class PacketParserUtilsTest { assertTrue(message.getBodyLanguages().contains(defaultLanguage)); assertEquals(defaultLanguage, message.getBody(defaultLanguage)); assertNull(message.getBody(otherLanguage)); - assertXMLEqual(control, message.toXML(StreamOpen.CLIENT_NAMESPACE).toString()); + assertXMLEqual(control, message.toXML(null).toString()); } @@ -232,7 +239,7 @@ public class PacketParserUtilsTest { assertTrue(message.getSubjectLanguages().isEmpty()); assertEquals(defaultLanguage, message.getSubject(defaultLanguage)); assertNull(message.getSubject(otherLanguage)); - assertXMLEqual(control, message.toXML(null).toString()); + assertXMLEqual(control, message.toXML(StreamOpen.CLIENT_NAMESPACE).toString()); // message has non-default language, subject has no language control = XMLBuilder.create("message") @@ -251,7 +258,7 @@ public class PacketParserUtilsTest { assertTrue(message.getSubjectLanguages().isEmpty()); assertEquals(otherLanguage, message.getSubject(otherLanguage)); assertNull(message.getSubject(defaultLanguage)); - assertXMLEqual(control, message.toXML(null).toString()); + assertXMLEqual(control, message.toXML(StreamOpen.CLIENT_NAMESPACE).toString()); // message has no language, subject has no language control = XMLBuilder.create("message") @@ -267,9 +274,9 @@ public class PacketParserUtilsTest { assertEquals(defaultLanguage, message.getSubject()); assertTrue(message.getSubjectLanguages().isEmpty()); - assertEquals(defaultLanguage, message.getSubject(defaultLanguage)); + assertEquals(defaultLanguage, message.getSubject(null)); assertNull(message.getSubject(otherLanguage)); - assertXMLEqual(control, message.toXML(null).toString()); + assertXMLEqual(control, message.toXML(StreamOpen.CLIENT_NAMESPACE).toString()); // message has no language, subject has default language control = XMLBuilder.create("message") @@ -284,13 +291,11 @@ public class PacketParserUtilsTest { message = PacketParserUtils.parseMessage(PacketParserUtils.getParserFor(control)); - assertEquals(defaultLanguage, message.getSubject()); - assertTrue(message.getSubjectLanguages().isEmpty()); + assertFalse(message.getSubjectLanguages().isEmpty()); assertEquals(defaultLanguage, message.getSubject(defaultLanguage)); assertNull(message.getSubject(otherLanguage)); - // subject attribute xml:lang is unnecessary - assertXMLNotEqual(control, message.toXML(null).toString()); + assertXMLEqual(control, message.toXML(StreamOpen.CLIENT_NAMESPACE).toString()); // message has no language, subject has non-default language control = XMLBuilder.create("message") @@ -310,7 +315,7 @@ public class PacketParserUtilsTest { assertTrue(message.getSubjectLanguages().contains(otherLanguage)); assertEquals(otherLanguage, message.getSubject(otherLanguage)); assertNull(message.getSubject(defaultLanguage)); - assertXMLEqual(control, message.toXML(null).toString()); + assertXMLEqual(control, message.toXML(StreamOpen.CLIENT_NAMESPACE).toString()); // message has default language, subject has non-default language control = XMLBuilder.create("message") @@ -331,7 +336,7 @@ public class PacketParserUtilsTest { assertTrue(message.getSubjectLanguages().contains(otherLanguage)); assertEquals(otherLanguage, message.getSubject(otherLanguage)); assertNull(message.getSubject(defaultLanguage)); - assertXMLEqual(control, message.toXML(null).toString()); + assertXMLEqual(control, message.toXML(StreamOpen.CLIENT_NAMESPACE).toString()); // message has non-default language, subject has default language control = XMLBuilder.create("message") @@ -352,7 +357,7 @@ public class PacketParserUtilsTest { assertTrue(message.getSubjectLanguages().contains(defaultLanguage)); assertEquals(defaultLanguage, message.getSubject(defaultLanguage)); assertNull(message.getSubject(otherLanguage)); - assertXMLEqual(control, message.toXML(null).toString()); + assertXMLEqual(control, message.toXML(StreamOpen.CLIENT_NAMESPACE).toString()); } @@ -366,6 +371,7 @@ public class PacketParserUtilsTest { // message has default language, first body no language, second body other language control = XMLBuilder.create("message") + .namespace(StreamOpen.CLIENT_NAMESPACE) .a("from", "romeo@montague.lit/orchard") .a("to", "juliet@capulet.lit/balcony") .a("id", "zid615d9") @@ -387,34 +393,11 @@ public class PacketParserUtilsTest { assertEquals(2, message.getBodies().size()); assertEquals(1, message.getBodyLanguages().size()); assertTrue(message.getBodyLanguages().contains(otherLanguage)); - assertXMLEqual(control, message.toXML(StreamOpen.CLIENT_NAMESPACE).toString()); - - // message has default language, first body no language, second body default language - control = XMLBuilder.create("message") - .a("from", "romeo@montague.lit/orchard") - .a("to", "juliet@capulet.lit/balcony") - .a("id", "zid615d9") - .a("type", "chat") - .a("xml:lang", defaultLanguage) - .e("body") - .t(defaultLanguage) - .up() - .e("body") - .a("xml:lang", defaultLanguage) - .t(defaultLanguage + "2") - .asString(outputProperties); - - message = PacketParserUtils - .parseMessage(PacketParserUtils.getParserFor(control)); - - assertEquals(defaultLanguage, message.getBody()); - assertEquals(defaultLanguage, message.getBody(defaultLanguage)); - assertEquals(1, message.getBodies().size()); - assertEquals(0, message.getBodyLanguages().size()); - assertXMLNotEqual(control, message.toXML(null).toString()); + assertXMLEqual(control, message.toXML(null).toString()); // message has non-default language, first body no language, second body default language control = XMLBuilder.create("message") + .namespace(StreamOpen.CLIENT_NAMESPACE) .a("from", "romeo@montague.lit/orchard") .a("to", "juliet@capulet.lit/balcony") .a("id", "zid615d9") @@ -436,14 +419,24 @@ public class PacketParserUtilsTest { assertEquals(2, message.getBodies().size()); assertEquals(1, message.getBodyLanguages().size()); assertTrue(message.getBodyLanguages().contains(defaultLanguage)); - assertXMLEqual(control, message.toXML(StreamOpen.CLIENT_NAMESPACE).toString()); + assertXMLEqual(control, message.toXML(null).toString()); + } - // message has no language, first body no language, second body default language - control = XMLBuilder.create("message") + // TODO: Re-enable once we throw an exception on duplicate body elements. + @Ignore + @Test + public void duplicateMessageBodiesTest() + throws FactoryConfigurationError, XmlPullParserException, IOException, Exception { + String defaultLanguage = Stanza.getDefaultLanguage(); + + // message has default language, first body no language, second body default language + String control = XMLBuilder.create("message") + .namespace(StreamOpen.CLIENT_NAMESPACE) .a("from", "romeo@montague.lit/orchard") .a("to", "juliet@capulet.lit/balcony") .a("id", "zid615d9") .a("type", "chat") + .a("xml:lang", defaultLanguage) .e("body") .t(defaultLanguage) .up() @@ -452,7 +445,7 @@ public class PacketParserUtilsTest { .t(defaultLanguage + "2") .asString(outputProperties); - message = PacketParserUtils + Message message = PacketParserUtils .parseMessage(PacketParserUtils.getParserFor(control)); assertEquals(defaultLanguage, message.getBody()); @@ -460,9 +453,19 @@ public class PacketParserUtilsTest { assertEquals(1, message.getBodies().size()); assertEquals(0, message.getBodyLanguages().size()); assertXMLNotEqual(control, message.toXML(null).toString()); + } - // message has no language, first body no language, second body other language - control = XMLBuilder.create("message") + @Ignore + @Test + public void duplicateMessageBodiesTest2() + throws FactoryConfigurationError, XmlPullParserException, IOException, Exception { + String defaultLanguage = Stanza.getDefaultLanguage(); + String otherLanguage = determineNonDefaultLanguage(); + + // message has no language, first body no language, second body no language + String control = XMLBuilder.create("message") + .namespace(StreamOpen.CLIENT_NAMESPACE) + .a("xml:lang", defaultLanguage) .a("from", "romeo@montague.lit/orchard") .a("to", "juliet@capulet.lit/balcony") .a("id", "zid615d9") @@ -470,43 +473,44 @@ public class PacketParserUtilsTest { .e("body") .t(defaultLanguage) .up() + .e("body") + .t(otherLanguage) + .asString(outputProperties); + + PacketParserUtils.parseMessage(PacketParserUtils.getParserFor(control)); + } + + @Test + public void messageNoLanguageFirstBodyNoLanguageSecondBodyOtherTest() + throws FactoryConfigurationError, XmlPullParserException, IOException, Exception { + String defaultLanguage = Stanza.getDefaultLanguage(); + String otherLanguage = determineNonDefaultLanguage(); + + // message has no language, first body no language, second body other language + String control = XMLBuilder.create("message") + .namespace(StreamOpen.CLIENT_NAMESPACE) + .a("from", "romeo@montague.lit/orchard") + .a("to", "juliet@capulet.lit/balcony") + .a("id", "zid615d9") + .a("type", "chat") + .e("body") + // TODO change default language into something else + .t(defaultLanguage) + .up() .e("body") .a("xml:lang", otherLanguage) .t(otherLanguage) .asString(outputProperties); - message = PacketParserUtils + Message message = PacketParserUtils .parseMessage(PacketParserUtils.getParserFor(control)); assertEquals(defaultLanguage, message.getBody()); - assertEquals(defaultLanguage, message.getBody(defaultLanguage)); + assertEquals(defaultLanguage, message.getBody(null)); assertEquals(otherLanguage, message.getBody(otherLanguage)); assertEquals(2, message.getBodies().size()); assertEquals(1, message.getBodyLanguages().size()); - assertXMLEqual(control, message.toXML(StreamOpen.CLIENT_NAMESPACE).toString()); - - // message has no language, first body no language, second body no language - control = XMLBuilder.create("message") - .a("from", "romeo@montague.lit/orchard") - .a("to", "juliet@capulet.lit/balcony") - .a("id", "zid615d9") - .a("type", "chat") - .e("body") - .t(defaultLanguage) - .up() - .e("body") - .t(otherLanguage) - .asString(outputProperties); - - message = PacketParserUtils - .parseMessage(PacketParserUtils.getParserFor(control)); - - assertEquals(defaultLanguage, message.getBody()); - assertEquals(defaultLanguage, message.getBody(defaultLanguage)); - assertEquals(1, message.getBodies().size()); - assertEquals(0, message.getBodyLanguages().size()); - assertXMLNotEqual(control, message.toXML(null).toString()); - + assertXMLEqual(control, message.toXML(null).toString()); } @Test @@ -540,7 +544,7 @@ public class PacketParserUtilsTest { assertEquals(2, message.getSubjects().size()); assertEquals(1, message.getSubjectLanguages().size()); assertTrue(message.getSubjectLanguages().contains(otherLanguage)); - assertXMLEqual(control, message.toXML(null).toString()); + assertXMLEqual(control, message.toXML(StreamOpen.CLIENT_NAMESPACE).toString()); // message has default language, first subject no language, second subject default language control = XMLBuilder.create("message") @@ -564,7 +568,7 @@ public class PacketParserUtilsTest { assertEquals(defaultLanguage, message.getSubject(defaultLanguage)); assertEquals(1, message.getSubjects().size()); assertEquals(0, message.getSubjectLanguages().size()); - assertXMLNotEqual(control, message.toXML(null).toString()); + assertXMLNotEqual(control, message.toXML(StreamOpen.CLIENT_NAMESPACE).toString()); // message has non-default language, first subject no language, second subject default language control = XMLBuilder.create("message") @@ -589,8 +593,9 @@ public class PacketParserUtilsTest { assertEquals(2, message.getSubjects().size()); assertEquals(1, message.getSubjectLanguages().size()); assertTrue(message.getSubjectLanguages().contains(defaultLanguage)); - assertXMLEqual(control, message.toXML(null).toString()); + assertXMLEqual(control, message.toXML(StreamOpen.CLIENT_NAMESPACE).toString()); + /* // message has no language, first subject no language, second subject default language control = XMLBuilder.create("message") .a("from", "romeo@montague.lit/orchard") @@ -612,7 +617,7 @@ public class PacketParserUtilsTest { assertEquals(defaultLanguage, message.getSubject(defaultLanguage)); assertEquals(1, message.getSubjects().size()); assertEquals(0, message.getSubjectLanguages().size()); - assertXMLNotEqual(control, message.toXML(null).toString()); + assertXMLNotEqual(control, message.toXML(StreamOpen.CLIENT_NAMESPACE).toString()); // message has no language, first subject no language, second subject other language control = XMLBuilder.create("message") @@ -636,7 +641,7 @@ public class PacketParserUtilsTest { assertEquals(otherLanguage, message.getSubject(otherLanguage)); assertEquals(2, message.getSubjects().size()); assertEquals(1, message.getSubjectLanguages().size()); - assertXMLEqual(control, message.toXML(null).toString()); + assertXMLEqual(control, message.toXML(StreamOpen.CLIENT_NAMESPACE).toString()); // message has no language, first subject no language, second subject no language control = XMLBuilder.create("message") @@ -658,7 +663,8 @@ public class PacketParserUtilsTest { assertEquals(defaultLanguage, message.getSubject(defaultLanguage)); assertEquals(1, message.getSubjects().size()); assertEquals(0, message.getSubjectLanguages().size()); - assertXMLNotEqual(control, message.toXML(null).toString()); + assertXMLNotEqual(control, message.toXML(StreamOpen.CLIENT_NAMESPACE).toString()); + */ } @@ -671,6 +677,7 @@ public class PacketParserUtilsTest { @Test(expected = XmlPullParserException.class) public void invalidMessageBodyContainingTagTest() throws Exception { String control = XMLBuilder.create("message") + .namespace(StreamOpen.CLIENT_NAMESPACE) .a("from", "romeo@montague.lit/orchard") .a("to", "juliet@capulet.lit/balcony") .a("id", "zid615d9") @@ -691,6 +698,7 @@ public class PacketParserUtilsTest { @Test public void invalidXMLInMessageBody() throws Exception { String validControl = XMLBuilder.create("message") + .namespace(StreamOpen.CLIENT_NAMESPACE) .a("from", "romeo@montague.lit/orchard") .a("to", "juliet@capulet.lit/balcony") .a("id", "zid615d9") @@ -732,12 +740,17 @@ public class PacketParserUtilsTest { @Test public void multipleMessageBodiesParsingTest() throws Exception { String control = XMLBuilder.create("message") + .namespace(StreamOpen.CLIENT_NAMESPACE) .a("from", "romeo@montague.lit/orchard") .a("to", "juliet@capulet.lit/balcony") .a("id", "zid615d9") .a("type", "chat") .a("xml:lang", "en") .e("body") + // TODO: Remove the following xml:lang once Smack's serialization toXml() API is aware of a potential + // scoping xml:lang value. The out message stanza already declares an xml:lang with the exact same + // value, hence this statement is redundant. + .a("xml:lang", "en") .t("This is a test of the emergency broadcast system, 1.") .up() .e("body") @@ -750,7 +763,7 @@ public class PacketParserUtilsTest { .asString(outputProperties); Stanza message = PacketParserUtils.parseStanza(control); - XmlUnitUtils.assertSimilar(control, message.toXML(StreamOpen.CLIENT_NAMESPACE)); + XmlUnitUtils.assertSimilar(control, message.toXML(null)); } @Test @@ -760,7 +773,7 @@ public class PacketParserUtilsTest { Presence presence = PacketParserUtils.parsePresence(PacketParserUtils.getParserFor(stanza)); - assertXMLEqual(stanza, presence.toXML(null).toString()); + assertXMLEqual(stanza, presence.toXML(StreamOpen.CLIENT_NAMESPACE).toString()); // CHECKSTYLE:ON } @@ -771,7 +784,7 @@ public class PacketParserUtilsTest { Presence presence = PacketParserUtils.parsePresence(PacketParserUtils.getParserFor(stanza)); - assertXMLEqual(stanza, presence.toXML(null).toString()); + assertXMLEqual(stanza, presence.toXML(StreamOpen.CLIENT_NAMESPACE).toString()); assertEquals(Presence.Type.unsubscribed, presence.getType()); // CHECKSTYLE:ON } @@ -786,7 +799,7 @@ public class PacketParserUtilsTest { + ""; Presence presence = PacketParserUtils.parsePresence(PacketParserUtils.getParserFor(stanza)); - assertXMLEqual(stanza, presence.toXML(null).toString()); + assertXMLEqual(stanza, presence.toXML(StreamOpen.CLIENT_NAMESPACE).toString()); assertEquals(Presence.Type.unsubscribed, presence.getType()); assertEquals("dnd", presence.getMode().name()); assertEquals("en", presence.getLanguage()); diff --git a/smack-experimental/src/test/java/org/jivesoftware/smackx/chat_markers/AcknowledgedExtensionTest.java b/smack-experimental/src/test/java/org/jivesoftware/smackx/chat_markers/AcknowledgedExtensionTest.java index 86e3a3dcc..383e3d441 100644 --- a/smack-experimental/src/test/java/org/jivesoftware/smackx/chat_markers/AcknowledgedExtensionTest.java +++ b/smack-experimental/src/test/java/org/jivesoftware/smackx/chat_markers/AcknowledgedExtensionTest.java @@ -17,6 +17,7 @@ package org.jivesoftware.smackx.chat_markers; import org.jivesoftware.smack.packet.Message; +import org.jivesoftware.smack.packet.StreamOpen; import org.jivesoftware.smack.util.PacketParserUtils; import org.jivesoftware.smackx.chat_markers.element.ChatMarkersElements; @@ -40,7 +41,7 @@ public class AcknowledgedExtensionTest { Message message = new Message(JidCreate.from("northumberland@shakespeare.lit/westminster")); message.setStanzaId("message-2"); message.addExtension(new ChatMarkersElements.AcknowledgedExtension("message-1")); - Assert.assertEquals(acknowledgedMessageStanza, message.toXML(null).toString()); + Assert.assertEquals(acknowledgedMessageStanza, message.toXML(StreamOpen.CLIENT_NAMESPACE).toString()); } @Test diff --git a/smack-experimental/src/test/java/org/jivesoftware/smackx/chat_markers/DisplayedExtensionTest.java b/smack-experimental/src/test/java/org/jivesoftware/smackx/chat_markers/DisplayedExtensionTest.java index 03f07d3d3..7cf6daf9a 100644 --- a/smack-experimental/src/test/java/org/jivesoftware/smackx/chat_markers/DisplayedExtensionTest.java +++ b/smack-experimental/src/test/java/org/jivesoftware/smackx/chat_markers/DisplayedExtensionTest.java @@ -17,6 +17,7 @@ package org.jivesoftware.smackx.chat_markers; import org.jivesoftware.smack.packet.Message; +import org.jivesoftware.smack.packet.StreamOpen; import org.jivesoftware.smack.util.PacketParserUtils; import org.jivesoftware.smackx.chat_markers.element.ChatMarkersElements; @@ -40,7 +41,7 @@ public class DisplayedExtensionTest { Message message = new Message(JidCreate.from("northumberland@shakespeare.lit/westminster")); message.setStanzaId("message-2"); message.addExtension(new ChatMarkersElements.DisplayedExtension("message-1")); - Assert.assertEquals(displayedMessageStanza, message.toXML(null).toString()); + Assert.assertEquals(displayedMessageStanza, message.toXML(StreamOpen.CLIENT_NAMESPACE).toString()); } @Test diff --git a/smack-experimental/src/test/java/org/jivesoftware/smackx/chat_markers/MarkableExtensionTest.java b/smack-experimental/src/test/java/org/jivesoftware/smackx/chat_markers/MarkableExtensionTest.java index 4d0fc4430..0c9de3105 100644 --- a/smack-experimental/src/test/java/org/jivesoftware/smackx/chat_markers/MarkableExtensionTest.java +++ b/smack-experimental/src/test/java/org/jivesoftware/smackx/chat_markers/MarkableExtensionTest.java @@ -30,7 +30,7 @@ import org.xmlpull.v1.XmlPullParser; public class MarkableExtensionTest { - String markableMessageStanza = "" + String markableMessageStanza = "" + "My lord, dispatch; read o'er these articles." + "" + ""; diff --git a/smack-experimental/src/test/java/org/jivesoftware/smackx/chat_markers/ReceivedExtensionTest.java b/smack-experimental/src/test/java/org/jivesoftware/smackx/chat_markers/ReceivedExtensionTest.java index 87963deab..417c95471 100644 --- a/smack-experimental/src/test/java/org/jivesoftware/smackx/chat_markers/ReceivedExtensionTest.java +++ b/smack-experimental/src/test/java/org/jivesoftware/smackx/chat_markers/ReceivedExtensionTest.java @@ -17,6 +17,7 @@ package org.jivesoftware.smackx.chat_markers; import org.jivesoftware.smack.packet.Message; +import org.jivesoftware.smack.packet.StreamOpen; import org.jivesoftware.smack.util.PacketParserUtils; import org.jivesoftware.smackx.chat_markers.element.ChatMarkersElements; @@ -40,7 +41,7 @@ public class ReceivedExtensionTest { Message message = new Message(JidCreate.from("northumberland@shakespeare.lit/westminster")); message.setStanzaId("message-2"); message.addExtension(new ChatMarkersElements.ReceivedExtension("message-1")); - Assert.assertEquals(receivedMessageStanza, message.toXML(null).toString()); + Assert.assertEquals(receivedMessageStanza, message.toXML(StreamOpen.CLIENT_NAMESPACE).toString()); } @Test diff --git a/smack-experimental/src/test/java/org/jivesoftware/smackx/httpfileupload/provider/SlotProviderTest.java b/smack-experimental/src/test/java/org/jivesoftware/smackx/httpfileupload/provider/SlotProviderTest.java index 971c1d590..0cd8bc305 100644 --- a/smack-experimental/src/test/java/org/jivesoftware/smackx/httpfileupload/provider/SlotProviderTest.java +++ b/smack-experimental/src/test/java/org/jivesoftware/smackx/httpfileupload/provider/SlotProviderTest.java @@ -1,6 +1,6 @@ /** * - * Copyright © 2017 Grigory Fedorov, Florian Schmaus + * Copyright © 2017-2018 Grigory Fedorov, Florian Schmaus * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -22,6 +22,7 @@ import static org.junit.Assert.assertEquals; import java.net.MalformedURLException; import java.net.URL; +import org.jivesoftware.smack.packet.StreamOpen; import org.jivesoftware.smack.util.PacketParserUtils; import org.jivesoftware.smackx.httpfileupload.element.Slot; @@ -68,7 +69,7 @@ public class SlotProviderTest { checkUrls(slot); - assertXMLEqual(SLOT_IQ, slot.toXML(null).toString()); + assertXMLEqual(SLOT_IQ, slot.toXML(StreamOpen.CLIENT_NAMESPACE).toString()); } private static final String SLOT_V0_2_IQ = @@ -88,7 +89,7 @@ public class SlotProviderTest { checkUrls(slot); - String slotXml = slot.toXML(null).toString(); + String slotXml = slot.toXML(StreamOpen.CLIENT_NAMESPACE).toString(); assertXMLEqual(SLOT_V0_2_IQ, slotXml); } @@ -112,7 +113,7 @@ public class SlotProviderTest { checkUrls(slot); - String slotXml = slot.toXML(null).toString(); + String slotXml = slot.toXML(StreamOpen.CLIENT_NAMESPACE).toString(); assertXMLEqual(SLOT_WITH_HEADERS_IQ, slotXml); } diff --git a/smack-experimental/src/test/java/org/jivesoftware/smackx/mam/PagingTest.java b/smack-experimental/src/test/java/org/jivesoftware/smackx/mam/PagingTest.java index 751530a5f..fcbf395f8 100644 --- a/smack-experimental/src/test/java/org/jivesoftware/smackx/mam/PagingTest.java +++ b/smack-experimental/src/test/java/org/jivesoftware/smackx/mam/PagingTest.java @@ -17,6 +17,7 @@ package org.jivesoftware.smackx.mam; import org.jivesoftware.smack.packet.IQ; +import org.jivesoftware.smack.packet.StreamOpen; import org.jivesoftware.smackx.mam.element.MamQueryIQ; import org.jivesoftware.smackx.rsm.packet.RSMSet; @@ -45,7 +46,7 @@ public class PagingTest extends MamTest { Assert.assertEquals(mamQueryIQ.getDataForm(), dataForm); Assert.assertEquals(mamQueryIQ.getDataForm().getFields().get(0).getValues().get(0), "urn:xmpp:mam:1"); - Assert.assertEquals(mamQueryIQ.toXML(null).toString(), pagingStanza); + Assert.assertEquals(mamQueryIQ.toXML(StreamOpen.CLIENT_NAMESPACE).toString(), pagingStanza); } } diff --git a/smack-experimental/src/test/java/org/jivesoftware/smackx/mam/PreferencesTest.java b/smack-experimental/src/test/java/org/jivesoftware/smackx/mam/PreferencesTest.java index 434151452..c251492ff 100644 --- a/smack-experimental/src/test/java/org/jivesoftware/smackx/mam/PreferencesTest.java +++ b/smack-experimental/src/test/java/org/jivesoftware/smackx/mam/PreferencesTest.java @@ -19,6 +19,8 @@ package org.jivesoftware.smackx.mam; import java.util.ArrayList; import java.util.List; +import org.jivesoftware.smack.packet.StreamOpen; + import org.jivesoftware.smackx.mam.element.MamElements; import org.jivesoftware.smackx.mam.element.MamPrefsIQ; import org.jivesoftware.smackx.mam.element.MamPrefsIQ.DefaultBehavior; @@ -41,7 +43,7 @@ public class PreferencesTest { public void checkRetrievePrefsStanza() throws Exception { MamPrefsIQ mamPrefIQ = new MamPrefsIQ(); mamPrefIQ.setStanzaId("sarasa"); - Assert.assertEquals(mamPrefIQ.toXML(null).toString(), retrievePrefsStanzaExample); + Assert.assertEquals(mamPrefIQ.toXML(StreamOpen.CLIENT_NAMESPACE).toString(), retrievePrefsStanzaExample); } @Test @@ -55,7 +57,7 @@ public class PreferencesTest { MamPrefsIQ mamPrefIQ = new MamPrefsIQ(alwaysJids, neverJids, DefaultBehavior.roster); mamPrefIQ.setStanzaId("sarasa"); - Assert.assertEquals(mamPrefIQ.toXML(null).toString(), updatePrefsStanzaExample); + Assert.assertEquals(mamPrefIQ.toXML(StreamOpen.CLIENT_NAMESPACE).toString(), updatePrefsStanzaExample); } } diff --git a/smack-experimental/src/test/java/org/jivesoftware/smackx/mam/QueryArchiveTest.java b/smack-experimental/src/test/java/org/jivesoftware/smackx/mam/QueryArchiveTest.java index 4b6d2e44b..5af0bae2a 100644 --- a/smack-experimental/src/test/java/org/jivesoftware/smackx/mam/QueryArchiveTest.java +++ b/smack-experimental/src/test/java/org/jivesoftware/smackx/mam/QueryArchiveTest.java @@ -23,6 +23,7 @@ import java.util.TimeZone; import org.jivesoftware.smack.packet.IQ; import org.jivesoftware.smack.packet.Message; import org.jivesoftware.smack.packet.Message.Type; +import org.jivesoftware.smack.packet.StreamOpen; import org.jivesoftware.smackx.delay.packet.DelayInformation; import org.jivesoftware.smackx.forward.packet.Forwarded; @@ -45,7 +46,7 @@ public class QueryArchiveTest extends MamTest { + "" + "" + "" + "" + "Thrice the brinded cat hath mew." + "" + "" + "" + ""; @@ -55,7 +56,7 @@ public class QueryArchiveTest extends MamTest { MamQueryIQ mamQueryIQ = new MamQueryIQ(queryId, dataForm); mamQueryIQ.setType(IQ.Type.set); mamQueryIQ.setStanzaId("sarasa"); - Assert.assertEquals(mamQueryIQ.toXML(null).toString(), mamSimpleQueryIQ); + Assert.assertEquals(mamQueryIQ.toXML(StreamOpen.CLIENT_NAMESPACE).toString(), mamSimpleQueryIQ); } @Test @@ -80,7 +81,8 @@ public class QueryArchiveTest extends MamTest { message.addExtension(new MamResultExtension("g27", "34482-21985-73620", forwarded)); - Assert.assertEquals(message.toXML(null).toString(), mamQueryResultExample); + // FIXME: The order of assertEquals is reversed, fix it by switching it. + Assert.assertEquals(message.toXML(StreamOpen.CLIENT_NAMESPACE).toString(), mamQueryResultExample); MamResultExtension mamResultExtension = MamResultExtension.from(message); diff --git a/smack-experimental/src/test/java/org/jivesoftware/smackx/mam/ResultsLimitTest.java b/smack-experimental/src/test/java/org/jivesoftware/smackx/mam/ResultsLimitTest.java index d474a1198..48b014201 100644 --- a/smack-experimental/src/test/java/org/jivesoftware/smackx/mam/ResultsLimitTest.java +++ b/smack-experimental/src/test/java/org/jivesoftware/smackx/mam/ResultsLimitTest.java @@ -19,6 +19,7 @@ package org.jivesoftware.smackx.mam; import java.lang.reflect.Method; import org.jivesoftware.smack.packet.IQ; +import org.jivesoftware.smack.packet.StreamOpen; import org.jivesoftware.smackx.mam.element.MamElements; import org.jivesoftware.smackx.mam.element.MamQueryIQ; @@ -46,7 +47,7 @@ public class ResultsLimitTest extends MamTest { mamQueryIQ.setStanzaId("sarasa"); methodAddResultsLimit.invoke(mamManager, 10, mamQueryIQ); - Assert.assertEquals(mamQueryIQ.toXML(null).toString(), resultsLimitStanza); + Assert.assertEquals(mamQueryIQ.toXML(StreamOpen.CLIENT_NAMESPACE).toString(), resultsLimitStanza); } } diff --git a/smack-experimental/src/test/java/org/jivesoftware/smackx/mam/RetrieveFormFieldsTest.java b/smack-experimental/src/test/java/org/jivesoftware/smackx/mam/RetrieveFormFieldsTest.java index 070735143..86ecb8ead 100644 --- a/smack-experimental/src/test/java/org/jivesoftware/smackx/mam/RetrieveFormFieldsTest.java +++ b/smack-experimental/src/test/java/org/jivesoftware/smackx/mam/RetrieveFormFieldsTest.java @@ -20,6 +20,8 @@ import java.lang.reflect.Method; import java.util.ArrayList; import java.util.List; +import org.jivesoftware.smack.packet.StreamOpen; + import org.jivesoftware.smackx.mam.element.MamElements; import org.jivesoftware.smackx.mam.element.MamQueryIQ; import org.jivesoftware.smackx.xdata.FormField; @@ -44,7 +46,7 @@ public class RetrieveFormFieldsTest extends MamTest { MamQueryIQ mamQueryIQ = new MamQueryIQ(queryId); mamQueryIQ.setStanzaId("sarasa"); - Assert.assertEquals(mamQueryIQ.toXML(null).toString(), retrieveFormFieldStanza); + Assert.assertEquals(mamQueryIQ.toXML(StreamOpen.CLIENT_NAMESPACE).toString(), retrieveFormFieldStanza); } @Test diff --git a/smack-experimental/src/test/java/org/jivesoftware/smackx/muclight/MUCLightAffiliationsChangeExtensionTest.java b/smack-experimental/src/test/java/org/jivesoftware/smackx/muclight/MUCLightAffiliationsChangeExtensionTest.java index bc7c74059..a95e244ae 100644 --- a/smack-experimental/src/test/java/org/jivesoftware/smackx/muclight/MUCLightAffiliationsChangeExtensionTest.java +++ b/smack-experimental/src/test/java/org/jivesoftware/smackx/muclight/MUCLightAffiliationsChangeExtensionTest.java @@ -30,19 +30,19 @@ import org.jxmpp.jid.impl.JidCreate; public class MUCLightAffiliationsChangeExtensionTest { - private static final String exampleMessageStanza = "" + private static final String exampleMessageStanza = "" + "" + "sarasa2@shakespeare.lit" + "sarasa1@shakespeare.lit" + "sarasa3@shakespeare.lit" + "" + ""; - private static final String exampleMessageStanzaWithVersion = "" + "" + "qwerty" + "sarasa1@shakespeare.lit" + "sarasa3@shakespeare.lit" + "" + "" + ""; - private static final String exampleMessageStanzaWithPrevVersion = "" + "" + "njiokm" + "qwerty" + "sarasa2@shakespeare.lit" diff --git a/smack-experimental/src/test/java/org/jivesoftware/smackx/muclight/MUCLightBlockingTest.java b/smack-experimental/src/test/java/org/jivesoftware/smackx/muclight/MUCLightBlockingTest.java index 7ae843747..1da29f0ca 100644 --- a/smack-experimental/src/test/java/org/jivesoftware/smackx/muclight/MUCLightBlockingTest.java +++ b/smack-experimental/src/test/java/org/jivesoftware/smackx/muclight/MUCLightBlockingTest.java @@ -20,6 +20,7 @@ import java.util.HashMap; import org.jivesoftware.smack.packet.IQ; import org.jivesoftware.smack.packet.IQ.Type; +import org.jivesoftware.smack.packet.StreamOpen; import org.jivesoftware.smack.util.PacketParserUtils; import org.jivesoftware.smackx.muclight.element.MUCLightBlockingIQ; @@ -61,7 +62,7 @@ public class MUCLightBlockingTest { mucLightBlockingIQ.setStanzaId("getblock1"); mucLightBlockingIQ.setTo(JidCreate.from("muclight.shakespeare.lit")); - Assert.assertEquals(getBlockingListIQExample, mucLightBlockingIQ.toXML(null).toString()); + Assert.assertEquals(getBlockingListIQExample, mucLightBlockingIQ.toXML(StreamOpen.CLIENT_NAMESPACE).toString()); } @Test @@ -88,7 +89,7 @@ public class MUCLightBlockingTest { mucLightBlockingIQ.setTo(JidCreate.from("muclight.shakespeare.lit")); mucLightBlockingIQ.setStanzaId("block1"); - Assert.assertEquals(blockingRoomsIQExample, mucLightBlockingIQ.toXML(null).toString()); + Assert.assertEquals(blockingRoomsIQExample, mucLightBlockingIQ.toXML(StreamOpen.CLIENT_NAMESPACE).toString()); } @Test @@ -102,7 +103,7 @@ public class MUCLightBlockingTest { mucLightBlockingIQ.setTo(JidCreate.from("muclight.shakespeare.lit")); mucLightBlockingIQ.setStanzaId("block2"); - Assert.assertEquals(blockingUsersIQExample, mucLightBlockingIQ.toXML(null).toString()); + Assert.assertEquals(blockingUsersIQExample, mucLightBlockingIQ.toXML(StreamOpen.CLIENT_NAMESPACE).toString()); } @Test @@ -118,7 +119,7 @@ public class MUCLightBlockingTest { mucLightBlockingIQ.setTo(JidCreate.from("muclight.shakespeare.lit")); mucLightBlockingIQ.setStanzaId("unblock1"); - Assert.assertEquals(unblockingUsersAndRoomsExample, mucLightBlockingIQ.toXML(null).toString()); + Assert.assertEquals(unblockingUsersAndRoomsExample, mucLightBlockingIQ.toXML(StreamOpen.CLIENT_NAMESPACE).toString()); } } diff --git a/smack-experimental/src/test/java/org/jivesoftware/smackx/muclight/MUCLightConfigurationsChangeExtensionTest.java b/smack-experimental/src/test/java/org/jivesoftware/smackx/muclight/MUCLightConfigurationsChangeExtensionTest.java index 1be967aea..ae52ddf8a 100644 --- a/smack-experimental/src/test/java/org/jivesoftware/smackx/muclight/MUCLightConfigurationsChangeExtensionTest.java +++ b/smack-experimental/src/test/java/org/jivesoftware/smackx/muclight/MUCLightConfigurationsChangeExtensionTest.java @@ -26,16 +26,16 @@ import org.junit.Test; public class MUCLightConfigurationsChangeExtensionTest { - private static final String messageWithSubjectChangeExample = "" + private static final String messageWithSubjectChangeExample = "" + "" + "" + "asdfghj000" + "asdfghj" + "To be or not to be?" + "" + ""; - private static final String messageWithRoomNameChangeExample = "" + private static final String messageWithRoomNameChangeExample = "" + "" + "" + "zaqwsx" + "zxcvbnm" + "A Darker Cave" + "" + ""; - private static final String messageWithConfigsChangeExample = "" + private static final String messageWithConfigsChangeExample = "" + "" + "" + "zaqwsx" + "zxcvbnm" + "A Darker Cave" + "blue" + "" + ""; diff --git a/smack-experimental/src/test/java/org/jivesoftware/smackx/muclight/MUCLightDestroyTest.java b/smack-experimental/src/test/java/org/jivesoftware/smackx/muclight/MUCLightDestroyTest.java index 854fd5f9f..737ada8ec 100644 --- a/smack-experimental/src/test/java/org/jivesoftware/smackx/muclight/MUCLightDestroyTest.java +++ b/smack-experimental/src/test/java/org/jivesoftware/smackx/muclight/MUCLightDestroyTest.java @@ -16,6 +16,8 @@ */ package org.jivesoftware.smackx.muclight; +import org.jivesoftware.smack.packet.StreamOpen; + import org.jivesoftware.smackx.muclight.element.MUCLightDestroyIQ; import org.junit.Assert; @@ -31,7 +33,7 @@ public class MUCLightDestroyTest { public void checkDestroyMUCLightStanza() throws Exception { MUCLightDestroyIQ mucLightDestroyIQ = new MUCLightDestroyIQ(JidCreate.from("coven@muclight.shakespeare.lit")); mucLightDestroyIQ.setStanzaId("destroy1"); - Assert.assertEquals(mucLightDestroyIQ.toXML(null).toString(), stanza); + Assert.assertEquals(mucLightDestroyIQ.toXML(StreamOpen.CLIENT_NAMESPACE).toString(), stanza); } } diff --git a/smack-experimental/src/test/java/org/jivesoftware/smackx/muclight/MUCLightGetAffiliationsTest.java b/smack-experimental/src/test/java/org/jivesoftware/smackx/muclight/MUCLightGetAffiliationsTest.java index f1628b069..ef543e424 100644 --- a/smack-experimental/src/test/java/org/jivesoftware/smackx/muclight/MUCLightGetAffiliationsTest.java +++ b/smack-experimental/src/test/java/org/jivesoftware/smackx/muclight/MUCLightGetAffiliationsTest.java @@ -19,6 +19,7 @@ package org.jivesoftware.smackx.muclight; import java.util.HashMap; import org.jivesoftware.smack.packet.IQ; +import org.jivesoftware.smack.packet.StreamOpen; import org.jivesoftware.smack.util.PacketParserUtils; import org.jivesoftware.smackx.muclight.element.MUCLightAffiliationsIQ; @@ -45,7 +46,7 @@ public class MUCLightGetAffiliationsTest { MUCLightGetAffiliationsIQ mucLightGetAffiliationsIQ = new MUCLightGetAffiliationsIQ( JidCreate.from("coven@muclight.shakespeare.lit"), "abcdefg"); mucLightGetAffiliationsIQ.setStanzaId("getmembers"); - Assert.assertEquals(getAffiliationsIQExample, mucLightGetAffiliationsIQ.toXML(null).toString()); + Assert.assertEquals(getAffiliationsIQExample, mucLightGetAffiliationsIQ.toXML(StreamOpen.CLIENT_NAMESPACE).toString()); } @Test diff --git a/smack-experimental/src/test/java/org/jivesoftware/smackx/muclight/MUCLightGetConfigsTest.java b/smack-experimental/src/test/java/org/jivesoftware/smackx/muclight/MUCLightGetConfigsTest.java index 3ae8b558e..3b77c8da3 100644 --- a/smack-experimental/src/test/java/org/jivesoftware/smackx/muclight/MUCLightGetConfigsTest.java +++ b/smack-experimental/src/test/java/org/jivesoftware/smackx/muclight/MUCLightGetConfigsTest.java @@ -19,6 +19,7 @@ package org.jivesoftware.smackx.muclight; import java.util.HashMap; import org.jivesoftware.smack.packet.IQ; +import org.jivesoftware.smack.packet.StreamOpen; import org.jivesoftware.smack.util.PacketParserUtils; import org.jivesoftware.smackx.muclight.element.MUCLightConfigurationIQ; @@ -48,7 +49,7 @@ public class MUCLightGetConfigsTest { MUCLightGetConfigsIQ mucLightGetConfigsIQ = new MUCLightGetConfigsIQ( JidCreate.from("coven@muclight.shakespeare.lit"), "abcdefg"); mucLightGetConfigsIQ.setStanzaId("config0"); - Assert.assertEquals(getConfigsIQExample, mucLightGetConfigsIQ.toXML(null).toString()); + Assert.assertEquals(getConfigsIQExample, mucLightGetConfigsIQ.toXML(StreamOpen.CLIENT_NAMESPACE).toString()); } @Test diff --git a/smack-experimental/src/test/java/org/jivesoftware/smackx/muclight/MUCLightInfoTest.java b/smack-experimental/src/test/java/org/jivesoftware/smackx/muclight/MUCLightInfoTest.java index 1aaeb204d..adc6d4701 100644 --- a/smack-experimental/src/test/java/org/jivesoftware/smackx/muclight/MUCLightInfoTest.java +++ b/smack-experimental/src/test/java/org/jivesoftware/smackx/muclight/MUCLightInfoTest.java @@ -17,6 +17,7 @@ package org.jivesoftware.smackx.muclight; import org.jivesoftware.smack.packet.IQ; +import org.jivesoftware.smack.packet.StreamOpen; import org.jivesoftware.smack.util.PacketParserUtils; import org.jivesoftware.smackx.muclight.element.MUCLightGetInfoIQ; @@ -45,7 +46,7 @@ public class MUCLightInfoTest { MUCLightGetInfoIQ mucLightGetInfoIQWithVersion = new MUCLightGetInfoIQ( JidCreate.from("coven@muclight.shakespeare.lit"), "abcdefg"); mucLightGetInfoIQWithVersion.setStanzaId("getinfo1"); - Assert.assertEquals(mucLightGetInfoIQWithVersion.toXML(null).toString(), exampleWithVersion); + Assert.assertEquals(mucLightGetInfoIQWithVersion.toXML(StreamOpen.CLIENT_NAMESPACE).toString(), exampleWithVersion); } @Test @@ -53,7 +54,7 @@ public class MUCLightInfoTest { MUCLightGetInfoIQ mucLightGetInfoIQWithoutVersion = new MUCLightGetInfoIQ( JidCreate.from("coven@muclight.shakespeare.lit"), null); mucLightGetInfoIQWithoutVersion.setStanzaId("getinfo1"); - Assert.assertEquals(mucLightGetInfoIQWithoutVersion.toXML(null).toString(), exampleWithoutVersion); + Assert.assertEquals(mucLightGetInfoIQWithoutVersion.toXML(StreamOpen.CLIENT_NAMESPACE).toString(), exampleWithoutVersion); } @Test diff --git a/smack-experimental/src/test/java/org/jivesoftware/smackx/muclight/MUCLightSetConfigsIQTest.java b/smack-experimental/src/test/java/org/jivesoftware/smackx/muclight/MUCLightSetConfigsIQTest.java index 5aa97c2d2..41828c29b 100644 --- a/smack-experimental/src/test/java/org/jivesoftware/smackx/muclight/MUCLightSetConfigsIQTest.java +++ b/smack-experimental/src/test/java/org/jivesoftware/smackx/muclight/MUCLightSetConfigsIQTest.java @@ -18,6 +18,8 @@ package org.jivesoftware.smackx.muclight; import java.util.HashMap; +import org.jivesoftware.smack.packet.StreamOpen; + import org.jivesoftware.smackx.muclight.element.MUCLightSetConfigsIQ; import org.junit.Assert; @@ -47,7 +49,7 @@ public class MUCLightSetConfigsIQTest { JidCreate.from("coven@muclight.shakespeare.lit"), "A Darker Cave", customConfigs); mucLightSetConfigsIQ.setStanzaId("conf1"); - Assert.assertEquals(setConfigsIQExample, mucLightSetConfigsIQ.toXML(null).toString()); + Assert.assertEquals(setConfigsIQExample, mucLightSetConfigsIQ.toXML(StreamOpen.CLIENT_NAMESPACE).toString()); } @Test @@ -56,7 +58,7 @@ public class MUCLightSetConfigsIQTest { JidCreate.from("coven@muclight.shakespeare.lit"), "A Darker Cave", null); mucLightChangeRoomNameIQ.setStanzaId("roomName1"); - Assert.assertEquals(changeRoomNameIQExample, mucLightChangeRoomNameIQ.toXML(null).toString()); + Assert.assertEquals(changeRoomNameIQExample, mucLightChangeRoomNameIQ.toXML(StreamOpen.CLIENT_NAMESPACE).toString()); } @Test @@ -65,7 +67,7 @@ public class MUCLightSetConfigsIQTest { JidCreate.from("coven@muclight.shakespeare.lit"), null, "To be or not to be?", null); mucLightChangeSubjectIQ.setStanzaId("subject1"); - Assert.assertEquals(changeSubjectIQExample, mucLightChangeSubjectIQ.toXML(null).toString()); + Assert.assertEquals(changeSubjectIQExample, mucLightChangeSubjectIQ.toXML(StreamOpen.CLIENT_NAMESPACE).toString()); } } diff --git a/smack-experimental/src/test/java/org/jivesoftware/smackx/push_notifications/DisablePushNotificationsIQTest.java b/smack-experimental/src/test/java/org/jivesoftware/smackx/push_notifications/DisablePushNotificationsIQTest.java index 6d5041fa5..ddd9f8b61 100644 --- a/smack-experimental/src/test/java/org/jivesoftware/smackx/push_notifications/DisablePushNotificationsIQTest.java +++ b/smack-experimental/src/test/java/org/jivesoftware/smackx/push_notifications/DisablePushNotificationsIQTest.java @@ -16,6 +16,8 @@ */ package org.jivesoftware.smackx.push_notifications; +import org.jivesoftware.smack.packet.StreamOpen; + import org.jivesoftware.smackx.push_notifications.element.DisablePushNotificationsIQ; import org.junit.Assert; @@ -36,7 +38,7 @@ public class DisablePushNotificationsIQTest { DisablePushNotificationsIQ disablePushNotificationsIQ = new DisablePushNotificationsIQ( JidCreate.from("push-5.client.example")); disablePushNotificationsIQ.setStanzaId("x97"); - Assert.assertEquals(disableAllNotificationsIQExample, disablePushNotificationsIQ.toXML(null).toString()); + Assert.assertEquals(disableAllNotificationsIQExample, disablePushNotificationsIQ.toXML(StreamOpen.CLIENT_NAMESPACE).toString()); } @Test @@ -44,7 +46,7 @@ public class DisablePushNotificationsIQTest { DisablePushNotificationsIQ disablePushNotificationsIQ = new DisablePushNotificationsIQ( JidCreate.from("push-5.client.example"), "yxs32uqsflafdk3iuqo"); disablePushNotificationsIQ.setStanzaId("x97"); - Assert.assertEquals(disableNodeNotificationsIQExample, disablePushNotificationsIQ.toXML(null).toString()); + Assert.assertEquals(disableNodeNotificationsIQExample, disablePushNotificationsIQ.toXML(StreamOpen.CLIENT_NAMESPACE).toString()); } } diff --git a/smack-experimental/src/test/java/org/jivesoftware/smackx/push_notifications/EnablePushNotificationsIQTest.java b/smack-experimental/src/test/java/org/jivesoftware/smackx/push_notifications/EnablePushNotificationsIQTest.java index 41df4e9b2..3fe872ab5 100644 --- a/smack-experimental/src/test/java/org/jivesoftware/smackx/push_notifications/EnablePushNotificationsIQTest.java +++ b/smack-experimental/src/test/java/org/jivesoftware/smackx/push_notifications/EnablePushNotificationsIQTest.java @@ -18,6 +18,8 @@ package org.jivesoftware.smackx.push_notifications; import java.util.HashMap; +import org.jivesoftware.smack.packet.StreamOpen; + import org.jivesoftware.smackx.push_notifications.element.EnablePushNotificationsIQ; import org.junit.Assert; @@ -41,7 +43,7 @@ public class EnablePushNotificationsIQTest { EnablePushNotificationsIQ enablePushNotificationsIQ = new EnablePushNotificationsIQ( JidCreate.from("push-5.client.example"), "yxs32uqsflafdk3iuqo"); enablePushNotificationsIQ.setStanzaId("x42"); - Assert.assertEquals(exampleEnableIQ, enablePushNotificationsIQ.toXML(null).toString()); + Assert.assertEquals(exampleEnableIQ, enablePushNotificationsIQ.toXML(StreamOpen.CLIENT_NAMESPACE).toString()); } @Test @@ -53,7 +55,7 @@ public class EnablePushNotificationsIQTest { JidCreate.from("push-5.client.example"), "yxs32uqsflafdk3iuqo", publishOptions); enablePushNotificationsIQ.setStanzaId("x42"); - Assert.assertEquals(exampleEnableIQWithPublishOptions, enablePushNotificationsIQ.toXML(null).toString()); + Assert.assertEquals(exampleEnableIQWithPublishOptions, enablePushNotificationsIQ.toXML(StreamOpen.CLIENT_NAMESPACE).toString()); } } diff --git a/smack-extensions/src/test/java/org/jivesoftware/smackx/blocking/BlockContactsIQTest.java b/smack-extensions/src/test/java/org/jivesoftware/smackx/blocking/BlockContactsIQTest.java index 6ad754efd..8a92e81cd 100644 --- a/smack-extensions/src/test/java/org/jivesoftware/smackx/blocking/BlockContactsIQTest.java +++ b/smack-extensions/src/test/java/org/jivesoftware/smackx/blocking/BlockContactsIQTest.java @@ -31,10 +31,10 @@ import org.jxmpp.jid.impl.JidCreate; public class BlockContactsIQTest { - private static final String blockContactIQExample = "" + "" + private static final String blockContactIQExample = "" + "" + "" + "" + "" + ""; - private static final String blockContactPushIQExample = "" + private static final String blockContactPushIQExample = "" + "" + "" + "" + "" + ""; diff --git a/smack-extensions/src/test/java/org/jivesoftware/smackx/blocking/GetBlockingListTest.java b/smack-extensions/src/test/java/org/jivesoftware/smackx/blocking/GetBlockingListTest.java index 609671bbb..cfa26583d 100644 --- a/smack-extensions/src/test/java/org/jivesoftware/smackx/blocking/GetBlockingListTest.java +++ b/smack-extensions/src/test/java/org/jivesoftware/smackx/blocking/GetBlockingListTest.java @@ -18,6 +18,7 @@ package org.jivesoftware.smackx.blocking; import org.jivesoftware.smack.packet.IQ; import org.jivesoftware.smack.packet.IQ.Type; +import org.jivesoftware.smack.packet.StreamOpen; import org.jivesoftware.smack.util.PacketParserUtils; import org.jivesoftware.smackx.blocking.element.BlockListIQ; @@ -42,7 +43,7 @@ public class GetBlockingListTest { BlockListIQ getBlockListIQ = new BlockListIQ(null); getBlockListIQ.setType(Type.get); getBlockListIQ.setStanzaId("blocklist1"); - Assert.assertEquals(getBlockingListIQExample, getBlockListIQ.toXML(null).toString()); + Assert.assertEquals(getBlockingListIQExample, getBlockListIQ.toXML(StreamOpen.CLIENT_NAMESPACE).toString()); } @Test diff --git a/smack-extensions/src/test/java/org/jivesoftware/smackx/blocking/UnblockContactsIQTest.java b/smack-extensions/src/test/java/org/jivesoftware/smackx/blocking/UnblockContactsIQTest.java index b7d6f3e05..d7b72fe56 100644 --- a/smack-extensions/src/test/java/org/jivesoftware/smackx/blocking/UnblockContactsIQTest.java +++ b/smack-extensions/src/test/java/org/jivesoftware/smackx/blocking/UnblockContactsIQTest.java @@ -20,6 +20,7 @@ import java.util.ArrayList; import java.util.List; import org.jivesoftware.smack.packet.IQ; +import org.jivesoftware.smack.packet.StreamOpen; import org.jivesoftware.smack.util.PacketParserUtils; import org.jivesoftware.smackx.blocking.element.UnblockContactsIQ; @@ -53,7 +54,7 @@ public class UnblockContactsIQTest { UnblockContactsIQ unblockContactIQ = new UnblockContactsIQ(jids); unblockContactIQ.setStanzaId("unblock1"); - Assert.assertEquals(unblockContactIQExample, unblockContactIQ.toXML(null).toString()); + Assert.assertEquals(unblockContactIQExample, unblockContactIQ.toXML(StreamOpen.CLIENT_NAMESPACE).toString()); } @Test @@ -68,7 +69,7 @@ public class UnblockContactsIQTest { public void checkUnblockAllIQStanza() throws Exception { UnblockContactsIQ unblockAllIQ = new UnblockContactsIQ(null); unblockAllIQ.setStanzaId("unblock2"); - Assert.assertEquals(unblockAllIQExample, unblockAllIQ.toXML(null).toString()); + Assert.assertEquals(unblockAllIQExample, unblockAllIQ.toXML(StreamOpen.CLIENT_NAMESPACE).toString()); } @Test diff --git a/smack-extensions/src/test/java/org/jivesoftware/smackx/bob/BoBIQTest.java b/smack-extensions/src/test/java/org/jivesoftware/smackx/bob/BoBIQTest.java index 2d377dd4f..849e6350c 100644 --- a/smack-extensions/src/test/java/org/jivesoftware/smackx/bob/BoBIQTest.java +++ b/smack-extensions/src/test/java/org/jivesoftware/smackx/bob/BoBIQTest.java @@ -17,6 +17,7 @@ package org.jivesoftware.smackx.bob; import org.jivesoftware.smack.packet.IQ.Type; +import org.jivesoftware.smack.packet.StreamOpen; import org.jivesoftware.smack.test.util.SmackTestSuite; import org.jivesoftware.smack.util.PacketParserUtils; import org.jivesoftware.smack.util.StringUtils; @@ -45,7 +46,7 @@ public class BoBIQTest extends SmackTestSuite { createdBoBIQ.setTo(JidCreate.from("ladymacbeth@shakespeare.lit/castle")); createdBoBIQ.setType(Type.get); - Assert.assertEquals(sampleBoBIQRequest, createdBoBIQ.toXML(null).toString()); + Assert.assertEquals(sampleBoBIQRequest, createdBoBIQ.toXML(StreamOpen.CLIENT_NAMESPACE).toString()); } @Test @@ -65,7 +66,7 @@ public class BoBIQTest extends SmackTestSuite { Assert.assertEquals(bobIQ.getBoBData().getMaxAge(), createdBoBIQ.getBoBData().getMaxAge()); Assert.assertEquals(bobIQ.getBoBData().getType(), createdBoBIQ.getBoBData().getType()); Assert.assertEquals(bobIQ.getBoBData().getContentBase64Encoded(), createdBoBIQ.getBoBData().getContentBase64Encoded()); - Assert.assertEquals(bobIQ.toXML(null).toString(), createdBoBIQ.toXML(null).toString()); + Assert.assertEquals(bobIQ.toXML(StreamOpen.CLIENT_NAMESPACE).toString(), createdBoBIQ.toXML(StreamOpen.CLIENT_NAMESPACE).toString()); } } diff --git a/smack-extensions/src/test/java/org/jivesoftware/smackx/bytestreams/ibb/packet/CloseTest.java b/smack-extensions/src/test/java/org/jivesoftware/smackx/bytestreams/ibb/packet/CloseTest.java index 6cd9d0441..d300046d3 100644 --- a/smack-extensions/src/test/java/org/jivesoftware/smackx/bytestreams/ibb/packet/CloseTest.java +++ b/smack-extensions/src/test/java/org/jivesoftware/smackx/bytestreams/ibb/packet/CloseTest.java @@ -22,6 +22,7 @@ import static org.junit.Assert.assertEquals; import java.util.Properties; import org.jivesoftware.smack.packet.IQ; +import org.jivesoftware.smack.packet.StreamOpen; import org.jivesoftware.smackx.InitExtensions; @@ -80,7 +81,7 @@ public class CloseTest extends InitExtensions { close.setTo(JidCreate.from("juliet@capulet.lit/balcony")); close.setStanzaId("us71g45j"); - assertXMLEqual(control, close.toXML(null).toString()); + assertXMLEqual(control, close.toXML(StreamOpen.CLIENT_NAMESPACE).toString()); } } diff --git a/smack-extensions/src/test/java/org/jivesoftware/smackx/bytestreams/ibb/packet/DataTest.java b/smack-extensions/src/test/java/org/jivesoftware/smackx/bytestreams/ibb/packet/DataTest.java index 9f8857923..3484686d7 100644 --- a/smack-extensions/src/test/java/org/jivesoftware/smackx/bytestreams/ibb/packet/DataTest.java +++ b/smack-extensions/src/test/java/org/jivesoftware/smackx/bytestreams/ibb/packet/DataTest.java @@ -23,6 +23,7 @@ import static org.mockito.Mockito.mock; import java.util.Properties; import org.jivesoftware.smack.packet.IQ; +import org.jivesoftware.smack.packet.StreamOpen; import org.jivesoftware.smack.util.stringencoder.Base64; import org.jivesoftware.smackx.InitExtensions; @@ -77,7 +78,7 @@ public class DataTest extends InitExtensions { data.setTo(JidCreate.from("juliet@capulet.lit/balcony")); data.setStanzaId("kr91n475"); - assertXMLEqual(control, data.toXML(null).toString()); + assertXMLEqual(control, data.toXML(StreamOpen.CLIENT_NAMESPACE).toString()); } } diff --git a/smack-extensions/src/test/java/org/jivesoftware/smackx/bytestreams/ibb/packet/OpenTest.java b/smack-extensions/src/test/java/org/jivesoftware/smackx/bytestreams/ibb/packet/OpenTest.java index 231d7f4f2..dc15a5239 100644 --- a/smack-extensions/src/test/java/org/jivesoftware/smackx/bytestreams/ibb/packet/OpenTest.java +++ b/smack-extensions/src/test/java/org/jivesoftware/smackx/bytestreams/ibb/packet/OpenTest.java @@ -22,6 +22,7 @@ import static org.junit.Assert.assertEquals; import java.util.Properties; import org.jivesoftware.smack.packet.IQ; +import org.jivesoftware.smack.packet.StreamOpen; import org.jivesoftware.smackx.InitExtensions; import org.jivesoftware.smackx.bytestreams.ibb.InBandBytestreamManager.StanzaType; @@ -102,7 +103,7 @@ public class OpenTest extends InitExtensions { open.setTo(JidCreate.from("juliet@capulet.lit/balcony")); open.setStanzaId("jn3h8g65"); - assertXMLEqual(control, open.toXML(null).toString()); + assertXMLEqual(control, open.toXML(StreamOpen.CLIENT_NAMESPACE).toString()); } diff --git a/smack-extensions/src/test/java/org/jivesoftware/smackx/jiveproperties/JivePropertiesExtensionTest.java b/smack-extensions/src/test/java/org/jivesoftware/smackx/jiveproperties/JivePropertiesExtensionTest.java index 1c50e6369..58da80039 100644 --- a/smack-extensions/src/test/java/org/jivesoftware/smackx/jiveproperties/JivePropertiesExtensionTest.java +++ b/smack-extensions/src/test/java/org/jivesoftware/smackx/jiveproperties/JivePropertiesExtensionTest.java @@ -1,6 +1,6 @@ /** * - * Copyright 2014 Florian Schmaus + * Copyright 2014-2018 Florian Schmaus * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -44,7 +44,7 @@ public class JivePropertiesExtensionTest extends InitExtensions { @Test public void checkProvider() throws Exception { // @formatter:off - String properties = "" + String properties = "" + "Neither, fair saint, if either thee dislike." + "" + "" diff --git a/smack-extensions/src/test/java/org/jivesoftware/smackx/message_correct/MessageCorrectExtensionTest.java b/smack-extensions/src/test/java/org/jivesoftware/smackx/message_correct/MessageCorrectExtensionTest.java index 8120c987c..956748c70 100644 --- a/smack-extensions/src/test/java/org/jivesoftware/smackx/message_correct/MessageCorrectExtensionTest.java +++ b/smack-extensions/src/test/java/org/jivesoftware/smackx/message_correct/MessageCorrectExtensionTest.java @@ -28,12 +28,12 @@ public class MessageCorrectExtensionTest { private static final String idInitialMessage = "bad1"; - private static final String initialMessageXml = "" + private static final String initialMessageXml = "" + "But soft, what light through yonder window breaks?" + ""; private static final CharSequence messageCorrectionXml = ""; - private static final CharSequence expectedXml = "" + private static final CharSequence expectedXml = "" + "But soft, what light through yonder window breaks?" + "" + ""; diff --git a/smack-extensions/src/test/java/org/jivesoftware/smackx/shim/provider/HeadersProviderTest.java b/smack-extensions/src/test/java/org/jivesoftware/smackx/shim/provider/HeadersProviderTest.java index 2cebeffb5..3279c433f 100644 --- a/smack-extensions/src/test/java/org/jivesoftware/smackx/shim/provider/HeadersProviderTest.java +++ b/smack-extensions/src/test/java/org/jivesoftware/smackx/shim/provider/HeadersProviderTest.java @@ -1,6 +1,6 @@ /** * - * Copyright 2014 Florian Schmaus + * Copyright 2014-2018 Florian Schmaus * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -34,7 +34,7 @@ public class HeadersProviderTest { public void headersInMessageTest() throws Exception { // @formatter:off final String messageStanza = - "" + + "" + "Wherefore are thou?!?" + "" + "
high
" +