Move Solace assertions to assertj (#10765)

Author: eddumelendez

modules/solace/src/test/java/org/testcontainers/solace/SolaceContainerAMQPTest.java

@@ -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;
@@ -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 {
 
@@ -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;
         }
     }

modules/solace/src/test/java/org/testcontainers/solace/SolaceContainerMQTTTest.java

@@ -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;
@@ -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 {
 
@@ -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;
         }
     }

modules/solace/src/test/java/org/testcontainers/solace/SolaceContainerRESTTest.java

@@ -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 {
 
@@ -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();
     }

modules/solace/src/test/java/org/testcontainers/solace/SolaceContainerSMFTest.java

@@ -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;
@@ -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 {
 
@@ -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;
         }
     }