Skip to content

DEVEXP-1375: Refactor e2e tests for list responses #351

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
edu-sinch merged 3 commits into from
Jun 18, 2026
Merged

DEVEXP-1375: Refactor e2e tests for list responses #351

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
b9bb6ae
Refactor e2e tests for list responses
edu-sinch Jun 16, 2026
45e3ed9
Refactor e2e tests for parallel execution with JUnit 5 Cucumber
edu-sinch Jun 17, 2026
e449cb6
Removed dead code for parallelism into the pom.xml file
edu-sinch Jun 17, 2026
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
49 changes: 13 additions & 36 deletions client/src/test/java/com/sinch/sdk/e2e/domains/conversation/ContactsSteps.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,16 +30,12 @@ public class ContactsSteps {
ContactsService service;
Contact createResponse;
ContactsListResponse listPageResponse;
ContactsListResponse listAllResponse;
ContactsListResponse listPageIterateResponse;
Contact getResponse;
Contact updateResponse;
Contact mergeResponse;
boolean deletePassed;
GetChannelProfileResponse channelProfileByContactIdResponse;
IdentityConflictsListResponse listIdentityConflictsResponse;
IdentityConflictsListResponse listAllIdentityConflictsResponse;
IdentityConflictsListResponse listPageIterateIdentityConflictsResponse;

@Given("^the Conversation service \"Contacts\" is available$")
public void serviceAvailable() {
Expand Down Expand Up @@ -78,15 +74,15 @@ public void listAll() {

ContactsListQueryParameters request =
ContactsListQueryParameters.builder().setPageSize(2).build();
listAllResponse = service.list(request);
listPageResponse = service.list(request);
}

@When("^I iterate manually over the contacts pages$")
public void listPageIterate() {

ContactsListQueryParameters request =
ContactsListQueryParameters.builder().setPageSize(2).build();
listPageIterateResponse = service.list(request);
listPageResponse = service.list(request);
}

@When("^I send a request to retrieve a contact$")
Expand Down Expand Up @@ -156,15 +152,15 @@ public void listIdentityConflictsAll() {

IdentityConflictsListQueryParameters request =
IdentityConflictsListQueryParameters.builder().setPageSize(2).build();
listAllIdentityConflictsResponse = service.listIdentityConflicts(request);
listIdentityConflictsResponse = service.listIdentityConflicts(request);
}

@When("^I iterate manually over the identity conflicts pages$")
public void listIdentityConflictsPageIterate() {

IdentityConflictsListQueryParameters request =
IdentityConflictsListQueryParameters.builder().setPageSize(2).build();
listPageIterateIdentityConflictsResponse = service.listIdentityConflicts(request);
listIdentityConflictsResponse = service.listIdentityConflicts(request);
}

@Then("the contact is created")
Expand All @@ -181,31 +177,21 @@ public void listExistingResult(int size) {
@Then("the contacts list contains \"{int}\" contacts")
public void listAllResult(int size) {

// FIXME: to be thread-safe compliant we need to check which variables are set
Iterator<?> iterator = null;
if (null != listAllResponse) {
iterator = listAllResponse.iterator();
}

if (null != listPageIterateResponse) {
iterator = listPageIterateResponse.iterator();
}
Iterator<?> iterator = listPageResponse.iterator();
TestHelpers.checkIteratorItems(iterator, size);
}

@Then("the contacts iteration result contains the data from \"{int}\" pages")
public void listPageIterateResult(int size) {

int pageCount = 0;

ContactsListResponse listPageIterateResponseThreadSafety = listPageIterateResponse;
ContactsListResponse currentPage = listPageResponse;
do {
pageCount++;
if (!listPageIterateResponseThreadSafety.hasNextPage()) {
if (!currentPage.hasNextPage()) {
break;
}
listPageIterateResponseThreadSafety = listPageIterateResponseThreadSafety.nextPage();

currentPage = currentPage.nextPage();
} while (true);

Assertions.assertEquals(pageCount, size);
Expand Down Expand Up @@ -281,31 +267,22 @@ public void listIdentityConflictsResults(int count) {

@Then("the identity conflicts list contains \"{int}\" identity conflicts")
public void listIdentityConflictsAllResults(int count) {
// FIXME: to be thread-safe compliant we need to check which variables are set
Iterator<?> iterator = null;
if (null != listAllIdentityConflictsResponse) {
iterator = listAllIdentityConflictsResponse.iterator();
}

if (null != listPageIterateIdentityConflictsResponse) {
iterator = listPageIterateIdentityConflictsResponse.iterator();
}

Iterator<?> iterator = listIdentityConflictsResponse.iterator();
TestHelpers.checkIteratorItems(iterator, count);
}

@Then("the identity conflicts iteration result contains the data from \"{int}\" pages")
public void listAllIdentityConflictsPageIterateResults(int count) {

int pageCount = 0;
IdentityConflictsListResponse listPageIterateResponseThreadSafety =
listPageIterateIdentityConflictsResponse;
IdentityConflictsListResponse currentPage = listIdentityConflictsResponse;
do {
pageCount++;
if (!listPageIterateResponseThreadSafety.hasNextPage()) {
if (!currentPage.hasNextPage()) {
break;
}
listPageIterateResponseThreadSafety = listPageIterateResponseThreadSafety.nextPage();

currentPage = currentPage.nextPage();
} while (true);

Assertions.assertEquals(pageCount, count);
Expand Down
2 changes: 2 additions & 0 deletions client/src/test/java/com/sinch/sdk/e2e/domains/conversation/ConversationIT.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
package com.sinch.sdk.e2e.domains.conversation;

import static io.cucumber.junit.platform.engine.Constants.GLUE_PROPERTY_NAME;
import static io.cucumber.junit.platform.engine.Constants.PARALLEL_EXECUTION_ENABLED_PROPERTY_NAME;

import org.junit.platform.suite.api.ConfigurationParameter;
import org.junit.platform.suite.api.IncludeEngines;
Expand All @@ -13,4 +14,5 @@
@IncludeEngines("cucumber")
@SelectClasspathResource("features/conversation")
@ConfigurationParameter(key = GLUE_PROPERTY_NAME, value = "com.sinch.sdk.e2e.domains.conversation")
@ConfigurationParameter(key = PARALLEL_EXECUTION_ENABLED_PROPERTY_NAME, value = "true")
public class ConversationIT {}
48 changes: 12 additions & 36 deletions client/src/test/java/com/sinch/sdk/e2e/domains/conversation/ConversationsSteps.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,11 +38,7 @@ public class ConversationsSteps {
ConversationsService service;
Conversation createResponse;
ConversationsListResponse listPageResponse;
ConversationsListResponse listAllResponse;
ConversationsListResponse listPageIterateResponse;
RecentConversationsListResponse listRecentPageResponse;
RecentConversationsListResponse listRecentAllResponse;
RecentConversationsListResponse listRecentPageIterateResponse;
Conversation getResponse;
Conversation updateResponse;
boolean deletePassed;
Expand Down Expand Up @@ -87,15 +83,15 @@ public void listAll() {

ConversationsListQueryParameters request =
ConversationsListQueryParameters.builder().setAppId(AppsSteps.APP_ID).build();
listAllResponse = service.list(request);
listPageResponse = service.list(request);
}

@When("^I iterate manually over the conversations pages$")
public void listPageIterate() {

ConversationsListQueryParameters request =
ConversationsListQueryParameters.builder().setAppId(AppsSteps.APP_ID).build();
listPageIterateResponse = service.list(request);
listPageResponse = service.list(request);
}

@When("^I send a request to list the recent conversations$")
Expand All @@ -111,15 +107,15 @@ public void listRecentAll() {

RecentConversationsListQueryParameters request =
RecentConversationsListQueryParameters.builder().setAppId(AppsSteps.APP_ID).build();
listRecentAllResponse = service.listRecent(request);
listRecentPageResponse = service.listRecent(request);
}

@When("^I iterate manually over the recent conversations pages$")
public void listRecentPageIterate() {

RecentConversationsListQueryParameters request =
RecentConversationsListQueryParameters.builder().setAppId(AppsSteps.APP_ID).build();
listRecentPageIterateResponse = service.listRecent(request);
listRecentPageResponse = service.listRecent(request);
}

@When("^I send a request to retrieve a conversation$")
Expand Down Expand Up @@ -205,31 +201,21 @@ public void listPageResult(int size) {
@Then("the conversations list contains \"{int}\" conversations")
public void listAllResult(int size) {

// FIXME: to be thread-safe compliant we need to check which variables are set
Iterator<?> iterator = null;
if (null != listAllResponse) {
iterator = listAllResponse.iterator();
}

if (null != listPageIterateResponse) {
iterator = listPageIterateResponse.iterator();
}
Iterator<?> iterator = listPageResponse.iterator();
TestHelpers.checkIteratorItems(iterator, size);
}

@Then("the conversations iteration result contains the data from \"{int}\" pages")
public void listPageIterateResult(int size) {

int pageCount = 0;

ConversationsListResponse listPageIterateResponseThreadSafety = listPageIterateResponse;
ConversationsListResponse currentPage = listPageResponse;
do {
pageCount++;
if (!listPageIterateResponseThreadSafety.hasNextPage()) {
if (!currentPage.hasNextPage()) {
break;
}
listPageIterateResponseThreadSafety = listPageIterateResponseThreadSafety.nextPage();

currentPage = currentPage.nextPage();
} while (true);

Assertions.assertEquals(pageCount, size);
Expand All @@ -244,31 +230,21 @@ public void listRecentPageResult(int size) {
@Then("the recent conversations list contains \"{int}\" recent conversations")
public void listRecentAllResult(int size) {

Iterator<?> iterator = null;
if (null != listRecentAllResponse) {
iterator = listRecentAllResponse.iterator();
}

if (null != listRecentPageIterateResponse) {
iterator = listRecentPageIterateResponse.iterator();
}
Iterator<?> iterator = listRecentPageResponse.iterator();
TestHelpers.checkIteratorItems(iterator, size);
}

@Then("the recent conversations iteration result contains the data from \"{int}\" pages")
public void listRecentPageIterateResult(int size) {

int pageCount = 0;

RecentConversationsListResponse listPageIterateResponseThreadSafety =
listRecentPageIterateResponse;
RecentConversationsListResponse currentPage = listRecentPageResponse;
do {
pageCount++;
if (!listPageIterateResponseThreadSafety.hasNextPage()) {
if (!currentPage.hasNextPage()) {
break;
}
listPageIterateResponseThreadSafety = listPageIterateResponseThreadSafety.nextPage();

currentPage = currentPage.nextPage();
} while (true);

Assertions.assertEquals(pageCount, size);
Expand Down
24 changes: 6 additions & 18 deletions client/src/test/java/com/sinch/sdk/e2e/domains/conversation/EventsSteps.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,8 +23,6 @@ public class EventsSteps {
EventsService service;
SendEventResponse sendResponse;
EventsListResponse listPageResponse;
EventsListResponse listAllResponse;
EventsListResponse listPageIterateResponse;
ConversationEvent getResponse;
boolean deletePassed;

Expand Down Expand Up @@ -57,14 +55,14 @@ public void listPage() {
public void listAll() {

EventsListQueryParameters request = EventsListQueryParameters.builder().setPageSize(2).build();
listAllResponse = service.list(request);
listPageResponse = service.list(request);
}

@When("^I iterate manually over the conversation events pages$")
public void listPageIterate() {

EventsListQueryParameters request = EventsListQueryParameters.builder().setPageSize(2).build();
listPageIterateResponse = service.list(request);
listPageResponse = service.list(request);
}

@When("^I send a request to retrieve a conversation event$")
Expand Down Expand Up @@ -94,31 +92,21 @@ public void listPageResult(int size) {
@Then("the conversation events list contains \"{int}\" conversation events")
public void listAllResult(int size) {

// FIXME: to be thread-safe compliant we need to check which variables are set
Iterator<?> iterator = null;
if (null != listAllResponse) {
iterator = listAllResponse.iterator();
}

if (null != listPageIterateResponse) {
iterator = listPageIterateResponse.iterator();
}
Iterator<?> iterator = listPageResponse.iterator();
TestHelpers.checkIteratorItems(iterator, size);
}

@Then("the conversation events iteration result contains the data from \"{int}\" pages")
public void listPageIterateResult(int size) {

int pageCount = 0;

EventsListResponse listPageIterateResponseThreadSafety = listPageIterateResponse;
EventsListResponse currentPage = listPageResponse;
do {
pageCount++;
if (!listPageIterateResponseThreadSafety.hasNextPage()) {
if (!currentPage.hasNextPage()) {
break;
}
listPageIterateResponseThreadSafety = listPageIterateResponseThreadSafety.nextPage();

currentPage = currentPage.nextPage();
} while (true);

Assertions.assertEquals(pageCount, size);
Expand Down
Loading
Loading