Merge 73ed9d3 into f65cf45

igniterealtime · Jan 19, 2023 · 796a848 · 796a848
2 parents f65cf45 + 73ed9d3
commit 796a848
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 1 deletion.
diff --git a/.../src/main/java/org/igniterealtime/smack/inttest/AbstractSmackLowLevelIntegrationTest.java b/.../src/main/java/org/igniterealtime/smack/inttest/AbstractSmackLowLevelIntegrationTest.java
@@ -21,6 +21,7 @@
 import java.util.List;
 
 import org.jivesoftware.smack.AbstractXMPPConnection;
+import org.jivesoftware.smack.ConnectionConfiguration;
 import org.jivesoftware.smack.SmackException;
 import org.jivesoftware.smack.SmackException.NoResponseException;
 import org.jivesoftware.smack.SmackException.NotConnectedException;
@@ -40,13 +41,19 @@ public abstract class AbstractSmackLowLevelIntegrationTest extends AbstractSmack
 
     protected final DomainBareJid service;
 
+    protected XmppConnectionDescriptor<? extends AbstractXMPPConnection, ? extends ConnectionConfiguration, ? extends ConnectionConfiguration.Builder<?, ?>> defaultConnectionDescriptor;
+
     protected AbstractSmackLowLevelIntegrationTest(SmackIntegrationTestEnvironment environment) {
         super(environment);
         this.environment = environment;
         this.configuration = environment.configuration;
         this.service = configuration.service;
     }
 
+    public void overrideDefaultConnectionDescriptor(XmppConnectionDescriptor<? extends AbstractXMPPConnection, ? extends ConnectionConfiguration, ? extends ConnectionConfiguration.Builder<?, ?>> defaultConnectionDescriptor) {
+        this.defaultConnectionDescriptor = defaultConnectionDescriptor;
+    }
+
     protected AbstractXMPPConnection getConnectedConnection() throws InterruptedException, XMPPException, SmackException, IOException {
         AbstractXMPPConnection connection = getUnconnectedConnection();
         connection.connect().login();
@@ -55,7 +62,11 @@ protected AbstractXMPPConnection getConnectedConnection() throws InterruptedExce
 
     protected AbstractXMPPConnection getUnconnectedConnection()
                     throws NoResponseException, XMPPErrorException, NotConnectedException, InterruptedException {
-        return environment.connectionManager.constructConnection();
+        if (defaultConnectionDescriptor == null) {
+            return environment.connectionManager.constructConnection();
+        } else {
+            return environment.connectionManager.constructConnection(defaultConnectionDescriptor);
+        }
     }
 
     protected List<AbstractXMPPConnection> getUnconnectedConnections(int count)

diff --git a/...on-test/src/main/java/org/igniterealtime/smack/inttest/SmackIntegrationTestFramework.java b/...on-test/src/main/java/org/igniterealtime/smack/inttest/SmackIntegrationTestFramework.java
@@ -851,6 +851,7 @@ private void invoke(AbstractSmackLowLevelIntegrationTest test,
                 connectionCount = testMethod.getParameterCount();
             }
 
+            test.overrideDefaultConnectionDescriptor(connectionDescriptor);
             List<? extends AbstractXMPPConnection> connections = connectionManager.constructConnectedConnections(
                             connectionDescriptor, connectionCount);