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

Rename getSid -> getSession/StreamId

Browse source 
add junit tests for JingleSession
This commit is contained in:
vanitasvitae 2017-08-09 16:45:35 +02:00
parent a23eb6aeea
commit f930c1bdc5
Signed by: vanitasvitae
GPG key ID: 62BEE9264BF17311
10 changed files with 182 additions and 20 deletions
Download patch file Download diff file Expand all files Collapse all files

6
smack-integration-test/src/main/java/org/jivesoftware/smackx/jet/JetTest.java → smack-integration-test/src/main/java/org/jivesoftware/smackx/jet/JetIntegrationTestTest.java
View file

@ -16,7 +16,7 @@
*/
package org.jivesoftware.smackx.jet;
import static org.jivesoftware.smackx.jft.JingleFileTransferTest.prepareNewTestFile;
import static org.jivesoftware.smackx.jft.JingleFileTransferIntegrationTest.prepareNewTestFile;
import static org.jivesoftware.smackx.omemo.OmemoIntegrationTestHelper.cleanServerSideTraces;
import static org.jivesoftware.smackx.omemo.OmemoIntegrationTestHelper.setUpOmemoManager;
import static org.jivesoftware.smackx.omemo.OmemoIntegrationTestHelper.subscribe;
@ -46,7 +46,7 @@ import org.igniterealtime.smack.inttest.SmackIntegrationTestEnvironment;
import org.igniterealtime.smack.inttest.TestNotPossibleException;
import org.igniterealtime.smack.inttest.util.SimpleResultSyncPoint;
public class JetTest extends AbstractOmemoIntegrationTest {
public class JetIntegrationTestTest extends AbstractOmemoIntegrationTest {
private OmemoManager oa, ob;
private JetManager ja, jb;
@ -65,7 +65,7 @@ public class JetTest extends AbstractOmemoIntegrationTest {
}
}
public JetTest(SmackIntegrationTestEnvironment environment)
public JetIntegrationTestTest(SmackIntegrationTestEnvironment environment)
throws XMPPException.XMPPErrorException, SmackException.NotConnectedException, InterruptedException,
SmackException.NoResponseException, TestNotPossibleException {
super(environment);

4
smack-integration-test/src/main/java/org/jivesoftware/smackx/jft/JingleFileTransferTest.java → smack-integration-test/src/main/java/org/jivesoftware/smackx/jft/JingleFileTransferIntegrationTest.java
View file

@ -46,7 +46,7 @@ import org.jxmpp.jid.FullJid;
/**
* Created by vanitas on 29.06.17.
*/
public class JingleFileTransferTest extends AbstractSmackIntegrationTest {
public class JingleFileTransferIntegrationTest extends AbstractSmackIntegrationTest {
private static final File tempDir;
@ -60,7 +60,7 @@ public class JingleFileTransferTest extends AbstractSmackIntegrationTest {
}
}
public JingleFileTransferTest(SmackIntegrationTestEnvironment environment) {
public JingleFileTransferIntegrationTest(SmackIntegrationTestEnvironment environment) {
super(environment);
}

4
smack-integration-test/src/main/java/org/jivesoftware/smackx/jft/JingleFileTransferTransportFallbackTest.java → smack-integration-test/src/main/java/org/jivesoftware/smackx/jft/JingleFileTransferTransportFallbackIntegrationTest.java
View file

@ -46,7 +46,7 @@ import org.junit.AfterClass;
import org.junit.Before;
import org.jxmpp.jid.FullJid;
public class JingleFileTransferTransportFallbackTest extends AbstractSmackIntegrationTest {
public class JingleFileTransferTransportFallbackIntegrationTest extends AbstractSmackIntegrationTest {
private static final File tempDir;
@ -60,7 +60,7 @@ public class JingleFileTransferTransportFallbackTest extends AbstractSmackIntegr
}
}
public JingleFileTransferTransportFallbackTest(SmackIntegrationTestEnvironment environment) {
public JingleFileTransferTransportFallbackIntegrationTest(SmackIntegrationTestEnvironment environment) {
super(environment);
}

6
smack-integration-test/src/main/java/org/jivesoftware/smackx/jingle/transport/JingleTransportTest.java → smack-integration-test/src/main/java/org/jivesoftware/smackx/jingle/transport/JingleTransportIntegrationTest.java
View file

@ -49,9 +49,9 @@ import org.junit.Assert;
/**
* Test the JingleIBBTransport in a very basic case.
*/
public class JingleTransportTest extends AbstractSmackIntegrationTest {
public class JingleTransportIntegrationTest extends AbstractSmackIntegrationTest {
public JingleTransportTest(SmackIntegrationTestEnvironment environment) {
public JingleTransportIntegrationTest(SmackIntegrationTestEnvironment environment) {
super(environment);
}
@ -61,7 +61,7 @@ public class JingleTransportTest extends AbstractSmackIntegrationTest {
XMPPConnection receiver = conTwo;
JingleIBBTransport sTransport = new JingleIBBTransport();
JingleIBBTransport rTransport = new JingleIBBTransport(sTransport.getSid(), sTransport.getBlockSize());
JingleIBBTransport rTransport = new JingleIBBTransport(sTransport.getStreamId(), sTransport.getBlockSize());
JingleSession sSession = new JingleSession(JingleManager.getInstanceFor(sender), sender.getUser().asFullJidOrThrow(), receiver.getUser().asFullJidOrThrow(), Role.initiator, "session");
JingleSession rSession = new JingleSession(JingleManager.getInstanceFor(receiver), sender.getUser().asFullJidOrThrow(), receiver.getUser().asFullJidOrThrow(), Role.responder, "session");