mirror of
https://codeberg.org/Mercury-IM/Smack
synced 2024-11-30 02:02:06 +01:00
Test fixes.
git-svn-id: http://svn.igniterealtime.org/svn/repos/smack/trunk@7231 b35dd754-fafc-0310-a699-88a17e54d16e
This commit is contained in:
Matt Tucker
matt
parent
2ceed95f6b
commit
9356de64bd
1 changed files with 106 additions and 93 deletions
|
|
@ -90,8 +90,8 @@ public class RosterTest extends SmackTestCase {
|
|||
// Wait until the server confirms the new entries
|
||||
long initial = System.currentTimeMillis();
|
||||
while (System.currentTimeMillis() - initial < 2000 && (
|
||||
roster.getPresence(getBareJID(1)) == null ||
|
||||
roster.getPresence(getBareJID(2)) == null)) {
|
||||
!roster.getPresence(getBareJID(1)).isAvailable() ||
|
||||
!roster.getPresence(getBareJID(2)).isAvailable())) {
|
||||
Thread.sleep(100);
|
||||
}
|
||||
|
||||
|
|
@ -134,12 +134,13 @@ public class RosterTest extends SmackTestCase {
|
|||
"The number of groups in connection 0 should be 0",
|
||||
0,
|
||||
roster.getGroupCount());
|
||||
|
||||
cleanUpRoster();
|
||||
}
|
||||
catch (Exception e) {
|
||||
fail(e.getMessage());
|
||||
}
|
||||
finally {
|
||||
cleanUpRoster();
|
||||
}
|
||||
}
|
||||
|
||||
/**
|
||||
|
|
@ -165,12 +166,13 @@ public class RosterTest extends SmackTestCase {
|
|||
// Wait up to 2 seconds to receive presences of the new roster contacts
|
||||
initial = System.currentTimeMillis();
|
||||
while (System.currentTimeMillis() - initial < 5000 &&
|
||||
(roster.getPresence(getBareJID(1)) == null ||
|
||||
roster.getPresence(getBareJID(2)) == null)) {
|
||||
(!roster.getPresence(getBareJID(1)).isAvailable() ||
|
||||
!roster.getPresence(getBareJID(2)).isAvailable()))
|
||||
{
|
||||
Thread.sleep(100);
|
||||
}
|
||||
assertNotNull("Presence not received", roster.getPresence(getBareJID(1)));
|
||||
assertNotNull("Presence not received", roster.getPresence(getBareJID(2)));
|
||||
assertTrue("Presence not received", roster.getPresence(getBareJID(1)).isAvailable());
|
||||
assertTrue("Presence not received", roster.getPresence(getBareJID(2)).isAvailable());
|
||||
|
||||
for (RosterEntry entry : roster.getEntries()) {
|
||||
roster.removeEntry(entry);
|
||||
|
|
@ -215,8 +217,8 @@ public class RosterTest extends SmackTestCase {
|
|||
// Wait up to 2 seconds to let the server process presence subscriptions
|
||||
long initial = System.currentTimeMillis();
|
||||
while (System.currentTimeMillis() - initial < 2000 && (
|
||||
roster.getPresence(getBareJID(1)) == null ||
|
||||
roster.getPresence(getBareJID(2)) == null)) {
|
||||
!roster.getPresence(getBareJID(1)).isAvailable() ||
|
||||
!roster.getPresence(getBareJID(2)).isAvailable())) {
|
||||
Thread.sleep(100);
|
||||
}
|
||||
|
||||
|
|
@ -266,7 +268,8 @@ public class RosterTest extends SmackTestCase {
|
|||
// Wait up to 2 seconds to let the server process presence subscriptions
|
||||
long initial = System.currentTimeMillis();
|
||||
while (System.currentTimeMillis() - initial < 2000 &&
|
||||
roster.getPresence(getBareJID(1)) == null) {
|
||||
!roster.getPresence(getBareJID(1)).isAvailable())
|
||||
{
|
||||
Thread.sleep(100);
|
||||
}
|
||||
|
||||
|
|
@ -281,12 +284,13 @@ public class RosterTest extends SmackTestCase {
|
|||
for (RosterEntry entry : roster.getEntries()) {
|
||||
assertEquals("gato11", entry.getName());
|
||||
}
|
||||
|
||||
cleanUpRoster();
|
||||
}
|
||||
catch (Exception e) {
|
||||
fail(e.getMessage());
|
||||
}
|
||||
finally {
|
||||
cleanUpRoster();
|
||||
}
|
||||
}
|
||||
|
||||
/**
|
||||
|
|
@ -308,7 +312,7 @@ public class RosterTest extends SmackTestCase {
|
|||
// Wait up to 5 seconds to receive presences of the new roster contacts
|
||||
long initial = System.currentTimeMillis();
|
||||
while (System.currentTimeMillis() - initial < 5000 &&
|
||||
roster.getPresence(getBareJID(0)) == null) {
|
||||
!roster.getPresence(getBareJID(0)).isAvailable()) {
|
||||
Thread.sleep(100);
|
||||
}
|
||||
//assertNotNull("Presence not received", roster.getPresence(getBareJID(0)));
|
||||
|
|
@ -329,15 +333,16 @@ public class RosterTest extends SmackTestCase {
|
|||
// Wait up to 5 seconds to receive presences of the new roster contacts
|
||||
initial = System.currentTimeMillis();
|
||||
while (System.currentTimeMillis() - initial < 5000 &&
|
||||
roster.getPresence(getBareJID(1)) == null) {
|
||||
!roster.getPresence(getBareJID(1)).isAvailable()) {
|
||||
Thread.sleep(100);
|
||||
}
|
||||
assertNotNull("Presence not received", roster.getPresence(getBareJID(1)));
|
||||
|
||||
cleanUpRoster();
|
||||
assertTrue("Presence not received", roster.getPresence(getBareJID(1)).isAvailable());
|
||||
} catch (Exception e) {
|
||||
fail(e.getMessage());
|
||||
}
|
||||
finally {
|
||||
cleanUpRoster();
|
||||
}
|
||||
}
|
||||
|
||||
/**
|
||||
|
|
@ -389,12 +394,13 @@ public class RosterTest extends SmackTestCase {
|
|||
// Close the new connection
|
||||
con2.disconnect();
|
||||
Thread.sleep(500);
|
||||
|
||||
cleanUpRoster();
|
||||
}
|
||||
catch (Exception e) {
|
||||
fail(e.getMessage());
|
||||
}
|
||||
finally {
|
||||
cleanUpRoster();
|
||||
}
|
||||
}
|
||||
|
||||
/**
|
||||
|
|
@ -413,8 +419,8 @@ public class RosterTest extends SmackTestCase {
|
|||
// Wait up to 2 seconds to let the server process presence subscriptions
|
||||
long initial = System.currentTimeMillis();
|
||||
while (System.currentTimeMillis() - initial < 2000 && (
|
||||
roster.getPresence(getBareJID(1)) == null ||
|
||||
roster.getPresence(getBareJID(2)) == null)) {
|
||||
!roster.getPresence(getBareJID(1)).isAvailable() ||
|
||||
!roster.getPresence(getBareJID(2)).isAvailable())) {
|
||||
Thread.sleep(100);
|
||||
}
|
||||
|
||||
|
|
@ -457,12 +463,15 @@ public class RosterTest extends SmackTestCase {
|
|||
2,
|
||||
roster.getUnfiledEntryCount());*/
|
||||
|
||||
cleanUpRoster();
|
||||
|
||||
Thread.sleep(200);
|
||||
}
|
||||
catch (Exception e) {
|
||||
fail(e.getMessage());
|
||||
}
|
||||
finally {
|
||||
cleanUpRoster();
|
||||
}
|
||||
}
|
||||
|
||||
/**
|
||||
|
|
@ -476,7 +485,7 @@ public class RosterTest extends SmackTestCase {
|
|||
*/
|
||||
public void testRosterPresences() throws Exception {
|
||||
Thread.sleep(200);
|
||||
|
||||
try {
|
||||
Presence presence;
|
||||
|
||||
// Create another connection for the same user of connection 1
|
||||
|
|
@ -497,7 +506,7 @@ public class RosterTest extends SmackTestCase {
|
|||
|
||||
// Check that a presence is returned for a user
|
||||
presence = roster.getPresence(getBareJID(1));
|
||||
assertNotNull("Returned a null Presence for an existing user", presence);
|
||||
assertTrue("Returned a null Presence for an existing user", presence.isAvailable());
|
||||
|
||||
// Check that the right presence is returned for a user+resource
|
||||
presence = roster.getPresenceResource(getUsername(1) + "@" + conn4.getServiceName() + "/Home");
|
||||
|
|
@ -506,13 +515,13 @@ public class RosterTest extends SmackTestCase {
|
|||
|
||||
// Check that the right presence is returned for a user+resource
|
||||
presence = roster.getPresenceResource(getFullJID(1));
|
||||
assertNotNull("Presence not found for user " + getFullJID(1), presence);
|
||||
assertTrue("Presence not found for user " + getFullJID(1), presence.isAvailable());
|
||||
assertEquals("Returned the wrong Presence", "Smack",
|
||||
StringUtils.parseResource(presence.getFrom()));
|
||||
|
||||
// Check the returned presence for a non-existent user+resource
|
||||
presence = roster.getPresenceResource("noname@" + getServiceName() + "/Smack");
|
||||
assertNotNull("No presence was returned for a non-existing user", presence);
|
||||
assertFalse("Available presence was returned for a non-existing user", presence.isAvailable());
|
||||
assertEquals("Returned Presence for a non-existing user has the incorrect type",
|
||||
Presence.Type.unavailable, presence.getType());
|
||||
|
||||
|
|
@ -538,8 +547,11 @@ public class RosterTest extends SmackTestCase {
|
|||
assertEquals("Wrong number of returned presences", count, 1);
|
||||
|
||||
Thread.sleep(200);
|
||||
}
|
||||
finally {
|
||||
cleanUpRoster();
|
||||
}
|
||||
}
|
||||
|
||||
/**
|
||||
* User1 is connected from 2 resources. User1 adds User0 to his roster. Ensure
|
||||
|
|
@ -559,18 +571,18 @@ public class RosterTest extends SmackTestCase {
|
|||
// Wait up to 2 seconds
|
||||
long initial = System.currentTimeMillis();
|
||||
while (System.currentTimeMillis() - initial < 2000 && (
|
||||
roster.getPresence(getBareJID(0)) == null ||
|
||||
getConnection(1).getRoster().getPresence(getBareJID(0)) == null)) {
|
||||
!roster.getPresence(getBareJID(0)).isAvailable() ||
|
||||
!getConnection(1).getRoster().getPresence(getBareJID(0)).isAvailable())) {
|
||||
Thread.sleep(100);
|
||||
}
|
||||
|
||||
// Check that a presence is returned for the new contact
|
||||
Presence presence = roster.getPresence(getBareJID(0));
|
||||
assertNotNull("Returned a null Presence for an existing user", presence);
|
||||
assertTrue("Returned a null Presence for an existing user", presence.isAvailable());
|
||||
|
||||
// Check that a presence is returned for the new contact
|
||||
presence = getConnection(1).getRoster().getPresence(getBareJID(0));
|
||||
assertNotNull("Returned a null Presence for an existing user", presence);
|
||||
assertTrue("Returned a null Presence for an existing user", presence.isAvailable());
|
||||
|
||||
// Delete user from roster
|
||||
roster.removeEntry(roster.getEntry(getBareJID(0)));
|
||||
|
|
@ -586,13 +598,13 @@ public class RosterTest extends SmackTestCase {
|
|||
|
||||
// Check that no presence is returned for the removed contact
|
||||
presence = roster.getPresence(getBareJID(0));
|
||||
assertNotNull("No presence was returned for removed contact", presence);
|
||||
assertFalse("Available presence was returned for removed contact", presence.isAvailable());
|
||||
assertEquals("Returned Presence for removed contact has incorrect type",
|
||||
Presence.Type.unavailable, presence.getType());
|
||||
|
||||
// Check that no presence is returned for the removed contact
|
||||
presence = getConnection(1).getRoster().getPresence(getBareJID(0));
|
||||
assertNotNull("No presence was returned for removed contact", presence);
|
||||
assertFalse("Available presence was returned for removed contact", presence.isAvailable());
|
||||
assertEquals("Returned Presence for removed contact has incorrect type",
|
||||
Presence.Type.unavailable, presence.getType());
|
||||
}
|
||||
|
|
@ -629,9 +641,10 @@ public class RosterTest extends SmackTestCase {
|
|||
private void cleanUpRoster() {
|
||||
for (int i=0; i<getMaxConnections(); i++) {
|
||||
// Delete all the entries from the roster
|
||||
for (RosterEntry entry : getConnection(i).getRoster().getEntries()) {
|
||||
Roster roster = getConnection(i).getRoster();
|
||||
for (RosterEntry entry : roster.getEntries()) {
|
||||
try {
|
||||
getConnection(i).getRoster().removeEntry(entry);
|
||||
roster.removeEntry(entry);
|
||||
}
|
||||
catch (XMPPException e) {
|
||||
e.printStackTrace();
|
||||
|
|
@ -705,24 +718,24 @@ public class RosterTest extends SmackTestCase {
|
|||
// Wait up to 2 seconds to let the server process presence subscriptions
|
||||
long initial = System.currentTimeMillis();
|
||||
while (System.currentTimeMillis() - initial < 2000 && (
|
||||
roster.getPresence(getBareJID(1)) == null ||
|
||||
roster.getPresence(getBareJID(2)) == null)) {
|
||||
!roster.getPresence(getBareJID(1)).isAvailable() ||
|
||||
!roster.getPresence(getBareJID(2)).isAvailable())) {
|
||||
Thread.sleep(100);
|
||||
}
|
||||
|
||||
Thread.sleep(200);
|
||||
|
||||
// Brakes the connection
|
||||
// Break the connection
|
||||
getConnection(0).packetReader.notifyConnectionError(new Exception("Simulated Error"));
|
||||
|
||||
Presence presence = roster.getPresence(getBareJID(1));
|
||||
assertNotNull("Unavailable presence not found for offline user", presence);
|
||||
assertFalse("Unavailable presence not found for offline user", presence.isAvailable());
|
||||
assertEquals("Unavailable presence not found for offline user", Presence.Type.unavailable,
|
||||
presence.getType());
|
||||
// Reconnection should occur in 10 seconds
|
||||
Thread.sleep(12200);
|
||||
presence = roster.getPresence(getBareJID(1));
|
||||
assertNotNull("Presence not found for user", presence);
|
||||
assertTrue("Presence not found for user", presence.isAvailable());
|
||||
assertEquals("Presence should be online after a connection reconnection",
|
||||
Presence.Type.available, presence.getType());
|
||||
}
|
||||
|
|
|
|||
Loading…
Reference in a new issue