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

[sinttest] decrease length of MUC names

Browse source 
To reduce the noise in XMPP traces, decrease the length of MUC names
generated by sinttest.
This commit is contained in:
Florian Schmaus 2024-10-18 16:11:29 +02:00
parent 75636884ad
commit 37a2df5486
7 changed files with 54 additions and 54 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
smack-integration-test/src/main/java/org/jivesoftware/smackx/muc/AbstractMultiUserChatIntegrationTest.java
View file

@ -105,7 +105,7 @@ public abstract class AbstractMultiUserChatIntegrationTest extends AbstractSmack
* @throws XmppStringprepException if the prefix isn't a valid XMPP Localpart
*/
public EntityBareJid getRandomRoom(String prefix) throws XmppStringprepException {
final String roomNameLocal = String.join("-", prefix, testRunId, StringUtils.insecureRandomString(6));
final String roomNameLocal = String.join("-", "sinttest", prefix, testRunId, StringUtils.insecureRandomString(3));
return JidCreate.entityBareFrom(Localpart.from(roomNameLocal), mucService.getDomain());
}

8
smack-integration-test/src/main/java/org/jivesoftware/smackx/muc/MultiUserChatEntityIntegrationTest.java
View file

@ -97,7 +97,7 @@ public class MultiUserChatEntityIntegrationTest extends AbstractMultiUserChatInt
"service. The service SHOULD return a full list of the public rooms it hosts (i.e., not return any rooms that" +
"are hidden).")
public void mucTestForDiscoveringRooms() throws Exception {
EntityBareJid mucAddressPublic = getRandomRoom("smack-inttest-publicroom");
EntityBareJid mucAddressPublic = getRandomRoom("publicroom");
MultiUserChat mucAsSeenByOne = mucManagerOne.getMultiUserChat(mucAddressPublic);
EntityBareJid mucAddressHidden = getRandomRoom("smack-inttest-hiddenroom");
@ -127,7 +127,7 @@ public class MultiUserChatEntityIntegrationTest extends AbstractMultiUserChatInt
"Using the disco#info protocol, an entity may also query a specific chat room for more detailed information " +
"about the room....The room MUST return its identity and SHOULD return the features it supports")
public void mucTestForDiscoveringRoomInfo() throws Exception {
EntityBareJid mucAddress = getRandomRoom("smack-inttest-discoinfo");
EntityBareJid mucAddress = getRandomRoom("discoinfo");
MultiUserChat mucAsSeenByOne = mucManagerOne.getMultiUserChat(mucAddress);
createMuc(mucAsSeenByOne, Resourcepart.from("one-" + randomString));
@ -154,7 +154,7 @@ public class MultiUserChatEntityIntegrationTest extends AbstractMultiUserChatInt
"of existing occupants if that information is publicly available, or return no list at all if this " +
"information is kept private.")
public void mucTestForDiscoveringRoomItems() throws Exception {
EntityBareJid mucAddress = getRandomRoom("smack-inttest-discoitems");
EntityBareJid mucAddress = getRandomRoom("discoitems");
MultiUserChat mucAsSeenByOne = mucManagerOne.getMultiUserChat(mucAddress);
createMuc(mucAsSeenByOne, Resourcepart.from("one-" + randomString));
@ -178,7 +178,7 @@ public class MultiUserChatEntityIntegrationTest extends AbstractMultiUserChatInt
"If a non-occupant attempts to send a disco request to an address of the form <room@service/nick>, a MUC " +
"service MUST return a <bad-request> error")
public void mucTestForRejectingDiscoOnRoomOccupantByNonOccupant() throws Exception {
EntityBareJid mucAddress = getRandomRoom("smack-inttest-discoitems");
EntityBareJid mucAddress = getRandomRoom("discoitems");
MultiUserChat mucAsSeenByOne = mucManagerOne.getMultiUserChat(mucAddress);
final Resourcepart nicknameOne = Resourcepart.from("one-" + randomString);
createMuc(mucAsSeenByOne, nicknameOne);

12
smack-integration-test/src/main/java/org/jivesoftware/smackx/muc/MultiUserChatIntegrationTest.java
View file

@ -57,7 +57,7 @@ public class MultiUserChatIntegrationTest extends AbstractMultiUserChatIntegrati
@SmackIntegrationTest
public void mucTest() throws Exception {
EntityBareJid mucAddress = getRandomRoom("smack-inttest-message");
EntityBareJid mucAddress = getRandomRoom("message");
MultiUserChat mucAsSeenByOne = mucManagerOne.getMultiUserChat(mucAddress);
MultiUserChat mucAsSeenByTwo = mucManagerTwo.getMultiUserChat(mucAddress);
@ -98,7 +98,7 @@ public class MultiUserChatIntegrationTest extends AbstractMultiUserChatIntegrati
"users from the room... and destroys the room")
public void mucDestroyOwnerTest() throws TimeoutException, Exception {
EntityBareJid mucAddress = getRandomRoom("smack-inttest-destroy-owner");
EntityBareJid mucAddress = getRandomRoom("destroy-owner");
MultiUserChat muc = mucManagerOne.getMultiUserChat(mucAddress);
createMuc(muc, Resourcepart.from("one-" + randomString));
@ -145,7 +145,7 @@ public class MultiUserChatIntegrationTest extends AbstractMultiUserChatIntegrati
"users from the room... and destroys the room")
public void mucDestroyTestOccupant() throws TimeoutException, Exception {
EntityBareJid mucAddress = getRandomRoom("smack-inttest-destroy-occupant");
EntityBareJid mucAddress = getRandomRoom("destroy-occupant");
MultiUserChat mucAsSeenByOwner = mucManagerOne.getMultiUserChat(mucAddress);
MultiUserChat mucAsSeenByParticipant = mucManagerTwo.getMultiUserChat(mucAddress);
@ -189,7 +189,7 @@ public class MultiUserChatIntegrationTest extends AbstractMultiUserChatIntegrati
throws XmppStringprepException, MucAlreadyJoinedException, MissingMucCreationAcknowledgeException,
NotAMucServiceException, NoResponseException, XMPPErrorException, NotConnectedException,
InterruptedException, MucConfigurationNotSupportedException {
EntityBareJid mucAddress = getRandomRoom("smack-inttest-muc-name-change");
EntityBareJid mucAddress = getRandomRoom("muc-name-change");
MultiUserChat muc = mucManagerOne.getMultiUserChat(mucAddress);
createMuc(muc, Resourcepart.from("one-" + randomString));
@ -214,7 +214,7 @@ public class MultiUserChatIntegrationTest extends AbstractMultiUserChatIntegrati
public void mucTestVisitorNotAllowedToChangeSubject() throws XmppStringprepException, MucAlreadyJoinedException,
MissingMucCreationAcknowledgeException, NotAMucServiceException, NoResponseException,
XMPPErrorException, NotConnectedException, InterruptedException, TestNotPossibleException {
final EntityBareJid mucAddress = getRandomRoom("smack-inttest-visitor-change-subject");
final EntityBareJid mucAddress = getRandomRoom("visitor-change-subject");
final MultiUserChat mucAsSeenByOne = mucManagerOne.getMultiUserChat(mucAddress);
final MultiUserChat mucAsSeenByTwo = mucManagerTwo.getMultiUserChat(mucAddress);
@ -250,7 +250,7 @@ public class MultiUserChatIntegrationTest extends AbstractMultiUserChatIntegrati
public void mucTestChangeRoomName() throws XmppStringprepException, MucAlreadyJoinedException,
MissingMucCreationAcknowledgeException, NotAMucServiceException, NoResponseException,
XMPPErrorException, NotConnectedException, InterruptedException, TestNotPossibleException {
final EntityBareJid mucAddress = getRandomRoom("smack-inttest-change-room-name");
final EntityBareJid mucAddress = getRandomRoom("change-room-name");
final MultiUserChat mucAsSeenByOne = mucManagerOne.getMultiUserChat(mucAddress);
final Resourcepart nicknameOne = Resourcepart.from("one-" + randomString);

42
smack-integration-test/src/main/java/org/jivesoftware/smackx/muc/MultiUserChatOccupantIntegrationTest.java
View file

@ -84,7 +84,7 @@ public class MultiUserChatOccupantIntegrationTest extends AbstractMultiUserChatI
// stanzas arrive. Instead, it joins a chatroom and listens for its stanzas using basic stanza handling. As
// this uses exactly one stanza listener, that's guaranteed to be invoked in order of stanza arrival, which is
// not necessarily the case when using the MUC API.
EntityBareJid mucAddress = getRandomRoom("smack-inttest-eventordering");
EntityBareJid mucAddress = getRandomRoom("eventordering");
final String mucSubject = "Subject smack-inttest-eventordering " + randomString;
final String mucMessage = "Message smack-inttest-eventordering " + randomString;
@ -173,7 +173,7 @@ public class MultiUserChatOccupantIntegrationTest extends AbstractMultiUserChatI
"§ 7.2.1: In order to participate in the discussions held in a multi-user chat room, a user MUST first become an occupant by entering the room [...] " +
"§ 7.4: If the sender is not an occupant of the room, the service SHOULD return a <not-acceptable/> error to the sender and SHOULD NOT reflect the message to all occupants")
public void mucSendBeforeJoiningTest() throws Exception {
EntityBareJid mucAddress = getRandomRoom("smack-inttest-send-without-joining");
EntityBareJid mucAddress = getRandomRoom("send-without-joining");
MultiUserChat mucAsSeenByOne = mucManagerOne.getMultiUserChat(mucAddress);
MultiUserChat mucAsSeenByTwo = mucManagerTwo.getMultiUserChat(mucAddress);
@ -213,7 +213,7 @@ public class MultiUserChatOccupantIntegrationTest extends AbstractMultiUserChatI
"complete list of the existing occupants to the new occupant and only then send the new occupant's own " +
"presence to the new occupant.")
public void mucJoinPresenceInformationTest() throws Exception {
EntityBareJid mucAddress = getRandomRoom("smack-inttest-presenceinfo");
EntityBareJid mucAddress = getRandomRoom("presenceinfo");
MultiUserChat mucAsSeenByOne = mucManagerOne.getMultiUserChat(mucAddress);
MultiUserChat mucAsSeenByTwo = mucManagerTwo.getMultiUserChat(mucAddress);
@ -272,7 +272,7 @@ public class MultiUserChatOccupantIntegrationTest extends AbstractMultiUserChatI
"the service MUST also send presence from the new participant's occupant JID to the full JIDs of all the " +
"occupants (including the new occupant)")
public void mucJoinPresenceBroadcastTest() throws Exception {
EntityBareJid mucAddress = getRandomRoom("smack-inttest-presenceinfo");
EntityBareJid mucAddress = getRandomRoom("presenceinfo");
MultiUserChat mucAsSeenByOne = mucManagerOne.getMultiUserChat(mucAddress);
MultiUserChat mucAsSeenByTwo = mucManagerTwo.getMultiUserChat(mucAddress);
@ -331,7 +331,7 @@ public class MultiUserChatOccupantIntegrationTest extends AbstractMultiUserChatI
"full JID as shown above), the service MUST warn the user by including a status code of \"100\" in the " +
"initial presence that the room sends to the new occupant.")
public void mucJoinNonAnonymousRoomTest() throws Exception {
EntityBareJid mucAddress = getRandomRoom("smack-inttest-joinnonanonymousroom");
EntityBareJid mucAddress = getRandomRoom("joinnonanonymousroom");
MultiUserChat mucAsSeenByOne = mucManagerOne.getMultiUserChat(mucAddress);
MultiUserChat mucAsSeenByTwo = mucManagerTwo.getMultiUserChat(mucAddress);
@ -388,7 +388,7 @@ public class MultiUserChatOccupantIntegrationTest extends AbstractMultiUserChatI
"option), but MUST include the new occupant's full JID only in the presence notifications it sends to " +
"occupants with a role of \"moderator\" and not to non-moderator occupants.")
public void mucJoinSemiAnonymousRoomReceivedByNonModeratorTest() throws Exception {
EntityBareJid mucAddress = getRandomRoom("smack-inttest-seminanonymous-by-non-moderator");
EntityBareJid mucAddress = getRandomRoom("seminanonymous-by-non-moderator");
MultiUserChat mucAsSeenByOne = mucManagerOne.getMultiUserChat(mucAddress);
MultiUserChat mucAsSeenByTwo = mucManagerTwo.getMultiUserChat(mucAddress);
@ -434,7 +434,7 @@ public class MultiUserChatOccupantIntegrationTest extends AbstractMultiUserChatI
"option), but MUST include the new occupant's full JID only in the presence notifications it sends to " +
"occupants with a role of \"moderator\" and not to non-moderator occupants.")
public void mucJoinSemiAnonymousRoomReceivedByModeratorTest() throws Exception {
EntityBareJid mucAddress = getRandomRoom("smack-inttest-seminanonymous-by-moderator");
EntityBareJid mucAddress = getRandomRoom("seminanonymous-by-moderator");
MultiUserChat mucAsSeenByOne = mucManagerOne.getMultiUserChat(mucAddress);
MultiUserChat mucAsSeenByTwo = mucManagerTwo.getMultiUserChat(mucAddress);
@ -478,7 +478,7 @@ public class MultiUserChatOccupantIntegrationTest extends AbstractMultiUserChatI
"service MUST deny access to the room and inform the user that they are unauthorized; this is done by returning " +
"a presence stanza of type \"error\" specifying a <not-authorized/> error.")
public void mucJoinPasswordProtectedWithoutPasswordRoomTest() throws Exception {
EntityBareJid mucAddress = getRandomRoom("smack-inttest-enterpasswordprotectedroom");
EntityBareJid mucAddress = getRandomRoom("enterpasswordprotectedroom");
MultiUserChat mucAsSeenByOne = mucManagerOne.getMultiUserChat(mucAddress);
MultiUserChat mucAsSeenByTwo = mucManagerTwo.getMultiUserChat(mucAddress);
@ -514,7 +514,7 @@ public class MultiUserChatOccupantIntegrationTest extends AbstractMultiUserChatI
"service MUST deny access to the room and inform the user that they are unauthorized; this is done by returning " +
"a presence stanza of type \"error\" specifying a <not-authorized/> error.")
public void mucJoinPasswordProtectedRoomWrongPasswordTest() throws Exception {
EntityBareJid mucAddress = getRandomRoom("smack-inttest-enterpasswordprotectedroom");
EntityBareJid mucAddress = getRandomRoom("enterpasswordprotectedroom");
MultiUserChat mucAsSeenByOne = mucManagerOne.getMultiUserChat(mucAddress);
MultiUserChat mucAsSeenByTwo = mucManagerTwo.getMultiUserChat(mucAddress);
@ -551,7 +551,7 @@ public class MultiUserChatOccupantIntegrationTest extends AbstractMultiUserChatI
"service MUST deny access to the room and inform the user that they are unauthorized; this is done by returning " +
"a presence stanza of type \"error\" specifying a <not-authorized/> error.")
public void mucJoinPasswordProtectedRoomCorrectPasswordTest() throws Exception {
EntityBareJid mucAddress = getRandomRoom("smack-inttest-enterpasswordprotectedroom");
EntityBareJid mucAddress = getRandomRoom("enterpasswordprotectedroom");
MultiUserChat mucAsSeenByOne = mucManagerOne.getMultiUserChat(mucAddress);
MultiUserChat mucAsSeenByTwo = mucManagerTwo.getMultiUserChat(mucAddress);
@ -593,7 +593,7 @@ public class MultiUserChatOccupantIntegrationTest extends AbstractMultiUserChatI
"room and inform the user that they are not allowed to enter the room; this is done by returning a presence " +
"stanza of type \"error\" specifying a <registration-required/> error condition.")
public void mucJoinMembersOnlyRoomTest() throws Exception {
EntityBareJid mucAddress = getRandomRoom("smack-inttest-entermembersonlyroom");
EntityBareJid mucAddress = getRandomRoom("entermembersonlyroom");
MultiUserChat mucAsSeenByOne = mucManagerOne.getMultiUserChat(mucAddress);
MultiUserChat mucAsSeenByTwo = mucManagerTwo.getMultiUserChat(mucAddress);
@ -631,7 +631,7 @@ public class MultiUserChatOccupantIntegrationTest extends AbstractMultiUserChatI
"access to the room and inform the user of the fact that they are banned; this is done by returning a presence " +
"stanza of type \"error\" specifying a <forbidden/> error condition.")
public void mucBannedUserJoinRoomTest() throws Exception {
EntityBareJid mucAddress = getRandomRoom("smack-inttest-banneduser");
EntityBareJid mucAddress = getRandomRoom("banneduser");
MultiUserChat mucAsSeenByOne = mucManagerOne.getMultiUserChat(mucAddress);
MultiUserChat mucAsSeenByTwo = mucManagerTwo.getMultiUserChat(mucAddress);
@ -667,7 +667,7 @@ public class MultiUserChatOccupantIntegrationTest extends AbstractMultiUserChatI
"room and inform the user of the conflict; this is done by returning a presence stanza of type \"error\" " +
"specifying a <conflict/> error condition.")
public void mucNicknameConflictJoinRoomTest() throws Exception {
EntityBareJid mucAddress = getRandomRoom("smack-inttest-nicknameclash");
EntityBareJid mucAddress = getRandomRoom("nicknameclash");
MultiUserChat mucAsSeenByOne = mucManagerOne.getMultiUserChat(mucAddress);
MultiUserChat mucAsSeenByTwo = mucManagerTwo.getMultiUserChat(mucAddress);
@ -701,7 +701,7 @@ public class MultiUserChatOccupantIntegrationTest extends AbstractMultiUserChatI
"specifying a <service-unavailable/> error condition. Alternatively, the room could kick an \"idle user\" " +
"in order to free up space (where the definition of \"idle user\" is up to the implementation).")
public void mucMaxUsersLimitJoinRoomTest() throws Exception {
EntityBareJid mucAddress = getRandomRoom("smack-inttest-maxusersreached");
EntityBareJid mucAddress = getRandomRoom("maxusersreached");
MultiUserChat mucAsSeenByOne = mucManagerOne.getMultiUserChat(mucAddress);
MultiUserChat mucAsSeenByTwo = mucManagerTwo.getMultiUserChat(mucAddress);
@ -780,7 +780,7 @@ public class MultiUserChatOccupantIntegrationTest extends AbstractMultiUserChatI
"room MUST allow the admin or owner to join, up to some reasonable number of additional occupants; this " +
"helps to prevent denial of service attacks caused by stuffing the room with non-admin users.")
public void mucMaxUsersLimitAdminCanStillJoinRoomTest() throws Exception {
EntityBareJid mucAddress = getRandomRoom("smack-inttest-maxusersreached-adminjoin");
EntityBareJid mucAddress = getRandomRoom("maxusersreached-adminjoin");
MultiUserChat mucAsSeenByOne = mucManagerOne.getMultiUserChat(mucAddress);
MultiUserChat mucAsSeenByTwo = mucManagerTwo.getMultiUserChat(mucAddress);
@ -832,7 +832,7 @@ public class MultiUserChatOccupantIntegrationTest extends AbstractMultiUserChatI
"room MUST allow the admin or owner to join, up to some reasonable number of additional occupants; this " +
"helps to prevent denial of service attacks caused by stuffing the room with non-admin users.")
public void mucMaxUsersLimitOwnerCanStillJoinRoomTest() throws Exception {
EntityBareJid mucAddress = getRandomRoom("smack-inttest-maxusersreached-ownerjoin");
EntityBareJid mucAddress = getRandomRoom("maxusersreached-ownerjoin");
MultiUserChat mucAsSeenByOne = mucManagerOne.getMultiUserChat(mucAddress);
MultiUserChat mucAsSeenByTwo = mucManagerTwo.getMultiUserChat(mucAddress);
@ -889,7 +889,7 @@ public class MultiUserChatOccupantIntegrationTest extends AbstractMultiUserChatI
throw new TestNotPossibleException("ejabberd does not implement MUC locked rooms as per XEP-0045 § 7.2.10");
}
EntityBareJid mucAddress = getRandomRoom("smack-inttest-lockedroom");
EntityBareJid mucAddress = getRandomRoom("lockedroom");
MultiUserChat mucAsSeenByOne = mucManagerOne.getMultiUserChat(mucAddress);
MultiUserChat mucAsSeenByTwo = mucManagerTwo.getMultiUserChat(mucAddress);
@ -926,7 +926,7 @@ public class MultiUserChatOccupantIntegrationTest extends AbstractMultiUserChatI
"discussions are logged. This is done by including a status code of \"170\" in the initial presence that the " +
"room sends to the new occupant.")
public void mucJoinRoomWithPublicLoggingTest() throws Exception {
final EntityBareJid mucAddress = getRandomRoom("smack-inttest-publiclogging");
final EntityBareJid mucAddress = getRandomRoom("publiclogging");
final MultiUserChat mucAsSeenByOne = mucManagerOne.getMultiUserChat(mucAddress);
final MultiUserChat mucAsSeenByTwo = mucManagerTwo.getMultiUserChat(mucAddress);
@ -967,7 +967,7 @@ public class MultiUserChatOccupantIntegrationTest extends AbstractMultiUserChatI
"case, nick='oldhag') - A status code of 303 This enables the recipients to correlate the old roomnick with " +
"the new roomnick.\n")
public void mucChangeNicknameInformationTest() throws Exception {
EntityBareJid mucAddress = getRandomRoom("smack-inttest-changenickname");
EntityBareJid mucAddress = getRandomRoom("changenickname");
MultiUserChat mucAsSeenByOne = mucManagerOne.getMultiUserChat(mucAddress);
MultiUserChat mucAsSeenByTwo = mucManagerTwo.getMultiUserChat(mucAddress);
@ -1062,7 +1062,7 @@ public class MultiUserChatOccupantIntegrationTest extends AbstractMultiUserChatI
"service MUST deny the nickname change request and inform the user of the conflict; this is done by " +
"returning a presence stanza of type \"error\" specifying a <conflict/> error condition:")
public void mucBlockChangeNicknameInformationTest() throws Exception {
EntityBareJid mucAddress = getRandomRoom("smack-inttest-blockchangenickname");
EntityBareJid mucAddress = getRandomRoom("blockchangenickname");
MultiUserChat mucAsSeenByOne = mucManagerOne.getMultiUserChat(mucAddress);
MultiUserChat mucAsSeenByTwo = mucManagerTwo.getMultiUserChat(mucAddress);
@ -1107,7 +1107,7 @@ public class MultiUserChatOccupantIntegrationTest extends AbstractMultiUserChatI
"JID to the departing occupant's full JIDs, including a status code of \"110\" to indicate that this " +
"notification is \"self-presence\"")
public void mucLeaveTest() throws Exception {
EntityBareJid mucAddress = getRandomRoom("smack-inttest-leave");
EntityBareJid mucAddress = getRandomRoom("leave");
MultiUserChat muc = mucManagerOne.getMultiUserChat(mucAddress);
try {

36
smack-integration-test/src/main/java/org/jivesoftware/smackx/muc/MultiUserChatRolesAffiliationsPrivilegesIntegrationTest.java
View file

@ -70,7 +70,7 @@ public class MultiUserChatRolesAffiliationsPrivilegesIntegrationTest extends Abs
"communicate the change to all occupants [...] (§ 9.6) The service MUST then send updated presence from this " +
"individual to all occupants, indicating the addition of moderator status...")
public void mucRoleTestForReceivingModerator() throws Exception {
EntityBareJid mucAddress = getRandomRoom("smack-inttest");
EntityBareJid mucAddress = getRandomRoom("inttest");
MultiUserChat mucAsSeenByOne = mucManagerOne.getMultiUserChat(mucAddress);
MultiUserChat mucAsSeenByTwo = mucManagerTwo.getMultiUserChat(mucAddress);
@ -109,7 +109,7 @@ public class MultiUserChatRolesAffiliationsPrivilegesIntegrationTest extends Abs
"communicate the change to all occupants [...] (§ 9.6) The service MUST then send updated presence from this " +
"individual to all occupants, indicating the addition of moderator status...")
public void mucRoleTestForWitnessingModerator() throws Exception {
EntityBareJid mucAddress = getRandomRoom("smack-inttest");
EntityBareJid mucAddress = getRandomRoom("inttest");
MultiUserChat mucAsSeenByOne = mucManagerOne.getMultiUserChat(mucAddress);
MultiUserChat mucAsSeenByTwo = mucManagerTwo.getMultiUserChat(mucAddress);
@ -150,7 +150,7 @@ public class MultiUserChatRolesAffiliationsPrivilegesIntegrationTest extends Abs
"communicate the change to all occupants [...] (§ 9.7) The service MUST then send updated presence from this " +
"individual to all occupants, indicating the removal of moderator status...")
public void mucRoleTestForRemovingModerator() throws Exception {
EntityBareJid mucAddress = getRandomRoom("smack-inttest");
EntityBareJid mucAddress = getRandomRoom("inttest");
MultiUserChat mucAsSeenByOne = mucManagerOne.getMultiUserChat(mucAddress);
MultiUserChat mucAsSeenByTwo = mucManagerTwo.getMultiUserChat(mucAddress);
@ -188,7 +188,7 @@ public class MultiUserChatRolesAffiliationsPrivilegesIntegrationTest extends Abs
"communicate the change to all occupants [...] (§ 9.7) The service MUST then send updated presence from this " +
"individual to all occupants, indicating the removal of moderator status...")
public void mucRoleTestForWitnessingModeratorRemoval() throws Exception {
EntityBareJid mucAddress = getRandomRoom("smack-inttest");
EntityBareJid mucAddress = getRandomRoom("inttest");
MultiUserChat mucAsSeenByOne = mucManagerOne.getMultiUserChat(mucAddress);
MultiUserChat mucAsSeenByTwo = mucManagerTwo.getMultiUserChat(mucAddress);
@ -228,7 +228,7 @@ public class MultiUserChatRolesAffiliationsPrivilegesIntegrationTest extends Abs
"communicate the change to all occupants [...] (§ 8.4) The service MUST then send updated presence from " +
"this individual to all occupants, indicating the removal of voice privileges...")
public void mucRoleTestForRevokingVoice() throws Exception {
EntityBareJid mucAddress = getRandomRoom("smack-inttest");
EntityBareJid mucAddress = getRandomRoom("inttest");
MultiUserChat mucAsSeenByOne = mucManagerOne.getMultiUserChat(mucAddress);
MultiUserChat mucAsSeenByTwo = mucManagerTwo.getMultiUserChat(mucAddress);
@ -263,7 +263,7 @@ public class MultiUserChatRolesAffiliationsPrivilegesIntegrationTest extends Abs
"communicate the change to all occupants [...] (§ 8.4) The service MUST then send updated presence from " +
"this individual to all occupants, indicating the removal of voice privileges...")
public void mucRoleTestForWitnessingRevokingVoice() throws Exception {
EntityBareJid mucAddress = getRandomRoom("smack-inttest");
EntityBareJid mucAddress = getRandomRoom("inttest");
MultiUserChat mucAsSeenByOne = mucManagerOne.getMultiUserChat(mucAddress);
MultiUserChat mucAsSeenByTwo = mucManagerTwo.getMultiUserChat(mucAddress);
@ -302,7 +302,7 @@ public class MultiUserChatRolesAffiliationsPrivilegesIntegrationTest extends Abs
"communicate that to all occupants [...] (§ 10.6) If the user is in the room, the service MUST then send " +
"updated presence from this individual to all occupants, indicating the granting of admin status...")
public void mucAffiliationTestForReceivingAdmin() throws Exception {
EntityBareJid mucAddress = getRandomRoom("smack-inttest");
EntityBareJid mucAddress = getRandomRoom("inttest");
MultiUserChat mucAsSeenByOne = mucManagerOne.getMultiUserChat(mucAddress);
MultiUserChat mucAsSeenByTwo = mucManagerTwo.getMultiUserChat(mucAddress);
@ -341,7 +341,7 @@ public class MultiUserChatRolesAffiliationsPrivilegesIntegrationTest extends Abs
"communicate that to all occupants [...] (§ 10.6) If the user is in the room, the service MUST then send " +
"updated presence from this individual to all occupants, indicating the granting of admin status...")
public void mucAffiliationTestForWitnessingAdmin() throws Exception {
EntityBareJid mucAddress = getRandomRoom("smack-inttest");
EntityBareJid mucAddress = getRandomRoom("inttest");
MultiUserChat mucAsSeenByOne = mucManagerOne.getMultiUserChat(mucAddress);
MultiUserChat mucAsSeenByTwo = mucManagerTwo.getMultiUserChat(mucAddress);
@ -381,7 +381,7 @@ public class MultiUserChatRolesAffiliationsPrivilegesIntegrationTest extends Abs
"updated presence from this individual to all occupants, indicating the loss of admin status by sending a " +
"presence element...")
public void mucAffiliationTestForRemovingAdmin() throws Exception {
EntityBareJid mucAddress = getRandomRoom("smack-inttest");
EntityBareJid mucAddress = getRandomRoom("inttest");
MultiUserChat mucAsSeenByOne = mucManagerOne.getMultiUserChat(mucAddress);
MultiUserChat mucAsSeenByTwo = mucManagerTwo.getMultiUserChat(mucAddress);
@ -431,7 +431,7 @@ public class MultiUserChatRolesAffiliationsPrivilegesIntegrationTest extends Abs
"updated presence from this individual to all occupants, indicating the loss of admin status by sending a " +
"presence element...")
public void mucAffiliationTestForWitnessingAdminRemoval() throws Exception {
EntityBareJid mucAddress = getRandomRoom("smack-inttest");
EntityBareJid mucAddress = getRandomRoom("inttest");
MultiUserChat mucAsSeenByOne = mucManagerOne.getMultiUserChat(mucAddress);
MultiUserChat mucAsSeenByTwo = mucManagerTwo.getMultiUserChat(mucAddress);
@ -473,7 +473,7 @@ public class MultiUserChatRolesAffiliationsPrivilegesIntegrationTest extends Abs
"presence information, optionally along with the reason (if provided) and the roomnick or bare JID of the " +
"user who initiated the kick.")
public void mucPresenceTestForGettingKicked() throws Exception {
EntityBareJid mucAddress = getRandomRoom("smack-inttest");
EntityBareJid mucAddress = getRandomRoom("inttest");
MultiUserChat mucAsSeenByOne = mucManagerOne.getMultiUserChat(mucAddress);
MultiUserChat mucAsSeenByTwo = mucManagerTwo.getMultiUserChat(mucAddress);
@ -517,7 +517,7 @@ public class MultiUserChatRolesAffiliationsPrivilegesIntegrationTest extends Abs
"(<room@service/nick>) to all the remaining occupants (just as it does when occupants exit the room of their " +
"own volition), including the status code and optionally the reason and actor.")
public void mucPresenceTestForWitnessingKick() throws Exception {
EntityBareJid mucAddress = getRandomRoom("smack-inttest");
EntityBareJid mucAddress = getRandomRoom("inttest");
MultiUserChat mucAsSeenByOne = mucManagerOne.getMultiUserChat(mucAddress);
MultiUserChat mucAsSeenByTwo = mucManagerTwo.getMultiUserChat(mucAddress);
@ -564,7 +564,7 @@ public class MultiUserChatRolesAffiliationsPrivilegesIntegrationTest extends Abs
"affected by happenings in the room...Affiliations are granted, revoked, and maintained based on the user's " +
"bare JID, not the nick as with roles.")
public void mucTestPersistentAffiliation() throws Exception {
EntityBareJid mucAddress = getRandomRoom("smack-inttest");
EntityBareJid mucAddress = getRandomRoom("inttest");
MultiUserChat mucAsSeenByOne = mucManagerOne.getMultiUserChat(mucAddress);
MultiUserChat mucAsSeenByTwo = mucManagerTwo.getMultiUserChat(mucAddress);
@ -605,7 +605,7 @@ public class MultiUserChatRolesAffiliationsPrivilegesIntegrationTest extends Abs
"moderator attempts to revoke voice privileges from such a user, the service MUST deny the request and return " +
"a <not-allowed/> error to the sender along with the offending item(s)")
public void mucTestModeratorCannotRevokeVoiceFromOwner() throws Exception {
EntityBareJid mucAddress = getRandomRoom("smack-inttest");
EntityBareJid mucAddress = getRandomRoom("inttest");
MultiUserChat mucAsSeenByOne = mucManagerOne.getMultiUserChat(mucAddress);
MultiUserChat mucAsSeenByTwo = mucManagerTwo.getMultiUserChat(mucAddress);
@ -637,7 +637,7 @@ public class MultiUserChatRolesAffiliationsPrivilegesIntegrationTest extends Abs
"than themselves (i.e., an unaffiliated moderator SHOULD NOT be allowed to revoke moderation privileges from " +
"an admin or an owner, and an admin SHOULD NOT be allowed to revoke moderation privileges from an owner)")
public void mucTestModeratorCannotBeRevokedFromHigherAffiliation() throws Exception {
EntityBareJid mucAddress = getRandomRoom("smack-inttest");
EntityBareJid mucAddress = getRandomRoom("inttest");
MultiUserChat mucAsSeenByOne = mucManagerOne.getMultiUserChat(mucAddress);
MultiUserChat mucAsSeenByTwo = mucManagerTwo.getMultiUserChat(mucAddress);
@ -683,7 +683,7 @@ public class MultiUserChatRolesAffiliationsPrivilegesIntegrationTest extends Abs
@SmackIntegrationTest(section = "5.1.2", quote =
"...the initial default roles that a service SHOULD set based on the user's affiliation...")
public void mucTestDefaultRoleForAffiliationInUnmoderatedRoom() throws Exception {
EntityBareJid mucAddress = getRandomRoom("smack-inttest-unmoderatedroles");
EntityBareJid mucAddress = getRandomRoom("unmoderatedroles");
MultiUserChat mucAsSeenByOne = mucManagerOne.getMultiUserChat(mucAddress);
MultiUserChat mucAsSeenByTwo = mucManagerTwo.getMultiUserChat(mucAddress);
@ -736,7 +736,7 @@ public class MultiUserChatRolesAffiliationsPrivilegesIntegrationTest extends Abs
@SmackIntegrationTest(section = "5.1.2", quote =
"...the initial default roles that a service SHOULD set based on the user's affiliation...")
public void mucTestDefaultRoleForAffiliationInModeratedRoom() throws Exception {
EntityBareJid mucAddress = getRandomRoom("smack-inttest-moderatedroles");
EntityBareJid mucAddress = getRandomRoom("moderatedroles");
MultiUserChat mucAsSeenByOne = mucManagerOne.getMultiUserChat(mucAddress);
MultiUserChat mucAsSeenByTwo = mucManagerTwo.getMultiUserChat(mucAddress);
@ -799,7 +799,7 @@ public class MultiUserChatRolesAffiliationsPrivilegesIntegrationTest extends Abs
@SmackIntegrationTest(section = "5.1.2", quote =
"...the initial default roles that a service SHOULD set based on the user's affiliation...")
public void mucTestDefaultRoleForAffiliationInMembersOnlyRoom() throws Exception {
EntityBareJid mucAddress = getRandomRoom("smack-inttest-membersonlyroles");
EntityBareJid mucAddress = getRandomRoom("membersonlyroles");
MultiUserChat mucAsSeenByOne = mucManagerOne.getMultiUserChat(mucAddress);
MultiUserChat mucAsSeenByTwo = mucManagerTwo.getMultiUserChat(mucAddress);

4
smack-integration-test/src/main/java/org/jivesoftware/smackx/muc/ParticipantStatusIntegrationTest.java
View file

@ -48,7 +48,7 @@ public class ParticipantStatusIntegrationTest extends AbstractMultiUserChatInteg
@SmackIntegrationTest(section = "9.4", quote = "An admin might want to revoke a user's membership [...] The service MUST then send updated presence from this individual to all occupants, indicating the loss of membership by sending a presence element that contains an <x/> element qualified by the 'http://jabber.org/protocol/muc#user' namespace and containing an <item/> child with the 'affiliation' attribute set to a value of \"none\".")
public void testMembershipRevokedInOpenRoom() throws Exception {
// Setup test fixture.
final EntityBareJid mucAddress = getRandomRoom("smack-inttest-participantstatus-membership-revoked-open");
final EntityBareJid mucAddress = getRandomRoom("participantstatus-membership-revoked-open");
final MultiUserChat mucAsSeenByOwner = mucManagerOne.getMultiUserChat(mucAddress);
final MultiUserChat mucAsSeenByTarget = mucManagerTwo.getMultiUserChat(mucAddress);
@ -89,7 +89,7 @@ public class ParticipantStatusIntegrationTest extends AbstractMultiUserChatInteg
@SmackIntegrationTest(section = "9.4", quote = "An admin might want to revoke a user's membership [...] If the room is members-only, the service MUST remove the user from the room, including a status code of 321 to indicate that the user was removed because of an affiliation change, and inform all remaining occupants")
public void testMembershipRevokedInMemberOnlyRoom() throws Exception {
// Setup test fixture.
final EntityBareJid mucAddress = getRandomRoom("smack-inttest-participantstatus-membership-revoked-membersonly");
final EntityBareJid mucAddress = getRandomRoom("participantstatus-membership-revoked-membersonly");
final MultiUserChat mucAsSeenByOwner = mucManagerOne.getMultiUserChat(mucAddress);
final MultiUserChat mucAsSeenByTarget = mucManagerTwo.getMultiUserChat(mucAddress);

4
smack-integration-test/src/main/java/org/jivesoftware/smackx/muc/UserStatusIntegrationTest.java
View file

@ -50,7 +50,7 @@ public class UserStatusIntegrationTest extends AbstractMultiUserChatIntegrationT
@SmackIntegrationTest(section = "9.4", quote = "An admin might want to revoke a user's membership [...] The service MUST then send updated presence from this individual to all occupants, indicating the loss of membership by sending a presence element that contains an <x/> element qualified by the 'http://jabber.org/protocol/muc#user' namespace and containing an <item/> child with the 'affiliation' attribute set to a value of \"none\".")
public void testMembershipRevokedInOpenRoom() throws Exception {
// Setup test fixture.
final EntityBareJid mucAddress = getRandomRoom("smack-inttest-userstatus-membership-revoked-membersonly");
final EntityBareJid mucAddress = getRandomRoom("userstatus-membership-revoked-membersonly");
final MultiUserChat mucAsSeenByOwner = mucManagerOne.getMultiUserChat(mucAddress);
final MultiUserChat mucAsSeenByTarget = mucManagerTwo.getMultiUserChat(mucAddress);
@ -89,7 +89,7 @@ public class UserStatusIntegrationTest extends AbstractMultiUserChatIntegrationT
@SmackIntegrationTest(section = "9.4", quote = "An admin might want to revoke a user's membership [...] If the room is members-only, the service MUST remove the user from the room, including a status code of 321 to indicate that the user was removed because of an affiliation change, and inform all remaining occupants")
public void testMembershipRevokedInMemberOnlyRoom() throws Exception {
// Setup test fixture.
final EntityBareJid mucAddress = getRandomRoom("smack-inttest-userstatus-membership-revoked-membersonly");
final EntityBareJid mucAddress = getRandomRoom("userstatus-membership-revoked-membersonly");
final MultiUserChat mucAsSeenByOwner = mucManagerOne.getMultiUserChat(mucAddress);
final MultiUserChat mucAsSeenByTarget = mucManagerTwo.getMultiUserChat(mucAddress);