Swift
summaryrefslogtreecommitdiffstats
path: root/test/com
diff options
context:
space:
mode:
authorAlex Clayton <alex.clayton@isode.com>2016-03-11 13:18:15 (GMT)
committerAlex Clayton <alex.clayton@isode.com>2016-03-14 15:17:54 (GMT)
commita0a0b9fd74f6d99da1c756b36aad6cc0122f011b (patch)
tree0c79a9093b73db6eaf459ef4fc311006822a1201 /test/com
parentc77facbc3036590cfa347f38859f9f536f082d6b (diff)
downloadstroke-a0a0b9fd74f6d99da1c756b36aad6cc0122f011b.zip
stroke-a0a0b9fd74f6d99da1c756b36aad6cc0122f011b.tar.bz2
Add methods to PresenceOracle.
As per swiften patch 'Change bare JID presence lookup code to ignore priorities' (0f5ef716a50c8d9761cafda12aacf818cdfd6353) add a couple of methods and a test for PresenceOracle. Test-information: Unit tests still pass. Change-Id: If3961f29be821a065ffa854faeab7f20da666d25
Diffstat (limited to 'test/com')
-rw-r--r--test/com/isode/stroke/parser/payloadparsers/JingleParserTest.java26
-rw-r--r--test/com/isode/stroke/presence/PresenceOracleTest.java85
2 files changed, 78 insertions, 33 deletions
diff --git a/test/com/isode/stroke/parser/payloadparsers/JingleParserTest.java b/test/com/isode/stroke/parser/payloadparsers/JingleParserTest.java
index ec7f044..d561222 100644
--- a/test/com/isode/stroke/parser/payloadparsers/JingleParserTest.java
+++ b/test/com/isode/stroke/parser/payloadparsers/JingleParserTest.java
@@ -4,7 +4,7 @@
* See Documentation/Licenses/BSD-simplified.txt for more information.
*/
/*
- * Copyright (c) 2015 Isode Limited.
+ * Copyright (c) 2015-2016 Isode Limited.
* All rights reserved.
* See the COPYING file for more information.
*/
@@ -18,28 +18,27 @@ package com.isode.stroke.parser.payloadparsers;
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertNotNull;
-import static org.junit.Assert.assertNull;
+
+import java.net.InetAddress;
+import java.net.UnknownHostException;
+import java.util.Vector;
+import java.util.logging.Logger;
+
import org.junit.Test;
-import com.isode.stroke.serializer.payloadserializers.JingleContentPayloadSerializer;
-import com.isode.stroke.elements.JinglePayload;
+
+import com.isode.stroke.base.DateTime;
import com.isode.stroke.elements.JingleContentPayload;
import com.isode.stroke.elements.JingleFileTransferDescription;
import com.isode.stroke.elements.JingleFileTransferFileInfo;
+import com.isode.stroke.elements.JingleFileTransferHash;
import com.isode.stroke.elements.JingleIBBTransportPayload;
+import com.isode.stroke.elements.JinglePayload;
import com.isode.stroke.elements.JingleS5BTransportPayload;
-import com.isode.stroke.elements.JingleFileTransferHash;
-import com.isode.stroke.parser.payloadparsers.PayloadsParserTester;
import com.isode.stroke.eventloop.DummyEventLoop;
import com.isode.stroke.jid.JID;
-import com.isode.stroke.base.DateTime;
-import com.isode.stroke.stringcodecs.Base64;
-import java.util.Vector;
-import java.util.logging.Logger;
-import java.util.logging.Level;
import com.isode.stroke.network.HostAddress;
import com.isode.stroke.network.HostAddressPort;
-import java.net.InetAddress;
-import java.net.UnknownHostException;
+import com.isode.stroke.stringcodecs.Base64;
public class JingleParserTest {
@@ -431,7 +430,6 @@ public class JingleParserTest {
// http://xmpp.org/extensions/xep-0234.html#example-10
@Test
public void testParse_Xep0234_Example10() {
- logger_.setLevel(Level.FINE);
DummyEventLoop eventLoop = new DummyEventLoop();
PayloadsParserTester parser = new PayloadsParserTester(eventLoop);
assertNotNull(parser.parse(
diff --git a/test/com/isode/stroke/presence/PresenceOracleTest.java b/test/com/isode/stroke/presence/PresenceOracleTest.java
index ac82045..9a440e6 100644
--- a/test/com/isode/stroke/presence/PresenceOracleTest.java
+++ b/test/com/isode/stroke/presence/PresenceOracleTest.java
@@ -12,32 +12,24 @@
package com.isode.stroke.presence;
import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertNotNull;
import static org.junit.Assert.assertNull;
-import static org.junit.Assert.assertFalse;
-import static org.junit.Assert.assertTrue;
-import org.junit.Test;
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.List;
+import java.util.Vector;
+
import org.junit.Before;
+import org.junit.Test;
-import com.isode.stroke.elements.Presence;
-import com.isode.stroke.elements.Payload;
import com.isode.stroke.client.DummyStanzaChannel;
-import com.isode.stroke.presence.DirectedPresenceSender;
-import com.isode.stroke.presence.StanzaChannelPresenceSender;
-import com.isode.stroke.presence.PayloadAddingPresenceSender;
-import com.isode.stroke.presence.PresenceOracle;
-import com.isode.stroke.presence.SubscriptionManager;
+import com.isode.stroke.elements.Presence;
+import com.isode.stroke.elements.StatusShow;
import com.isode.stroke.jid.JID;
import com.isode.stroke.roster.XMPPRoster;
import com.isode.stroke.roster.XMPPRosterImpl;
-import com.isode.stroke.signals.SignalConnection;
-import com.isode.stroke.signals.Slot2;
-import com.isode.stroke.signals.Slot3;
import com.isode.stroke.signals.Slot1;
-
-import java.util.Collection;
-import java.util.Vector;
+import com.isode.stroke.signals.Slot3;
public class PresenceOracleTest {
@@ -91,6 +83,16 @@ public class PresenceOracleTest {
sentPresence.setFrom(jid);
return sentPresence;
}
+
+ private Presence createPresence(JID jid, int priority, Presence.Type type, StatusShow.Type statusShow) {
+ Presence presence = new Presence();
+ presence.setFrom(jid);
+ presence.setPriority(priority);
+ presence.setType(type);
+ presence.setShow(statusShow);
+ assertEquals(statusShow,presence.getShow());
+ return presence;
+ }
@Before
public void setUp() {
@@ -222,5 +224,50 @@ public class PresenceOracleTest {
stanzaChannel_.setAvailable(true);
assertNull(oracle_.getLastPresence(user1));
- }
-} \ No newline at end of file
+ }
+
+ @Test
+ public void testGetActivePresence() {
+ {
+ List<Presence> presenceList = new ArrayList<Presence>();
+ presenceList.add(createPresence(new JID("alice@wonderland.lit/resourceA"), 10,
+ Presence.Type.Available, StatusShow.Type.Away));
+ presenceList.add(createPresence(new JID("alice@wonderland.lit/resourceB"), 5,
+ Presence.Type.Available, StatusShow.Type.Online));
+
+ assertEquals(StatusShow.Type.Online,PresenceOracle.getActivePresence(presenceList).getShow());
+ }
+
+
+ {
+ List<Presence> presenceList = new ArrayList<Presence>();
+ presenceList.add(createPresence(new JID("alice@wonderland.lit/resourceA"), 10,
+ Presence.Type.Available, StatusShow.Type.Away));
+ presenceList.add(createPresence(new JID("alice@wonderland.lit/resourceB"), 5,
+ Presence.Type.Available, StatusShow.Type.DND));
+
+ assertEquals(StatusShow.Type.DND,PresenceOracle.getActivePresence(presenceList).getShow());
+ }
+
+ {
+ List<Presence> presenceList = new ArrayList<Presence>();
+ presenceList.add(createPresence(new JID("alice@wonderland.lit/resourceA"), 0,
+ Presence.Type.Available, StatusShow.Type.Online));
+ presenceList.add(createPresence(new JID("alice@wonderland.lit/resourceB"), 0,
+ Presence.Type.Available, StatusShow.Type.DND));
+
+ assertEquals(StatusShow.Type.Online,PresenceOracle.getActivePresence(presenceList).getShow());
+ }
+
+ {
+ List<Presence> presenceList = new ArrayList<Presence>();
+ presenceList.add(createPresence(new JID("alice@wonderland.lit/resourceA"), 1,
+ Presence.Type.Available, StatusShow.Type.Online));
+ presenceList.add(createPresence(new JID("alice@wonderland.lit/resourceB"), 0,
+ Presence.Type.Available, StatusShow.Type.Online));
+
+ assertEquals(new JID("alice@wonderland.lit/resourceA"), PresenceOracle.getActivePresence(presenceList).getFrom());
+ }
+ }
+
+}