From f8a68eb0c2de6aee7c2e2e847bed8e692fa818f8 Mon Sep 17 00:00:00 2001 From: marcel corso Date: Mon, 27 May 2019 13:37:50 +0200 Subject: [PATCH 1/5] cut-2.1.1 --- README.md | 4 ++-- api/pom.xml | 2 +- api/src/main/java/com/messagebird/MessageBirdServiceImpl.java | 2 +- examples/pom.xml | 4 ++-- 4 files changed, 6 insertions(+), 6 deletions(-) diff --git a/README.md b/README.md index 37a930eb..247b1e45 100644 --- a/README.md +++ b/README.md @@ -29,7 +29,7 @@ If you are using maven simply add the messagebird API to your dependencies like com.messagebird messagebird-api - 2.1.0 + 2.1.1 ``` @@ -37,7 +37,7 @@ In case you are building without maven you still need maven to build the librari then simply copy the following jar's over to your project ``` -messagebird-api-2.1.0.jar +messagebird-api-2.1.1.jar jackson-core-2.9.8.jar jackson-databind-2.9.8.jar jackson-dataformat-csv-2.9.8.jar diff --git a/api/pom.xml b/api/pom.xml index 3b64b194..4fba6d24 100644 --- a/api/pom.xml +++ b/api/pom.xml @@ -6,7 +6,7 @@ com.messagebird messagebird-api - 2.1.0 diff --git a/api/src/main/java/com/messagebird/MessageBirdServiceImpl.java b/api/src/main/java/com/messagebird/MessageBirdServiceImpl.java index f9c359e0..abe70e7d 100644 --- a/api/src/main/java/com/messagebird/MessageBirdServiceImpl.java +++ b/api/src/main/java/com/messagebird/MessageBirdServiceImpl.java @@ -57,7 +57,7 @@ public class MessageBirdServiceImpl implements MessageBirdService { private final String accessKey; private final String serviceUrl; - private final String clientVersion = "2.1.0"; + private final String clientVersion = "2.1.1"; private final String userAgentString; private Proxy proxy = null; diff --git a/examples/pom.xml b/examples/pom.xml index a4b7979e..00936a20 100644 --- a/examples/pom.xml +++ b/examples/pom.xml @@ -6,7 +6,7 @@ com.messagebird examples - 2.1.0 + 2.1.1 @@ -20,7 +20,7 @@ com.messagebird messagebird-api - 2.1.0 + 2.1.1 From 2dd6e916b9c3944d08c73a8b8143d0444c972210 Mon Sep 17 00:00:00 2001 From: marcel corso Date: Mon, 27 May 2019 15:25:28 +0200 Subject: [PATCH 2/5] cut-2.1.1 again --- api/pom.xml | 17 ++++++++--------- 1 file changed, 8 insertions(+), 9 deletions(-) diff --git a/api/pom.xml b/api/pom.xml index 4fba6d24..4408b9ca 100644 --- a/api/pom.xml +++ b/api/pom.xml @@ -1,12 +1,10 @@ - + 4.0.0 com.messagebird messagebird-api - 2.1.1 @@ -44,7 +42,8 @@ scm:git:git@github.com:messagebird/java-rest-api.git scm:git:git@github.com:messagebird/java-rest-api.git git@github.com:messagebird/java-rest-api.git - + HEAD + @@ -54,8 +53,8 @@ true - - + + UTF-8 @@ -73,8 +72,8 @@ none true - - + + UTF-8 From 1eb11031aec24bd44ec9e061be7a8adbf749bfad Mon Sep 17 00:00:00 2001 From: marcel corso Date: Mon, 27 May 2019 15:26:56 +0200 Subject: [PATCH 3/5] -SNAPSHOT --- api/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/api/pom.xml b/api/pom.xml index 4408b9ca..70647cf5 100644 --- a/api/pom.xml +++ b/api/pom.xml @@ -4,7 +4,7 @@ com.messagebird messagebird-api - 2.1.2-SNAPSHOT From 252c736a1ebb491835a097599660fa38499bb92c Mon Sep 17 00:00:00 2001 From: Deniz Kilic Date: Thu, 6 Jun 2019 14:35:21 +0200 Subject: [PATCH 4/5] testList method updated --- .../java/com/messagebird/ContactTest.java | 34 ++++++++++++++++--- .../test/java/com/messagebird/TestUtil.java | 33 ++++++++++++++++++ 2 files changed, 62 insertions(+), 5 deletions(-) diff --git a/api/src/test/java/com/messagebird/ContactTest.java b/api/src/test/java/com/messagebird/ContactTest.java index 7e6f9ee0..b060e9aa 100644 --- a/api/src/test/java/com/messagebird/ContactTest.java +++ b/api/src/test/java/com/messagebird/ContactTest.java @@ -5,13 +5,16 @@ import com.messagebird.exceptions.UnauthorizedException; import com.messagebird.objects.*; import org.junit.*; +import org.mockito.Mockito; import static org.junit.Assert.*; +import static org.mockito.Mockito.*; public class ContactTest { private static MessageBirdServiceImpl messageBirdService; private static MessageBirdClient messageBirdClient; + private static final String CONTACTPATH = "/contacts"; private static String msisdn; @@ -62,12 +65,33 @@ public static void tearDown() throws UnauthorizedException, GeneralException, No @Test public void testList() throws UnauthorizedException, GeneralException { - ContactList actual = messageBirdClient.listContacts(); + final ContactList contactResponseList = TestUtil.createContactList(); + + MessageBirdService messageBirdServiceMock = mock(MessageBirdService.class); + MessageBirdClient messageBirdClientInjectMock = new MessageBirdClient(messageBirdServiceMock); + + when(messageBirdServiceMock.requestList(Mockito.eq(CONTACTPATH), Mockito.eq(0), Mockito.eq(20), + Mockito.eq(ContactList.class))) + .thenReturn(contactResponseList); + + final ContactList response = messageBirdClientInjectMock.listContacts(); + verify(messageBirdServiceMock, times(1)) + .requestList(Mockito.eq(CONTACTPATH), Mockito.eq(0), Mockito.eq(20), + Mockito.eq(ContactList.class)); + assertEquals(response.getItems().get(0).getFirstName(), contactResponseList.getItems().get(0).getFirstName()); + assertEquals(response.getItems().get(0).getLastName(), contactResponseList.getItems().get(0).getLastName()); + assertEquals(response.getItems().get(0).getId(), contactResponseList.getItems().get(0).getId()); + assertEquals(response.getItems().get(0).getCreatedDatetime(), contactResponseList.getItems().get(0).getCreatedDatetime()); + assertEquals(response.getItems().get(0).getMsisdn(), contactResponseList.getItems().get(0).getMsisdn()); + assertEquals(response.getItems().get(0).getCustomDetails().getCustom1(), contactResponseList.getItems().get(0).getCustomDetails().getCustom1()); + assertEquals(response.getItems().get(0).getMessages().getHREF(), contactResponseList.getItems().get(0).getMessages().getHREF()); + assertEquals(response.getItems().get(0).getMessages().getTotalCount(), contactResponseList.getItems().get(0).getMessages().getTotalCount()); + assertEquals(response.getItems().get(0).getHref(), contactResponseList.getItems().get(0).getHref()); + assertEquals(response.getItems().get(0).getGroups().getHREF(), contactResponseList.getItems().get(0).getGroups().getHREF()); + assertEquals(response.getItems().get(0).getGroups().getTotalCount(), contactResponseList.getItems().get(0).getGroups().getTotalCount()); + assertNotNull(response.getItems().get(0).getCreatedDatetime()); + assertNotNull(response.getItems().get(0).getUpdatedDatetime()); - assertSame(20, actual.getLimit()); - assertSame(0, actual.getOffset()); - assertNotSame(0, actual.getTotalCount()); - assertNotNull(actual.getItems().get(0).getId()); } @Test diff --git a/api/src/test/java/com/messagebird/TestUtil.java b/api/src/test/java/com/messagebird/TestUtil.java index ebb3691e..927025ad 100644 --- a/api/src/test/java/com/messagebird/TestUtil.java +++ b/api/src/test/java/com/messagebird/TestUtil.java @@ -115,4 +115,37 @@ static WebhookResponseData createWebhookResponseData() { webhookResponseData.setData(Collections.singletonList(createWebhookResponse())); return webhookResponseData; } + + private static Contact createContact(){ + final CustomDetails customDetails = new CustomDetails(); + customDetails.setCustom1("ANY_DETAIL"); + + final MessageReference messageReferance = new MessageReference(); + messageReferance.setHREF("ANY_HREF"); + messageReferance.setTotalCount(30); + + final GroupReference groupReference = new GroupReference(); + groupReference.setHREF("ANY_HREF"); + groupReference.setTotalCount(30); + + final Contact contact = new Contact(); + contact.setFirstName("ANY_NAME"); + contact.setLastName("ANY_LAST_NAME"); + contact.setId("ANY_ID"); + contact.setCreatedDatetime(new Date()); + contact.setMsisdn("ANY_MSISDN"); + contact.setCustomDetails(customDetails); + contact.setMessages(messageReferance); + contact.setHref("ANY_HREF"); + contact.setGroups(groupReference); + contact.setUpdatedDatetime(new Date()); + + return contact; + } + static ContactList createContactList() { + final ContactList contactList = new ContactList(); + contactList.setItems(Collections.singletonList(createContact())); + return contactList; + } + } From 965744adc7f67bfa38c414dc75055cbd7977ce37 Mon Sep 17 00:00:00 2001 From: Deniz Kilic Date: Thu, 6 Jun 2019 17:31:47 +0200 Subject: [PATCH 5/5] added dependency to use assertReflectionEquals --- api/pom.xml | 6 ++++++ .../test/java/com/messagebird/ContactTest.java | 17 ++--------------- api/src/test/java/com/messagebird/TestUtil.java | 8 ++++---- 3 files changed, 12 insertions(+), 19 deletions(-) diff --git a/api/pom.xml b/api/pom.xml index 70647cf5..6715612f 100644 --- a/api/pom.xml +++ b/api/pom.xml @@ -101,6 +101,12 @@ 4.11 test + + org.unitils + unitils-core + 3.4.2 + test + org.mockito mockito-core diff --git a/api/src/test/java/com/messagebird/ContactTest.java b/api/src/test/java/com/messagebird/ContactTest.java index b060e9aa..d289a4fe 100644 --- a/api/src/test/java/com/messagebird/ContactTest.java +++ b/api/src/test/java/com/messagebird/ContactTest.java @@ -6,9 +6,9 @@ import com.messagebird.objects.*; import org.junit.*; import org.mockito.Mockito; - import static org.junit.Assert.*; import static org.mockito.Mockito.*; +import static org.unitils.reflectionassert.ReflectionAssert.assertReflectionEquals; public class ContactTest { @@ -78,20 +78,7 @@ public void testList() throws UnauthorizedException, GeneralException { verify(messageBirdServiceMock, times(1)) .requestList(Mockito.eq(CONTACTPATH), Mockito.eq(0), Mockito.eq(20), Mockito.eq(ContactList.class)); - assertEquals(response.getItems().get(0).getFirstName(), contactResponseList.getItems().get(0).getFirstName()); - assertEquals(response.getItems().get(0).getLastName(), contactResponseList.getItems().get(0).getLastName()); - assertEquals(response.getItems().get(0).getId(), contactResponseList.getItems().get(0).getId()); - assertEquals(response.getItems().get(0).getCreatedDatetime(), contactResponseList.getItems().get(0).getCreatedDatetime()); - assertEquals(response.getItems().get(0).getMsisdn(), contactResponseList.getItems().get(0).getMsisdn()); - assertEquals(response.getItems().get(0).getCustomDetails().getCustom1(), contactResponseList.getItems().get(0).getCustomDetails().getCustom1()); - assertEquals(response.getItems().get(0).getMessages().getHREF(), contactResponseList.getItems().get(0).getMessages().getHREF()); - assertEquals(response.getItems().get(0).getMessages().getTotalCount(), contactResponseList.getItems().get(0).getMessages().getTotalCount()); - assertEquals(response.getItems().get(0).getHref(), contactResponseList.getItems().get(0).getHref()); - assertEquals(response.getItems().get(0).getGroups().getHREF(), contactResponseList.getItems().get(0).getGroups().getHREF()); - assertEquals(response.getItems().get(0).getGroups().getTotalCount(), contactResponseList.getItems().get(0).getGroups().getTotalCount()); - assertNotNull(response.getItems().get(0).getCreatedDatetime()); - assertNotNull(response.getItems().get(0).getUpdatedDatetime()); - + assertReflectionEquals(response.getItems().get(0),contactResponseList.getItems().get(0)); } @Test diff --git a/api/src/test/java/com/messagebird/TestUtil.java b/api/src/test/java/com/messagebird/TestUtil.java index 927025ad..c49642e8 100644 --- a/api/src/test/java/com/messagebird/TestUtil.java +++ b/api/src/test/java/com/messagebird/TestUtil.java @@ -120,9 +120,9 @@ private static Contact createContact(){ final CustomDetails customDetails = new CustomDetails(); customDetails.setCustom1("ANY_DETAIL"); - final MessageReference messageReferance = new MessageReference(); - messageReferance.setHREF("ANY_HREF"); - messageReferance.setTotalCount(30); + final MessageReference messageReference = new MessageReference(); + messageReference.setHREF("ANY_HREF"); + messageReference.setTotalCount(30); final GroupReference groupReference = new GroupReference(); groupReference.setHREF("ANY_HREF"); @@ -135,7 +135,7 @@ private static Contact createContact(){ contact.setCreatedDatetime(new Date()); contact.setMsisdn("ANY_MSISDN"); contact.setCustomDetails(customDetails); - contact.setMessages(messageReferance); + contact.setMessages(messageReference); contact.setHref("ANY_HREF"); contact.setGroups(groupReference); contact.setUpdatedDatetime(new Date());