mirror of
https://github.com/vanitasvitae/Smack.git
synced 2024-11-01 01:35:59 +01:00
SMACK-334 FileTransferNegotiator now passes the correct type in the stream-method variable.
git-svn-id: http://svn.igniterealtime.org/svn/repos/smack/trunk@12212 b35dd754-fafc-0310-a699-88a17e54d16e
This commit is contained in:
parent
8a8b8ccd79
commit
2c55c2ac65
2 changed files with 42 additions and 1 deletions
|
@ -473,7 +473,7 @@ public class FileTransferNegotiator {
|
||||||
private DataForm createDefaultInitiationForm() {
|
private DataForm createDefaultInitiationForm() {
|
||||||
DataForm form = new DataForm(Form.TYPE_FORM);
|
DataForm form = new DataForm(Form.TYPE_FORM);
|
||||||
FormField field = new FormField(STREAM_DATA_FIELD_NAME);
|
FormField field = new FormField(STREAM_DATA_FIELD_NAME);
|
||||||
field.setType(FormField.TYPE_LIST_MULTI);
|
field.setType(FormField.TYPE_LIST_SINGLE);
|
||||||
if (!IBB_ONLY) {
|
if (!IBB_ONLY) {
|
||||||
field.addOption(new FormField.Option(Socks5BytestreamManager.NAMESPACE));
|
field.addOption(new FormField.Option(Socks5BytestreamManager.NAMESPACE));
|
||||||
}
|
}
|
||||||
|
|
|
@ -0,0 +1,41 @@
|
||||||
|
package org.jivesoftware.smackx.filetransfer;
|
||||||
|
|
||||||
|
import static org.junit.Assert.*;
|
||||||
|
|
||||||
|
import org.jivesoftware.smack.DummyConnection;
|
||||||
|
import org.jivesoftware.smack.XMPPException;
|
||||||
|
import org.jivesoftware.smack.packet.Packet;
|
||||||
|
import org.jivesoftware.smackx.ServiceDiscoveryManager;
|
||||||
|
import org.junit.After;
|
||||||
|
import org.junit.Before;
|
||||||
|
import org.junit.Test;
|
||||||
|
|
||||||
|
public class FileTransferNegotiatorTest {
|
||||||
|
private DummyConnection connection;
|
||||||
|
|
||||||
|
@Before
|
||||||
|
public void setUp() throws Exception {
|
||||||
|
// Uncomment this to enable debug output
|
||||||
|
//Connection.DEBUG_ENABLED = true;
|
||||||
|
|
||||||
|
connection = new DummyConnection();
|
||||||
|
connection.connect();
|
||||||
|
connection.login("me", "secret");
|
||||||
|
new ServiceDiscoveryManager(connection);
|
||||||
|
}
|
||||||
|
|
||||||
|
@After
|
||||||
|
public void tearDown() throws Exception {
|
||||||
|
if (connection != null)
|
||||||
|
connection.disconnect();
|
||||||
|
}
|
||||||
|
|
||||||
|
@Test
|
||||||
|
public void verifyForm() throws Exception
|
||||||
|
{
|
||||||
|
FileTransferNegotiator fileNeg = FileTransferNegotiator.getInstanceFor(connection);
|
||||||
|
fileNeg.negotiateOutgoingTransfer("me", "streamid", "file", 1024, null, 10);
|
||||||
|
Packet packet = connection.getSentPacket();
|
||||||
|
assertTrue(packet.toXML().indexOf("\"stream-method\" type=\"list-single\"") != -1);
|
||||||
|
}
|
||||||
|
}
|
Loading…
Reference in a new issue