Mercury-IM/Smack
Mercury-IM/Smack
1
0
Fork 0
mirror of https://codeberg.org/Mercury-IM/Smack synced 2025-09-10 18:59:41 +02:00
Code Issues Releases Wiki Activity

Rework Roster IQ and DirectoryRosterStore

Browse source 
remove (set|get)ItemStatus. This was always the ask status, which can
only be set to 'subscribe' or is non-existent.

Use the standard (de-)serialization facilities for DirectoryRosterStore.

Fixes Smack-657.
This commit is contained in:
Florian Schmaus 2015-09-29 22:35:50 +02:00
parent b746e5caee
commit 86548b87bb
8 changed files with 184 additions and 305 deletions
Download patch file Download diff file Expand all files Collapse all files

15
smack-im/src/test/java/org/jivesoftware/smack/roster/rosterstore/DirectoryRosterStoreTest.java
View file

@ -27,7 +27,6 @@ import java.util.List;
import org.jivesoftware.smack.roster.packet.RosterPacket;
import org.jivesoftware.smack.roster.packet.RosterPacket.Item;
import org.jivesoftware.smack.roster.packet.RosterPacket.ItemStatus;
import org.jivesoftware.smack.roster.packet.RosterPacket.ItemType;
import org.junit.After;
import org.junit.Before;
@ -106,7 +105,7 @@ public class DirectoryRosterStoreTest {
assertEquals("ItemType of added entry",
item1.getItemType(), storedItem.getItemType());
assertEquals("ItemStatus of added entry",
item1.getItemStatus(), storedItem.getItemStatus());
item1.isSubscriptionPending(), storedItem.isSubscriptionPending());
assertEquals("Approved of added entry",
item1.isApproved(), storedItem.isApproved());
@ -115,7 +114,7 @@ public class DirectoryRosterStoreTest {
final RosterPacket.Item item2 = new Item(userName, "Ursula Example");
item2.addGroupName("users");
item2.addGroupName("examples");
item2.setItemStatus(ItemStatus.subscribe);
item2.setSubscriptionPending(true);
item2.setItemType(ItemType.none);
item2.setApproved(true);
store.addEntry(item2,version2);
@ -130,7 +129,7 @@ public class DirectoryRosterStoreTest {
assertEquals("ItemType of added entry",
item2.getItemType(), storedItem.getItemType());
assertEquals("ItemStatus of added entry",
item2.getItemStatus(), storedItem.getItemStatus());
item2.isSubscriptionPending(), storedItem.isSubscriptionPending());
assertEquals("Approved of added entry",
item2.isApproved(), storedItem.isApproved());
@ -140,13 +139,13 @@ public class DirectoryRosterStoreTest {
final RosterPacket.Item item3 = new Item(JidTestUtil.BARE_JID_1, "Foo Bar");
item3.addGroupName("The Foo Fighters");
item3.addGroupName("Bar Friends");
item3.setItemStatus(ItemStatus.unsubscribe);
item3.setSubscriptionPending(true);
item3.setItemType(ItemType.both);
final RosterPacket.Item item4 = new Item(JidTestUtil.BARE_JID_2, "Baba Baz");
item4.addGroupName("The Foo Fighters");
item4.addGroupName("Bar Friends");
item4.setItemStatus(ItemStatus.subscribe);
item4.setSubscriptionPending(false);
item4.setItemType(ItemType.both);
item4.setApproved(true);
@ -167,7 +166,7 @@ public class DirectoryRosterStoreTest {
assertEquals("ItemType of added entry",
item3.getItemType(), storedItem.getItemType());
assertEquals("ItemStatus of added entry",
item3.getItemStatus(), storedItem.getItemStatus());
item3.isSubscriptionPending(), storedItem.isSubscriptionPending());
assertEquals("Approved of added entry",
item3.isApproved(), storedItem.isApproved());
@ -182,7 +181,7 @@ public class DirectoryRosterStoreTest {
assertEquals("ItemType of added entry",
item4.getItemType(), storedItem.getItemType());
assertEquals("ItemStatus of added entry",
item4.getItemStatus(), storedItem.getItemStatus());
item4.isSubscriptionPending(), storedItem.isSubscriptionPending());
assertEquals("Approved of added entry",
item4.isApproved(), storedItem.isApproved());