Skip to content

Fixing test assertion for different JVM's #931

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
chrjohn merged 1 commit into from
Jan 17, 2025
Merged

Fixing test assertion for different JVM's #931

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
18 changes: 10 additions & 8 deletions quickfixj-core/src/test/java/quickfix/mina/ssl/SSLCertificateTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -63,8 +63,8 @@
import org.junit.After;
import quickfix.mina.SocksProxyServer;

import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertSame;
import static org.junit.Assert.assertTrue;

public class SSLCertificateTest {

Expand Down Expand Up @@ -191,7 +191,7 @@ public void shouldAuthenticateServerNameUsingServerCommonName() throws Exception

TestInitiator initiator = new TestInitiator(
createInitiatorSettings("single-session/empty.keystore", "single-session/client-cn.truststore",
CIPHER_SUITES_TLS, "TLSv1.2", "ZULU", "ALFA", Integer.toString(freePort), "JKS", "JKS"));
CIPHER_SUITES_TLS, "TLSv1.2", "ZULU", "ALFA", Integer.toString(freePort), "JKS", "JKS", "HTTPS"));

try {
initiator.start();
Expand Down Expand Up @@ -226,7 +226,7 @@ public void shouldAuthenticateServerNameUsingSNIExtension() throws Exception {

TestInitiator initiator = new TestInitiator(
createInitiatorSettings("single-session/empty.keystore", "single-session/client-sni.truststore",
CIPHER_SUITES_TLS, "TLSv1.2", "ZULU", "ALFA", Integer.toString(freePort), "JKS", "JKS"));
CIPHER_SUITES_TLS, "TLSv1.2", "ZULU", "ALFA", Integer.toString(freePort), "JKS", "JKS", "HTTPS"));

try {
initiator.start();
Expand Down Expand Up @@ -786,7 +786,7 @@ public void assertSslExceptionThrown() throws Exception {
assertSslExceptionThrown(null, null);
}

public void assertSslExceptionThrown(String errorMessage, Class<?> errorType) throws Exception {
public void assertSslExceptionThrown(String expectedErrorMessage, Class<?> expectedErrorType) throws Exception {
boolean reachedZero = exceptionThrownLatch.await(TIMEOUT_SECONDS, TimeUnit.SECONDS);

if (!reachedZero) {
Expand All @@ -795,12 +795,14 @@ public void assertSslExceptionThrown(String errorMessage, Class<?> errorType) th

Throwable throwable = exception.get();

if (errorMessage != null) {
assertEquals(errorMessage, throwable.getMessage());
if (expectedErrorMessage != null) {
String thrownErrorMessage = throwable.getMessage();
assertTrue("Thrown error message: " + thrownErrorMessage + " does not contain: " + expectedErrorMessage,
thrownErrorMessage != null && thrownErrorMessage.contains(expectedErrorMessage));
}

if (errorType != null) {
assertSame(errorType, throwable.getClass());
if (expectedErrorType != null) {
assertSame(expectedErrorType, throwable.getClass());
}
}

Expand Down
Loading