vanitasvitae/Smack
1
0
Fork 0
mirror of https://github.com/vanitasvitae/Smack.git synced 2025-09-15 03: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

2
smack-extensions/src/test/java/org/jivesoftware/smackx/bytestreams/ibb/DataListenerTest.java
View file

@ -42,7 +42,7 @@ public class DataListenerTest {
static final Jid targetJID = JidTestUtil.FULL_JID_1_RESOURCE_1;
/**
* If a data packet of an unknown session is received it should be replied
* If a data stanza(/packet) of an unknown session is received it should be replied
* with an <item-not-found/> error.
*
* @throws Exception should not happen

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

@ -248,7 +248,7 @@ public class InBandBytestreamSessionMessageTest {
}
/**
* If a data packet is received out of order the session should be closed. See XEP-0047 Section
* If a data stanza(/packet) is received out of order the session should be closed. See XEP-0047 Section
* 2.2.
*
* @throws Exception should not happen

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

@ -358,7 +358,7 @@ public class InBandBytestreamSessionTest {
}
/**
* If the data packet has a sequence that is already used an 'unexpected-request' error should
* If the data stanza(/packet) has a sequence that is already used an 'unexpected-request' error should
* be returned. See XEP-0047 Section 2.2.
*
* @throws Exception should not happen
@ -399,7 +399,7 @@ public class InBandBytestreamSessionTest {
}
/**
* If the data packet contains invalid Base64 encoding an 'bad-request' error should be
* If the data stanza(/packet) contains invalid Base64 encoding an 'bad-request' error should be
* returned. See XEP-0047 Section 2.2.
*
* @throws Exception should not happen
@ -434,7 +434,7 @@ public class InBandBytestreamSessionTest {
}
/**
* If a data packet is received out of order the session should be closed. See XEP-0047 Section
* If a data stanza(/packet) is received out of order the session should be closed. See XEP-0047 Section
* 2.2.
*
* @throws Exception should not happen

6
smack-extensions/src/test/java/org/jivesoftware/smackx/bytestreams/socks5/Socks5PacketUtils.java
View file

@ -49,7 +49,7 @@ public class Socks5PacketUtils {
}
/**
* Returns a response to a SOCKS5 Bytestream initialization request. The packet doesn't contain
* Returns a response to a SOCKS5 Bytestream initialization request. The stanza(/packet) doesn't contain
* the uses-host information.
*
* @param from the target
@ -65,7 +65,7 @@ public class Socks5PacketUtils {
}
/**
* Returns a response to an item discovery request. The packet doesn't contain any items.
* Returns a response to an item discovery request. The stanza(/packet) doesn't contain any items.
*
* @param from the XMPP server
* @param to the XMPP client
@ -80,7 +80,7 @@ public class Socks5PacketUtils {
}
/**
* Returns a response to an info discovery request. The packet doesn't contain any infos.
* Returns a response to an info discovery request. The stanza(/packet) doesn't contain any infos.
*
* @param from the target
* @param to the initiator

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>
*

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

@ -50,10 +50,10 @@ import org.jivesoftware.smack.packet.Stanza;
* <pre>
* <code>
* public void methodToTest() {
* Packet packet = new Packet(); // create an XMPP packet
* Stanza(/Packet) stanza(/packet) = new Packet(); // create an XMPP packet
* PacketCollector collector = connection.createPacketCollector(new StanzaIdFilter());
* connection.sendStanza(packet);
* Packet reply = collector.nextResult();
* Stanza(/Packet) reply = collector.nextResult();
* }
*
* public void testMethod() {
@ -62,8 +62,8 @@ import org.jivesoftware.smack.packet.Stanza;
* // create mocked connection
* XMPPConnection connection = ConnectionUtils.createMockedConnection(protocol, "user@xmpp-server", "xmpp-server");
*
* // add reply packet to protocol
* Packet reply = new Packet();
* // add reply stanza(/packet) to protocol
* Stanza(/Packet) reply = new Packet();
* protocol.add(reply);
*
* // call method to test