Skip to content

sinttest: Improve extensibility of AbstractMultiUserChatIntegrationTest #689

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
guusdk wants to merge 1 commit into
base: master
Choose a base branch
from
Open

sinttest: Improve extensibility of AbstractMultiUserChatIntegrationTest #689

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
40 changes: 20 additions & 20 deletions ...-test/src/main/java/org/jivesoftware/smackx/muc/AbstractMultiUserChatIntegrationTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -49,16 +49,16 @@

public abstract class AbstractMultiUserChatIntegrationTest extends AbstractSmackIntegrationTest {

final String randomString = StringUtils.insecureRandomString(6);
protected final String randomString = StringUtils.insecureRandomString(6);

final MultiUserChatManager mucManagerOne;
final MultiUserChatManager mucManagerTwo;
final MultiUserChatManager mucManagerThree;
final DomainBareJid mucService;
protected final MultiUserChatManager mucManagerOne;
protected final MultiUserChatManager mucManagerTwo;
protected final MultiUserChatManager mucManagerThree;
protected final DomainBareJid mucService;

final Resourcepart nicknameOne = Resourcepart.from("one-" + randomString);
final Resourcepart nicknameTwo = Resourcepart.from("two-" + randomString);
final Resourcepart nicknameThree = Resourcepart.from("three-" + randomString);
protected final Resourcepart nicknameOne = Resourcepart.from("one-" + randomString);
protected final Resourcepart nicknameTwo = Resourcepart.from("two-" + randomString);
protected final Resourcepart nicknameThree = Resourcepart.from("three-" + randomString);

public AbstractMultiUserChatIntegrationTest(SmackIntegrationTestEnvironment environment)
throws SmackException.NoResponseException, XMPPException.XMPPErrorException, SmackException.NotConnectedException,
Expand Down Expand Up @@ -99,7 +99,7 @@ public AbstractMultiUserChatIntegrationTest(SmackIntegrationTestEnvironment envi
mucService = needle;
}

static void mucCreationDisallowedOrThrow(XMPPException.XMPPErrorException e) throws XMPPErrorException {
public static void mucCreationDisallowedOrThrow(XMPPException.XMPPErrorException e) throws XMPPErrorException {
StanzaError.Condition condition = e.getStanzaError().getCondition();
if (condition == StanzaError.Condition.not_allowed)
return;
Expand Down Expand Up @@ -127,15 +127,15 @@ public EntityBareJid getRandomRoom(String prefix) throws XmppStringprepException
* @throws XMPPException.XMPPErrorException if there was an XMPP error returned.
* @throws SmackException.NoResponseException if there was no response from the remote entity.
*/
static void tryDestroy(final MultiUserChat muc) throws SmackException.NoResponseException, XMPPException.XMPPErrorException, SmackException.NotConnectedException, InterruptedException {
public static void tryDestroy(final MultiUserChat muc) throws SmackException.NoResponseException, XMPPException.XMPPErrorException, SmackException.NotConnectedException, InterruptedException {
if (muc == null) {
return;
}
// TODO: check if the muc exists before trying to destroy it.
muc.destroy("test fixture teardown", null);
}

static void createMuc(MultiUserChat muc, Resourcepart resourceName) throws
public static void createMuc(MultiUserChat muc, Resourcepart resourceName) throws
SmackException.NoResponseException, XMPPException.XMPPErrorException,
InterruptedException, MultiUserChatException.MucAlreadyJoinedException,
SmackException.NotConnectedException,
Expand All @@ -158,15 +158,15 @@ static void createMuc(MultiUserChat muc, String nickname) throws
createMuc(muc, Resourcepart.from(nickname));
}

static void createMuc(MultiUserChat muc, Resourcepart nickname, MucConfigApplier applier)
public static void createMuc(MultiUserChat muc, Resourcepart nickname, MucConfigApplier applier)
throws MucAlreadyJoinedException, MissingMucCreationAcknowledgeException, NotAMucServiceException,
NoResponseException, XMPPErrorException, NotConnectedException, InterruptedException,
TestNotPossibleException {
muc.create(nickname);
modifyMuc(muc, applier);
}

static void modifyMuc(MultiUserChat muc, MucConfigApplier applier) throws NoResponseException, XMPPErrorException, NotConnectedException, InterruptedException, TestNotPossibleException {
public static void modifyMuc(MultiUserChat muc, MucConfigApplier applier) throws NoResponseException, XMPPErrorException, NotConnectedException, InterruptedException, TestNotPossibleException {
var configManager = muc.getConfigFormManager();
try {
configManager.applyAndSubmit(applier);
Expand All @@ -175,7 +175,7 @@ static void modifyMuc(MultiUserChat muc, MucConfigApplier applier) throws NoResp
}
}

static void createMembersOnlyMuc(MultiUserChat muc, Resourcepart nickname) throws
public static void createMembersOnlyMuc(MultiUserChat muc, Resourcepart nickname) throws
SmackException.NoResponseException, XMPPException.XMPPErrorException,
InterruptedException, MultiUserChatException.MucAlreadyJoinedException,
SmackException.NotConnectedException,
Expand All @@ -185,7 +185,7 @@ static void createMembersOnlyMuc(MultiUserChat muc, Resourcepart nickname) throw
createMuc(muc, nickname, a -> a.makeMembersOnly());
}

static void createModeratedMuc(MultiUserChat muc, Resourcepart nickname)
public static void createModeratedMuc(MultiUserChat muc, Resourcepart nickname)
throws SmackException.NoResponseException, XMPPException.XMPPErrorException, InterruptedException,
MucAlreadyJoinedException, NotConnectedException,
MissingMucCreationAcknowledgeException,
Expand All @@ -194,7 +194,7 @@ static void createModeratedMuc(MultiUserChat muc, Resourcepart nickname)
createMuc(muc, nickname, a -> a.makeModerated());
}

static void createHiddenMuc(MultiUserChat muc, Resourcepart nickname)
public static void createHiddenMuc(MultiUserChat muc, Resourcepart nickname)
throws SmackException.NoResponseException, XMPPErrorException, InterruptedException,
MucAlreadyJoinedException, NotConnectedException,
MissingMucCreationAcknowledgeException, NotAMucServiceException, XmppStringprepException,
Expand All @@ -211,7 +211,7 @@ static void createHiddenMuc(MultiUserChat muc, Resourcepart nickname)
* semi-anonymous (a value of "moderators"), or fully anonymous (a value of "none", not shown here).
* </blockquote>
*/
static void createMucNonAnonymous(MultiUserChat muc, Resourcepart nickname) throws NoResponseException,
public static void createMucNonAnonymous(MultiUserChat muc, Resourcepart nickname) throws NoResponseException,
XMPPErrorException, NotConnectedException, InterruptedException, MucAlreadyJoinedException,
MissingMucCreationAcknowledgeException, NotAMucServiceException, TestNotPossibleException {
createMuc(muc, nickname, a -> a.setWhoisAllowedBy(WhoisAllowedBy.anyone));
Expand All @@ -226,7 +226,7 @@ static void createMucNonAnonymous(MultiUserChat muc, Resourcepart nickname) thro
* semi-anonymous (a value of "moderators"), or fully anonymous (a value of "none", not shown here).
* </blockquote>
*/
static void createMucSemiAnonymous(MultiUserChat muc, Resourcepart nickname)
public static void createMucSemiAnonymous(MultiUserChat muc, Resourcepart nickname)
throws NoResponseException, XMPPErrorException, InterruptedException, MucAlreadyJoinedException,
SmackException.NotConnectedException, MissingMucCreationAcknowledgeException,
NotAMucServiceException, TestNotPossibleException {
Expand All @@ -236,14 +236,14 @@ static void createMucSemiAnonymous(MultiUserChat muc, Resourcepart nickname)
/**
* Creates a password-protected room.
*/
static void setMucPasswordProtected(MultiUserChat muc, String password)
public static void setMucPasswordProtected(MultiUserChat muc, String password)
throws SmackException.NoResponseException, XMPPException.XMPPErrorException, InterruptedException,
MucAlreadyJoinedException, NotConnectedException, MissingMucCreationAcknowledgeException,
NotAMucServiceException, TestNotPossibleException {
modifyMuc(muc, a -> a.setAndEnablePassword(password));
}

static void setMaxUsers(MultiUserChat muc, int maxUsers) throws NoResponseException, XMPPErrorException,
public static void setMaxUsers(MultiUserChat muc, int maxUsers) throws NoResponseException, XMPPErrorException,
InterruptedException, NotConnectedException, TestNotPossibleException {
modifyMuc(muc, a -> a.setMaxUsers(maxUsers));
}
Expand Down
Loading