Skip to content

Commit

Permalink
[integration-test] Check that connections are connected for normal in…
Browse files Browse the repository at this point in the history
…tegration tests
  • Loading branch information
Flowdalic committed Nov 9, 2024
1 parent 2cc77b4 commit 6a03bdb
Showing 1 changed file with 17 additions and 1 deletion.
Original file line number Diff line number Diff line change
Expand Up @@ -48,6 +48,7 @@
import java.util.TreeSet;
import java.util.logging.Level;
import java.util.logging.Logger;
import java.util.stream.Collectors;

import org.jivesoftware.smack.AbstractXMPPConnection;
import org.jivesoftware.smack.ConnectionConfiguration;
Expand All @@ -57,6 +58,7 @@
import org.jivesoftware.smack.SmackException;
import org.jivesoftware.smack.SmackException.NoResponseException;
import org.jivesoftware.smack.SmackException.NotConnectedException;
import org.jivesoftware.smack.XMPPConnection;
import org.jivesoftware.smack.XMPPException;
import org.jivesoftware.smack.XMPPException.XMPPErrorException;
import org.jivesoftware.smack.util.StringUtils;
Expand Down Expand Up @@ -483,7 +485,13 @@ private void runTests(Set<Class<? extends AbstractSmackIntTest>> classes)
for (Method testMethod : smackIntegrationTestMethods) {
switch (testType) {
case Normal: {
ConcreteTest.Executor concreteTestExecutor = () -> testMethod.invoke(test);
ConcreteTest.Executor concreteTestExecutor = () -> {
AbstractSmackIntegrationTest abstractTest = (AbstractSmackIntegrationTest) test;

throwIfDisconnectedConnections(abstractTest, testMethod, "Cannot execute test of");
testMethod.invoke(test);
throwIfDisconnectedConnections(abstractTest, testMethod, "There where disconnected connections after executing");
};
ConcreteTest concreteTest = new ConcreteTest(testType, testMethod, concreteTestExecutor);
concreteTests.add(concreteTest);
}
Expand Down Expand Up @@ -1111,4 +1119,12 @@ static TestMethodParameterType determineTestMethodParameterType(Method testMetho
return null;
}

private static void throwIfDisconnectedConnections(AbstractSmackIntegrationTest abstractTest, Method testMethod, String message) throws IOException {
List<XMPPConnection> disconnectedConnections = abstractTest.connections.stream().filter(c -> !c.isConnected()).collect(Collectors.toList());
if (disconnectedConnections.isEmpty()) return;

throw new IOException(message + " " + testMethod.getDeclaringClass().getSimpleName() + "."
+ testMethod.getName() + ", as not all connections are connected. Disconnected connections: "
+ disconnectedConnections);
}
}

0 comments on commit 6a03bdb

Please sign in to comment.