Skip to content

Commit 29208a6

Browse files
author
Rafael Marinho
committed
fix unit tests
1 parent 905ae88 commit 29208a6

File tree

2 files changed

+9
-19
lines changed

2 files changed

+9
-19
lines changed

src/main/java/io/getstream/chat/java/models/MarkDeliveredOptions.java

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -47,10 +47,7 @@ public MarkDeliveredRequest options(MarkDeliveredOptions options) {
4747
}
4848

4949
public MarkDeliveredRequest userId(String userId) {
50-
if (this.options == null) {
51-
this.options = new MarkDeliveredOptions();
52-
}
53-
this.options.setUserId(userId);
50+
this.userId = userId;
5451
return this;
5552
}
5653

src/test/java/io/getstream/chat/java/DeliveryReceiptsTest.java

Lines changed: 8 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,6 @@
66
import io.getstream.chat.java.models.Message;
77
import io.getstream.chat.java.models.Message.MessageRequestObject;
88
import io.getstream.chat.java.models.Message.MessageType;
9-
import io.getstream.chat.java.models.User;
109
import java.util.Arrays;
1110
import java.util.List;
1211
import org.junit.jupiter.api.Assertions;
@@ -38,17 +37,7 @@ void whenMarkingChannelsDelivered_thenNoException() throws StreamException {
3837
confirmation.setCid(testChannel.getCId());
3938
confirmation.setId(message.getId());
4039

41-
// Create mark delivered options with both user and userId
42-
MarkDeliveredOptions options = new MarkDeliveredOptions();
43-
options.setLatestDeliveredMessages(Arrays.asList(confirmation));
44-
45-
// Set both user object and userId string
46-
User user = new User();
47-
user.setId(testUserRequestObject.getId());
48-
options.setUser(user);
49-
options.setUserId(testUserRequestObject.getId());
50-
51-
// Mark channels as delivered
40+
// Mark channels as delivered using the fluent API
5241
MarkDeliveredOptions.MarkDeliveredResponse response =
5342
MarkDeliveredOptions.markChannelsDelivered(Arrays.asList(confirmation))
5443
.userId(testUserRequestObject.getId())
@@ -80,9 +69,13 @@ void whenMarkingChannelsDeliveredWithOptions_thenNoException() throws StreamExce
8069
confirmation.setCid(testChannel.getCId());
8170
confirmation.setId(message.getId());
8271

83-
// Mark channels as delivered with user_id as parameter
72+
// Create mark delivered options
73+
MarkDeliveredOptions options = new MarkDeliveredOptions();
74+
options.setLatestDeliveredMessages(Arrays.asList(confirmation));
75+
76+
// Mark channels as delivered using the fluent API
8477
MarkDeliveredOptions.MarkDeliveredResponse response =
85-
MarkDeliveredOptions.markChannelsDelivered(Arrays.asList(confirmation))
78+
MarkDeliveredOptions.markChannelsDelivered(options)
8679
.userId(testUserRequestObject.getId())
8780
.request();
8881

@@ -121,7 +114,7 @@ void whenMarkingChannelsDeliveredWithMultipleMessages_thenNoException() throws S
121114
createConfirmation(testChannel.getCId(), messages.get(0).getId()),
122115
createConfirmation(testChannel.getCId(), messages.get(1).getId()));
123116

124-
// Mark channels as delivered with user_id as parameter
117+
// Mark channels as delivered using the fluent API
125118
MarkDeliveredOptions.MarkDeliveredResponse response =
126119
MarkDeliveredOptions.markChannelsDelivered(confirmations)
127120
.userId(testUserRequestObject.getId())

0 commit comments

Comments
 (0)