vanitasvitae/Smack
1
0
Fork 0
mirror of https://github.com/vanitasvitae/Smack.git synced 2024-11-25 21:42:07 +01:00
Code Issues Releases Wiki Activity

Merge pull request #605 from guusdk/sint_roster-cleanup

Browse source 
[sinttest] Cleanup of test fixtures
This commit is contained in:
Florian Schmaus 2024-07-02 12:34:53 +00:00 committed by GitHub
commit 8fcfe2cc33
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
5 changed files with 29 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
smack-integration-test/src/main/java/org/jivesoftware/smack/roster/LowLevelRosterIntegrationTest.java
View file

@ -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,8 +57,10 @@ public class LowLevelRosterIntegrationTest extends AbstractSmackLowLevelIntegrat
}
offlineTriggered.signal();
}
});
};
rosterOne.addPresenceEventListener(presenceEventListener);
try {
// Disconnect conTwo, this should cause an 'unavailable' presence to be send from conTwo to
// conOne.
conTwo.disconnect();
@ -67,6 +69,13 @@ public class LowLevelRosterIntegrationTest extends AbstractSmackLowLevelIntegrat
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);
}
}
}

2
smack-integration-test/src/main/java/org/jivesoftware/smackx/geolocation/GeolocationIntegrationTest.java
View file

@ -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);
}
}

2
smack-integration-test/src/main/java/org/jivesoftware/smackx/mood/MoodIntegrationTest.java
View file

@ -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);
}
}

6
smack-integration-test/src/main/java/org/jivesoftware/smackx/softwareInfo/SoftwareInfoIntegrationTest.java
View file

@ -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();

2
smack-integration-test/src/main/java/org/jivesoftware/smackx/usertune/UserTuneIntegrationTest.java
View file

@ -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);
}
}