mirror of
https://github.com/vanitasvitae/Smack.git
synced 2024-12-26 04:28:00 +01:00
Merge branch 'JingleErrors' into jingle2
This commit is contained in:
commit
2ee10fa83b
2 changed files with 15 additions and 15 deletions
|
@ -28,11 +28,11 @@ public final class JingleError implements ExtensionElement {
|
|||
|
||||
public static final JingleError OUT_OF_ORDER = new JingleError("out-of-order");
|
||||
|
||||
public static final JingleError TIE_BREAK = new JingleError("tie-break");
|
||||
|
||||
public static final JingleError UNKNOWN_SESSION = new JingleError("unknown-session");
|
||||
|
||||
public static final JingleError UNSUPPORTED_CONTENT = new JingleError("unsupported-content");
|
||||
|
||||
public static final JingleError UNSUPPORTED_TRANSPORTS = new JingleError("unsupported-transports");
|
||||
public static final JingleError UNSUPPORTED_INFO = new JingleError("unsupported-info");
|
||||
|
||||
private final String errorName;
|
||||
|
||||
|
@ -71,10 +71,10 @@ public final class JingleError implements ExtensionElement {
|
|||
return OUT_OF_ORDER;
|
||||
case "unknown-session":
|
||||
return UNKNOWN_SESSION;
|
||||
case "unsupported-content":
|
||||
return UNSUPPORTED_CONTENT;
|
||||
case "unsupported-transports":
|
||||
return UNSUPPORTED_TRANSPORTS;
|
||||
case "tie-break":
|
||||
return TIE_BREAK;
|
||||
case "unsupported-info":
|
||||
return UNSUPPORTED_INFO;
|
||||
default:
|
||||
throw new IllegalArgumentException();
|
||||
}
|
||||
|
|
|
@ -16,15 +16,15 @@
|
|||
*/
|
||||
package org.jivesoftware.smackx.jingle;
|
||||
|
||||
import static junit.framework.TestCase.assertEquals;
|
||||
import static junit.framework.TestCase.fail;
|
||||
|
||||
import org.jivesoftware.smack.test.util.SmackTestSuite;
|
||||
import org.jivesoftware.smackx.jingle.element.JingleError;
|
||||
import org.junit.Test;
|
||||
|
||||
import static junit.framework.TestCase.assertEquals;
|
||||
import static junit.framework.TestCase.fail;
|
||||
|
||||
/**
|
||||
* Test the JingleError class. TODO: Uncomment missing tests once implemented.
|
||||
* Test the JingleError class.
|
||||
*/
|
||||
public class JingleErrorTest extends SmackTestSuite {
|
||||
|
||||
|
@ -32,12 +32,12 @@ public class JingleErrorTest extends SmackTestSuite {
|
|||
public void parserTest() {
|
||||
assertEquals("<out-of-order xmlns='urn:xmpp:jingle:errors:1'/>",
|
||||
JingleError.fromString("out-of-order").toXML().toString());
|
||||
//assertEquals("<tie-break xmlns='urn:xmpp:jingle:errors:1'/>",
|
||||
// JingleError.fromString("tie-break").toXML().toString());
|
||||
assertEquals("<tie-break xmlns='urn:xmpp:jingle:errors:1'/>",
|
||||
JingleError.fromString("tie-break").toXML().toString());
|
||||
assertEquals("<unknown-session xmlns='urn:xmpp:jingle:errors:1'/>",
|
||||
JingleError.fromString("unknown-session").toXML().toString());
|
||||
//assertEquals("<unsupported-info xmlns='urn:xmpp:jingle:errors:1'/>",
|
||||
// JingleError.fromString("unsupported-info").toXML().toString());
|
||||
assertEquals("<unsupported-info xmlns='urn:xmpp:jingle:errors:1'/>",
|
||||
JingleError.fromString("unsupported-info").toXML().toString());
|
||||
assertEquals("unknown-session", JingleError.fromString("unknown-session").getMessage());
|
||||
|
||||
try {
|
||||
|
|
Loading…
Reference in a new issue