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

s/processPacket/processStanza/ s/PacketCollector/StanzaCollector/

Browse source
This commit is contained in:
Florian Schmaus 2017-01-03 11:12:34 +01:00
parent 9328182912
commit 90a5e289f8
100 changed files with 406 additions and 406 deletions
Download patch file Download diff file Expand all files Collapse all files

6
smack-extensions/src/test/java/org/jivesoftware/smackx/bytestreams/ibb/InBandBytestreamSessionMessageTest.java
View file

@ -274,7 +274,7 @@ public class InBandBytestreamSessionMessageTest extends InitExtensions {
dataMessage.addExtension(dpe);
// add data packets
listener.processPacket(dataMessage);
listener.processStanza(dataMessage);
// read until exception is thrown
try {
@ -313,7 +313,7 @@ public class InBandBytestreamSessionMessageTest extends InitExtensions {
DataPacketExtension dpe = new DataPacketExtension(sessionID, i, base64Data);
Message dataMessage = new Message();
dataMessage.addExtension(dpe);
listener.processPacket(dataMessage);
listener.processStanza(dataMessage);
}
byte[] bytes = new byte[3 * blockSize];
@ -358,7 +358,7 @@ public class InBandBytestreamSessionMessageTest extends InitExtensions {
DataPacketExtension dpe = new DataPacketExtension(sessionID, i, base64Data);
Message dataMessage = new Message();
dataMessage.addExtension(dpe);
listener.processPacket(dataMessage);
listener.processStanza(dataMessage);
}
// read data

20
smack-extensions/src/test/java/org/jivesoftware/smackx/bytestreams/ibb/InBandBytestreamSessionTest.java
View file

@ -316,7 +316,7 @@ public class InBandBytestreamSessionTest extends InitExtensions {
String base64Data = Base64.encode("Data");
DataPacketExtension dpe = new DataPacketExtension(sessionID, 0, base64Data);
Data data = new Data(dpe);
listener.processPacket(data);
listener.processStanza(data);
// verify no packet send
protocol.verifyAll();
@ -352,7 +352,7 @@ public class InBandBytestreamSessionTest extends InitExtensions {
DataPacketExtension dpe = new DataPacketExtension(sessionID, 0, base64Data);
Data data = new Data(dpe);
listener.processPacket(data);
listener.processStanza(data);
protocol.verifyAll();
@ -392,8 +392,8 @@ public class InBandBytestreamSessionTest extends InitExtensions {
Data data2 = new Data(dpe);
// notify listener
listener.processPacket(data1);
listener.processPacket(data2);
listener.processStanza(data1);
listener.processStanza(data2);
protocol.verifyAll();
@ -428,7 +428,7 @@ public class InBandBytestreamSessionTest extends InitExtensions {
Data data = new Data(dpe);
// notify listener
listener.processPacket(data);
listener.processStanza(data);
protocol.verifyAll();
@ -463,7 +463,7 @@ public class InBandBytestreamSessionTest extends InitExtensions {
Data data = new Data(dpe);
// add data packets
listener.processPacket(data);
listener.processStanza(data);
// read until exception is thrown
try {
@ -504,7 +504,7 @@ public class InBandBytestreamSessionTest extends InitExtensions {
String base64Data = Base64.encodeToString(controlData, i * blockSize, blockSize);
DataPacketExtension dpe = new DataPacketExtension(sessionID, i, base64Data);
Data data = new Data(dpe);
listener.processPacket(data);
listener.processStanza(data);
}
byte[] bytes = new byte[3 * blockSize];
@ -551,7 +551,7 @@ public class InBandBytestreamSessionTest extends InitExtensions {
String base64Data = Base64.encodeToString(controlData, i * blockSize, blockSize);
DataPacketExtension dpe = new DataPacketExtension(sessionID, i, base64Data);
Data data = new Data(dpe);
listener.processPacket(data);
listener.processStanza(data);
}
// read data
@ -592,7 +592,7 @@ public class InBandBytestreamSessionTest extends InitExtensions {
Data data = new Data(dpe);
// add data packets
listener.processPacket(data);
listener.processStanza(data);
inputStream.close();
@ -635,7 +635,7 @@ public class InBandBytestreamSessionTest extends InitExtensions {
Data data = new Data(dpe);
// add data packets
listener.processPacket(data);
listener.processStanza(data);
Thread closer = new Thread(new Runnable() {

16
smack-extensions/src/test/java/org/jivesoftware/util/ConnectionUtils.java
View file

@ -23,7 +23,7 @@ import static org.mockito.Mockito.doAnswer;
import static org.mockito.Mockito.mock;
import static org.mockito.Mockito.when;
import org.jivesoftware.smack.PacketCollector;
import org.jivesoftware.smack.StanzaCollector;
import org.jivesoftware.smack.SmackException;
import org.jivesoftware.smack.XMPPConnection;
import org.jivesoftware.smack.XMPPException.XMPPErrorException;
@ -49,11 +49,11 @@ public class ConnectionUtils {
* form the protocol instance.
* <p>
* This mocked connection can used to collect packets that require a reply using a
* PacketCollector.
* StanzaCollector.
*
* <pre>
* <code>
* PacketCollector collector = connection.createPacketCollector(new PacketFilter());
* StanzaCollector collector = connection.createStanzaCollector(new PacketFilter());
* connection.sendStanza(packet);
* Stanza(/Packet) reply = collector.nextResult();
* </code>
@ -76,19 +76,19 @@ public class ConnectionUtils {
when(connection.getXMPPServiceDomain()).thenReturn(xmppServer);
// mock packet collector
final PacketCollector collector = mock(PacketCollector.class);
when(connection.createPacketCollector(isA(StanzaFilter.class))).thenReturn(
final StanzaCollector collector = mock(StanzaCollector.class);
when(connection.createStanzaCollector(isA(StanzaFilter.class))).thenReturn(
collector);
Answer<PacketCollector> collectorAndSend = new Answer<PacketCollector>() {
Answer<StanzaCollector> collectorAndSend = new Answer<StanzaCollector>() {
@Override
public PacketCollector answer(InvocationOnMock invocation) throws Throwable {
public StanzaCollector answer(InvocationOnMock invocation) throws Throwable {
Stanza packet = (Stanza) invocation.getArguments()[0];
protocol.getRequests().add(packet);
return collector;
}
};
when(connection.createPacketCollectorAndSend(isA(IQ.class))).thenAnswer(collectorAndSend);
when(connection.createStanzaCollectorAndSend(isA(IQ.class))).thenAnswer(collectorAndSend);
// mock send method
Answer<Object> addIncoming = new Answer<Object>() {

2
smack-extensions/src/test/java/org/jivesoftware/util/Protocol.java
View file

@ -51,7 +51,7 @@ import org.jivesoftware.smack.packet.Stanza;
* <code>
* public void methodToTest() {
* Stanza(/Packet) stanza(/packet) = new Packet(); // create an XMPP packet
* PacketCollector collector = connection.createPacketCollector(new StanzaIdFilter());
* StanzaCollector collector = connection.createStanzaCollector(new StanzaIdFilter());
* connection.sendStanza(packet);
* Stanza(/Packet) reply = collector.nextResult();
* }