mirror of
https://github.com/vanitasvitae/Smack.git
synced 2024-12-24 11:38:00 +01:00
[sinttest] Cleanup of test fixtures
Additional cleanup of test fixtures: - various tests that change roster/subscription get a roster-reset - one test that registers a listener now deregisters that listener
This commit is contained in:
parent
d27fef0bae
commit
426a5efb1d
5 changed files with 29 additions and 8 deletions
|
@ -49,7 +49,7 @@ public class LowLevelRosterIntegrationTest extends AbstractSmackLowLevelIntegrat
|
|||
|
||||
final SimpleResultSyncPoint offlineTriggered = new SimpleResultSyncPoint();
|
||||
|
||||
rosterOne.addPresenceEventListener(new AbstractPresenceEventListener() {
|
||||
final AbstractPresenceEventListener presenceEventListener = new AbstractPresenceEventListener() {
|
||||
@Override
|
||||
public void presenceUnavailable(FullJid jid, Presence presence) {
|
||||
if (!jid.equals(conTwo.getUser())) {
|
||||
|
@ -57,15 +57,24 @@ public class LowLevelRosterIntegrationTest extends AbstractSmackLowLevelIntegrat
|
|||
}
|
||||
offlineTriggered.signal();
|
||||
}
|
||||
});
|
||||
};
|
||||
rosterOne.addPresenceEventListener(presenceEventListener);
|
||||
|
||||
// Disconnect conTwo, this should cause an 'unavailable' presence to be send from conTwo to
|
||||
// conOne.
|
||||
conTwo.disconnect();
|
||||
try {
|
||||
// Disconnect conTwo, this should cause an 'unavailable' presence to be send from conTwo to
|
||||
// conOne.
|
||||
conTwo.disconnect();
|
||||
|
||||
Boolean result = offlineTriggered.waitForResult(timeout);
|
||||
if (!result) {
|
||||
throw new Exception("presenceUnavailable() was not called");
|
||||
Boolean result = offlineTriggered.waitForResult(timeout);
|
||||
if (!result) {
|
||||
throw new Exception("presenceUnavailable() was not called");
|
||||
}
|
||||
} finally {
|
||||
// Clean up test fixture.
|
||||
rosterOne.removePresenceEventListener(presenceEventListener);
|
||||
conTwo.connect();
|
||||
conTwo.login();
|
||||
IntegrationTestRosterUtil.ensureBothAccountsAreNotInEachOthersRoster(conOne, conTwo);
|
||||
}
|
||||
}
|
||||
|
||||
|
|
|
@ -111,6 +111,7 @@ public class GeolocationIntegrationTest extends AbstractSmackIntegrationTest {
|
|||
" that contained '" + data.toXML() + "', but did not.");
|
||||
} finally {
|
||||
unregisterListener(glm2, geoLocationListener);
|
||||
IntegrationTestRosterUtil.ensureBothAccountsAreNotInEachOthersRoster(conOne, conTwo);
|
||||
}
|
||||
}
|
||||
|
||||
|
@ -171,6 +172,7 @@ public class GeolocationIntegrationTest extends AbstractSmackIntegrationTest {
|
|||
" that contained '" + data.toXML() + "', but did not.");
|
||||
} finally {
|
||||
unregisterListener(glm2, geoLocationListener);
|
||||
IntegrationTestRosterUtil.ensureBothAccountsAreNotInEachOthersRoster(conOne, conTwo);
|
||||
}
|
||||
}
|
||||
|
||||
|
|
|
@ -82,6 +82,7 @@ public class MoodIntegrationTest extends AbstractSmackIntegrationTest {
|
|||
assertResult(moodReceived, "Expected " + conTwo.getUser() + " to receive a PEP notification, but did not.");
|
||||
} finally {
|
||||
unregisterListener(mm2, moodListener);
|
||||
IntegrationTestRosterUtil.ensureBothAccountsAreNotInEachOthersRoster(conOne, conTwo);
|
||||
}
|
||||
}
|
||||
|
||||
|
@ -117,6 +118,7 @@ public class MoodIntegrationTest extends AbstractSmackIntegrationTest {
|
|||
assertResult(moodReceived, "Expected " + conTwo.getUser() + " to receive a PEP notification, but did not.");
|
||||
} finally {
|
||||
unregisterListener(mm2, moodListener);
|
||||
IntegrationTestRosterUtil.ensureBothAccountsAreNotInEachOthersRoster(conOne, conTwo);
|
||||
}
|
||||
}
|
||||
|
||||
|
|
|
@ -31,6 +31,7 @@ import org.jivesoftware.smackx.softwareinfo.form.SoftwareInfoForm;
|
|||
|
||||
import org.igniterealtime.smack.inttest.AbstractSmackIntegrationTest;
|
||||
import org.igniterealtime.smack.inttest.SmackIntegrationTestEnvironment;
|
||||
import org.igniterealtime.smack.inttest.annotations.AfterClass;
|
||||
import org.igniterealtime.smack.inttest.annotations.BeforeClass;
|
||||
import org.igniterealtime.smack.inttest.annotations.SmackIntegrationTest;
|
||||
import org.igniterealtime.smack.inttest.annotations.SpecificationReference;
|
||||
|
@ -54,6 +55,11 @@ public class SoftwareInfoIntegrationTest extends AbstractSmackIntegrationTest {
|
|||
IntegrationTestRosterUtil.ensureBothAccountsAreSubscribedToEachOther(conOne, conTwo, timeout);
|
||||
}
|
||||
|
||||
@AfterClass
|
||||
public void cleanUp() throws Exception {
|
||||
IntegrationTestRosterUtil.ensureBothAccountsAreNotInEachOthersRoster(conOne, conTwo);
|
||||
}
|
||||
|
||||
@SmackIntegrationTest
|
||||
public void test() throws Exception {
|
||||
SoftwareInfoForm softwareInfoSent = createSoftwareInfoForm();
|
||||
|
|
|
@ -98,6 +98,7 @@ public class UserTuneIntegrationTest extends AbstractSmackIntegrationTest {
|
|||
Assertions.assertNotNull(result, "Expected to receive a PEP notification, but did not.");
|
||||
} finally {
|
||||
unregisterListener(utm2, userTuneListener);
|
||||
IntegrationTestRosterUtil.ensureBothAccountsAreNotInEachOthersRoster(conOne, conTwo);
|
||||
}
|
||||
}
|
||||
|
||||
|
@ -142,6 +143,7 @@ public class UserTuneIntegrationTest extends AbstractSmackIntegrationTest {
|
|||
assertResult(userTuneReceived, "Expected " + conTwo.getUser() + " to receive a PEP notification from " + conOne.getUser() + ", but did not.");
|
||||
} finally {
|
||||
unregisterListener(utm2, userTuneListener);
|
||||
IntegrationTestRosterUtil.ensureBothAccountsAreNotInEachOthersRoster(conOne, conTwo);
|
||||
}
|
||||
}
|
||||
|
||||
|
|
Loading…
Reference in a new issue