From 86c1d38170b8a066330c417fa4dde12dfbe156cd Mon Sep 17 00:00:00 2001 From: Miguel Hincapie Date: Thu, 18 Oct 2018 12:05:54 -0500 Subject: [PATCH 01/12] Created classes to complement XEP-0172. --- .../smackx/nick/NickListener.java | 27 ++++ .../jivesoftware/smackx/nick/NickManager.java | 125 ++++++++++++++++++ .../smackx/nick/filter/NickFilter.java | 34 +++++ .../smackx/nick/filter/package-info.java | 21 +++ 4 files changed, 207 insertions(+) create mode 100644 smack-extensions/src/main/java/org/jivesoftware/smackx/nick/NickListener.java create mode 100644 smack-extensions/src/main/java/org/jivesoftware/smackx/nick/NickManager.java create mode 100644 smack-extensions/src/main/java/org/jivesoftware/smackx/nick/filter/NickFilter.java create mode 100644 smack-extensions/src/main/java/org/jivesoftware/smackx/nick/filter/package-info.java diff --git a/smack-extensions/src/main/java/org/jivesoftware/smackx/nick/NickListener.java b/smack-extensions/src/main/java/org/jivesoftware/smackx/nick/NickListener.java new file mode 100644 index 0000000000..44e13ce26c --- /dev/null +++ b/smack-extensions/src/main/java/org/jivesoftware/smackx/nick/NickListener.java @@ -0,0 +1,27 @@ +/** + * + * Copyright 2018 Miguel Hincapie. + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +package org.jivesoftware.smackx.nick; + +import org.jivesoftware.smack.packet.Message; + +/** + * @author Miguel Hincapie 2018 + * @see XEP-0172: User Nickname + */ +public interface NickListener { + void newNickMessage(Message message); +} diff --git a/smack-extensions/src/main/java/org/jivesoftware/smackx/nick/NickManager.java b/smack-extensions/src/main/java/org/jivesoftware/smackx/nick/NickManager.java new file mode 100644 index 0000000000..486710fc81 --- /dev/null +++ b/smack-extensions/src/main/java/org/jivesoftware/smackx/nick/NickManager.java @@ -0,0 +1,125 @@ +/** + * Copyright 2018 Miguel Hincapie. + *

+ * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + *

+ * http://www.apache.org/licenses/LICENSE-2.0 + *

+ * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +package org.jivesoftware.smackx.nick; + +import org.jivesoftware.smack.AsyncButOrdered; +import org.jivesoftware.smack.Manager; +import org.jivesoftware.smack.SmackException; +import org.jivesoftware.smack.StanzaListener; +import org.jivesoftware.smack.XMPPConnection; +import org.jivesoftware.smack.filter.StanzaFilter; +import org.jivesoftware.smack.packet.Message; +import org.jivesoftware.smack.packet.Stanza; +import org.jivesoftware.smack.util.StringUtils; +import org.jivesoftware.smackx.nick.filter.NickFilter; +import org.jivesoftware.smackx.nick.packet.Nick; +import org.jxmpp.jid.EntityBareJid; + +import java.util.HashSet; +import java.util.Map; +import java.util.Set; +import java.util.WeakHashMap; + +/** + * @author Miguel Hincapie 2018 + * @see XEP-0172: User Nickname + */ +public class NickManager extends Manager { + + private static final Map INSTANCES = new WeakHashMap<>(); + + private static final StanzaFilter INCOMING_MESSAGE_FILTER = NickFilter.INSTANCE; + + private final Set nickListeners = new HashSet<>(); + + private final AsyncButOrdered asyncButOrdered = new AsyncButOrdered<>(); + + private NickManager(XMPPConnection connection) { + super(connection); + + connection.addSyncStanzaListener(new StanzaListener() { + @Override + public void processStanza(Stanza packet) + throws + SmackException.NotConnectedException, + InterruptedException, + SmackException.NotLoggedInException { + final Message message = (Message) packet; + + asyncButOrdered.performAsyncButOrdered(message, new Runnable() { + @Override + public void run() { + for (NickListener listener : nickListeners) { + listener.newNickMessage(message); + } + } + }); + + } + }, INCOMING_MESSAGE_FILTER); + } + + public static synchronized NickManager getInstanceFor(XMPPConnection connection) { + NickManager nickManager = INSTANCES.get(connection); + if (nickManager == null) { + nickManager = new NickManager(connection); + INSTANCES.put(connection, nickManager); + } + return nickManager; + } + + public synchronized boolean addNickMessageListener(NickListener listener) { + return nickListeners.add(listener); + } + + public synchronized boolean removeNickMessageListener(NickListener listener) { + return nickListeners.remove(listener); + } + + public void sendNickMessage(EntityBareJid to, String nickname) throws + SmackException.NotLoggedInException, + InterruptedException, + SmackException.NotConnectedException { + sendNickMessage(createNickMessage(to, nickname)); + } + + /** + * Create a Smack's message stanza to update the user's nickName. + * + * @param to the receiver. + * @param nickName the new nickName. + * @return instance of Message stanza. + */ + private Message createNickMessage(EntityBareJid to, String nickName) { + String escapedNickName = StringUtils.escapeForXml(nickName).toString(); + Message message = new Message(); + message.setFrom(connection().getUser()); + message.setTo(to); + message.setType(Message.Type.chat); + message.setStanzaId(); + message.addExtension(new Nick(escapedNickName)); + return message; + } + + private void sendNickMessage(Message message) + throws + SmackException.NotLoggedInException, + SmackException.NotConnectedException, + InterruptedException { + XMPPConnection connection = getAuthenticatedConnectionOrThrow(); + connection.sendStanza(message); + } +} diff --git a/smack-extensions/src/main/java/org/jivesoftware/smackx/nick/filter/NickFilter.java b/smack-extensions/src/main/java/org/jivesoftware/smackx/nick/filter/NickFilter.java new file mode 100644 index 0000000000..c20a402a77 --- /dev/null +++ b/smack-extensions/src/main/java/org/jivesoftware/smackx/nick/filter/NickFilter.java @@ -0,0 +1,34 @@ +/** + * + * Copyright 2018 Miguel Hincapie. + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +package org.jivesoftware.smackx.nick.filter; + +import org.jivesoftware.smack.filter.StanzaExtensionFilter; +import org.jivesoftware.smack.filter.StanzaFilter; +import org.jivesoftware.smackx.nick.packet.Nick; + +/** + * @author Miguel Hincapie 2018 + * @see XEP-0172: User Nickname + */ +public class NickFilter extends StanzaExtensionFilter { + + public static final StanzaFilter INSTANCE = new NickFilter(Nick.NAMESPACE); + + private NickFilter(String namespace) { + super(namespace); + } +} diff --git a/smack-extensions/src/main/java/org/jivesoftware/smackx/nick/filter/package-info.java b/smack-extensions/src/main/java/org/jivesoftware/smackx/nick/filter/package-info.java new file mode 100644 index 0000000000..3b49f182bb --- /dev/null +++ b/smack-extensions/src/main/java/org/jivesoftware/smackx/nick/filter/package-info.java @@ -0,0 +1,21 @@ +/** + * + * Copyright 2018 Miguel Hincapie + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +/** + * Smacks implementation of XEP-0172: User Nickname. + */ +package org.jivesoftware.smackx.nick.filter; From f1912cd431cb0725e02d92e24c07131fb898a5bb Mon Sep 17 00:00:00 2001 From: Miguel Hincapie Date: Fri, 19 Oct 2018 09:24:21 -0500 Subject: [PATCH 02/12] javadoc and checkstyle minor changes --- .../smackx/nick/NickListener.java | 2 ++ .../jivesoftware/smackx/nick/NickManager.java | 23 +++++++++++-------- .../smackx/nick/filter/NickFilter.java | 4 +++- 3 files changed, 19 insertions(+), 10 deletions(-) diff --git a/smack-extensions/src/main/java/org/jivesoftware/smackx/nick/NickListener.java b/smack-extensions/src/main/java/org/jivesoftware/smackx/nick/NickListener.java index 44e13ce26c..62db427fd3 100644 --- a/smack-extensions/src/main/java/org/jivesoftware/smackx/nick/NickListener.java +++ b/smack-extensions/src/main/java/org/jivesoftware/smackx/nick/NickListener.java @@ -19,6 +19,8 @@ import org.jivesoftware.smack.packet.Message; /** + * Used with NickManager. + * * @author Miguel Hincapie 2018 * @see XEP-0172: User Nickname */ diff --git a/smack-extensions/src/main/java/org/jivesoftware/smackx/nick/NickManager.java b/smack-extensions/src/main/java/org/jivesoftware/smackx/nick/NickManager.java index 486710fc81..a4acfd5e01 100644 --- a/smack-extensions/src/main/java/org/jivesoftware/smackx/nick/NickManager.java +++ b/smack-extensions/src/main/java/org/jivesoftware/smackx/nick/NickManager.java @@ -1,12 +1,13 @@ /** + * * Copyright 2018 Miguel Hincapie. - *

+ * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at - *

- * http://www.apache.org/licenses/LICENSE-2.0 - *

+ * + * http://www.apache.org/licenses/LICENSE-2.0 + * * Unless required by applicable law or agreed to in writing, software * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. @@ -15,6 +16,11 @@ */ package org.jivesoftware.smackx.nick; +import java.util.HashSet; +import java.util.Map; +import java.util.Set; +import java.util.WeakHashMap; + import org.jivesoftware.smack.AsyncButOrdered; import org.jivesoftware.smack.Manager; import org.jivesoftware.smack.SmackException; @@ -26,18 +32,17 @@ import org.jivesoftware.smack.util.StringUtils; import org.jivesoftware.smackx.nick.filter.NickFilter; import org.jivesoftware.smackx.nick.packet.Nick; + import org.jxmpp.jid.EntityBareJid; -import java.util.HashSet; -import java.util.Map; -import java.util.Set; -import java.util.WeakHashMap; /** + * Implementation of XEP-0172. + * * @author Miguel Hincapie 2018 * @see XEP-0172: User Nickname */ -public class NickManager extends Manager { +public final class NickManager extends Manager { private static final Map INSTANCES = new WeakHashMap<>(); diff --git a/smack-extensions/src/main/java/org/jivesoftware/smackx/nick/filter/NickFilter.java b/smack-extensions/src/main/java/org/jivesoftware/smackx/nick/filter/NickFilter.java index c20a402a77..5e02c17e21 100644 --- a/smack-extensions/src/main/java/org/jivesoftware/smackx/nick/filter/NickFilter.java +++ b/smack-extensions/src/main/java/org/jivesoftware/smackx/nick/filter/NickFilter.java @@ -21,10 +21,12 @@ import org.jivesoftware.smackx.nick.packet.Nick; /** + * Used with NickManager. + * * @author Miguel Hincapie 2018 * @see XEP-0172: User Nickname */ -public class NickFilter extends StanzaExtensionFilter { +public final class NickFilter extends StanzaExtensionFilter { public static final StanzaFilter INSTANCE = new NickFilter(Nick.NAMESPACE); From fad201c18a059788e3f96f25e1bd1824ff709566 Mon Sep 17 00:00:00 2001 From: Miguel Hincapie Date: Tue, 23 Oct 2018 18:07:29 -0500 Subject: [PATCH 03/12] Added elementName in constructor. --- .../org/jivesoftware/smackx/nick/filter/NickFilter.java | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/smack-extensions/src/main/java/org/jivesoftware/smackx/nick/filter/NickFilter.java b/smack-extensions/src/main/java/org/jivesoftware/smackx/nick/filter/NickFilter.java index 5e02c17e21..e7ac96587b 100644 --- a/smack-extensions/src/main/java/org/jivesoftware/smackx/nick/filter/NickFilter.java +++ b/smack-extensions/src/main/java/org/jivesoftware/smackx/nick/filter/NickFilter.java @@ -28,9 +28,9 @@ */ public final class NickFilter extends StanzaExtensionFilter { - public static final StanzaFilter INSTANCE = new NickFilter(Nick.NAMESPACE); + public static final StanzaFilter INSTANCE = new NickFilter(Nick.ELEMENT_NAME, Nick.NAMESPACE); - private NickFilter(String namespace) { - super(namespace); + private NickFilter(String elementName, String namespace) { + super(elementName, namespace); } } From 647950de4495561be88a2ad2c75afde53fc3f616 Mon Sep 17 00:00:00 2001 From: Miguel Hincapie Date: Tue, 23 Oct 2018 18:17:35 -0500 Subject: [PATCH 04/12] Changes due comments in PR --- .../java/org/jivesoftware/smackx/nick/NickManager.java | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) diff --git a/smack-extensions/src/main/java/org/jivesoftware/smackx/nick/NickManager.java b/smack-extensions/src/main/java/org/jivesoftware/smackx/nick/NickManager.java index a4acfd5e01..1ccea9b7e9 100644 --- a/smack-extensions/src/main/java/org/jivesoftware/smackx/nick/NickManager.java +++ b/smack-extensions/src/main/java/org/jivesoftware/smackx/nick/NickManager.java @@ -29,7 +29,6 @@ import org.jivesoftware.smack.filter.StanzaFilter; import org.jivesoftware.smack.packet.Message; import org.jivesoftware.smack.packet.Stanza; -import org.jivesoftware.smack.util.StringUtils; import org.jivesoftware.smackx.nick.filter.NickFilter; import org.jivesoftware.smackx.nick.packet.Nick; @@ -98,7 +97,7 @@ public void sendNickMessage(EntityBareJid to, String nickname) throws SmackException.NotLoggedInException, InterruptedException, SmackException.NotConnectedException { - sendNickMessage(createNickMessage(to, nickname)); + sendStanza(createNickMessage(to, nickname)); } /** @@ -109,17 +108,15 @@ public void sendNickMessage(EntityBareJid to, String nickname) throws * @return instance of Message stanza. */ private Message createNickMessage(EntityBareJid to, String nickName) { - String escapedNickName = StringUtils.escapeForXml(nickName).toString(); Message message = new Message(); - message.setFrom(connection().getUser()); message.setTo(to); message.setType(Message.Type.chat); message.setStanzaId(); - message.addExtension(new Nick(escapedNickName)); + message.addExtension(new Nick(nickName)); return message; } - private void sendNickMessage(Message message) + private void sendStanza(Message message) throws SmackException.NotLoggedInException, SmackException.NotConnectedException, From e439bf17e7e7a0a1a088160a8965bcef87cecc5b Mon Sep 17 00:00:00 2001 From: miguelhincapie Date: Sat, 30 Mar 2019 14:57:27 -0500 Subject: [PATCH 05/12] access to datastructure is synchronized --- .../main/java/org/jivesoftware/smackx/nick/NickManager.java | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/smack-extensions/src/main/java/org/jivesoftware/smackx/nick/NickManager.java b/smack-extensions/src/main/java/org/jivesoftware/smackx/nick/NickManager.java index 1ccea9b7e9..8d0a7c9741 100644 --- a/smack-extensions/src/main/java/org/jivesoftware/smackx/nick/NickManager.java +++ b/smack-extensions/src/main/java/org/jivesoftware/smackx/nick/NickManager.java @@ -66,8 +66,10 @@ public void processStanza(Stanza packet) asyncButOrdered.performAsyncButOrdered(message, new Runnable() { @Override public void run() { - for (NickListener listener : nickListeners) { - listener.newNickMessage(message); + synchronized (nickListeners) { + for (NickListener listener : nickListeners) { + listener.newNickMessage(message); + } } } }); From 7e0d1e51abd3ad0eba72fbeccfc4b4bf9fae9006 Mon Sep 17 00:00:00 2001 From: miguelhincapie Date: Sat, 30 Mar 2019 15:34:42 -0500 Subject: [PATCH 06/12] change due PR comments: asyncButOrdered now use a Jid instead a Message --- .../jivesoftware/smackx/nick/NickManager.java | 22 +++++++++++-------- 1 file changed, 13 insertions(+), 9 deletions(-) diff --git a/smack-extensions/src/main/java/org/jivesoftware/smackx/nick/NickManager.java b/smack-extensions/src/main/java/org/jivesoftware/smackx/nick/NickManager.java index 8d0a7c9741..1681b94ef4 100644 --- a/smack-extensions/src/main/java/org/jivesoftware/smackx/nick/NickManager.java +++ b/smack-extensions/src/main/java/org/jivesoftware/smackx/nick/NickManager.java @@ -33,6 +33,7 @@ import org.jivesoftware.smackx.nick.packet.Nick; import org.jxmpp.jid.EntityBareJid; +import org.jxmpp.jid.Jid; /** @@ -49,7 +50,7 @@ public final class NickManager extends Manager { private final Set nickListeners = new HashSet<>(); - private final AsyncButOrdered asyncButOrdered = new AsyncButOrdered<>(); + private final AsyncButOrdered asyncButOrdered = new AsyncButOrdered<>(); private NickManager(XMPPConnection connection) { super(connection); @@ -63,16 +64,19 @@ public void processStanza(Stanza packet) SmackException.NotLoggedInException { final Message message = (Message) packet; - asyncButOrdered.performAsyncButOrdered(message, new Runnable() { - @Override - public void run() { - synchronized (nickListeners) { - for (NickListener listener : nickListeners) { - listener.newNickMessage(message); + Jid from = message.getFrom(); + if (from != null) { + asyncButOrdered.performAsyncButOrdered(from, new Runnable() { + @Override + public void run() { + synchronized (nickListeners) { + for (NickListener listener : nickListeners) { + listener.newNickMessage(message); + } } } - } - }); + }); + } } }, INCOMING_MESSAGE_FILTER); From a2ce27524ff711aa7f11959b747f1cb6a7533881 Mon Sep 17 00:00:00 2001 From: miguelhincapie Date: Sat, 30 Mar 2019 15:36:29 -0500 Subject: [PATCH 07/12] added static to createNickMessage() --- .../src/main/java/org/jivesoftware/smackx/nick/NickManager.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/smack-extensions/src/main/java/org/jivesoftware/smackx/nick/NickManager.java b/smack-extensions/src/main/java/org/jivesoftware/smackx/nick/NickManager.java index 1681b94ef4..8415a6ecee 100644 --- a/smack-extensions/src/main/java/org/jivesoftware/smackx/nick/NickManager.java +++ b/smack-extensions/src/main/java/org/jivesoftware/smackx/nick/NickManager.java @@ -113,7 +113,7 @@ public void sendNickMessage(EntityBareJid to, String nickname) throws * @param nickName the new nickName. * @return instance of Message stanza. */ - private Message createNickMessage(EntityBareJid to, String nickName) { + private static Message createNickMessage(EntityBareJid to, String nickName) { Message message = new Message(); message.setTo(to); message.setType(Message.Type.chat); From acc1452759a9490b0c1a5179e5c7062bafe5299d Mon Sep 17 00:00:00 2001 From: miguelhincapie Date: Sat, 30 Mar 2019 15:39:00 -0500 Subject: [PATCH 08/12] Removed date from @author --- .../src/main/java/org/jivesoftware/smackx/nick/NickManager.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/smack-extensions/src/main/java/org/jivesoftware/smackx/nick/NickManager.java b/smack-extensions/src/main/java/org/jivesoftware/smackx/nick/NickManager.java index 8415a6ecee..e31dc546fc 100644 --- a/smack-extensions/src/main/java/org/jivesoftware/smackx/nick/NickManager.java +++ b/smack-extensions/src/main/java/org/jivesoftware/smackx/nick/NickManager.java @@ -39,7 +39,7 @@ /** * Implementation of XEP-0172. * - * @author Miguel Hincapie 2018 + * @author Miguel Hincapie * @see XEP-0172: User Nickname */ public final class NickManager extends Manager { From da9a9f2e15ff6b1741aa3c84a077fddd6fc2c95c Mon Sep 17 00:00:00 2001 From: miguelhincapie Date: Sat, 30 Mar 2019 16:04:21 -0500 Subject: [PATCH 09/12] Added empty tests for NickManager --- .../smackx/nick/NickManagerTest.java | 49 +++++++++++++++++++ 1 file changed, 49 insertions(+) create mode 100644 smack-extensions/src/test/java/org/jivesoftware/smackx/nick/NickManagerTest.java diff --git a/smack-extensions/src/test/java/org/jivesoftware/smackx/nick/NickManagerTest.java b/smack-extensions/src/test/java/org/jivesoftware/smackx/nick/NickManagerTest.java new file mode 100644 index 0000000000..72ff8da43d --- /dev/null +++ b/smack-extensions/src/test/java/org/jivesoftware/smackx/nick/NickManagerTest.java @@ -0,0 +1,49 @@ +/** + * + * Copyright Miguel Hincapie + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +package org.jivesoftware.smackx.nick; + +import org.junit.After; +import org.junit.Before; +import org.junit.Test; + + +public class NickManagerTest { + + @Before + public void setUp() { + } + + @After + public void tearDown() { + } + + @Test + public void getInstanceFor() { + } + + @Test + public void addNickMessageListener() { + } + + @Test + public void removeNickMessageListener() { + } + + @Test + public void sendNickMessage() { + } +} \ No newline at end of file From cfc05ae891cd50a2fca5e82b9b19ec45a1e270c7 Mon Sep 17 00:00:00 2001 From: miguelhincapie Date: Sat, 30 Mar 2019 16:20:01 -0500 Subject: [PATCH 10/12] Test for getInstanceFor created --- .../jivesoftware/smackx/nick/NickManagerTest.java | 14 +++++++++++--- 1 file changed, 11 insertions(+), 3 deletions(-) diff --git a/smack-extensions/src/test/java/org/jivesoftware/smackx/nick/NickManagerTest.java b/smack-extensions/src/test/java/org/jivesoftware/smackx/nick/NickManagerTest.java index 72ff8da43d..2dbf3f166b 100644 --- a/smack-extensions/src/test/java/org/jivesoftware/smackx/nick/NickManagerTest.java +++ b/smack-extensions/src/test/java/org/jivesoftware/smackx/nick/NickManagerTest.java @@ -16,12 +16,16 @@ */ package org.jivesoftware.smackx.nick; +import org.jivesoftware.smack.DummyConnection; +import org.jivesoftware.smackx.InitExtensions; import org.junit.After; import org.junit.Before; import org.junit.Test; +import static org.junit.Assert.assertNotNull; -public class NickManagerTest { + +public class NickManagerTest extends InitExtensions { @Before public void setUp() { @@ -32,7 +36,11 @@ public void tearDown() { } @Test - public void getInstanceFor() { + public void getInstanceFor() throws Exception { + DummyConnection dummyConnection = new DummyConnection(); + dummyConnection.connect(); + NickManager nickManager = NickManager.getInstanceFor(dummyConnection); + assertNotNull(nickManager); } @Test @@ -46,4 +54,4 @@ public void removeNickMessageListener() { @Test public void sendNickMessage() { } -} \ No newline at end of file +} From 9cced7508dd3ac8171b9551cc6f0d94ed246bd54 Mon Sep 17 00:00:00 2001 From: miguelhincapie Date: Sat, 30 Mar 2019 16:32:33 -0500 Subject: [PATCH 11/12] moved import due checkstyle --- .../java/org/jivesoftware/smackx/nick/NickManagerTest.java | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/smack-extensions/src/test/java/org/jivesoftware/smackx/nick/NickManagerTest.java b/smack-extensions/src/test/java/org/jivesoftware/smackx/nick/NickManagerTest.java index 2dbf3f166b..a39d22b370 100644 --- a/smack-extensions/src/test/java/org/jivesoftware/smackx/nick/NickManagerTest.java +++ b/smack-extensions/src/test/java/org/jivesoftware/smackx/nick/NickManagerTest.java @@ -16,13 +16,14 @@ */ package org.jivesoftware.smackx.nick; +import static org.junit.Assert.assertNotNull; + import org.jivesoftware.smack.DummyConnection; import org.jivesoftware.smackx.InitExtensions; import org.junit.After; import org.junit.Before; import org.junit.Test; -import static org.junit.Assert.assertNotNull; public class NickManagerTest extends InitExtensions { From 6b4de5e4973c61cdd1fa8c3844b2a1743b376825 Mon Sep 17 00:00:00 2001 From: miguelhincapie Date: Sat, 30 Mar 2019 16:41:01 -0500 Subject: [PATCH 12/12] checkstyle in imports --- .../test/java/org/jivesoftware/smackx/nick/NickManagerTest.java | 1 + 1 file changed, 1 insertion(+) diff --git a/smack-extensions/src/test/java/org/jivesoftware/smackx/nick/NickManagerTest.java b/smack-extensions/src/test/java/org/jivesoftware/smackx/nick/NickManagerTest.java index a39d22b370..755aed75cf 100644 --- a/smack-extensions/src/test/java/org/jivesoftware/smackx/nick/NickManagerTest.java +++ b/smack-extensions/src/test/java/org/jivesoftware/smackx/nick/NickManagerTest.java @@ -20,6 +20,7 @@ import org.jivesoftware.smack.DummyConnection; import org.jivesoftware.smackx.InitExtensions; + import org.junit.After; import org.junit.Before; import org.junit.Test;