Fix tests

This commit is contained in:
Paul Schaub 2018-05-22 14:57:28 +02:00
parent c0d59d8d49
commit 69a4cba19c
2 changed files with 22 additions and 21 deletions

View File

@ -31,7 +31,7 @@ import org.jxmpp.jid.FullJid;
/** /**
* The Jingle element. This represents a {@link JingleSession}. * The Jingle element. This represents a {@link JingleSession}.
* *
* @author Florian Schmaus * @author Florian Schmaus
*/ */
public final class JingleElement extends IQ { public final class JingleElement extends IQ {

View File

@ -25,6 +25,7 @@ import java.io.IOException;
import org.jivesoftware.smack.DummyConnection; import org.jivesoftware.smack.DummyConnection;
import org.jivesoftware.smack.XMPPConnection; import org.jivesoftware.smack.XMPPConnection;
import org.jivesoftware.smack.packet.IQ; import org.jivesoftware.smack.packet.IQ;
import org.jivesoftware.smack.packet.StreamOpen;
import org.jivesoftware.smack.test.util.SmackTestSuite; import org.jivesoftware.smack.test.util.SmackTestSuite;
import org.jivesoftware.smack.test.util.TestUtils; import org.jivesoftware.smack.test.util.TestUtils;
import org.jivesoftware.smackx.jingle.element.JingleAction; import org.jivesoftware.smackx.jingle.element.JingleAction;
@ -74,7 +75,7 @@ public class JingleElementTest extends SmackTestSuite {
"</reason>" + "</reason>" +
"</jingle>"; "</jingle>";
String xml = getIQXML(romeo, juliet, terminate.getStanzaId(), jingleXML); String xml = getIQXML(romeo, juliet, terminate.getStanzaId(), jingleXML);
assertXMLEqual(xml, terminate.toXML(null).toString()); assertXMLEqual(xml, terminate.toXML(StreamOpen.CLIENT_NAMESPACE).toString());
JingleElement jingle = new JingleProvider().parse(TestUtils.getParser(jingleXML)); JingleElement jingle = new JingleProvider().parse(TestUtils.getParser(jingleXML));
assertNotNull(jingle); assertNotNull(jingle);
assertEquals(jingle.getAction(), JingleAction.session_terminate); assertEquals(jingle.getAction(), JingleAction.session_terminate);
@ -93,7 +94,7 @@ public class JingleElementTest extends SmackTestSuite {
"</reason>" + "</reason>" +
"</jingle>"; "</jingle>";
String xml = getIQXML(romeo, juliet, success.getStanzaId(), jingleXML); String xml = getIQXML(romeo, juliet, success.getStanzaId(), jingleXML);
assertXMLEqual(xml, success.toXML(null).toString()); assertXMLEqual(xml, success.toXML(StreamOpen.CLIENT_NAMESPACE).toString());
JingleElement jingle = new JingleProvider().parse(TestUtils.getParser(jingleXML)); JingleElement jingle = new JingleProvider().parse(TestUtils.getParser(jingleXML));
assertNotNull(jingle); assertNotNull(jingle);
assertEquals(jingle.getAction(), JingleAction.session_terminate); assertEquals(jingle.getAction(), JingleAction.session_terminate);
@ -112,7 +113,7 @@ public class JingleElementTest extends SmackTestSuite {
"</reason>" + "</reason>" +
"</jingle>"; "</jingle>";
String xml = getIQXML(romeo, juliet, busy.getStanzaId(), jingleXML); String xml = getIQXML(romeo, juliet, busy.getStanzaId(), jingleXML);
assertXMLEqual(xml, busy.toXML(null).toString()); assertXMLEqual(xml, busy.toXML(StreamOpen.CLIENT_NAMESPACE).toString());
JingleElement jingle = new JingleProvider().parse(TestUtils.getParser(jingleXML)); JingleElement jingle = new JingleProvider().parse(TestUtils.getParser(jingleXML));
assertNotNull(jingle); assertNotNull(jingle);
assertEquals(jingle.getAction(), JingleAction.session_terminate); assertEquals(jingle.getAction(), JingleAction.session_terminate);
@ -133,7 +134,7 @@ public class JingleElementTest extends SmackTestSuite {
"</reason>" + "</reason>" +
"</jingle>"; "</jingle>";
String xml = getIQXML(romeo, juliet, busy.getStanzaId(), jingleXML); String xml = getIQXML(romeo, juliet, busy.getStanzaId(), jingleXML);
assertXMLEqual(xml, busy.toXML(null).toString()); assertXMLEqual(xml, busy.toXML(StreamOpen.CLIENT_NAMESPACE).toString());
JingleElement jingle = new JingleProvider().parse(TestUtils.getParser(jingleXML)); JingleElement jingle = new JingleProvider().parse(TestUtils.getParser(jingleXML));
assertNotNull(jingle); assertNotNull(jingle);
assertEquals(jingle.getAction(), JingleAction.session_terminate); assertEquals(jingle.getAction(), JingleAction.session_terminate);
@ -154,7 +155,7 @@ public class JingleElementTest extends SmackTestSuite {
"</reason>" + "</reason>" +
"</jingle>"; "</jingle>";
String xml = getIQXML(romeo, juliet, cancel.getStanzaId(), jingleXML); String xml = getIQXML(romeo, juliet, cancel.getStanzaId(), jingleXML);
assertXMLEqual(xml, cancel.toXML(null).toString()); assertXMLEqual(xml, cancel.toXML(StreamOpen.CLIENT_NAMESPACE).toString());
JingleElement jingle = new JingleProvider().parse(TestUtils.getParser(jingleXML)); JingleElement jingle = new JingleProvider().parse(TestUtils.getParser(jingleXML));
assertNotNull(jingle); assertNotNull(jingle);
assertEquals(jingle.getAction(), JingleAction.session_terminate); assertEquals(jingle.getAction(), JingleAction.session_terminate);
@ -173,7 +174,7 @@ public class JingleElementTest extends SmackTestSuite {
"</reason>" + "</reason>" +
"</jingle>"; "</jingle>";
String xml = getIQXML(romeo, juliet, unsupportedTransports.getStanzaId(), jingleXML); String xml = getIQXML(romeo, juliet, unsupportedTransports.getStanzaId(), jingleXML);
assertXMLEqual(xml, unsupportedTransports.toXML(null).toString()); assertXMLEqual(xml, unsupportedTransports.toXML(StreamOpen.CLIENT_NAMESPACE).toString());
JingleElement jingle = new JingleProvider().parse(TestUtils.getParser(jingleXML)); JingleElement jingle = new JingleProvider().parse(TestUtils.getParser(jingleXML));
assertNotNull(jingle); assertNotNull(jingle);
assertEquals(jingle.getAction(), JingleAction.session_terminate); assertEquals(jingle.getAction(), JingleAction.session_terminate);
@ -192,7 +193,7 @@ public class JingleElementTest extends SmackTestSuite {
"</reason>" + "</reason>" +
"</jingle>"; "</jingle>";
String xml = getIQXML(romeo, juliet, unsupportedApplications.getStanzaId(), jingleXML); String xml = getIQXML(romeo, juliet, unsupportedApplications.getStanzaId(), jingleXML);
assertXMLEqual(xml, unsupportedApplications.toXML(null).toString()); assertXMLEqual(xml, unsupportedApplications.toXML(StreamOpen.CLIENT_NAMESPACE).toString());
JingleElement jingle = new JingleProvider().parse(TestUtils.getParser(jingleXML)); JingleElement jingle = new JingleProvider().parse(TestUtils.getParser(jingleXML));
assertNotNull(jingle); assertNotNull(jingle);
assertEquals(jingle.getAction(), JingleAction.session_terminate); assertEquals(jingle.getAction(), JingleAction.session_terminate);
@ -211,7 +212,7 @@ public class JingleElementTest extends SmackTestSuite {
"</reason>" + "</reason>" +
"</jingle>"; "</jingle>";
String xml = getIQXML(romeo, juliet, failedTransport.getStanzaId(), jingleXML); String xml = getIQXML(romeo, juliet, failedTransport.getStanzaId(), jingleXML);
assertXMLEqual(xml, failedTransport.toXML(null).toString()); assertXMLEqual(xml, failedTransport.toXML(StreamOpen.CLIENT_NAMESPACE).toString());
assertEquals(JingleAction.session_terminate, failedTransport.getAction()); assertEquals(JingleAction.session_terminate, failedTransport.getAction());
assertEquals(JingleReasonElement.Reason.failed_transport, failedTransport.getReason().asEnum()); assertEquals(JingleReasonElement.Reason.failed_transport, failedTransport.getReason().asEnum());
} }
@ -228,7 +229,7 @@ public class JingleElementTest extends SmackTestSuite {
"</reason>" + "</reason>" +
"</jingle>"; "</jingle>";
String xml = getIQXML(romeo, juliet, failedApplication.getStanzaId(), jingleXML); String xml = getIQXML(romeo, juliet, failedApplication.getStanzaId(), jingleXML);
assertXMLEqual(xml, failedApplication.toXML(null).toString()); assertXMLEqual(xml, failedApplication.toXML(StreamOpen.CLIENT_NAMESPACE).toString());
assertEquals(JingleAction.session_terminate, failedApplication.getAction()); assertEquals(JingleAction.session_terminate, failedApplication.getAction());
assertEquals(JingleReasonElement.Reason.failed_application, failedApplication.getReason().asEnum()); assertEquals(JingleReasonElement.Reason.failed_application, failedApplication.getReason().asEnum());
} }
@ -241,7 +242,7 @@ public class JingleElementTest extends SmackTestSuite {
"action='session-info' " + "action='session-info' " +
"sid='thisisit'/>"; "sid='thisisit'/>";
String xml = getIQXML(romeo, juliet, ping.getStanzaId(), jingleXML); String xml = getIQXML(romeo, juliet, ping.getStanzaId(), jingleXML);
assertXMLEqual(xml, ping.toXML(null).toString()); assertXMLEqual(xml, ping.toXML(StreamOpen.CLIENT_NAMESPACE).toString());
JingleElement jingle = new JingleProvider().parse(TestUtils.getParser(jingleXML)); JingleElement jingle = new JingleProvider().parse(TestUtils.getParser(jingleXML));
assertNotNull(jingle); assertNotNull(jingle);
assertEquals(JingleAction.session_info, jingle.getAction()); assertEquals(JingleAction.session_info, jingle.getAction());
@ -260,7 +261,7 @@ public class JingleElementTest extends SmackTestSuite {
"</reason>" + "</reason>" +
"</jingle>"; "</jingle>";
String xml = getIQXML(romeo, juliet, cancel.getStanzaId(), jingleXML); String xml = getIQXML(romeo, juliet, cancel.getStanzaId(), jingleXML);
assertXMLEqual(xml, cancel.toXML(null).toString()); assertXMLEqual(xml, cancel.toXML(StreamOpen.CLIENT_NAMESPACE).toString());
JingleElement jingle = new JingleProvider().parse(TestUtils.getParser(jingleXML)); JingleElement jingle = new JingleProvider().parse(TestUtils.getParser(jingleXML));
assertNotNull(jingle); assertNotNull(jingle);
assertEquals(JingleAction.session_terminate, jingle.getAction()); assertEquals(JingleAction.session_terminate, jingle.getAction());
@ -284,7 +285,7 @@ public class JingleElementTest extends SmackTestSuite {
"</reason>" + "</reason>" +
"</jingle>"; "</jingle>";
String xml = getIQXML(romeo, juliet, terminate.getStanzaId(), jingleXML); String xml = getIQXML(romeo, juliet, terminate.getStanzaId(), jingleXML);
assertXMLEqual(xml, terminate.toXML(null).toString()); assertXMLEqual(xml, terminate.toXML(StreamOpen.CLIENT_NAMESPACE).toString());
assertEquals(JingleReasonElement.Reason.incompatible_parameters, terminate.getReason().asEnum()); assertEquals(JingleReasonElement.Reason.incompatible_parameters, terminate.getReason().asEnum());
assertEquals("incompatibleSID", terminate.getSid()); assertEquals("incompatibleSID", terminate.getSid());
} }
@ -304,7 +305,7 @@ public class JingleElementTest extends SmackTestSuite {
"</content>" + "</content>" +
"</jingle>"; "</jingle>";
String xml = getIQXML(juliet, romeo, transportAccept.getStanzaId(), jingleXML); String xml = getIQXML(juliet, romeo, transportAccept.getStanzaId(), jingleXML);
assertXMLEqual(xml, transportAccept.toXML(null).toString()); assertXMLEqual(xml, transportAccept.toXML(StreamOpen.CLIENT_NAMESPACE).toString());
assertEquals(JingleAction.transport_accept, transportAccept.getAction()); assertEquals(JingleAction.transport_accept, transportAccept.getAction());
assertEquals("transAcc", transportAccept.getSid()); assertEquals("transAcc", transportAccept.getSid());
} }
@ -329,7 +330,7 @@ public class JingleElementTest extends SmackTestSuite {
"</content>" + "</content>" +
"</jingle>"; "</jingle>";
String xml = getIQXML(juliet, romeo, transportReplace.getStanzaId(), jingleXML); String xml = getIQXML(juliet, romeo, transportReplace.getStanzaId(), jingleXML);
assertXMLEqual(xml, transportReplace.toXML(null).toString()); assertXMLEqual(xml, transportReplace.toXML(StreamOpen.CLIENT_NAMESPACE).toString());
assertEquals(JingleAction.transport_replace, transportReplace.getAction()); assertEquals(JingleAction.transport_replace, transportReplace.getAction());
assertEquals("transAcc", transportReplace.getSid()); assertEquals("transAcc", transportReplace.getSid());
} }
@ -347,7 +348,7 @@ public class JingleElementTest extends SmackTestSuite {
"<bad-request xmlns='urn:ietf:params:xml:ns:xmpp-stanzas'/>" + "<bad-request xmlns='urn:ietf:params:xml:ns:xmpp-stanzas'/>" +
"</error>" + "</error>" +
"</iq>"; "</iq>";
assertXMLEqual(xml, error.toXML(null).toString()); assertXMLEqual(xml, error.toXML(StreamOpen.CLIENT_NAMESPACE).toString());
} }
@Test @Test
@ -364,7 +365,7 @@ public class JingleElementTest extends SmackTestSuite {
"<tie-break xmlns='urn:xmpp:jingle:errors:1'/>" + "<tie-break xmlns='urn:xmpp:jingle:errors:1'/>" +
"</error>" + "</error>" +
"</iq>"; "</iq>";
assertXMLEqual(xml, error.toXML(null).toString()); assertXMLEqual(xml, error.toXML(StreamOpen.CLIENT_NAMESPACE).toString());
} }
@Test @Test
@ -381,7 +382,7 @@ public class JingleElementTest extends SmackTestSuite {
"<unknown-session xmlns='urn:xmpp:jingle:errors:1'/>" + "<unknown-session xmlns='urn:xmpp:jingle:errors:1'/>" +
"</error>" + "</error>" +
"</iq>"; "</iq>";
assertXMLEqual(xml, error.toXML(null).toString()); assertXMLEqual(xml, error.toXML(StreamOpen.CLIENT_NAMESPACE).toString());
} }
@Test @Test
@ -397,7 +398,7 @@ public class JingleElementTest extends SmackTestSuite {
"<service-unavailable xmlns='urn:ietf:params:xml:ns:xmpp-stanzas'/>" + "<service-unavailable xmlns='urn:ietf:params:xml:ns:xmpp-stanzas'/>" +
"</error>" + "</error>" +
"</iq>"; "</iq>";
assertXMLEqual(xml, error.toXML(null).toString()); assertXMLEqual(xml, error.toXML(StreamOpen.CLIENT_NAMESPACE).toString());
} }
@Test @Test
@ -414,7 +415,7 @@ public class JingleElementTest extends SmackTestSuite {
"<out-of-order xmlns='urn:xmpp:jingle:errors:1'/>" + "<out-of-order xmlns='urn:xmpp:jingle:errors:1'/>" +
"</error>" + "</error>" +
"</iq>"; "</iq>";
assertXMLEqual(xml, error.toXML(null).toString()); assertXMLEqual(xml, error.toXML(StreamOpen.CLIENT_NAMESPACE).toString());
} }
@Test @Test
@ -431,7 +432,7 @@ public class JingleElementTest extends SmackTestSuite {
"<unsupported-info xmlns='urn:xmpp:jingle:errors:1'/>" + "<unsupported-info xmlns='urn:xmpp:jingle:errors:1'/>" +
"</error>" + "</error>" +
"</iq>"; "</iq>";
assertXMLEqual(xml, error.toXML(null).toString()); assertXMLEqual(xml, error.toXML(StreamOpen.CLIENT_NAMESPACE).toString());
} }
public static String getIQXML(FullJid from, FullJid to, String stanzaId, String jingleXML) { public static String getIQXML(FullJid from, FullJid to, String stanzaId, String jingleXML) {