From 4ae84348520b734b0d6aa7b6c73109dd00c85d9d Mon Sep 17 00:00:00 2001 From: vanitasvitae Date: Tue, 13 Jun 2017 23:57:59 +0200 Subject: [PATCH 1/2] Remove unused errors and add missing ones --- .../smackx/jingle/element/JingleError.java | 14 +++++++------- .../smackx/jingle/JingleErrorTest.java | 10 +++++----- 2 files changed, 12 insertions(+), 12 deletions(-) diff --git a/smack-extensions/src/main/java/org/jivesoftware/smackx/jingle/element/JingleError.java b/smack-extensions/src/main/java/org/jivesoftware/smackx/jingle/element/JingleError.java index 9fc717e01..77fc356e9 100644 --- a/smack-extensions/src/main/java/org/jivesoftware/smackx/jingle/element/JingleError.java +++ b/smack-extensions/src/main/java/org/jivesoftware/smackx/jingle/element/JingleError.java @@ -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(); } diff --git a/smack-extensions/src/test/java/org/jivesoftware/smackx/jingle/JingleErrorTest.java b/smack-extensions/src/test/java/org/jivesoftware/smackx/jingle/JingleErrorTest.java index 7344fac6a..67e2a24ed 100644 --- a/smack-extensions/src/test/java/org/jivesoftware/smackx/jingle/JingleErrorTest.java +++ b/smack-extensions/src/test/java/org/jivesoftware/smackx/jingle/JingleErrorTest.java @@ -24,7 +24,7 @@ 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("", JingleError.fromString("out-of-order").toXML().toString()); - //assertEquals("", - // JingleError.fromString("tie-break").toXML().toString()); + assertEquals("", + JingleError.fromString("tie-break").toXML().toString()); assertEquals("", JingleError.fromString("unknown-session").toXML().toString()); - //assertEquals("", - // JingleError.fromString("unsupported-info").toXML().toString()); + assertEquals("", + JingleError.fromString("unsupported-info").toXML().toString()); assertEquals("unknown-session", JingleError.fromString("unknown-session").getMessage()); try { From 62167a785789f7b8cbd60466057f63d2402b8d57 Mon Sep 17 00:00:00 2001 From: vanitasvitae Date: Tue, 13 Jun 2017 23:58:41 +0200 Subject: [PATCH 2/2] Reorder imports --- .../org/jivesoftware/smackx/jingle/JingleErrorTest.java | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/smack-extensions/src/test/java/org/jivesoftware/smackx/jingle/JingleErrorTest.java b/smack-extensions/src/test/java/org/jivesoftware/smackx/jingle/JingleErrorTest.java index 67e2a24ed..dea943359 100644 --- a/smack-extensions/src/test/java/org/jivesoftware/smackx/jingle/JingleErrorTest.java +++ b/smack-extensions/src/test/java/org/jivesoftware/smackx/jingle/JingleErrorTest.java @@ -16,13 +16,13 @@ */ 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. */