Skip to content

Move Solace assertions to assertj #10765

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
eddumelendez merged 1 commit into from
Sep 4, 2025
+8 −8
Merged

Move Solace assertions to assertj #10765

Show file tree
Hide file tree
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
4 changes: 2 additions & 2 deletions modules/solace/src/test/java/org/testcontainers/solace/SolaceContainerAMQPTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
package org.testcontainers.solace;

import org.apache.qpid.jms.JmsConnectionFactory;
import org.junit.Assert;
import org.junit.jupiter.api.Test;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
Expand All @@ -19,6 +18,7 @@
import javax.jms.Topic;

import static org.assertj.core.api.Assertions.assertThat;
import static org.assertj.core.api.Assertions.fail;

class SolaceContainerAMQPTest {

Expand Down Expand Up @@ -57,7 +57,7 @@ private static Session createSession(String username, String password, String ho
connection.start();
return session;
} catch (Exception e) {
Assert.fail("Error connecting and setting up session! " + e.getMessage());
fail("Error connecting and setting up session! " + e.getMessage());
return null;
}
}
Expand Down
4 changes: 2 additions & 2 deletions modules/solace/src/test/java/org/testcontainers/solace/SolaceContainerMQTTTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,6 @@
import org.eclipse.paho.client.mqttv3.MqttConnectOptions;
import org.eclipse.paho.client.mqttv3.MqttException;
import org.eclipse.paho.client.mqttv3.MqttMessage;
import org.junit.Assert;
import org.junit.jupiter.api.Test;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
Expand All @@ -15,6 +14,7 @@
import java.util.concurrent.TimeUnit;

import static org.assertj.core.api.Assertions.assertThat;
import static org.assertj.core.api.Assertions.fail;

class SolaceContainerMQTTTest {

Expand Down Expand Up @@ -52,7 +52,7 @@ private static MqttClient createClient(String username, String password, String
mqttClient.connect(connOpts);
return mqttClient;
} catch (Exception e) {
Assert.fail("Error connecting and setting up session! " + e.getMessage());
fail("Error connecting and setting up session! " + e.getMessage());
return null;
}
}
Expand Down
4 changes: 2 additions & 2 deletions modules/solace/src/test/java/org/testcontainers/solace/SolaceContainerRESTTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,12 +12,12 @@
import org.apache.http.impl.client.BasicCredentialsProvider;
import org.apache.http.impl.client.HttpClientBuilder;
import org.apache.http.util.EntityUtils;
import org.junit.Assert;
import org.junit.jupiter.api.Test;

import java.io.IOException;

import static org.assertj.core.api.Assertions.assertThat;
import static org.assertj.core.api.Assertions.fail;

class SolaceContainerRESTTest {

Expand All @@ -44,7 +44,7 @@ private void testPublishMessageToSolace(SolaceContainer solaceContainer, Service
request.addHeader(HttpHeaders.CONTENT_TYPE, "text/plain");
HttpResponse response = client.execute(request);
if (response.getStatusLine().getStatusCode() != HttpStatus.SC_OK) {
Assert.fail("Cannot send message to solace - " + EntityUtils.toString(response.getEntity()));
fail("Cannot send message to solace - " + EntityUtils.toString(response.getEntity()));
}
assertThat(EntityUtils.toString(response.getEntity())).isEmpty();
}
Expand Down
4 changes: 2 additions & 2 deletions modules/solace/src/test/java/org/testcontainers/solace/SolaceContainerSMFTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,6 @@
import com.solacesystems.jcsmp.XMLMessageConsumer;
import com.solacesystems.jcsmp.XMLMessageListener;
import com.solacesystems.jcsmp.XMLMessageProducer;
import org.junit.Assert;
import org.junit.jupiter.api.Test;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
Expand All @@ -24,6 +23,7 @@
import java.util.concurrent.TimeUnit;

import static org.assertj.core.api.Assertions.assertThat;
import static org.assertj.core.api.Assertions.fail;

class SolaceContainerSMFTest {

Expand Down Expand Up @@ -145,7 +145,7 @@ private static JCSMPSession createSession(JCSMPProperties properties) {
session.connect();
return session;
} catch (Exception e) {
Assert.fail("Error connecting and setting up session! " + e.getMessage());
fail("Error connecting and setting up session! " + e.getMessage());
return null;
}
}
Expand Down
Loading