vanitasvitae/Smack
1
0
Fork 0
mirror of https://github.com/vanitasvitae/Smack.git synced 2025-09-10 01:29:38 +02:00
Code Issues Releases Wiki Activity

Enable LeftCurly checkstyle check

Browse source
This commit is contained in:
Florian Schmaus 2018-04-06 10:21:46 +02:00
parent 5a841ff0a8
commit 9b5dafe541
93 changed files with 549 additions and 1087 deletions
Download patch file Download diff file Expand all files Collapse all files

107
smack-core/src/test/java/org/jivesoftware/smack/StanzaCollectorTest.java
View file

@ -24,16 +24,13 @@ import org.jivesoftware.smack.packet.Stanza;
import org.junit.Test;
public class StanzaCollectorTest
{
public class StanzaCollectorTest {
@Test
public void verifyRollover() throws InterruptedException
{
public void verifyRollover() throws InterruptedException {
TestStanzaCollector collector = new TestStanzaCollector(null, new OKEverything(), 5);
for (int i = 0; i < 6; i++)
{
for (int i = 0; i < 6; i++) {
Stanza testPacket = new TestPacket(i);
collector.processStanza(testPacket);
}
@ -46,8 +43,7 @@ public class StanzaCollectorTest
assertEquals("5", collector.pollResult().getStanzaId());
assertNull(collector.pollResult());
for (int i = 10; i < 15; i++)
{
for (int i = 10; i < 15; i++) {
Stanza testPacket = new TestPacket(i);
collector.processStanza(testPacket);
}
@ -67,26 +63,18 @@ public class StanzaCollectorTest
* catch problems.
*/
@Test
public void verifyThreadSafety()
{
public void verifyThreadSafety() {
int insertCount = 500;
final TestStanzaCollector collector = new TestStanzaCollector(null, new OKEverything(), insertCount);
Thread consumer1 = new Thread(new Runnable()
{
Thread consumer1 = new Thread(new Runnable() {
@Override
public void run()
{
try
{
while (true)
{
try
{
public void run() {
try {
while (true) {
try {
Thread.sleep(3);
}
catch (InterruptedException e)
{
} catch (InterruptedException e) {
}
@SuppressWarnings("unused")
Stanza packet = collector.nextResultBlockForever();
@ -100,55 +88,41 @@ public class StanzaCollectorTest
});
consumer1.setName("consumer 1");
Thread consumer2 = new Thread(new Runnable()
{
Thread consumer2 = new Thread(new Runnable() {
@Override
public void run()
{
public void run() {
Stanza p;
do
{
try
{
do {
try {
Thread.sleep(3);
}
catch (InterruptedException e)
{
} catch (InterruptedException e) {
}
try {
p = collector.nextResult(1);
}
catch (InterruptedException e) {
} catch (InterruptedException e) {
throw new RuntimeException(e);
}
// System.out.println(Thread.currentThread().getName() + " packet: " + p);
// System.out.println(Thread.currentThread().getName() + " packet: " + p);
}
while (p != null);
}
});
consumer2.setName("consumer 2");
Thread consumer3 = new Thread(new Runnable()
{
Thread consumer3 = new Thread(new Runnable() {
@Override
public void run()
{
public void run() {
Stanza p;
do
{
try
{
do {
try {
Thread.sleep(3);
}
catch (InterruptedException e)
{
} catch (InterruptedException e) {
}
p = collector.pollResult();
// System.out.println(Thread.currentThread().getName() + " packet: " + p);
}
while (p != null);
// System.out.println(Thread.currentThread().getName() + " packet: " + p);
} while (p != null);
}
});
consumer3.setName("consumer 3");
@ -157,54 +131,43 @@ public class StanzaCollectorTest
consumer2.start();
consumer3.start();
for (int i = 0; i < insertCount; i++)
{
for (int i = 0; i < insertCount; i++) {
collector.processStanza(new TestPacket(i));
}
try
{
try {
Thread.sleep(5000);
consumer3.join();
consumer2.join();
consumer1.interrupt();
}
catch (InterruptedException e)
{
} catch (InterruptedException e) {
}
// We cannot guarantee that this is going to pass due to the possible issue of timing between consumer 1
// and main, but the probability is extremely remote.
assertNull(collector.pollResult());
}
static class OKEverything implements StanzaFilter
{
static class OKEverything implements StanzaFilter {
@Override
public boolean accept(Stanza packet)
{
public boolean accept(Stanza packet) {
return true;
}
}
static class TestStanzaCollector extends StanzaCollector
{
protected TestStanzaCollector(XMPPConnection conection, StanzaFilter packetFilter, int size)
{
static class TestStanzaCollector extends StanzaCollector {
protected TestStanzaCollector(XMPPConnection conection, StanzaFilter packetFilter, int size) {
super(conection, StanzaCollector.newConfiguration().setStanzaFilter(packetFilter).setSize(size));
}
}
static class TestPacket extends Stanza
{
TestPacket(int i)
{
static class TestPacket extends Stanza {
TestPacket(int i) {
setStanzaId(String.valueOf(i));
}
@Override
public String toXML()
{
public String toXML() {
return "<packetId>" + getStanzaId() + "</packetId>";
}

27
smack-core/src/test/java/org/jivesoftware/smack/filter/FromMatchesFilterTest.java
View file

@ -45,8 +45,7 @@ public class FromMatchesFilterTest {
private static final Jid SERVICE_JID2 = JidTestUtil.PUBSUB_EXAMPLE_ORG;
@Test
public void autoCompareMatchingEntityFullJid()
{
public void autoCompareMatchingEntityFullJid() {
FromMatchesFilter filter = FromMatchesFilter.create(FULL_JID1_R1);
Stanza packet = new Message();
@ -70,8 +69,7 @@ public class FromMatchesFilterTest {
}
@Test
public void autoCompareMatchingBaseJid()
{
public void autoCompareMatchingBaseJid() {
FromMatchesFilter filter = FromMatchesFilter.create(BASE_JID1);
Stanza packet = new Message();
@ -95,8 +93,7 @@ public class FromMatchesFilterTest {
}
@Test
public void autoCompareMatchingServiceJid()
{
public void autoCompareMatchingServiceJid() {
FromMatchesFilter filter = FromMatchesFilter.create(SERVICE_JID1);
Stanza packet = new Message();
@ -117,8 +114,7 @@ public class FromMatchesFilterTest {
}
@Test
public void bareCompareMatchingEntityFullJid()
{
public void bareCompareMatchingEntityFullJid() {
FromMatchesFilter filter = FromMatchesFilter.createBare(FULL_JID1_R1);
Stanza packet = new Message();
@ -142,8 +138,7 @@ public class FromMatchesFilterTest {
}
@Test
public void bareCompareMatchingBaseJid()
{
public void bareCompareMatchingBaseJid() {
FromMatchesFilter filter = FromMatchesFilter.createBare(BASE_JID1);
Stanza packet = new Message();
@ -167,8 +162,7 @@ public class FromMatchesFilterTest {
}
@Test
public void bareCompareMatchingServiceJid()
{
public void bareCompareMatchingServiceJid() {
FromMatchesFilter filter = FromMatchesFilter.createBare(SERVICE_JID1);
Stanza packet = new Message();
@ -189,8 +183,7 @@ public class FromMatchesFilterTest {
}
@Test
public void fullCompareMatchingEntityFullJid()
{
public void fullCompareMatchingEntityFullJid() {
FromMatchesFilter filter = FromMatchesFilter.createFull(FULL_JID1_R1);
Stanza packet = new Message();
@ -214,8 +207,7 @@ public class FromMatchesFilterTest {
}
@Test
public void fullCompareMatchingBaseJid()
{
public void fullCompareMatchingBaseJid() {
FromMatchesFilter filter = FromMatchesFilter.createFull(BASE_JID1);
Stanza packet = new Message();
@ -239,8 +231,7 @@ public class FromMatchesFilterTest {
}
@Test
public void fullCompareMatchingServiceJid()
{
public void fullCompareMatchingServiceJid() {
FromMatchesFilter filter = FromMatchesFilter.createFull(SERVICE_JID1);
Stanza packet = new Message();