@@ -24,7 +24,7 @@ class ControllerMessageMapperTest {
2424 private final ControllerMessageMapper mapper = new ControllerMessageMapper ();
2525
2626 @ Test
27- public void whenBodyHasEntityThenConvertToDto () {
27+ void whenBodyHasEntityThenConvertToDto () {
2828 var message = fakeBuilder ()
2929 .body (MessageBody .from ("Test" ))
3030 .build ();
@@ -34,7 +34,7 @@ public void whenBodyHasEntityThenConvertToDto() {
3434 }
3535
3636 @ Test
37- public void whenHasBodyInCreateDtoThenConvertToEntity () {
37+ void whenHasBodyInCreateDtoThenConvertToEntity () {
3838 var message = fakeDto ()
3939 .body ("Test" )
4040 .build ();
@@ -44,7 +44,7 @@ public void whenHasBodyInCreateDtoThenConvertToEntity() {
4444 }
4545
4646 @ Test
47- public void whenDateHasEntityThenConvertToDto () {
47+ void whenDateHasEntityThenConvertToDto () {
4848 var date = ZonedDateTime .now ();
4949 var message = fakeBuilder ()
5050 .scheduleDate (date )
@@ -56,7 +56,7 @@ public void whenDateHasEntityThenConvertToDto() {
5656
5757
5858 @ Test
59- public void whenEntityHasWhatsAppThenConvertToDto () {
59+ void whenEntityHasWhatsAppThenConvertToDto () {
6060 var message = fakeBuilder ()
6161 .channel (CommunicationChannel .WHATSAPP )
6262 .build ();
@@ -66,7 +66,7 @@ public void whenEntityHasWhatsAppThenConvertToDto() {
6666 }
6767
6868 @ Test
69- public void whenHasDateInCreateDtoThenConvertToEntity () {
69+ void whenHasDateInCreateDtoThenConvertToEntity () {
7070 var date = ZonedDateTime .now ();
7171 var message = fakeDto ()
7272 .scheduleDate (date )
@@ -77,7 +77,7 @@ public void whenHasDateInCreateDtoThenConvertToEntity() {
7777 }
7878
7979 @ Test
80- public void whenHasWhatsAppInCreateDtoThenConvertToEntity () {
80+ void whenHasWhatsAppInCreateDtoThenConvertToEntity () {
8181 var message = fakeDto ()
8282 .channel (CommunicationChannelDto .WHATSAPP )
8383 .build ();
@@ -87,7 +87,7 @@ public void whenHasWhatsAppInCreateDtoThenConvertToEntity() {
8787 }
8888
8989 @ Test
90- public void whenEntityHasEmailThenConvertToDto () {
90+ void whenEntityHasEmailThenConvertToDto () {
9191 var message = fakeBuilder ()
9292 .channel (CommunicationChannel .EMAIL )
9393 .build ();
@@ -97,7 +97,7 @@ public void whenEntityHasEmailThenConvertToDto() {
9797 }
9898
9999 @ Test
100- public void whenHasEmailInCreateDtoThenConvertToEntity () {
100+ void whenHasEmailInCreateDtoThenConvertToEntity () {
101101 var message = fakeDto ()
102102 .channel (CommunicationChannelDto .EMAIL )
103103 .build ();
@@ -106,15 +106,9 @@ public void whenHasEmailInCreateDtoThenConvertToEntity() {
106106 assertThat (entity .getChannel ()).isEqualTo (CommunicationChannel .EMAIL );
107107 }
108108
109- private MessageCreateDto .MessageCreateDtoBuilder fakeDto () {
110- return MessageCreateDto .builder ().body ("empty" )
111- .recipient (RecipientDto .builder ()
112- .phoneNumber ("123" )
113- .build ());
114- }
115109
116110 @ Test
117- public void whenEntityHasSmsThenConvertToDto () {
111+ void whenEntityHasSmsThenConvertToDto () {
118112 var message = fakeBuilder ()
119113 .channel (CommunicationChannel .SMS )
120114 .build ();
@@ -124,7 +118,7 @@ public void whenEntityHasSmsThenConvertToDto() {
124118 }
125119
126120 @ Test
127- public void whenHasSmsInCreateDtoThenConvertToEntity () {
121+ void whenHasSmsInCreateDtoThenConvertToEntity () {
128122 var message = fakeDto ()
129123 .channel (CommunicationChannelDto .SMS )
130124 .build ();
@@ -134,7 +128,7 @@ public void whenHasSmsInCreateDtoThenConvertToEntity() {
134128 }
135129
136130 @ Test
137- public void whenEntityHasPushThenConvertToDto () {
131+ void whenEntityHasPushThenConvertToDto () {
138132 var message = fakeBuilder ()
139133 .channel (CommunicationChannel .PUSH )
140134 .build ();
@@ -144,7 +138,7 @@ public void whenEntityHasPushThenConvertToDto() {
144138 }
145139
146140 @ Test
147- public void whenHasPushInCreateDtoThenConvertToEntity () {
141+ void whenHasPushInCreateDtoThenConvertToEntity () {
148142 var message = fakeDto ()
149143 .channel (CommunicationChannelDto .PUSH )
150144 .build ();
@@ -154,7 +148,7 @@ public void whenHasPushInCreateDtoThenConvertToEntity() {
154148 }
155149
156150 @ Test
157- public void whenWaitingStatusOnChannelThenConvertToDto () {
151+ void whenWaitingStatusOnChannelThenConvertToDto () {
158152 var message = fakeBuilder ()
159153 .chats (List .of (Chat .builder ().status (Status .WAITING ).build ()))
160154 .build ();
@@ -166,7 +160,7 @@ public void whenWaitingStatusOnChannelThenConvertToDto() {
166160 }
167161
168162 @ Test
169- public void whenSentStatusOnChannelThenConvertToDto () {
163+ void whenSentStatusOnChannelThenConvertToDto () {
170164 var message = fakeBuilder ()
171165 .chats (List .of (Chat .builder ().status (Status .SENT ).build ()))
172166 .build ();
@@ -177,16 +171,8 @@ public void whenSentStatusOnChannelThenConvertToDto() {
177171 );
178172 }
179173
180- private Message .MessageBuilder fakeBuilder () {
181- return Message .builder ().body (MessageBody .from ("empty" ))
182- .recipient (Recipient .builder ()
183- .phone (Phone .newNumber ("123123" ))
184- .build ())
185- .id (MessageId .from (1L ));
186- }
187-
188174 @ Test
189- public void whenSendingStatusOnChannelThenConvertToDto () {
175+ void whenSendingStatusOnChannelThenConvertToDto () {
190176 var message = fakeBuilder ()
191177 .chats (List .of (Chat .builder ().status (Status .SENDING ).build ()))
192178 .build ();
@@ -198,20 +184,24 @@ public void whenSendingStatusOnChannelThenConvertToDto() {
198184 }
199185
200186 @ Test
201- public void whenDateOnChannelThenConvertToDto () {
187+ void whenDateOnChannelThenConvertToDto () {
202188 var date = ZonedDateTime .now ();
203189 var message = fakeBuilder ()
204190 .chats (List .of (Chat .builder ().date (date ).build ()))
205191 .build ();
206192 var dto = mapper .toDto (message );
207193 assertThat (dto ).isNotNull ();
208- assertThat (dto .getChats ()).hasSize (1 ).first ().satisfies (
209- c -> assertThat (c .getDate ()).isEqualTo (date )
194+ assertThat (dto ).isNotNull ();
195+ assertThat (dto .getChats ()).hasSize (1 ).first ().satisfies (c ->
196+ {
197+ assertThat (c .getDate ()).isEqualTo (date );
198+ assertThat (c .getStatus ()).isEqualTo (StatusResponseDto .WAITING );
199+ }
210200 );
211201 }
212202
213203 @ Test
214- public void whenHasIdThenConvertToDto () {
204+ void whenHasIdThenConvertToDto () {
215205 var message = fakeBuilder ()
216206 .id (MessageId .from (123L ))
217207 .build ();
@@ -221,7 +211,7 @@ public void whenHasIdThenConvertToDto() {
221211 }
222212
223213 @ Test
224- public void whenEntityHasRecipientNameThenConvertToDto () {
214+ void whenEntityHasRecipientNameThenConvertToDto () {
225215 var message = fakeBuilder ()
226216 .recipient (Recipient .builder ()
227217 .name ("Alisson" )
@@ -234,7 +224,7 @@ public void whenEntityHasRecipientNameThenConvertToDto() {
234224 }
235225
236226 @ Test
237- public void whenHasRecipientNameInCreateDtoThenConvertToEntity () {
227+ void whenHasRecipientNameInCreateDtoThenConvertToEntity () {
238228 var message = MessageCreateDto .builder ()
239229 .body ("empty" )
240230 .recipient (RecipientDto .builder ()
@@ -248,7 +238,7 @@ public void whenHasRecipientNameInCreateDtoThenConvertToEntity() {
248238 }
249239
250240 @ Test
251- public void whenEntityHasRecipientEmailThenConvertToDto () {
241+ void whenEntityHasRecipientEmailThenConvertToDto () {
252242 var message = fakeBuilder ()
253243 .recipient (Recipient .builder ()
254244 .email ("alisson@mail.com" )
@@ -261,7 +251,7 @@ public void whenEntityHasRecipientEmailThenConvertToDto() {
261251 }
262252
263253 @ Test
264- public void whenHasRecipientEmailInCreateDtoThenConvertToEntity () {
254+ void whenHasRecipientEmailInCreateDtoThenConvertToEntity () {
265255 var message = MessageCreateDto .builder ().body ("empty" )
266256 .recipient (RecipientDto .builder ()
267257 .phoneNumber ("123" )
@@ -274,7 +264,7 @@ public void whenHasRecipientEmailInCreateDtoThenConvertToEntity() {
274264 }
275265
276266 @ Test
277- public void whenEntityHasRecipientPhoneIdThenConvertToDto () {
267+ void whenEntityHasRecipientPhoneIdThenConvertToDto () {
278268 var message = fakeBuilder ()
279269 .recipient (Recipient .builder ()
280270 .phone (Phone .from ("123" , "16000000" ))
@@ -286,7 +276,7 @@ public void whenEntityHasRecipientPhoneIdThenConvertToDto() {
286276 }
287277
288278 @ Test
289- public void whenHasRecipientPhoneIdInCreateDtoThenConvertToEntity () {
279+ void whenHasRecipientPhoneIdInCreateDtoThenConvertToEntity () {
290280 var message = MessageCreateDto .builder ().body ("empty" )
291281 .recipient (RecipientDto .builder ()
292282 .phoneId ("123" )
@@ -299,7 +289,7 @@ public void whenHasRecipientPhoneIdInCreateDtoThenConvertToEntity() {
299289 }
300290
301291 @ Test
302- public void whenEntityHasRecipientPhoneNumberThenConvertToDto () {
292+ void whenEntityHasRecipientPhoneNumberThenConvertToDto () {
303293 var message = fakeBuilder ()
304294 .recipient (Recipient .builder ()
305295 .phone (Phone .from ("123" , "999988887777" ))
@@ -311,7 +301,7 @@ public void whenEntityHasRecipientPhoneNumberThenConvertToDto() {
311301 }
312302
313303 @ Test
314- public void whenHasRecipientPhoneNumberInCreateDtoThenConvertToEntity () {
304+ void whenHasRecipientPhoneNumberInCreateDtoThenConvertToEntity () {
315305 var message = MessageCreateDto .builder ().body ("body" )
316306 .recipient (RecipientDto .builder ()
317307 .phoneNumber ("999988887777" )
@@ -322,5 +312,19 @@ public void whenHasRecipientPhoneNumberInCreateDtoThenConvertToEntity() {
322312 assertThat (entity .getRecipient ().getPhone ().getPhoneNumber ()).isEqualTo ("999988887777" );
323313 }
324314
315+ private MessageCreateDto .MessageCreateDtoBuilder fakeDto () {
316+ return MessageCreateDto .builder ().body ("empty" )
317+ .recipient (RecipientDto .builder ()
318+ .phoneNumber ("123" )
319+ .build ());
320+ }
325321
322+ private Message .MessageBuilder fakeBuilder () {
323+ return Message .builder ().body (MessageBody .from ("empty" ))
324+ .recipient (Recipient .builder ()
325+ .phone (Phone .newNumber ("123123" ))
326+ .build ())
327+ .id (MessageId .from (1L ));
328+ }
329+
326330}
0 commit comments