Do not use SCTP in tests, add JingleOfferFactoryTest (#729)

* test: Add JingleOfferFactoryTest. * test: Remove BundleTest. The test covers functions of jitsi-videobridge (which should be tested in the project) and the Jingle offer that jicofo creates (now covered in JingleOfferFactoryTest). The rest is just behavior specific to the *test* code (e.g. that a GroupPacketExtension is present, which is only ever added by MockParticipant itself). * test: Do not use SCTP in tests (do not try to load usrsctp). * ref: Simplift ColibriTest. * test: Do not verify jvb intenals. * test: Remove disabled test, do not verify jvb internals.
jitsi · Apr 21, 2021 · ff32df2 · ff32df2
1 parent 5f4c5f8
commit ff32df2
Show file tree

Hide file tree

Showing 9 changed files with 102 additions and 488 deletions.
diff --git a/src/test/java/mock/MockParticipant.java b/src/test/java/mock/MockParticipant.java
@@ -298,58 +298,6 @@ private Map<String, IceUdpTransportPacketExtension> createTransportMap(
         return transportMap;
     }
 
-    public Map<String, IceUdpTransportPacketExtension> generateFakeCandidates()
-    {
-        for (ContentPacketExtension content : myContents)
-        {
-            IceUdpTransportPacketExtension iceTransport
-                = transportMap.get(content.getName());
-
-            CandidatePacketExtension fakeCandidate
-                = new CandidatePacketExtension();
-
-            fakeCandidate.setIP("127.0.0.1");
-            fakeCandidate.setPort(60000);
-            fakeCandidate.setType(CandidateType.host);
-
-            iceTransport.addCandidate(fakeCandidate);
-        }
-        return transportMap;
-    }
-
-    public JingleIQ sendTransportInfo()
-    {
-        List<ContentPacketExtension> contents = new ArrayList<>();
-
-        for (ContentPacketExtension myContent : myContents)
-        {
-            ContentPacketExtension content = new ContentPacketExtension();
-            content.setName(myContent.getName());
-
-            try
-            {
-                IceUdpTransportPacketExtension transportCopy
-                    = IceUdpTransportPacketExtension
-                            .cloneTransportAndCandidates(transportMap.get(content.getName()), true);
-
-                content.addChildExtension(transportCopy);
-
-                contents.add(content);
-            }
-            catch (Exception e)
-            {
-                throw new RuntimeException(e);
-            }
-        }
-
-        JingleIQ transportInfoIq
-            = JinglePacketFactory.createTransportInfo(myJid, remoteJid, jingleSession.getSessionID(), contents);
-
-        UtilKt.tryToSendStanza(mockConnection, transportInfoIq);
-
-        return transportInfoIq;
-    }
-
     private JingleIQ generateSessionAccept(
             JingleIQ sessionInit,
             Map<String, IceUdpTransportPacketExtension> transportMap)
@@ -361,9 +309,6 @@ private JingleIQ generateSessionAccept(
         accept.setFrom(sessionInit.getTo());
         accept.setTo(sessionInit.getFrom());
 
-        // Jingle BUNDLE extension
-        accept.addExtension(GroupPacketExtension.createBundleGroup( sessionInit.getContentList()));
-
         for (ContentPacketExtension contentOffer : myContents)
         {
             ContentPacketExtension acceptContent = new ContentPacketExtension();

diff --git a/src/test/java/mock/MockXmppProvider.java b/src/test/java/mock/MockXmppProvider.java
@@ -25,13 +25,13 @@
 import org.jitsi.jicofo.jibri.*;
 import org.jitsi.jicofo.xmpp.*;
 import org.jitsi.protocol.xmpp.*;
-import org.jivesoftware.smack.*;
 import org.json.simple.*;
 import org.jxmpp.jid.*;
 import org.jxmpp.jid.impl.*;
 import org.jxmpp.stringprep.*;
 
 import java.util.*;
+import java.util.stream.*;
 
 /**
  *
@@ -42,6 +42,13 @@ public class MockXmppProvider
 {
     private final MockXmppConnection connection;
 
+    /**
+     * The features returned for any JID. We use default client features, but disable SCTP.
+     */
+    private final List<String> features
+            = DiscoveryUtil.getDefaultParticipantFeatureSet().stream()
+                .filter(f -> !f.equals(DiscoveryUtil.FEATURE_SCTP)).collect(Collectors.toList());
+
     private final AbstractOperationSetJingle jingleOpSet;
 
     private final MockMultiUserChatOpSet mucApi;
@@ -92,7 +99,7 @@ public XmppConnectionConfig getConfig()
 
 
     @Override
-    public AbstractXMPPConnection getXmppConnection()
+    public MockXmppConnection getXmppConnection()
     {
         return connection;
     }
@@ -134,7 +141,7 @@ public ChatRoom findOrCreateRoom(@NotNull EntityBareJid name) throws RoomExistsE
     @Override
     public List<String> discoverFeatures(@NotNull EntityFullJid jid)
     {
-        return DiscoveryUtil.getDefaultParticipantFeatureSet();
+        return features;
     }
 
     @Override

diff --git a/src/test/java/mock/jvb/MockVideobridge.java b/src/test/java/mock/jvb/MockVideobridge.java
@@ -25,7 +25,6 @@
 import org.jitsi.xmpp.extensions.colibri.*;
 import org.jivesoftware.smack.iqrequest.*;
 import org.jivesoftware.smack.packet.*;
-import org.jxmpp.jid.*;
 
 /**
  *
@@ -40,18 +39,15 @@ public class MockVideobridge
 
     private final MockXmppConnection connection;
 
-    private final Jid bridgeJid;
-
     private Videobridge bridge;
 
     private final ColibriConferenceIqHandler confIqGetHandler = new ColibriConferenceIqHandler(IQ.Type.get);
 
     private final ColibriConferenceIqHandler confIqSetHandler = new ColibriConferenceIqHandler(IQ.Type.set);
 
-    public MockVideobridge(MockXmppConnection connection, Jid bridgeJid)
+    public MockVideobridge(MockXmppConnection connection)
     {
         this.connection = connection;
-        this.bridgeJid = bridgeJid;
     }
 
     public void start()
@@ -102,21 +98,4 @@ public IQ handleIQRequest(IQ iqRequest)
             }
         }
     }
-
-    public int getEndpointCount()
-    {
-        return bridge.getConferences().stream()
-            .mapToInt(Conference::getEndpointCount)
-            .sum();
-    }
-
-    public Jid getBridgeJid()
-    {
-        return bridgeJid;
-    }
-
-    public int getConferenceCount()
-    {
-        return bridge.getConferences().size();
-    }
 }
diff --git a/src/test/java/mock/util/TestConference.java b/src/test/java/mock/util/TestConference.java
@@ -68,7 +68,7 @@ private void createJvbAndConference(String serverName, EntityBareJid roomName)
             throw new RuntimeException(e);
         }
 
-        mockBridge = new MockVideobridge(new MockXmppConnection(bridgeJid), bridgeJid);
+        mockBridge = new MockVideobridge(new MockXmppConnection(bridgeJid));
         mockBridge.start();
 
         harness.jicofoServices.getBridgeSelector().addJvbAddress(bridgeJid);