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

Merge branch '4.1'

Browse source 
Conflicts:
	smack-core/src/main/java/org/jivesoftware/smack/StanzaListener.java
	smack-core/src/main/java/org/jivesoftware/smack/XMPPConnection.java
	smack-core/src/main/java/org/jivesoftware/smack/packet/Stanza.java
	smack-core/src/main/java/org/jivesoftware/smack/util/PacketParserUtils.java
	version.gradle
This commit is contained in:
Florian Schmaus 2015-03-24 17:16:18 +01:00
commit 83b84c5bd3
168 changed files with 780 additions and 687 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -45,7 +45,7 @@ import org.mockito.stubbing.Answer;
public class ConnectionUtils {
/**
* Creates a mocked XMPP connection that stores every packet that is send over this
* Creates a mocked XMPP connection that stores every stanza(/packet) that is send over this
* connection in the given protocol instance and returns the predefined answer packets
* form the protocol instance.
* <p>
@ -56,7 +56,7 @@ public class ConnectionUtils {
* <code>
* PacketCollector collector = connection.createPacketCollector(new PacketFilter());
* connection.sendStanza(packet);
* Packet reply = collector.nextResult();
* Stanza(/Packet) reply = collector.nextResult();
* </code>
* </pre>
*