mirror of
https://codeberg.org/Mercury-IM/Smack
synced 2024-11-30 02:02:06 +01:00
Fixed test case when cleaning up roster.
git-svn-id: http://svn.igniterealtime.org/svn/repos/smack/trunk@3132 b35dd754-fafc-0310-a699-88a17e54d16e
This commit is contained in:
parent
66c30903d0
commit
ee6cedcea7
1 changed files with 23 additions and 16 deletions
|
@ -423,7 +423,12 @@ public class RosterTest extends SmackTestCase {
|
|||
|
||||
roster.getGroup("Amigos").setName("");
|
||||
|
||||
Thread.sleep(500);
|
||||
// Wait up to 2 seconds for the group to change its name
|
||||
initial = System.currentTimeMillis();
|
||||
while (System.currentTimeMillis() - initial < 2000 &&
|
||||
(roster.getGroup("Amigos") != null)) {
|
||||
Thread.sleep(100);
|
||||
}
|
||||
|
||||
assertNull("The group Amigos still exists", roster.getGroup("Amigos"));
|
||||
assertNotNull("The group with no name does not exist", roster.getGroup(""));
|
||||
|
@ -520,12 +525,13 @@ public class RosterTest extends SmackTestCase {
|
|||
* Clean up all the entries in the roster
|
||||
*/
|
||||
private void cleanUpRoster() {
|
||||
for (int i=0; i<getMaxConnections(); i++) {
|
||||
// Delete all the entries from the roster
|
||||
Iterator it = getConnection(0).getRoster().getEntries();
|
||||
Iterator it = getConnection(i).getRoster().getEntries();
|
||||
while (it.hasNext()) {
|
||||
RosterEntry entry = (RosterEntry) it.next();
|
||||
try {
|
||||
getConnection(0).getRoster().removeEntry(entry);
|
||||
getConnection(i).getRoster().removeEntry(entry);
|
||||
} catch (XMPPException e) {
|
||||
e.printStackTrace();
|
||||
fail(e.getMessage());
|
||||
|
@ -533,11 +539,12 @@ public class RosterTest extends SmackTestCase {
|
|||
}
|
||||
|
||||
try {
|
||||
Thread.sleep(1500);
|
||||
Thread.sleep(700);
|
||||
}
|
||||
catch (InterruptedException e) {
|
||||
fail(e.getMessage());
|
||||
}
|
||||
}
|
||||
// Wait up to 2 seconds to receive roster removal notifications
|
||||
long initial = System.currentTimeMillis();
|
||||
while (System.currentTimeMillis() - initial < 2000 &&
|
||||
|
|
Loading…
Reference in a new issue