Mercury-IM/Smack
Mercury-IM/Smack
1
0
Fork 0
mirror of https://codeberg.org/Mercury-IM/Smack synced 2025-09-10 18:59:41 +02:00
Code Issues Releases Wiki Activity

Change Element.toXml() to toXml(String enclosingNamespace)

Browse source
This commit is contained in:
Florian Schmaus 2018-04-25 14:20:18 +02:00
parent 380f9a2b72
commit 5ab2903c32
229 changed files with 634 additions and 536 deletions
Download patch file Download diff file Expand all files Collapse all files

2
smack-extensions/src/test/java/org/jivesoftware/smackx/amp/AMPExtensionTest.java
View file

@ -59,7 +59,7 @@ public class AMPExtensionTest {
ext.addRule(new AMPExtension.Rule(AMPExtension.Action.notify, new AMPMatchResourceCondition(AMPMatchResourceCondition.Value.exact)));
ext.addRule(new AMPExtension.Rule(AMPExtension.Action.notify, new AMPMatchResourceCondition(AMPMatchResourceCondition.Value.other)));
assertEquals(correctStanza, ext.toXML());
assertEquals(correctStanza, ext.toXML(null));
}
@Test

2
smack-extensions/src/test/java/org/jivesoftware/smackx/blocking/BlockContactsIQTest.java
View file

@ -47,7 +47,7 @@ public class BlockContactsIQTest {
BlockContactsIQ blockContactIQ = new BlockContactsIQ(jids);
blockContactIQ.setStanzaId("block1");
Assert.assertEquals(blockContactIQExample, blockContactIQ.toXML().toString());
Assert.assertEquals(blockContactIQExample, blockContactIQ.toXML(null).toString());
}
@Test

2
smack-extensions/src/test/java/org/jivesoftware/smackx/blocking/GetBlockingListTest.java
View file

@ -42,7 +42,7 @@ public class GetBlockingListTest {
BlockListIQ getBlockListIQ = new BlockListIQ(null);
getBlockListIQ.setType(Type.get);
getBlockListIQ.setStanzaId("blocklist1");
Assert.assertEquals(getBlockingListIQExample, getBlockListIQ.toXML().toString());
Assert.assertEquals(getBlockingListIQExample, getBlockListIQ.toXML(null).toString());
}
@Test

4
smack-extensions/src/test/java/org/jivesoftware/smackx/blocking/UnblockContactsIQTest.java
View file

@ -53,7 +53,7 @@ public class UnblockContactsIQTest {
UnblockContactsIQ unblockContactIQ = new UnblockContactsIQ(jids);
unblockContactIQ.setStanzaId("unblock1");
Assert.assertEquals(unblockContactIQExample, unblockContactIQ.toXML().toString());
Assert.assertEquals(unblockContactIQExample, unblockContactIQ.toXML(null).toString());
}
@Test
@ -68,7 +68,7 @@ public class UnblockContactsIQTest {
public void checkUnblockAllIQStanza() throws Exception {
UnblockContactsIQ unblockAllIQ = new UnblockContactsIQ(null);
unblockAllIQ.setStanzaId("unblock2");
Assert.assertEquals(unblockAllIQExample, unblockAllIQ.toXML().toString());
Assert.assertEquals(unblockAllIQExample, unblockAllIQ.toXML(null).toString());
}
@Test

4
smack-extensions/src/test/java/org/jivesoftware/smackx/bob/BoBIQTest.java
View file

@ -45,7 +45,7 @@ public class BoBIQTest extends SmackTestSuite {
createdBoBIQ.setTo(JidCreate.from("ladymacbeth@shakespeare.lit/castle"));
createdBoBIQ.setType(Type.get);
Assert.assertEquals(sampleBoBIQRequest, createdBoBIQ.toXML().toString());
Assert.assertEquals(sampleBoBIQRequest, createdBoBIQ.toXML(null).toString());
}
@Test
@ -65,7 +65,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().toString(), createdBoBIQ.toXML().toString());
Assert.assertEquals(bobIQ.toXML(null).toString(), createdBoBIQ.toXML(null).toString());
}
}

2
smack-extensions/src/test/java/org/jivesoftware/smackx/bytestreams/ibb/packet/CloseTest.java
View file

@ -80,7 +80,7 @@ public class CloseTest extends InitExtensions {
close.setTo(JidCreate.from("juliet@capulet.lit/balcony"));
close.setStanzaId("us71g45j");
assertXMLEqual(control, close.toXML().toString());
assertXMLEqual(control, close.toXML(null).toString());
}
}

2
smack-extensions/src/test/java/org/jivesoftware/smackx/bytestreams/ibb/packet/DataPacketExtensionTest.java
View file

@ -96,7 +96,7 @@ public class DataPacketExtensionTest extends InitExtensions {
.asString(outputProperties);
DataPacketExtension data = new DataPacketExtension("i781hf64", 0, "DATA");
assertXMLEqual(control, data.toXML().toString());
assertXMLEqual(control, data.toXML(null).toString());
}
}

2
smack-extensions/src/test/java/org/jivesoftware/smackx/bytestreams/ibb/packet/DataTest.java
View file

@ -77,7 +77,7 @@ public class DataTest extends InitExtensions {
data.setTo(JidCreate.from("juliet@capulet.lit/balcony"));
data.setStanzaId("kr91n475");
assertXMLEqual(control, data.toXML().toString());
assertXMLEqual(control, data.toXML(null).toString());
}
}

2
smack-extensions/src/test/java/org/jivesoftware/smackx/bytestreams/ibb/packet/OpenTest.java
View file

@ -102,7 +102,7 @@ public class OpenTest extends InitExtensions {
open.setTo(JidCreate.from("juliet@capulet.lit/balcony"));
open.setStanzaId("jn3h8g65");
assertXMLEqual(control, open.toXML().toString());
assertXMLEqual(control, open.toXML(null).toString());
}

2
smack-extensions/src/test/java/org/jivesoftware/smackx/caps/EntityCapsManagerTest.java
View file

@ -92,7 +92,7 @@ public class EntityCapsManagerTest extends InitExtensions {
DiscoverInfo restored_di = EntityCapsManager.getDiscoveryInfoByNodeVer(nodeVer);
assertNotNull(restored_di);
assertEquals(di.toXML().toString(), restored_di.toXML().toString());
assertEquals(di.toXML(null).toString(), restored_di.toXML(null).toString());
}
private static DiscoverInfo createComplexSamplePacket() throws XmppStringprepException {

2
smack-extensions/src/test/java/org/jivesoftware/smackx/filetransfer/FileTransferNegotiatorTest.java
View file

@ -56,7 +56,7 @@ public class FileTransferNegotiatorTest extends InitExtensions {
// We do not expect an answer. This unit test only checks the request sent.
}
Stanza packet = connection.getSentPacket();
String xml = packet.toXML().toString();
String xml = packet.toXML(null).toString();
assertTrue(xml.indexOf("var='stream-method' type='list-single'") != -1);
}
}

4
smack-extensions/src/test/java/org/jivesoftware/smackx/geoloc/packet/GeoLocationTest.java
View file

@ -120,7 +120,7 @@ public class GeoLocationTest extends InitExtensions {
GeoLocation geoLocation = messageWithGeoLocation.getExtension(GeoLocation.ELEMENT,
GeoLocation.NAMESPACE);
assertNotNull(geoLocation);
assertNotNull(geoLocation.toXML());
assertNotNull(geoLocation.toXML(null));
GeoLocation constructedGeoLocation = GeoLocation.builder().setAccuracy(23d).setAlt(1000d).setAltAccuracy(10d).setArea("Delhi").setBearing(
10d).setBuilding("Small Building").setCountry("India").setCountryCode("IN").setDescription(
@ -129,7 +129,7 @@ public class GeoLocationTest extends InitExtensions {
"Wall Street").setText("Unit Testing GeoLocation").setTimestamp(
XmppDateTime.parseDate("2004-02-19")).setTzo("+5:30").setUri(new URI("http://xmpp.org")).build();
assertEquals(constructedGeoLocation.toXML().toString(), geoLocation.toXML().toString());
assertEquals(constructedGeoLocation.toXML(null).toString(), geoLocation.toXML(null).toString());
}

6
smack-extensions/src/test/java/org/jivesoftware/smackx/jingle/JingleContentTest.java
View file

@ -65,12 +65,12 @@ public class JingleContentTest extends SmackTestSuite {
builder.setDisposition("session");
JingleContent content1 = builder.build();
assertEquals("session", content1.getDisposition());
assertNotSame(content.toXML().toString(), content1.toXML().toString());
assertEquals(content1.toXML().toString(), builder.build().toXML().toString());
assertNotSame(content.toXML(null).toString(), content1.toXML(null).toString());
assertEquals(content1.toXML(null).toString(), builder.build().toXML(null).toString());
String xml =
"<content creator='initiator' disposition='session' name='A name' senders='both'>" +
"</content>";
assertEquals(xml, content1.toXML().toString());
assertEquals(xml, content1.toXML(null).toString());
}
}

8
smack-extensions/src/test/java/org/jivesoftware/smackx/jingle/JingleErrorTest.java
View file

@ -34,28 +34,28 @@ public class JingleErrorTest extends SmackTestSuite {
public void tieBreakTest() throws Exception {
String xml = "<tie-break xmlns='urn:xmpp:jingle:errors:1'/>";
JingleError error = new JingleErrorProvider().parse(TestUtils.getParser(xml));
assertEquals(xml, error.toXML().toString());
assertEquals(xml, error.toXML(null).toString());
}
@Test
public void unknownSessionTest() throws Exception {
String xml = "<unknown-session xmlns='urn:xmpp:jingle:errors:1'/>";
JingleError error = new JingleErrorProvider().parse(TestUtils.getParser(xml));
assertEquals(xml, error.toXML().toString());
assertEquals(xml, error.toXML(null).toString());
}
@Test
public void unsupportedInfoTest() throws Exception {
String xml = "<unsupported-info xmlns='urn:xmpp:jingle:errors:1'/>";
JingleError error = new JingleErrorProvider().parse(TestUtils.getParser(xml));
assertEquals(xml, error.toXML().toString());
assertEquals(xml, error.toXML(null).toString());
}
@Test
public void outOfOrderTest() throws Exception {
String xml = "<out-of-order xmlns='urn:xmpp:jingle:errors:1'/>";
JingleError error = new JingleErrorProvider().parse(TestUtils.getParser(xml));
assertEquals(xml, error.toXML().toString());
assertEquals(xml, error.toXML(null).toString());
}
@Test(expected = IllegalArgumentException.class)

34
smack-extensions/src/test/java/org/jivesoftware/smackx/jingle/JingleReasonTest.java
View file

@ -32,39 +32,39 @@ public class JingleReasonTest extends SmackTestSuite {
@Test
public void parserTest() {
assertEquals("<reason><success/></reason>",
JingleReason.Success.toXML().toString());
JingleReason.Success.toXML(null).toString());
assertEquals("<reason><busy/></reason>",
JingleReason.Busy.toXML().toString());
JingleReason.Busy.toXML(null).toString());
assertEquals("<reason><cancel/></reason>",
JingleReason.Cancel.toXML().toString());
JingleReason.Cancel.toXML(null).toString());
assertEquals("<reason><connectivity-error/></reason>",
JingleReason.ConnectivityError.toXML().toString());
JingleReason.ConnectivityError.toXML(null).toString());
assertEquals("<reason><decline/></reason>",
JingleReason.Decline.toXML().toString());
JingleReason.Decline.toXML(null).toString());
assertEquals("<reason><expired/></reason>",
JingleReason.Expired.toXML().toString());
JingleReason.Expired.toXML(null).toString());
assertEquals("<reason><unsupported-transports/></reason>",
JingleReason.UnsupportedTransports.toXML().toString());
JingleReason.UnsupportedTransports.toXML(null).toString());
assertEquals("<reason><failed-transport/></reason>",
JingleReason.FailedTransport.toXML().toString());
JingleReason.FailedTransport.toXML(null).toString());
assertEquals("<reason><general-error/></reason>",
JingleReason.GeneralError.toXML().toString());
JingleReason.GeneralError.toXML(null).toString());
assertEquals("<reason><gone/></reason>",
JingleReason.Gone.toXML().toString());
JingleReason.Gone.toXML(null).toString());
assertEquals("<reason><media-error/></reason>",
JingleReason.MediaError.toXML().toString());
JingleReason.MediaError.toXML(null).toString());
assertEquals("<reason><security-error/></reason>",
JingleReason.SecurityError.toXML().toString());
JingleReason.SecurityError.toXML(null).toString());
assertEquals("<reason><unsupported-applications/></reason>",
JingleReason.UnsupportedApplications.toXML().toString());
JingleReason.UnsupportedApplications.toXML(null).toString());
assertEquals("<reason><timeout/></reason>",
JingleReason.Timeout.toXML().toString());
JingleReason.Timeout.toXML(null).toString());
assertEquals("<reason><failed-application/></reason>",
JingleReason.FailedApplication.toXML().toString());
JingleReason.FailedApplication.toXML(null).toString());
assertEquals("<reason><incompatible-parameters/></reason>",
JingleReason.IncompatibleParameters.toXML().toString());
JingleReason.IncompatibleParameters.toXML(null).toString());
assertEquals("<reason><alternative-session><sid>1234</sid></alternative-session></reason>",
JingleReason.AlternativeSession("1234").toXML().toString());
JingleReason.AlternativeSession("1234").toXML(null).toString());
}
@Test(expected = NullPointerException.class)

2
smack-extensions/src/test/java/org/jivesoftware/smackx/jingle/JingleTest.java
View file

@ -76,6 +76,6 @@ public class JingleTest extends SmackTestSuite {
"action='session-initiate' " +
"sid='" + sessionId + "'>" +
"</jingle>";
assertTrue(jingle.toXML().toString().contains(xml));
assertTrue(jingle.toXML(null).toString().contains(xml));
}
}

4
smack-extensions/src/test/java/org/jivesoftware/smackx/jingle/transports/jingle_ibb/JingleIBBTransportTest.java
View file

@ -43,7 +43,7 @@ public class JingleIBBTransportTest extends SmackTestSuite {
String xml = "<transport xmlns='urn:xmpp:jingle:transports:ibb:1' block-size='8192' sid='" + sid + "'/>";
JingleIBBTransport transport = new JingleIBBTransport(size, sid);
assertEquals(xml, transport.toXML().toString());
assertEquals(xml, transport.toXML(null).toString());
assertEquals(size, transport.getBlockSize());
assertEquals(sid, transport.getSessionId());
@ -51,7 +51,7 @@ public class JingleIBBTransportTest extends SmackTestSuite {
.parse(TestUtils.getParser(xml));
assertEquals(transport, parsed);
assertTrue(transport.equals(parsed));
assertEquals(xml, parsed.toXML().toString());
assertEquals(xml, parsed.toXML(null).toString());
JingleIBBTransport transport1 = new JingleIBBTransport((short) 1024);
assertEquals((short) 1024, transport1.getBlockSize());

12
smack-extensions/src/test/java/org/jivesoftware/smackx/jingle/transports/jingle_s5b/JingleS5BTransportTest.java
View file

@ -113,7 +113,7 @@ public class JingleS5BTransportTest extends SmackTestSuite {
assertEquals(7878787, candidate3.getPriority());
assertEquals(JingleS5BTransportCandidate.Type.proxy, candidate3.getType());
assertEquals(xml, transport.toXML().toString());
assertEquals(xml, transport.toXML(null).toString());
}
@Test
@ -129,7 +129,7 @@ public class JingleS5BTransportTest extends SmackTestSuite {
assertEquals("vj3hs98y", candidateErrorTransport.getStreamId());
assertEquals(JingleS5BTransportInfo.CandidateError.INSTANCE,
candidateErrorTransport.getInfo());
assertEquals(candidateError, candidateErrorTransport.toXML().toString());
assertEquals(candidateError, candidateErrorTransport.toXML(null).toString());
String proxyError =
"<transport xmlns='urn:xmpp:jingle:transports:s5b:1' sid='vj3hs98y'>" +
@ -143,7 +143,7 @@ public class JingleS5BTransportTest extends SmackTestSuite {
assertEquals("vj3hs98y", proxyErrorTransport.getStreamId());
assertEquals(JingleS5BTransportInfo.ProxyError.INSTANCE,
proxyErrorTransport.getInfo());
assertEquals(proxyError, proxyErrorTransport.toXML().toString());
assertEquals(proxyError, proxyErrorTransport.toXML(null).toString());
String candidateUsed =
"<transport xmlns='urn:xmpp:jingle:transports:s5b:1' sid='vj3hs98y'>" +
@ -157,7 +157,7 @@ public class JingleS5BTransportTest extends SmackTestSuite {
assertEquals("hr65dqyd",
((JingleS5BTransportInfo.CandidateUsed)
candidateUsedTransport.getInfo()).getCandidateId());
assertEquals(candidateUsed, candidateUsedTransport.toXML().toString());
assertEquals(candidateUsed, candidateUsedTransport.toXML(null).toString());
String candidateActivated =
"<transport xmlns='urn:xmpp:jingle:transports:s5b:1' sid='vj3hs98y'>" +
@ -173,7 +173,7 @@ public class JingleS5BTransportTest extends SmackTestSuite {
assertEquals("hr65dqyd",
((JingleS5BTransportInfo.CandidateActivated)
candidateActivatedTransport.getInfo()).getCandidateId());
assertEquals(candidateActivated, candidateActivatedTransport.toXML().toString());
assertEquals(candidateActivated, candidateActivatedTransport.toXML(null).toString());
}
@Test(expected = IllegalArgumentException.class)
@ -216,7 +216,7 @@ public class JingleS5BTransportTest extends SmackTestSuite {
assertEquals(host, candidate.getHost());
assertEquals(port, candidate.getPort());
assertEquals(streamHost.toXML().toString(), candidate.getStreamHost().toXML().toString());
assertEquals(streamHost.toXML(null).toString(), candidate.getStreamHost().toXML(null).toString());
}
@Test(expected = IllegalArgumentException.class)

2
smack-extensions/src/test/java/org/jivesoftware/smackx/last_interaction/IdleTest.java
View file

@ -44,7 +44,7 @@ public class IdleTest extends SmackTestSuite {
assertEquals(date, parsed.getSince());
IdleElement element = new IdleElement(date);
assertXMLEqual("<idle xmlns='urn:xmpp:idle:1' since='1969-07-21T02:56:15.000+00:00'/>", element.toXML().toString());
assertXMLEqual("<idle xmlns='urn:xmpp:idle:1' since='1969-07-21T02:56:15.000+00:00'/>", element.toXML(null).toString());
}
@Test

4
smack-extensions/src/test/java/org/jivesoftware/smackx/message_correct/MessageCorrectExtensionTest.java
View file

@ -42,11 +42,11 @@ public class MessageCorrectExtensionTest {
Message initialMessage = PacketParserUtils.parseStanza(initialMessageXml);
MessageCorrectExtension messageCorrectExtension = new MessageCorrectExtension(idInitialMessage);
Assert.assertEquals(messageCorrectExtension.toXML().toString(), messageCorrectionXml);
Assert.assertEquals(messageCorrectExtension.toXML(null).toString(), messageCorrectionXml);
initialMessage.addExtension(messageCorrectExtension);
Assert.assertEquals(initialMessage.toXML(), expectedXml);
Assert.assertEquals(initialMessage.toXML(null), expectedXml);
}
}

2
smack-extensions/src/test/java/org/jivesoftware/smackx/pubsub/AffiliationsExtensionTest.java
View file

@ -40,7 +40,7 @@ public class AffiliationsExtensionTest {
AffiliationsExtension affiliationsExtension = new AffiliationsExtension(affiliationsList, "testNode");
CharSequence xml = affiliationsExtension.toXML();
CharSequence xml = affiliationsExtension.toXML(null);
assertXMLEqual("<affiliations node='testNode'><affiliation xmlns='http://jabber.org/protocol/pubsub#owner' jid='one@exampleone.org' affiliation='member'/></affiliations>",
xml.toString());

24
smack-extensions/src/test/java/org/jivesoftware/smackx/pubsub/ItemValidationTest.java
View file

@ -62,15 +62,15 @@ public class ItemValidationTest extends InitExtensions {
public void verifyBasicItem() throws Exception {
Item simpleItem = new Item();
String simpleCtrl = "<item xmlns='http://jabber.org/protocol/pubsub' />";
assertXMLEqual(simpleCtrl, simpleItem.toXML().toString());
assertXMLEqual(simpleCtrl, simpleItem.toXML(null).toString());
Item idItem = new Item("uniqueid");
String idCtrl = "<item xmlns='http://jabber.org/protocol/pubsub' id='uniqueid'/>";
assertXMLEqual(idCtrl, idItem.toXML().toString());
assertXMLEqual(idCtrl, idItem.toXML(null).toString());
Item itemWithNodeId = new Item("testId", "testNode");
String nodeIdCtrl = "<item xmlns='http://jabber.org/protocol/pubsub' id='testId' node='testNode' />";
assertXMLEqual(nodeIdCtrl, itemWithNodeId.toXML().toString());
assertXMLEqual(nodeIdCtrl, itemWithNodeId.toXML(null).toString());
}
@Test
@ -78,16 +78,16 @@ public class ItemValidationTest extends InitExtensions {
SimplePayload payload = new SimplePayload("<data xmlns='https://example.org'>This is the payload</data>");
PayloadItem<SimplePayload> simpleItem = new PayloadItem<>(payload);
String simpleCtrl = "<item xmlns='http://jabber.org/protocol/pubsub'>" + payload.toXML() + "</item>";
assertXMLEqual(simpleCtrl, simpleItem.toXML().toString());
String simpleCtrl = "<item xmlns='http://jabber.org/protocol/pubsub'>" + payload.toXML(null) + "</item>";
assertXMLEqual(simpleCtrl, simpleItem.toXML(null).toString());
PayloadItem<SimplePayload> idItem = new PayloadItem<>("uniqueid", payload);
String idCtrl = "<item xmlns='http://jabber.org/protocol/pubsub' id='uniqueid'>" + payload.toXML() + "</item>";
assertXMLEqual(idCtrl, idItem.toXML().toString());
String idCtrl = "<item xmlns='http://jabber.org/protocol/pubsub' id='uniqueid'>" + payload.toXML(null) + "</item>";
assertXMLEqual(idCtrl, idItem.toXML(null).toString());
PayloadItem<SimplePayload> itemWithNodeId = new PayloadItem<>("testId", "testNode", payload);
String nodeIdCtrl = "<item xmlns='http://jabber.org/protocol/pubsub' id='testId' node='testNode'>" + payload.toXML() + "</item>";
assertXMLEqual(nodeIdCtrl, itemWithNodeId.toXML().toString());
String nodeIdCtrl = "<item xmlns='http://jabber.org/protocol/pubsub' id='testId' node='testNode'>" + payload.toXML(null) + "</item>";
assertXMLEqual(nodeIdCtrl, itemWithNodeId.toXML(null).toString());
}
@Test
@ -145,7 +145,7 @@ public class ItemValidationTest extends InitExtensions {
SimplePayload payload = (SimplePayload) item.getPayload();
assertEquals("foo", payload.getElementName());
assertEquals("smack:test", payload.getNamespace());
assertXMLEqual(itemContent, payload.toXML().toString());
assertXMLEqual(itemContent, payload.toXML(null).toString());
}
@Test
@ -191,7 +191,7 @@ public class ItemValidationTest extends InitExtensions {
SimplePayload payload = (SimplePayload) item.getPayload();
assertEquals("entry", payload.getElementName());
assertEquals("http://www.w3.org/2005/Atom", payload.getNamespace());
assertXMLEqual(itemContent, payload.toXML().toString());
assertXMLEqual(itemContent, payload.toXML(null).toString());
}
@Test
@ -226,6 +226,6 @@ public class ItemValidationTest extends InitExtensions {
assertEquals("testid1", item.getId());
assertTrue(item.getPayload() instanceof SimplePayload);
assertXMLEqual(itemContent, item.getPayload().toXML().toString());
assertXMLEqual(itemContent, item.getPayload().toXML(null).toString());
}
}

2
smack-extensions/src/test/java/org/jivesoftware/smackx/pubsub/PubSubNodeTest.java
View file

@ -61,7 +61,7 @@ public class PubSubNodeTest extends SmackTestSuite {
assertEquals("http://jabber.org/protocol/pubsub#owner", request.getChildElementNamespace());
assertEquals("pubsub", request.getChildElementName());
XmlPullParser parser = TestUtils.getIQParser(request.toXML().toString());
XmlPullParser parser = TestUtils.getIQParser(request.toXML(null).toString());
PubSub pubsubResult = (PubSub) PacketParserUtils.parseIQ(parser);
SubscriptionsExtension subElem = pubsubResult.getExtension(PubSubElementType.SUBSCRIPTIONS_OWNER);
List<Subscription> subscriptions = subElem.getSubscriptions();

2
smack-extensions/src/test/java/org/jivesoftware/smackx/pubsub/SimplePayloadTest.java
View file

@ -29,6 +29,6 @@ public class SimplePayloadTest {
assertEquals("element", simplePayload.getElementName());
assertEquals("https://example.org", simplePayload.getNamespace());
assertEquals(xmlPayload, simplePayload.toXML());
assertEquals(xmlPayload, simplePayload.toXML(null));
}
}

24
smack-extensions/src/test/java/org/jivesoftware/smackx/xdata/packet/DataFormTest.java
View file

@ -57,8 +57,8 @@ public class DataFormTest {
FormField field = new FormField("testField1");
df.addField(field);
assertNotNull(df.toXML());
String output = df.toXML().toString();
assertNotNull(df.toXML(null));
String output = df.toXML(null).toString();
assertEquals(TEST_OUTPUT_1, output);
XmlPullParser parser = PacketParserUtils.getParserFor(output);
@ -70,8 +70,8 @@ public class DataFormTest {
assertEquals(1 , df.getFields().size());
assertEquals(1 , df.getInstructions().size());
assertNotNull(df.toXML());
output = df.toXML().toString();
assertNotNull(df.toXML(null));
output = df.toXML(null).toString();
assertEquals(TEST_OUTPUT_1, output);
}
@ -95,8 +95,8 @@ public class DataFormTest {
df.addExtensionElement(layout);
assertNotNull(df.toXML());
String output = df.toXML().toString();
assertNotNull(df.toXML(null));
String output = df.toXML(null).toString();
assertEquals(TEST_OUTPUT_2, output);
XmlPullParser parser = PacketParserUtils.getParserFor(output);
@ -112,8 +112,8 @@ public class DataFormTest {
assertEquals(3 , layout.getPageLayout().size());
assertNotNull(df.toXML());
output = df.toXML().toString();
assertNotNull(df.toXML(null));
output = df.toXML(null).toString();
assertEquals(TEST_OUTPUT_2, output);
}
@ -129,8 +129,8 @@ public class DataFormTest {
ValidateElement dv = new RangeValidateElement("xs:integer","1111", "9999");
field.setValidateElement(dv);
assertNotNull(df.toXML());
String output = df.toXML().toString();
assertNotNull(df.toXML(null));
String output = df.toXML(null).toString();
assertEquals(TEST_OUTPUT_3, output);
XmlPullParser parser = PacketParserUtils.getParserFor(output);
@ -146,8 +146,8 @@ public class DataFormTest {
assertEquals("xs:integer" , dv.getDatatype());
assertNotNull(df.toXML());
output = df.toXML().toString();
assertNotNull(df.toXML(null));
output = df.toXML(null).toString();
assertEquals(TEST_OUTPUT_3, output);
}

20
smack-extensions/src/test/java/org/jivesoftware/smackx/xdatalayout/packet/DataLayoutTest.java
View file

@ -80,8 +80,8 @@ public class DataLayoutTest {
layout.getPageLayout().add(section);
layout.getPageLayout().add(new Text("PageText"));
assertNotNull(layout.toXML());
String output = layout.toXML().toString();
assertNotNull(layout.toXML(null));
String output = layout.toXML(null).toString();
assertEquals(TEST_OUTPUT_2, output);
XmlPullParser parser = PacketParserUtils.getParserFor(output);
@ -91,8 +91,8 @@ public class DataLayoutTest {
assertEquals(3 , layout.getPageLayout().size());
assertEquals("Label", layout.getLabel());
assertNotNull(layout.toXML());
output = layout.toXML().toString();
assertNotNull(layout.toXML(null));
output = layout.toXML(null).toString();
assertEquals(TEST_OUTPUT_2, output);
}
@ -114,8 +114,8 @@ public class DataLayoutTest {
layout.getPageLayout().add(new Text("<html><font color='red'><em>DO NOT DELAY</em></font><br/>supply further information</html>"));
assertNotNull(layout.toXML());
String output = layout.toXML().toString();
assertNotNull(layout.toXML(null));
String output = layout.toXML(null).toString();
assertEquals(TEST_OUTPUT_SPECIAL, output);
XmlPullParser parser = PacketParserUtils.getParserFor(output);
@ -134,8 +134,8 @@ public class DataLayoutTest {
assertEquals("<html><font color='red'><em>DO NOT DELAY</em></font><br/>supply further information</html>", text.getText());
assertNotNull(layout.toXML());
output = layout.toXML().toString();
assertNotNull(layout.toXML(null));
output = layout.toXML(null).toString();
assertEquals(TEST_OUTPUT_SPECIAL, output);
}
@ -165,8 +165,8 @@ public class DataLayoutTest {
assertEquals("<html><font color='red'><em>DO NOT DELAY</em></font><br/>supply further information</html>", text.getText());
assertNotNull(layout.toXML());
String output = layout.toXML().toString();
assertNotNull(layout.toXML(null));
String output = layout.toXML(null).toString();
assertEquals(TEST_OUTPUT_SPECIAL, output);
}
}

24
smack-extensions/src/test/java/org/jivesoftware/smackx/xdatavalidation/provider/DataValidationTest.java
View file

@ -52,8 +52,8 @@ public class DataValidationTest {
ValidateElement dv = new BasicValidateElement(null);
assertNotNull(dv.toXML());
String output = dv.toXML().toString();
assertNotNull(dv.toXML(null));
String output = dv.toXML(null).toString();
assertEquals(TEST_OUTPUT_MIN, output);
XmlPullParser parser = getParser(TEST_INPUT_MIN);
@ -64,8 +64,8 @@ public class DataValidationTest {
assertEquals("xs:string", dv.getDatatype());
assertTrue(dv instanceof BasicValidateElement);
assertNotNull(dv.toXML());
output = dv.toXML().toString();
assertNotNull(dv.toXML(null));
output = dv.toXML(null).toString();
assertEquals(TEST_OUTPUT_MIN, output);
}
@ -77,8 +77,8 @@ public class DataValidationTest {
ListRange listRange = new ListRange(111L, 999L);
dv.setListRange(listRange);
assertNotNull(dv.toXML());
String output = dv.toXML().toString();
assertNotNull(dv.toXML(null));
String output = dv.toXML(null).toString();
assertEquals(TEST_OUTPUT_RANGE, output);
XmlPullParser parser = getParser(output);
@ -96,8 +96,8 @@ public class DataValidationTest {
assertEquals(999, rdv.getListRange().getMax().intValue());
assertNotNull(dv.toXML());
output = dv.toXML().toString();
assertNotNull(dv.toXML(null));
output = dv.toXML(null).toString();
assertEquals(TEST_OUTPUT_RANGE, output);
}
@ -106,8 +106,8 @@ public class DataValidationTest {
ValidateElement dv = new RangeValidateElement(null, null, null);
assertNotNull(dv.toXML());
String output = dv.toXML().toString();
assertNotNull(dv.toXML(null));
String output = dv.toXML(null).toString();
assertEquals(TEST_OUTPUT_RANGE2, output);
XmlPullParser parser = getParser(output);
@ -121,8 +121,8 @@ public class DataValidationTest {
assertEquals(null, rdv.getMin());
assertEquals(null, rdv.getMax());
assertNotNull(rdv.toXML());
output = rdv.toXML().toString();
assertNotNull(rdv.toXML(null));
output = rdv.toXML(null).toString();
assertEquals(TEST_OUTPUT_RANGE2, output);
}

4
smack-extensions/src/test/java/org/jivesoftware/util/Protocol.java
View file

@ -131,10 +131,10 @@ public class Protocol {
if (printProtocol) {
System.out.println("------------------- Request -------------\n");
System.out.println(XmlUtil.prettyFormatXml(request.toXML()));
System.out.println(XmlUtil.prettyFormatXml(request.toXML(null)));
System.out.println("------------------- Response ------------\n");
if (response != null) {
System.out.println(XmlUtil.prettyFormatXml(response.toXML()));
System.out.println(XmlUtil.prettyFormatXml(response.toXML(null)));
}
else {
System.out.println("No response");