From efaa3c27a9b836dd4c78dde9323b88a4cc4e244d Mon Sep 17 00:00:00 2001 From: vanitasvitae Date: Wed, 9 Aug 2017 19:26:33 +0200 Subject: [PATCH] More Jingle IBB tests --- .../element/JingleIBBTransportElement.java | 2 +- .../jingle_ibb/JingleIBBTransportTest.java | 24 +++++++------------ 2 files changed, 9 insertions(+), 17 deletions(-) diff --git a/smack-extensions/src/main/java/org/jivesoftware/smackx/jingle/transport/jingle_ibb/element/JingleIBBTransportElement.java b/smack-extensions/src/main/java/org/jivesoftware/smackx/jingle/transport/jingle_ibb/element/JingleIBBTransportElement.java index 25ddf2a9a..a7156e5f8 100644 --- a/smack-extensions/src/main/java/org/jivesoftware/smackx/jingle/transport/jingle_ibb/element/JingleIBBTransportElement.java +++ b/smack-extensions/src/main/java/org/jivesoftware/smackx/jingle/transport/jingle_ibb/element/JingleIBBTransportElement.java @@ -27,7 +27,7 @@ public class JingleIBBTransportElement extends JingleContentTransportElement { public static final String ATTR_BLOCK_SIZE = "block-size"; public static final String ATTR_SID = "sid"; - public static final short DEFAULT_BLOCK_SIZE = 4096; + public static final Short DEFAULT_BLOCK_SIZE = 4096; private final String sid; private final Short blockSize; diff --git a/smack-extensions/src/test/java/org/jivesoftware/smackx/jingle/transport/jingle_ibb/JingleIBBTransportTest.java b/smack-extensions/src/test/java/org/jivesoftware/smackx/jingle/transport/jingle_ibb/JingleIBBTransportTest.java index 8b2ad4074..0264a393e 100644 --- a/smack-extensions/src/test/java/org/jivesoftware/smackx/jingle/transport/jingle_ibb/JingleIBBTransportTest.java +++ b/smack-extensions/src/test/java/org/jivesoftware/smackx/jingle/transport/jingle_ibb/JingleIBBTransportTest.java @@ -17,6 +17,7 @@ package org.jivesoftware.smackx.jingle.transport.jingle_ibb; import static junit.framework.TestCase.assertEquals; +import static junit.framework.TestCase.assertFalse; import static junit.framework.TestCase.assertTrue; import org.jivesoftware.smack.test.util.SmackTestSuite; @@ -49,26 +50,17 @@ public class JingleIBBTransportTest extends SmackTestSuite { assertEquals(transport.getElement(), parsed); assertTrue(transport.getElement().equals(parsed)); assertEquals(xml, parsed.toXML().toString()); - /* - JingleIBBTransport transport1 = new JingleIBBTransport((short) 1024); - assertEquals((short) 1024, transport1.getBlockSize()); - assertNotSame(transport, transport1); - assertNotSame(transport.getSessionId(), transport1.getSessionId()); + + JingleIBBTransport transport1 = new JingleIBBTransport(); + assertEquals(JingleIBBTransportElement.DEFAULT_BLOCK_SIZE, transport1.getBlockSize()); assertFalse(transport.equals(null)); - JingleIBBTransport transport2 = new JingleIBBTransport(); - assertEquals(JingleIBBTransport.DEFAULT_BLOCK_SIZE, transport2.getBlockSize()); + JingleIBBTransport transport2 = new JingleIBBTransport(transport1.getStreamId(), (short) 256); + assertEquals((Short) (short) 256, transport2.getBlockSize()); assertFalse(transport1.equals(transport2)); - JingleIBBTransport transport3 = new JingleIBBTransport((short) -1024); - assertEquals(JingleIBBTransport.DEFAULT_BLOCK_SIZE, transport3.getBlockSize()); - - assertEquals(transport3.getNamespace(), JingleIBBTransport.NAMESPACE_V1); - assertEquals(transport3.getElementName(), "transport"); - - JingleIBBTransport transport4 = new JingleIBBTransport("session-id"); - assertEquals(JingleIBBTransport.DEFAULT_BLOCK_SIZE, transport4.getBlockSize()); - */ + transport1.handleSessionAccept(transport2.getElement(), null); + assertEquals(transport2.getBlockSize(), transport1.getBlockSize()); } }