Mercury-IM/Smack
Mercury-IM/Smack
1
0
Fork 0
mirror of https://codeberg.org/Mercury-IM/Smack synced 2025-09-13 04:09:41 +02:00
Code Issues Releases Wiki Activity

Merge branch '4.2'

Browse source
This commit is contained in:
Florian Schmaus 2017-05-25 10:39:59 +02:00
commit 7a5f9e6a03
187 changed files with 2284 additions and 588 deletions
Download patch file Download diff file Expand all files Collapse all files

14
smack-im/src/test/java/org/jivesoftware/smack/roster/RosterTest.java
View file

@ -227,10 +227,10 @@ public class RosterTest extends InitSmackIm {
contactName,
item.getName());
assertTrue("The updated contact doesn't belong to the requested groups ("
+ contactGroups[0] +")!",
+ contactGroups[0] + ")!",
item.getGroupNames().contains(contactGroups[0]));
assertTrue("The updated contact doesn't belong to the requested groups ("
+ contactGroups[1] +")!",
+ contactGroups[1] + ")!",
item.getGroupNames().contains(contactGroups[1]));
assertSame("The provided group number doesn't match the requested!",
contactGroups.length,
@ -257,10 +257,10 @@ public class RosterTest extends InitSmackIm {
contactName,
addedEntry.getName());
assertTrue("The updated contact doesn't belong to the requested groups ("
+ contactGroups[0] +")!",
+ contactGroups[0] + ")!",
roster.getGroup(contactGroups[0]).contains(addedEntry));
assertTrue("The updated contact doesn't belong to the requested groups ("
+ contactGroups[1] +")!",
+ contactGroups[1] + ")!",
roster.getGroup(contactGroups[1]).contains(addedEntry));
assertSame("The updated contact should be member of two groups!",
contactGroups.length,
@ -399,7 +399,7 @@ public class RosterTest extends InitSmackIm {
*
* @see <a href="http://www.igniterealtime.org/issues/browse/SMACK-294">SMACK-294</a>
*/
@Test(timeout=5000)
@Test(timeout = 5000)
public void testAddEmptyGroupEntry() throws Throwable {
// Constants for the new contact
final BareJid contactJID = JidCreate.entityBareFrom("nurse@example.com");
@ -516,9 +516,9 @@ public class RosterTest extends InitSmackIm {
* @param roster the roster (or buddy list) which should be initialized.
*/
public static void removeAllRosterEntries(DummyConnection connection, Roster roster) {
for(RosterEntry entry : roster.getEntries()) {
for (RosterEntry entry : roster.getEntries()) {
// prepare the roster push packet
final RosterPacket rosterPush= new RosterPacket();
final RosterPacket rosterPush = new RosterPacket();
rosterPush.setType(Type.set);
rosterPush.setTo(connection.getUser());

4
smack-im/src/test/java/org/jivesoftware/smack/roster/RosterVersioningTest.java
View file

@ -142,7 +142,7 @@ public class RosterVersioningTest {
// but a shortcut in the test implementation.
Stanza sentPacket = connection.getSentPacket();
if (sentPacket instanceof RosterPacket) {
RosterPacket sentRP = (RosterPacket)sentPacket;
RosterPacket sentRP = (RosterPacket) sentPacket;
RosterPacket answer = new RosterPacket();
answer.setStanzaId(sentRP.getStanzaId());
answer.setType(Type.result);
@ -254,7 +254,7 @@ public class RosterVersioningTest {
// but a shortcut in the test implementation.
Stanza sentPacket = connection.getSentPacket();
if (sentPacket instanceof RosterPacket) {
final IQ emptyIQ = IQ.createResultIQ((RosterPacket)sentPacket);
final IQ emptyIQ = IQ.createResultIQ((RosterPacket) sentPacket);
connection.processStanza(emptyIQ);
} else {
assertTrue("Expected to get a RosterPacket ", false);

2
smack-im/src/test/java/org/jivesoftware/smack/roster/SubscriptionPreApprovalTest.java
View file

@ -70,7 +70,7 @@ public class SubscriptionPreApprovalTest extends InitSmackIm {
connection = null;
}
@Test(expected=FeatureNotSupportedException.class)
@Test(expected = FeatureNotSupportedException.class)
public void testPreApprovalNotSupported() throws Throwable {
final Jid contactJID = JidCreate.from("preapproval@example.com");
roster.preApprove(contactJID.asBareJid());