Use static import for assertThat (#7188)

testcontainers · Jun 13, 2023 · 19a3c14 · 19a3c14
1 parent 09b1e47
commit 19a3c14
Show file tree

Hide file tree

Showing 4 changed files with 20 additions and 16 deletions.
diff --git a/modules/solace/src/test/java/org/testcontainers/solace/SolaceContainerAMQPTest.java b/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.assertj.core.api.Assertions;
 import org.junit.Assert;
 import org.junit.Test;
 import org.slf4j.Logger;
@@ -19,6 +18,8 @@
 import javax.jms.TextMessage;
 import javax.jms.Topic;
 
+import static org.assertj.core.api.Assertions.assertThat;
+
 public class SolaceContainerAMQPTest {
 
     private static final Logger LOGGER = LoggerFactory.getLogger(SolaceContainerAMQPTest.class);
@@ -42,8 +43,8 @@ public void testSolaceContainer() throws JMSException {
                 solaceContainer.getOrigin(Service.AMQP)
             );
             // }
-            Assertions.assertThat(session).isNotNull();
-            Assertions.assertThat(consumeMessageFromSolace(session)).isEqualTo(MESSAGE);
+            assertThat(session).isNotNull();
+            assertThat(consumeMessageFromSolace(session)).isEqualTo(MESSAGE);
             session.close();
         }
     }
@@ -86,7 +87,7 @@ private String consumeMessageFromSolace(Session session) {
                 }
             });
             publishMessageToSolace(session, topic);
-            Assertions.assertThat(latch.await(10L, TimeUnit.SECONDS)).isTrue();
+            assertThat(latch.await(10L, TimeUnit.SECONDS)).isTrue();
             messageConsumer.close();
             return result[0];
         } catch (Exception e) {

diff --git a/modules/solace/src/test/java/org/testcontainers/solace/SolaceContainerMQTTTest.java b/modules/solace/src/test/java/org/testcontainers/solace/SolaceContainerMQTTTest.java
@@ -1,6 +1,5 @@
 package org.testcontainers.solace;
 
-import org.assertj.core.api.Assertions;
 import org.eclipse.paho.client.mqttv3.IMqttDeliveryToken;
 import org.eclipse.paho.client.mqttv3.MqttCallback;
 import org.eclipse.paho.client.mqttv3.MqttClient;
@@ -15,6 +14,8 @@
 import java.util.concurrent.CountDownLatch;
 import java.util.concurrent.TimeUnit;
 
+import static org.assertj.core.api.Assertions.assertThat;
+
 public class SolaceContainerMQTTTest {
 
     private static final Logger LOGGER = LoggerFactory.getLogger(SolaceContainerMQTTTest.class);
@@ -36,8 +37,8 @@ public void testSolaceContainer() {
                 solaceContainer.getPassword(),
                 solaceContainer.getOrigin(Service.MQTT)
             );
-            Assertions.assertThat(client).isNotNull();
-            Assertions.assertThat(consumeMessageFromSolace(client)).isEqualTo(MESSAGE);
+            assertThat(client).isNotNull();
+            assertThat(consumeMessageFromSolace(client)).isEqualTo(MESSAGE);
         }
     }
 
@@ -86,7 +87,7 @@ public void deliveryComplete(IMqttDeliveryToken token) {}
             );
             client.subscribe(TOPIC_NAME, 0);
             publishMessageToSolace(client);
-            Assertions.assertThat(latch.await(10L, TimeUnit.SECONDS)).isTrue();
+            assertThat(latch.await(10L, TimeUnit.SECONDS)).isTrue();
             return result[0];
         } catch (Exception e) {
             throw new RuntimeException("Cannot receive message from solace", e);

diff --git a/modules/solace/src/test/java/org/testcontainers/solace/SolaceContainerRESTTest.java b/modules/solace/src/test/java/org/testcontainers/solace/SolaceContainerRESTTest.java
@@ -12,12 +12,13 @@
 import org.apache.http.impl.client.BasicCredentialsProvider;
 import org.apache.http.impl.client.HttpClientBuilder;
 import org.apache.http.util.EntityUtils;
-import org.assertj.core.api.Assertions;
 import org.junit.Assert;
 import org.junit.Test;
 
 import java.io.IOException;
 
+import static org.assertj.core.api.Assertions.assertThat;
+
 public class SolaceContainerRESTTest {
 
     private static final String MESSAGE = "HelloWorld";
@@ -45,7 +46,7 @@ private void testPublishMessageToSolace(SolaceContainer solaceContainer, Service
         if (response.getStatusLine().getStatusCode() != HttpStatus.SC_OK) {
             Assert.fail("Cannot send message to solace - " + EntityUtils.toString(response.getEntity()));
         }
-        Assertions.assertThat(EntityUtils.toString(response.getEntity())).isEmpty();
+        assertThat(EntityUtils.toString(response.getEntity())).isEmpty();
     }
 
     private HttpClient createClient(SolaceContainer solaceContainer) {

diff --git a/modules/solace/src/test/java/org/testcontainers/solace/SolaceContainerSMFTest.java b/modules/solace/src/test/java/org/testcontainers/solace/SolaceContainerSMFTest.java
@@ -11,7 +11,6 @@
 import com.solacesystems.jcsmp.XMLMessageConsumer;
 import com.solacesystems.jcsmp.XMLMessageListener;
 import com.solacesystems.jcsmp.XMLMessageProducer;
-import org.assertj.core.api.Assertions;
 import org.junit.Assert;
 import org.junit.Test;
 import org.slf4j.Logger;
@@ -21,6 +20,8 @@
 import java.util.concurrent.CountDownLatch;
 import java.util.concurrent.TimeUnit;
 
+import static org.assertj.core.api.Assertions.assertThat;
+
 public class SolaceContainerSMFTest {
 
     private static final Logger LOGGER = LoggerFactory.getLogger(SolaceContainerSMFTest.class);
@@ -41,8 +42,8 @@ public void testSolaceContainerWithSimpleAuthentication() {
         ) {
             solaceContainer.start();
             JCSMPSession session = createSessionWithBasicAuth(solaceContainer);
-            Assertions.assertThat(session).isNotNull();
-            Assertions.assertThat(consumeMessageFromSolace(session)).isEqualTo(MESSAGE);
+            assertThat(session).isNotNull();
+            assertThat(consumeMessageFromSolace(session)).isEqualTo(MESSAGE);
             session.closeSession();
         }
     }
@@ -61,8 +62,8 @@ public void testSolaceContainerWithCertificates() {
         ) {
             solaceContainer.start();
             JCSMPSession session = createSessionWithCertificates(solaceContainer);
-            Assertions.assertThat(session).isNotNull();
-            Assertions.assertThat(consumeMessageFromSolace(session)).isEqualTo(MESSAGE);
+            assertThat(session).isNotNull();
+            assertThat(consumeMessageFromSolace(session)).isEqualTo(MESSAGE);
             session.closeSession();
         }
     }
@@ -157,7 +158,7 @@ public void onException(JCSMPException e) {
             session.addSubscription(TOPIC);
             cons.start();
             publishMessageToSolace(session);
-            Assertions.assertThat(latch.await(10L, TimeUnit.SECONDS)).isTrue();
+            assertThat(latch.await(10L, TimeUnit.SECONDS)).isTrue();
             return result[0];
         } catch (Exception e) {
             throw new RuntimeException("Cannot receive message from solace", e);