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

Bump "Error Prone" to 2.0.15

Browse source 
and fix a few things :)
This commit is contained in:
Florian Schmaus 2017-02-11 16:16:41 +01:00
parent ef0af66b21
commit 4c646436a5
246 changed files with 1122 additions and 124 deletions
Download patch file Download diff file Expand all files Collapse all files

6
smack-im/src/test/java/org/jivesoftware/smack/chat/ChatConnectionTest.java
View file

@ -34,7 +34,7 @@ import org.junit.Test;
import org.jxmpp.jid.Jid;
import org.jxmpp.jid.JidTestUtil;
@SuppressWarnings("deprecation")
@SuppressWarnings({"deprecation", "ReferenceEquality"})
public class ChatConnectionTest {
private DummyConnection dc;
@ -347,7 +347,7 @@ public class ChatConnectionTest {
waitListener.waitAndReset();
}
class TestChatManagerListener extends WaitForPacketListener implements ChatManagerListener {
static class TestChatManagerListener extends WaitForPacketListener implements ChatManagerListener {
private Chat newChat;
private ChatMessageListener listener;
@ -372,7 +372,7 @@ public class ChatConnectionTest {
}
}
private class TestChatServer extends Thread {
private static class TestChatServer extends Thread {
private Stanza chatPacket;
private DummyConnection con;

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

@ -145,6 +145,7 @@ public class RosterTest extends InitSmackIm {
// Adding the new roster item
final RosterUpdateResponder serverSimulator = new RosterUpdateResponder() {
@Override
void verifyUpdateRequest(final RosterPacket updateRequest) {
final Item item = updateRequest.getRosterItems().iterator().next();
assertEquals("The provided JID doesn't match the requested!",
@ -216,6 +217,7 @@ public class RosterTest extends InitSmackIm {
// Updating the roster item
final RosterUpdateResponder serverSimulator = new RosterUpdateResponder() {
@Override
void verifyUpdateRequest(final RosterPacket updateRequest) {
final Item item = updateRequest.getRosterItems().iterator().next();
assertEquals("The provided JID doesn't match the requested!",
@ -289,6 +291,7 @@ public class RosterTest extends InitSmackIm {
// Delete a roster item
final RosterUpdateResponder serverSimulator = new RosterUpdateResponder() {
@Override
void verifyUpdateRequest(final RosterPacket updateRequest) {
final Item item = updateRequest.getRosterItems().iterator().next();
assertEquals("The provided JID doesn't match the requested!",
@ -410,6 +413,7 @@ public class RosterTest extends InitSmackIm {
// Adding the new roster item
final RosterUpdateResponder serverSimulator = new RosterUpdateResponder() {
@Override
void verifyUpdateRequest(final RosterPacket updateRequest) {
final Item item = updateRequest.getRosterItems().iterator().next();
assertSame("The provided JID doesn't match the requested!",
@ -656,6 +660,7 @@ public class RosterTest extends InitSmackIm {
*/
abstract void verifyUpdateRequest(final RosterPacket updateRequest);
@Override
public void run() {
try {
while (true) {
@ -712,21 +717,25 @@ public class RosterTest extends InitSmackIm {
private final List<Jid> addressesDeleted = new CopyOnWriteArrayList<>();
private final List<Jid> addressesUpdated = new CopyOnWriteArrayList<>();
@Override
public synchronized void entriesAdded(Collection<Jid> addresses) {
addressesAdded.addAll(addresses);
reportInvoked();
}
@Override
public synchronized void entriesDeleted(Collection<Jid> addresses) {
addressesDeleted.addAll(addresses);
reportInvoked();
}
@Override
public synchronized void entriesUpdated(Collection<Jid> addresses) {
addressesUpdated.addAll(addresses);
reportInvoked();
}
@Override
public void presenceChanged(Presence presence) {
reportInvoked();
}
@ -794,6 +803,7 @@ public class RosterTest extends InitSmackIm {
/**
* Reset the lists of added, deleted or updated items.
*/
@Override
public synchronized void reset() {
super.reset();
addressesAdded.clear();

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

@ -155,6 +155,7 @@ public class SubscriptionPreApprovalTest extends InitSmackIm {
*/
abstract void verifyPreApprovalRequest(final Presence preApproval);
@Override
public void run() {
try {
while (true) {