From 78991f91dad0fd0e40df2f965c918d661eb57a27 Mon Sep 17 00:00:00 2001 From: Luis Pina Date: Tue, 8 Oct 2024 11:44:33 -0500 Subject: [PATCH] Improved coverage of property tests --- src/test/java/com/sinch/xms/BatchFilterTest.java | 9 +++++---- .../java/com/sinch/xms/DeliveryReportFilterTest.java | 8 ++++---- src/test/java/com/sinch/xms/GroupFilterTest.java | 4 +++- src/test/java/com/sinch/xms/InboundsFilterTest.java | 8 ++++---- 4 files changed, 16 insertions(+), 13 deletions(-) diff --git a/src/test/java/com/sinch/xms/BatchFilterTest.java b/src/test/java/com/sinch/xms/BatchFilterTest.java index 9333d9f..5a77455 100644 --- a/src/test/java/com/sinch/xms/BatchFilterTest.java +++ b/src/test/java/com/sinch/xms/BatchFilterTest.java @@ -27,6 +27,7 @@ import static org.junit.Assume.assumeThat; import com.pholser.junit.quickcheck.Property; +import com.pholser.junit.quickcheck.generator.InRange; import com.pholser.junit.quickcheck.runner.JUnitQuickcheck; import java.time.LocalDate; import java.time.OffsetDateTime; @@ -101,15 +102,15 @@ public void generatesValidQueryParameters( assumeThat(senders, not(hasItem(containsString(",")))); assumeThat(tags, not(hasItem(containsString(",")))); - BatchFilter filter = + BatchFilter.Builder builder = SinchSMSApi.batchFilter() - .pageSize(pageSize) .senders(senders) .tags(tags) .startDate(startDate) .endDate(endDate) - .clientReference(clientReference) - .build(); + .clientReference(clientReference); + + BatchFilter filter = (senders.isEmpty()) ? builder.build() : builder.pageSize(pageSize).build(); List params = filter.toQueryParams(page); diff --git a/src/test/java/com/sinch/xms/DeliveryReportFilterTest.java b/src/test/java/com/sinch/xms/DeliveryReportFilterTest.java index d5a1eeb..1cee118 100644 --- a/src/test/java/com/sinch/xms/DeliveryReportFilterTest.java +++ b/src/test/java/com/sinch/xms/DeliveryReportFilterTest.java @@ -81,15 +81,15 @@ public void generatesValidQueryParameters( String clientReference) throws Exception { - DeliveryReportFilter filter = + DeliveryReportFilter.Builder builder = SinchSMSApi.deliveryReportFilter() - .pageSize(pageSize) .statuses(statuses) .codes(codes) .startDate(startDate) .endDate(endDate) - .clientReference(clientReference) - .build(); + .clientReference(clientReference); + + DeliveryReportFilter filter = (codes.isEmpty()) ? builder.build() : builder.pageSize(pageSize).build(); List params = filter.toQueryParams(page); diff --git a/src/test/java/com/sinch/xms/GroupFilterTest.java b/src/test/java/com/sinch/xms/GroupFilterTest.java index 1fda787..69b0c10 100644 --- a/src/test/java/com/sinch/xms/GroupFilterTest.java +++ b/src/test/java/com/sinch/xms/GroupFilterTest.java @@ -73,7 +73,9 @@ public void generatesValidQueryParameters(int page, int pageSize, Set ta // Constrain `tags` to strings not containing ',' assumeThat(tags, not(hasItem(containsString(",")))); - GroupFilter filter = SinchSMSApi.groupFilter().pageSize(pageSize).tags(tags).build(); + GroupFilter.Builder builder = SinchSMSApi.groupFilter().tags(tags); + + GroupFilter filter = (tags.isEmpty()) ? builder.build() : builder.pageSize(pageSize).build(); List params = filter.toQueryParams(page); diff --git a/src/test/java/com/sinch/xms/InboundsFilterTest.java b/src/test/java/com/sinch/xms/InboundsFilterTest.java index 1a0b9db..936614a 100644 --- a/src/test/java/com/sinch/xms/InboundsFilterTest.java +++ b/src/test/java/com/sinch/xms/InboundsFilterTest.java @@ -90,14 +90,14 @@ public void generatesValidQueryParameters( // Constrain `to` to strings not containing ',' assumeThat(to, not(hasItem(containsString(",")))); - InboundsFilter filter = + InboundsFilter.Builder builder = SinchSMSApi.inboundsFilter() - .pageSize(pageSize) .recipients(to) .startDate(startDate) .endDate(endDate) - .clientReference(clientReference) - .build(); + .clientReference(clientReference); + + InboundsFilter filter = (to.isEmpty()) ? builder.build() : builder.pageSize(pageSize).build(); List params = filter.toQueryParams(page);