vanitasvitae/Smack
1
0
Fork 0
mirror of https://github.com/vanitasvitae/Smack.git synced 2025-09-11 10:09:38 +02:00
Code Issues Releases Wiki Activity

SMACK-363 Applied code cleanup patches for many generics related issues.

Browse source 
git-svn-id: http://svn.igniterealtime.org/svn/repos/smack/trunk@13325 b35dd754-fafc-0310-a699-88a17e54d16e
This commit is contained in:
rcollier 2012-10-26 10:47:55 +00:00
parent 6dc64671e2
commit e08c8afe44
109 changed files with 577 additions and 605 deletions
Download patch file Download diff file Expand all files Collapse all files

4
test/config/test-case.xml
View file

@ -3,12 +3,12 @@
<testcase>
<!-- Host and port of the XMPP server to use -->
<host>localhost</host>
<host>sanctuary</host>
<port>5222</port>
<!-- Username prefix to use for creating accounts. Same value will be used for passwords. -->
<username>user</username>
<password same='true'>passw0rd</password>
<!-- Chat and MUC domain names to use -->
<chat>chat</chat>
<muc>conference</muc>

3
test/org/jivesoftware/smack/PrivacyClient.java
View file

@ -3,6 +3,7 @@ package org.jivesoftware.smack;
import java.util.List;
import org.jivesoftware.smack.packet.Privacy;
import org.jivesoftware.smack.packet.PrivacyItem;
/**
* This class supports automated tests about privacy communication from the
@ -27,7 +28,7 @@ public class PrivacyClient implements PrivacyListListener {
super();
}
public void setPrivacyList(String listName, List listItem) {
public void setPrivacyList(String listName, List<PrivacyItem> listItem) {
privacy.setPrivacyList(listName, listItem);
}

13
test/org/jivesoftware/smack/filter/PacketTypeFilterTest.java
View file

@ -60,8 +60,6 @@ import org.jivesoftware.smack.packet.*;
*/
public class PacketTypeFilterTest extends TestCase {
private class Dummy {}
private class InnerClassDummy {
public class DummyPacket extends Packet {
public String toXML() {
@ -88,12 +86,13 @@ public class PacketTypeFilterTest extends TestCase {
* Test case for the constructor of PacketTypeFilter objects.
*/
public void testConstructor() {
// We dont need to test this since PacketTypeFilter(Class<? extends Packet> packetType) only excepts Packets
// Test a class that is not a subclass of Packet
try {
new PacketTypeFilter(Dummy.class);
fail("Parameter must be a subclass of Packet.");
}
catch (IllegalArgumentException e) {}
// try {
// new PacketTypeFilter(Dummy.class);
// fail("Parameter must be a subclass of Packet.");
// }
// catch (IllegalArgumentException e) {}
// Test a class that is a subclass of Packet
try {

2
test/org/jivesoftware/smack/packet/MockPacket.java
View file

@ -52,8 +52,6 @@
package org.jivesoftware.smack.packet;
import java.util.*;
/**
* A mock implementation of the Packet abstract class. Implements toXML() by returning null.
*/

12
test/org/jivesoftware/smack/packet/PrivacyTest.java
View file

@ -45,11 +45,11 @@ public class PrivacyTest extends SmackTestCase {
// Assert the list composition.
assertEquals(listName, privacyManager.getActiveList().toString());
List privacyItems = privacyManager.getPrivacyList(listName).getItems();
List<PrivacyItem> privacyItems = privacyManager.getPrivacyList(listName).getItems();
assertEquals(1, privacyItems.size());
// Assert the privacy item composition
PrivacyItem receivedItem = (PrivacyItem) privacyItems.get(0);
PrivacyItem receivedItem = privacyItems.get(0);
assertEquals(1, receivedItem.getOrder());
assertEquals(PrivacyItem.Type.jid, receivedItem.getType());
assertEquals(true, receivedItem.isAllow());
@ -278,11 +278,11 @@ public class PrivacyTest extends SmackTestCase {
// Assert the list composition.
assertEquals(listName, privacyManager.getDefaultList().toString());
List privacyItems = privacyManager.getPrivacyList(listName).getItems();
List<PrivacyItem> privacyItems = privacyManager.getPrivacyList(listName).getItems();
assertEquals(1, privacyItems.size());
// Assert the privacy item composition
PrivacyItem receivedItem = (PrivacyItem) privacyItems.get(0);
PrivacyItem receivedItem = privacyItems.get(0);
assertEquals(1, receivedItem.getOrder());
assertEquals(PrivacyItem.Type.jid, receivedItem.getType());
assertEquals(true, receivedItem.isAllow());
@ -427,7 +427,7 @@ public class PrivacyTest extends SmackTestCase {
Thread.sleep(500);
// Assert the server list composition.
List privacyItems = privacyManager.getPrivacyList(listName).getItems();
List<PrivacyItem> privacyItems = privacyManager.getPrivacyList(listName).getItems();
assertEquals(originalPrivacyItems.length, privacyItems.size());
// Assert the local and server privacy item composition
@ -436,7 +436,7 @@ public class PrivacyTest extends SmackTestCase {
int index;
for (int j = 0; j < originalPrivacyItems.length; j++) {
// Look for the same server and original items
receivedItem = (PrivacyItem) privacyItems.get(j);
receivedItem = privacyItems.get(j);
index = 0;
while ((index < originalPrivacyItems.length)
&& (originalPrivacyItems[index].getOrder() != receivedItem.getOrder())) {

6
test/org/jivesoftware/smack/test/SmackTestCase.java
View file

@ -353,17 +353,17 @@ public abstract class SmackTestCase extends TestCase {
try {
boolean found = false;
// Try to load the configutation from an XML file specific for this test case
Enumeration resources =
Enumeration<URL> resources =
ClassLoader.getSystemClassLoader().getResources(getConfigurationFilename());
while (resources.hasMoreElements()) {
found = parseURL((URL) resources.nextElement());
found = parseURL(resources.nextElement());
}
// If none was found then try to load the configuration from the default configuration
// file (i.e. "config/test-case.xml")
if (!found) {
resources = ClassLoader.getSystemClassLoader().getResources("config/test-case.xml");
while (resources.hasMoreElements()) {
found = parseURL((URL) resources.nextElement());
found = parseURL(resources.nextElement());
}
}
if (!found) {

24
test/org/jivesoftware/smackx/MultipleRecipientManagerTest.java
View file

@ -57,9 +57,9 @@ public class MultipleRecipientManagerTest extends SmackTestCase {
Message message = new Message();
message.setBody("Hola");
List to = Arrays.asList(new String[]{getBareJID(1)});
List cc = Arrays.asList(new String[]{getBareJID(2)});
List bcc = Arrays.asList(new String[]{getBareJID(3)});
List<String> to = Arrays.asList(new String[]{getBareJID(1)});
List<String> cc = Arrays.asList(new String[]{getBareJID(2)});
List<String> bcc = Arrays.asList(new String[]{getBareJID(3)});
MultipleRecipientManager.send(getConnection(0), message, to, cc, bcc);
Packet message1 = collector1.nextResult(SmackConfiguration.getPacketReplyTimeout());
@ -67,7 +67,7 @@ public class MultipleRecipientManagerTest extends SmackTestCase {
MultipleRecipientInfo info1 = MultipleRecipientManager.getMultipleRecipientInfo(message1);
assertNotNull("Message 1 does not contain MultipleRecipientInfo", info1);
assertFalse("Message 1 should be 'replyable'", info1.shouldNotReply());
List addresses1 = info1.getTOAddresses();
List<?> addresses1 = info1.getTOAddresses();
assertEquals("Incorrect number of TO addresses", 1, addresses1.size());
String address1 = ((MultipleAddresses.Address) addresses1.get(0)).getJid();
assertEquals("Incorrect TO address", getBareJID(1), address1);
@ -81,7 +81,7 @@ public class MultipleRecipientManagerTest extends SmackTestCase {
MultipleRecipientInfo info2 = MultipleRecipientManager.getMultipleRecipientInfo(message2);
assertNotNull("Message 2 does not contain MultipleRecipientInfo", info2);
assertFalse("Message 2 should be 'replyable'", info2.shouldNotReply());
List addresses2 = info2.getTOAddresses();
List<MultipleAddresses.Address> addresses2 = info2.getTOAddresses();
assertEquals("Incorrect number of TO addresses", 1, addresses2.size());
String address2 = ((MultipleAddresses.Address) addresses2.get(0)).getJid();
assertEquals("Incorrect TO address", getBareJID(1), address2);
@ -95,7 +95,7 @@ public class MultipleRecipientManagerTest extends SmackTestCase {
MultipleRecipientInfo info3 = MultipleRecipientManager.getMultipleRecipientInfo(message3);
assertNotNull("Message 3 does not contain MultipleRecipientInfo", info3);
assertFalse("Message 3 should be 'replyable'", info3.shouldNotReply());
List addresses3 = info3.getTOAddresses();
List<MultipleAddresses.Address> addresses3 = info3.getTOAddresses();
assertEquals("Incorrect number of TO addresses", 1, addresses3.size());
String address3 = ((MultipleAddresses.Address) addresses3.get(0)).getJid();
assertEquals("Incorrect TO address", getBareJID(1), address3);
@ -125,9 +125,9 @@ public class MultipleRecipientManagerTest extends SmackTestCase {
// Send the intial message with multiple recipients
Message message = new Message();
message.setBody("Hola");
List to = Arrays.asList(new String[]{getBareJID(1)});
List cc = Arrays.asList(new String[]{getBareJID(2)});
List bcc = Arrays.asList(new String[]{getBareJID(3)});
List<String> to = Arrays.asList(new String[]{getBareJID(1)});
List<String> cc = Arrays.asList(new String[]{getBareJID(2)});
List<String> bcc = Arrays.asList(new String[]{getBareJID(3)});
MultipleRecipientManager.send(getConnection(0), message, to, cc, bcc);
// Get the message and ensure it's ok
@ -205,9 +205,9 @@ public class MultipleRecipientManagerTest extends SmackTestCase {
// Send the intial message with multiple recipients
Message message = new Message();
message.setBody("Hola");
List to = Arrays.asList(new String[]{getBareJID(1)});
List cc = Arrays.asList(new String[]{getBareJID(2)});
List bcc = Arrays.asList(new String[]{getBareJID(3)});
List<String> to = Arrays.asList(new String[]{getBareJID(1)});
List<String> cc = Arrays.asList(new String[]{getBareJID(2)});
List<String> bcc = Arrays.asList(new String[]{getBareJID(3)});
MultipleRecipientManager.send(getConnection(0), message, to, cc, bcc, null, null, true);
// Get the message and ensure it's ok

12
test/org/jivesoftware/smackx/OfflineMessageManagerTest.java
View file

@ -74,22 +74,22 @@ public class OfflineMessageManagerTest extends SmackTestCase {
OfflineMessageManager offlineManager = new OfflineMessageManager(getConnection(1));
assertEquals("Wrong number of offline messages", 2, offlineManager.getMessageCount());
// Check the message headers
Iterator headers = offlineManager.getHeaders();
Iterator<OfflineMessageHeader> headers = offlineManager.getHeaders();
assertTrue("No message header was found", headers.hasNext());
List<String> stamps = new ArrayList<String>();
while (headers.hasNext()) {
OfflineMessageHeader header = (OfflineMessageHeader) headers.next();
OfflineMessageHeader header = headers.next();
assertEquals("Incorrect sender", getFullJID(0), header.getJid());
assertNotNull("No stamp was found in the message header", header.getStamp());
stamps.add(header.getStamp());
}
assertEquals("Wrong number of headers", 2, stamps.size());
// Get the offline messages
Iterator messages = offlineManager.getMessages(stamps);
Iterator<Message> messages = offlineManager.getMessages(stamps);
assertTrue("No message was found", messages.hasNext());
stamps = new ArrayList<String>();
while (messages.hasNext()) {
Message message = (Message) messages.next();
Message message = messages.next();
OfflineMessageInfo info = (OfflineMessageInfo) message.getExtension("offline",
"http://jabber.org/protocol/offline");
assertNotNull("No offline information was included in the offline message", info);
@ -143,11 +143,11 @@ public class OfflineMessageManagerTest extends SmackTestCase {
OfflineMessageManager offlineManager = new OfflineMessageManager(getConnection(1));
assertEquals("Wrong number of offline messages", 2, offlineManager.getMessageCount());
// Get all offline messages
Iterator messages = offlineManager.getMessages();
Iterator<Message> messages = offlineManager.getMessages();
assertTrue("No message was found", messages.hasNext());
List<String> stamps = new ArrayList<String>();
while (messages.hasNext()) {
Message message = (Message) messages.next();
Message message = messages.next();
OfflineMessageInfo info = (OfflineMessageInfo) message.getExtension("offline",
"http://jabber.org/protocol/offline");
assertNotNull("No offline information was included in the offline message", info);

9
test/org/jivesoftware/smackx/RosterExchangeManagerTest.java
View file

@ -128,14 +128,14 @@ public class RosterExchangeManagerTest extends SmackTestCase {
// Create a RosterExchangeListener that will iterate over the received roster entries
RosterExchangeListener rosterExchangeListener = new RosterExchangeListener() {
public void entriesReceived(String from, Iterator remoteRosterEntries) {
public void entriesReceived(String from, Iterator<RemoteRosterEntry> remoteRosterEntries) {
int received = 0;
assertNotNull("From is null", from);
assertNotNull("rosterEntries is null", remoteRosterEntries);
assertTrue("Roster without entries", remoteRosterEntries.hasNext());
while (remoteRosterEntries.hasNext()) {
received++;
RemoteRosterEntry remoteEntry = (RemoteRosterEntry) remoteRosterEntries.next();
RemoteRosterEntry remoteEntry = remoteRosterEntries.next();
System.out.println(remoteEntry);
}
entriesReceived = received;
@ -178,7 +178,7 @@ public class RosterExchangeManagerTest extends SmackTestCase {
// Create a RosterExchangeListener that will accept all the received roster entries
RosterExchangeListener rosterExchangeListener = new RosterExchangeListener() {
public void entriesReceived(String from, Iterator remoteRosterEntries) {
public void entriesReceived(String from, Iterator<RemoteRosterEntry> remoteRosterEntries) {
int received = 0;
assertNotNull("From is null", from);
assertNotNull("remoteRosterEntries is null", remoteRosterEntries);
@ -186,8 +186,7 @@ public class RosterExchangeManagerTest extends SmackTestCase {
while (remoteRosterEntries.hasNext()) {
received++;
try {
RemoteRosterEntry remoteRosterEntry =
(RemoteRosterEntry) remoteRosterEntries.next();
RemoteRosterEntry remoteRosterEntry = remoteRosterEntries.next();
getConnection(1).getRoster().createEntry(
remoteRosterEntry.getUser(),
remoteRosterEntry.getName(),

5
test/org/jivesoftware/smackx/ServiceDiscoveryManagerTest.java
View file

@ -57,6 +57,7 @@ import java.util.Iterator;
import org.jivesoftware.smack.XMPPException;
import org.jivesoftware.smack.test.SmackTestCase;
import org.jivesoftware.smackx.packet.DiscoverInfo;
import org.jivesoftware.smackx.packet.DiscoverInfo.Identity;
/**
@ -81,9 +82,9 @@ public class ServiceDiscoveryManagerTest extends SmackTestCase {
// Discover the information of another Smack client
DiscoverInfo info = discoManager.discoverInfo(getFullJID(1));
// Check the identity of the Smack client
Iterator identities = info.getIdentities();
Iterator<Identity> identities = info.getIdentities();
assertTrue("No identities were found", identities.hasNext());
DiscoverInfo.Identity identity = (DiscoverInfo.Identity)identities.next();
Identity identity = identities.next();
assertEquals("Name in identity is wrong", ServiceDiscoveryManager.getIdentityName(),
identity.getName());
assertEquals("Category in identity is wrong", "client", identity.getCategory());

2
test/org/jivesoftware/smackx/SharedGroupsTest.java
View file

@ -20,7 +20,7 @@ public class SharedGroupsTest extends SmackTestCase {
}
public void testGetUserSharedGroups() throws XMPPException {
List groups = SharedGroupManager.getSharedGroups(getConnection(0));
List<String> groups = SharedGroupManager.getSharedGroups(getConnection(0));
assertNotNull("User groups was null", groups);
}

8
test/org/jivesoftware/smackx/XHTMLManagerTest.java
View file

@ -163,8 +163,8 @@ public class XHTMLManagerTest extends SmackTestCase {
assertTrue(
"Message without XHTML bodies",
XHTMLManager.getBodies(message).hasNext());
for (Iterator it = XHTMLManager.getBodies(message); it.hasNext();) {
String body = (String) it.next();
for (Iterator<String> it = XHTMLManager.getBodies(message); it.hasNext();) {
String body = it.next();
System.out.println(body);
}
}
@ -245,9 +245,9 @@ public class XHTMLManagerTest extends SmackTestCase {
assertTrue(
"Message without XHTML bodies",
XHTMLManager.getBodies(message).hasNext());
for (Iterator it = XHTMLManager.getBodies(message); it.hasNext();) {
for (Iterator<String> it = XHTMLManager.getBodies(message); it.hasNext();) {
received++;
String body = (String) it.next();
String body = it.next();
System.out.println(body);
}
bodiesReceived = received;

54
test/org/jivesoftware/smackx/muc/MultiUserChatTest.java
View file

@ -378,7 +378,7 @@ public class MultiUserChatTest extends SmackTestCase {
public void testDiscoverJoinedRooms() {
try {
// Check that user1 has joined only to one room
Iterator joinedRooms = MultiUserChat.getJoinedRooms(getConnection(1), getFullJID(0));
Iterator<String> joinedRooms = MultiUserChat.getJoinedRooms(getConnection(1), getFullJID(0));
assertTrue("Joined rooms shouldn't be empty", joinedRooms.hasNext());
assertEquals("Joined room is incorrect", joinedRooms.next(), room);
assertFalse("User has joined more than one room", joinedRooms.hasNext());
@ -427,12 +427,12 @@ public class MultiUserChatTest extends SmackTestCase {
public void testDiscoverMUCService() {
try {
Collection services = MultiUserChat.getServiceNames(getConnection(1));
Collection<String> services = MultiUserChat.getServiceNames(getConnection(1));
assertFalse("No MUC service was found", services.isEmpty());
// Discover the hosted rooms by the chat service.
Collection rooms = MultiUserChat.getHostedRooms(getConnection(1),
(String) services.toArray()[0]);
Collection<HostedRoom> rooms = MultiUserChat.getHostedRooms(getConnection(1),
services.toArray(new String[0])[0]);
// Check that we have discovered the room used by this test
assertFalse("No room was found", rooms.isEmpty());
// Check that we have discovered the room used by this test
@ -1553,22 +1553,21 @@ public class MultiUserChatTest extends SmackTestCase {
muc.grantModerator("testbot3");
// Check that the owner list is correct
Collection affiliates = muc.getOwners();
Collection<Affiliate> affiliates = muc.getOwners();
assertEquals("Room does not have 2 owners", 2, affiliates.size());
for (Object affiliate1 : affiliates) {
Affiliate affiliate = (Affiliate) affiliate1;
if (getBareJID(0).equals(affiliate.getJid())) {
assertEquals("Wrong affiliation", "owner", affiliate.getAffiliation());
assertEquals("Wrong role", "moderator", affiliate.getRole());
assertEquals("Wrong nick", "testbot", affiliate.getNick());
for (Affiliate affiliate1 : affiliates) {
if (getBareJID(0).equals(affiliate1.getJid())) {
assertEquals("Wrong affiliation", "owner", affiliate1.getAffiliation());
assertEquals("Wrong role", "moderator", affiliate1.getRole());
assertEquals("Wrong nick", "testbot", affiliate1.getNick());
}
else if (getBareJID(1).equals(affiliate.getJid())) {
assertEquals("Wrong affiliation", "owner", affiliate.getAffiliation());
assertEquals("Wrong role", "moderator", affiliate.getRole());
assertEquals("Wrong nick", "testbot2", affiliate.getNick());
else if (getBareJID(1).equals(affiliate1.getJid())) {
assertEquals("Wrong affiliation", "owner", affiliate1.getAffiliation());
assertEquals("Wrong role", "moderator", affiliate1.getRole());
assertEquals("Wrong nick", "testbot2", affiliate1.getNick());
}
else {
fail("Unknown owner " + affiliate.getJid());
fail("Unknown owner " + affiliate1.getJid());
}
}
@ -1592,22 +1591,21 @@ public class MultiUserChatTest extends SmackTestCase {
assertEquals("Room has outcasts", 0, affiliates.size());
// Check that the moderator list is correct
Collection occupants = muc.getModerators();
Collection<Occupant> occupants = muc.getModerators();
assertEquals("Room does not have 2 moderators", 2, occupants.size());
for (Object occupant1 : occupants) {
Occupant occupant = (Occupant) occupant1;
if (getFullJID(0).equals(occupant.getJid())) {
assertEquals("Wrong affiliation", "owner", occupant.getAffiliation());
assertEquals("Wrong role", "moderator", occupant.getRole());
assertEquals("Wrong nick", "testbot", occupant.getNick());
for (Occupant occupant1 : occupants) {
if (getFullJID(0).equals(occupant1.getJid())) {
assertEquals("Wrong affiliation", "owner", occupant1.getAffiliation());
assertEquals("Wrong role", "moderator", occupant1.getRole());
assertEquals("Wrong nick", "testbot", occupant1.getNick());
}
else if (getFullJID(2).equals(occupant.getJid())) {
assertEquals("Wrong affiliation", "none", occupant.getAffiliation());
assertEquals("Wrong role", "moderator", occupant.getRole());
assertEquals("Wrong nick", "testbot3", occupant.getNick());
else if (getFullJID(2).equals(occupant1.getJid())) {
assertEquals("Wrong affiliation", "none", occupant1.getAffiliation());
assertEquals("Wrong role", "moderator", occupant1.getRole());
assertEquals("Wrong nick", "testbot3", occupant1.getNick());
}
else {
fail("Unknown moderator " + occupant.getJid());
fail("Unknown moderator " + occupant1.getJid());
}
}

4
test/org/jivesoftware/smackx/packet/RosterExchangeTest.java
View file

@ -133,8 +133,8 @@ public class RosterExchangeTest extends SmackTestCase {
"Roster without entries",
rosterExchange.getRosterEntries().hasNext());
// Add the roster entries to user2's roster
for (Iterator it = rosterExchange.getRosterEntries(); it.hasNext();) {
RemoteRosterEntry remoteRosterEntry = (RemoteRosterEntry) it.next();
for (Iterator<RemoteRosterEntry> it = rosterExchange.getRosterEntries(); it.hasNext();) {
RemoteRosterEntry remoteRosterEntry = it.next();
getConnection(1).getRoster().createEntry(
remoteRosterEntry.getUser(),
remoteRosterEntry.getName(),

8
test/org/jivesoftware/smackx/packet/XHTMLExtensionTest.java
View file

@ -150,8 +150,8 @@ public class XHTMLExtensionTest extends SmackTestCase {
"Message without extension \"http://jabber.org/protocol/xhtml-im\"",
xhtmlExtension);
assertTrue("Message without XHTML bodies", xhtmlExtension.getBodiesCount() > 0);
for (Iterator it = xhtmlExtension.getBodies(); it.hasNext();) {
String body = (String) it.next();
for (Iterator<String> it = xhtmlExtension.getBodies(); it.hasNext();) {
String body = it.next();
System.out.println(body);
}
}
@ -222,9 +222,9 @@ public class XHTMLExtensionTest extends SmackTestCase {
"Message without extension \"http://jabber.org/protocol/xhtml-im\"",
xhtmlExtension);
assertTrue("Message without XHTML bodies", xhtmlExtension.getBodiesCount() > 0);
for (Iterator it = xhtmlExtension.getBodies(); it.hasNext();) {
for (Iterator<String> it = xhtmlExtension.getBodies(); it.hasNext();) {
received++;
System.out.println((String) it.next());
System.out.println(it.next());
}
bodiesReceived = received;
}

3
test/org/jivesoftware/smackx/pubsub/EntityUseCases.java
View file

@ -10,7 +10,6 @@ import org.jivesoftware.smackx.packet.DiscoverInfo;
import org.jivesoftware.smackx.packet.DiscoverItems;
import org.jivesoftware.smackx.packet.DiscoverInfo.Identity;
import org.jivesoftware.smackx.pubsub.test.SingleUserTestCase;
import org.jivesoftware.smackx.pubsub.util.XmlUtils;
public class EntityUseCases extends SingleUserTestCase
{
@ -41,7 +40,7 @@ public class EntityUseCases extends SingleUserTestCase
int count = 0;
for(Iterator it = items.getItems(); it.hasNext(); it.next(),count++);
for(Iterator<DiscoverItems.Item> it = items.getItems(); it.hasNext(); it.next(),count++);
assertEquals(4, count);
}

6
test/org/jivesoftware/smackx/pubsub/PublisherUseCases.java
View file

@ -3,7 +3,6 @@
*/
package org.jivesoftware.smackx.pubsub;
import java.util.ArrayList;
import java.util.Collection;
import java.util.List;
@ -105,7 +104,7 @@ public class PublisherUseCases extends SingleUserTestCase
assertNotNull(err.getExtension("payload-required", PubSubNamespace.ERROR.getXmlns()));
}
}
public void testDeleteItems() throws XMPPException
{
LeafNode node = getPubnode(true, false);
@ -118,8 +117,7 @@ public class PublisherUseCases extends SingleUserTestCase
node.deleteItem("1");
Collection<? extends Item> items = node.getItems();
assertTrue(items.size() == 3);
assertEquals(items.iterator().next().getId(), "2");
assertEquals(3, items.size());
}
public void testPersistItems() throws XMPPException

68
test/org/jivesoftware/smackx/pubsub/SubscriberUseCases.java
View file

@ -3,6 +3,8 @@
*/
package org.jivesoftware.smackx.pubsub;
import static org.custommonkey.xmlunit.XMLAssert.assertXMLEqual;
import java.util.ArrayList;
import java.util.Calendar;
import java.util.Collection;
@ -129,14 +131,13 @@ public class SubscriberUseCases extends SingleUserTestCase
// assertEquals(true, sub.isConfigRequired());
// }
//
public void testGetItems() throws XMPPException
public void testGetItems() throws Exception
{
LeafNode node = getPubnode(true, false);
runNodeTests(node);
}
private void runNodeTests(LeafNode node) throws XMPPException
private void runNodeTests(LeafNode node) throws Exception
{
node.send((Item)null);
node.send((Item)null);
@ -176,18 +177,33 @@ public class SubscriberUseCases extends SingleUserTestCase
payloadNode.send(new PayloadItem<SimplePayload>("9-" + curTime, new SimplePayload("entity", "pubsub:test", "<entity xmlns='pubsub:test'><inner><text>b</text></inner></entity>")));
List<PayloadItem<SimplePayload>> payloadItems = payloadNode.getItems();
assertTrue(payloadItems.size() == 4);
assertEquals(payloadItems.get(0).getId(), "6-" + curTime);
assertEquals("<a xmlns='pubsub:test'/>", payloadItems.get(0).getPayload().toXML().replace('\"', '\''));
assertEquals(payloadItems.get(1).getId(), "7-" + curTime);
assertEquals("<a xmlns='pubsub:test' href=\'/up/here\'/>", payloadItems.get(1).getPayload().toXML().replace('\"', '\''));
assertEquals(payloadItems.get(2).getId(), "8-" + curTime);
assertEquals("<entity xmlns='pubsub:test'>text<inner>a</inner></entity>", payloadItems.get(2).getPayload().toXML().replace('\"', '\''));
assertEquals(payloadItems.get(3).getId(), "9-" + curTime);
assertEquals("<entity xmlns='pubsub:test'><inner><text>b</text></inner></entity>", payloadItems.get(3).getPayload().toXML().replace('\"', '\''));
Map<String, PayloadItem<SimplePayload>> idMap = new HashMap<String, PayloadItem<SimplePayload>>();
for (PayloadItem<SimplePayload> payloadItem : payloadItems)
{
idMap.put(payloadItem.getId(), payloadItem);
}
assertEquals(4, payloadItems.size());
PayloadItem<SimplePayload> testItem = idMap.get("6-" + curTime);
assertNotNull(testItem);
assertXMLEqual("<a xmlns='pubsub:test'/>", testItem.getPayload().toXML());
testItem = idMap.get("7-" + curTime);
assertNotNull(testItem);
assertXMLEqual("<a xmlns='pubsub:test' href=\'/up/here\'/>", testItem.getPayload().toXML());
testItem = idMap.get("8-" + curTime);
assertNotNull(testItem);
assertXMLEqual("<entity xmlns='pubsub:test'>text<inner>a</inner></entity>", testItem.getPayload().toXML());
testItem = idMap.get("9-" + curTime);
assertNotNull(testItem);
assertXMLEqual("<entity xmlns='pubsub:test'><inner><text>b</text></inner></entity>", testItem.getPayload().toXML());
}
public void testGetSpecifiedItems() throws XMPPException
public void testGetSpecifiedItems() throws Exception
{
LeafNode node = getPubnode(true, true);
@ -204,12 +220,12 @@ public class SubscriberUseCases extends SingleUserTestCase
List<PayloadItem<SimplePayload>> items = node.getItems(ids);
assertEquals(3, items.size());
assertEquals(items.get(0).getId(), "1");
assertEquals("<a xmlns='pubsub:test' href='1'/>", items.get(0).getPayload().toXML().replace('\"', '\''));
assertEquals(items.get(1).getId(), "3");
assertEquals("<a xmlns='pubsub:test' href='3'/>", items.get(1).getPayload().toXML().replace('\"', '\''));
assertEquals(items.get(2).getId(), "4");
assertEquals("<a xmlns='pubsub:test' href='4'/>", items.get(2).getPayload().toXML().replace('\"', '\''));
assertEquals("1", items.get(0).getId());
assertXMLEqual("<a xmlns='pubsub:test' href='1'/>", items.get(0).getPayload().toXML());
assertEquals( "3", items.get(1).getId());
assertXMLEqual("<a xmlns='pubsub:test' href='3'/>", items.get(1).getPayload().toXML());
assertEquals("4", items.get(2).getId());
assertXMLEqual("<a xmlns='pubsub:test' href='4'/>", items.get(2).getPayload().toXML());
}
public void testGetLastNItems() throws XMPPException
@ -224,8 +240,18 @@ public class SubscriberUseCases extends SingleUserTestCase
List<Item> items = node.getItems(2);
assertEquals(2, items.size());
assertEquals(items.get(0).getId(), "4");
assertEquals(items.get(1).getId(), "5");
assertTrue(listContainsId("4", items));
assertTrue(listContainsId("5", items));
}
private static boolean listContainsId(String id, List<Item> items)
{
for (Item item : items)
{
if (item.getId().equals(id))
return true;
}
return false;
}
private String getJid()