test(integration): fix integration tests after dependencies updates

MikeSafonov · Apr 22, 2021 · 77b0667 · 77b0667
1 parent a94e0e6
commit 77b0667
Show file tree

Hide file tree

Showing 4 changed files with 27 additions and 6 deletions.
diff --git a/build.gradle b/build.gradle
@@ -68,8 +68,9 @@ dependencies {
     testImplementation("com.devskiller:jfairy:0.6.4")
     testImplementation('org.springframework.boot:spring-boot-starter-test')
 
-    testIntegrationImplementation platform("org.springframework.cloud:spring-cloud-dependencies:Hoxton.SR11")
+    testIntegrationImplementation platform("org.springframework.cloud:spring-cloud-dependencies:2020.0.2")
     testIntegrationImplementation("org.springframework.cloud:spring-cloud-starter")
+    testIntegrationImplementation("org.springframework.cloud:spring-cloud-starter-bootstrap")
     testIntegrationImplementation("org.awaitility:awaitility:4.0.3")
     testIntegrationImplementation("com.github.mikesafonov:smpp-server-mock-assertj:1.5.0")
     testIntegrationImplementation("com.github.mikesafonov:smpp-server-mock-junit:1.5.0")

diff --git a/src/testIntegration/java/com/github/mikesafonov/smpp/TestUtils.java b/src/testIntegration/java/com/github/mikesafonov/smpp/TestUtils.java
@@ -1,12 +1,18 @@
 package com.github.mikesafonov.smpp;
 
+import com.cloudhopper.smpp.SmppServerSession;
 import com.github.mikesafonov.smpp.config.SmppProperties;
 import com.github.mikesafonov.smpp.core.ClientFactory;
 import com.github.mikesafonov.smpp.core.connection.ConnectionManager;
 import com.github.mikesafonov.smpp.core.connection.ConnectionManagerFactory;
 import com.github.mikesafonov.smpp.core.sender.DefaultTypeOfAddressParser;
 import com.github.mikesafonov.smpp.core.sender.SenderClient;
 import lombok.experimental.UtilityClass;
+import org.assertj.core.api.Assertions;
+import org.assertj.core.api.InstanceOfAssertFactory;
+import org.assertj.core.api.IterableAssert;
+
+import java.util.Set;
 
 @UtilityClass
 public class TestUtils {
@@ -19,4 +25,8 @@ static SenderClient createDefaultSenderClient(String name, SmppProperties.Creden
         return new ClientFactory().standardSender(name, defaults, smsc, new DefaultTypeOfAddressParser(), manager);
     }
 
+    public static InstanceOfAssertFactory<Set, IterableAssert<SmppServerSession>> sessionSet() {
+        return new InstanceOfAssertFactory<>(Set.class, Assertions::<SmppServerSession>assertThat);
+    }
+
 }
diff --git a/src/testIntegration/java/com/github/mikesafonov/smpp/roundrobin/RoundRobinSmppTest.java b/src/testIntegration/java/com/github/mikesafonov/smpp/roundrobin/RoundRobinSmppTest.java
@@ -11,6 +11,7 @@
 import org.springframework.test.context.ActiveProfiles;
 import org.springframework.test.context.TestPropertySource;
 
+import static com.github.mikesafonov.smpp.TestUtils.sessionSet;
 import static com.github.mikesafonov.smpp.assertj.SmppAssertions.assertThat;
 
 
@@ -39,9 +40,9 @@ void stopAll() {
     @Test
     void shouldOpenTwoConnection(){
         org.assertj.core.api.Assertions.assertThat(smppServerHolder.getByName("one").get())
-            .extracting("handler.sessions.size").isEqualTo(2);
+            .extracting("handler.sessions").asInstanceOf(sessionSet()).hasSize(2);
         org.assertj.core.api.Assertions.assertThat(smppServerHolder.getByName("two").get())
-            .extracting("handler.sessions.size").isEqualTo(2);
+            .extracting("handler.sessions").asInstanceOf(sessionSet()).hasSize(2);
     }
 
     @Test

diff --git a/src/testIntegration/java/com/github/mikesafonov/smpp/transceiver/TransceiverTest.java b/src/testIntegration/java/com/github/mikesafonov/smpp/transceiver/TransceiverTest.java
@@ -9,14 +9,19 @@
 import com.github.mikesafonov.smpp.core.reciever.DeliveryReportConsumer;
 import com.github.mikesafonov.smpp.server.MockSmppServer;
 import com.github.mikesafonov.smpp.server.MockSmppServerHolder;
-import java.util.concurrent.TimeUnit;
-import org.junit.jupiter.api.*;
+import org.junit.jupiter.api.AfterAll;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.TestInstance;
 import org.mockito.ArgumentCaptor;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.boot.test.context.SpringBootTest;
 import org.springframework.test.context.ActiveProfiles;
 import org.springframework.test.context.TestPropertySource;
 
+import java.util.concurrent.TimeUnit;
+
+import static com.github.mikesafonov.smpp.TestUtils.sessionSet;
 import static org.assertj.core.api.Assertions.assertThat;
 import static org.awaitility.Awaitility.await;
 import static org.junit.jupiter.api.Assertions.assertEquals;
@@ -58,7 +63,9 @@ void stopAll() {
     @Test
     void shouldOpenOneConnection() {
         MockSmppServer smppServer = smppServerHolder.getByName("one").get();
-        assertThat(smppServer).extracting("handler.sessions.size").isEqualTo(1);
+        assertThat(smppServer).extracting("handler.sessions")
+                .asInstanceOf(sessionSet())
+                .hasSize(1);
     }
 
     @Test
@@ -84,4 +91,6 @@ void shouldReceiveDeliveryReport() {
         assertEquals(response.getSmscMessageID(), report.getMessageId());
         assertEquals("one", report.getResponseClientId());
     }
+
+
 }