Skip to content

Commit 92c4ad5

Browse files
committed
Reuse test user
1 parent 84271dc commit 92c4ad5

File tree

1 file changed

+37
-48
lines changed

1 file changed

+37
-48
lines changed

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

Lines changed: 37 additions & 48 deletions
Original file line numberDiff line numberDiff line change
@@ -8,11 +8,8 @@
88
import io.getstream.chat.java.models.Message;
99
import io.getstream.chat.java.models.Sort;
1010
import io.getstream.chat.java.models.Thread;
11-
import io.getstream.chat.java.models.User;
12-
import io.getstream.chat.java.models.User.UserRequestObject;
1311
import java.util.List;
1412
import java.util.UUID;
15-
import org.apache.commons.lang3.RandomStringUtils;
1613
import org.junit.jupiter.api.Assertions;
1714
import org.junit.jupiter.api.DisplayName;
1815
import org.junit.jupiter.api.Test;
@@ -23,30 +20,26 @@ public class ThreadTest extends BasicTest {
2320
@DisplayName("Can query threads with filter parameters")
2421
@Test
2522
void whenQueryingThreadsWithFilter_thenNoException() throws StreamException {
26-
// Create a user
27-
UserRequestObject user =
28-
UserRequestObject.builder()
29-
.id("user-" + RandomStringUtils.randomAlphabetic(10))
30-
.name("User 1")
31-
.build();
32-
User.upsert().user(user).request();
33-
3423
// Create a channel with a thread
3524
String channelId = UUID.randomUUID().toString();
3625
Channel.ChannelGetResponse channel =
3726
Channel.getOrCreate("messaging", channelId)
3827
.data(
3928
ChannelRequestObject.builder()
40-
.createdBy(user)
41-
.members(List.of(ChannelMemberRequestObject.builder().user(user).build()))
29+
.createdBy(testUserRequestObject)
30+
.members(
31+
List.of(
32+
ChannelMemberRequestObject.builder()
33+
.user(testUserRequestObject)
34+
.build()))
4235
.build())
4336
.request();
4437

4538
// Create a parent message for the thread
4639
Message.MessageRequestObject parentMessage =
4740
Message.MessageRequestObject.builder()
4841
.text("Parent message for thread")
49-
.userId(user.getId())
42+
.userId(testUserRequestObject.getId())
5043
.build();
5144

5245
Message.MessageSendResponse parentMessageResponse =
@@ -58,7 +51,7 @@ void whenQueryingThreadsWithFilter_thenNoException() throws StreamException {
5851
Message.MessageRequestObject replyMessage =
5952
Message.MessageRequestObject.builder()
6053
.text("Reply in thread")
61-
.userId(user.getId())
54+
.userId(testUserRequestObject.getId())
6255
.parentId(parentMessageResponse.getMessage().getId())
6356
.build();
6457

@@ -69,7 +62,7 @@ void whenQueryingThreadsWithFilter_thenNoException() throws StreamException {
6962
// Query threads with filter for the specific channel
7063
Thread.QueryThreadsResponse response =
7164
Thread.queryThreads()
72-
.userId(user.getId())
65+
.userId(testUserRequestObject.getId())
7366
.filter(FilterCondition.eq("channel_cid", channel.getChannel().getCId()))
7467
.request();
7568

@@ -87,30 +80,26 @@ void whenQueryingThreadsWithFilter_thenNoException() throws StreamException {
8780
@DisplayName("Can query threads with sort parameters")
8881
@Test
8982
void whenQueryingThreadsWithSort_thenNoException() throws StreamException {
90-
// Create a user
91-
UserRequestObject user =
92-
UserRequestObject.builder()
93-
.id("user-" + RandomStringUtils.randomAlphabetic(10))
94-
.name("User 1")
95-
.build();
96-
User.upsert().user(user).request();
97-
9883
// Create two channels with threads
9984
String channel1Id = UUID.randomUUID().toString();
10085
Channel.ChannelGetResponse channel1 =
10186
Channel.getOrCreate("messaging", channel1Id)
10287
.data(
10388
ChannelRequestObject.builder()
104-
.createdBy(user)
105-
.members(List.of(ChannelMemberRequestObject.builder().user(user).build()))
89+
.createdBy(testUserRequestObject)
90+
.members(
91+
List.of(
92+
ChannelMemberRequestObject.builder()
93+
.user(testUserRequestObject)
94+
.build()))
10695
.build())
10796
.request();
10897

10998
// Create a parent message for the first thread
11099
Message.MessageRequestObject parentMessage1 =
111100
Message.MessageRequestObject.builder()
112101
.text("Parent message for thread 1")
113-
.userId(user.getId())
102+
.userId(testUserRequestObject.getId())
114103
.build();
115104

116105
Message.MessageSendResponse parentMessageResponse1 =
@@ -122,7 +111,7 @@ void whenQueryingThreadsWithSort_thenNoException() throws StreamException {
122111
Message.MessageRequestObject replyMessage1 =
123112
Message.MessageRequestObject.builder()
124113
.text("Reply in thread 1")
125-
.userId(user.getId())
114+
.userId(testUserRequestObject.getId())
126115
.parentId(parentMessageResponse1.getMessage().getId())
127116
.build();
128117

@@ -136,16 +125,20 @@ void whenQueryingThreadsWithSort_thenNoException() throws StreamException {
136125
Channel.getOrCreate("messaging", channel2Id)
137126
.data(
138127
ChannelRequestObject.builder()
139-
.createdBy(user)
140-
.members(List.of(ChannelMemberRequestObject.builder().user(user).build()))
128+
.createdBy(testUserRequestObject)
129+
.members(
130+
List.of(
131+
ChannelMemberRequestObject.builder()
132+
.user(testUserRequestObject)
133+
.build()))
141134
.build())
142135
.request();
143136

144137
// Create a parent message for the second thread
145138
Message.MessageRequestObject parentMessage2 =
146139
Message.MessageRequestObject.builder()
147140
.text("Parent message for thread 2")
148-
.userId(user.getId())
141+
.userId(testUserRequestObject.getId())
149142
.build();
150143

151144
Message.MessageSendResponse parentMessageResponse2 =
@@ -157,7 +150,7 @@ void whenQueryingThreadsWithSort_thenNoException() throws StreamException {
157150
Message.MessageRequestObject replyMessage2 =
158151
Message.MessageRequestObject.builder()
159152
.text("Reply in thread 2")
160-
.userId(user.getId())
153+
.userId(testUserRequestObject.getId())
161154
.parentId(parentMessageResponse2.getMessage().getId())
162155
.build();
163156

@@ -168,7 +161,7 @@ void whenQueryingThreadsWithSort_thenNoException() throws StreamException {
168161
// Query threads with sort by created_at in descending order
169162
Thread.QueryThreadsResponse response =
170163
Thread.queryThreads()
171-
.userId(user.getId())
164+
.userId(testUserRequestObject.getId())
172165
.sort(Sort.builder().field("created_at").direction(Sort.Direction.DESC).build())
173166
.request();
174167

@@ -195,30 +188,26 @@ void whenQueryingThreadsWithSort_thenNoException() throws StreamException {
195188
@DisplayName("Can query threads with both filter and sort parameters")
196189
@Test
197190
void whenQueryingThreadsWithFilterAndSort_thenNoException() throws StreamException {
198-
// Create a user
199-
UserRequestObject user =
200-
UserRequestObject.builder()
201-
.id("user-" + RandomStringUtils.randomAlphabetic(10))
202-
.name("User 1")
203-
.build();
204-
User.upsert().user(user).request();
205-
206191
// Create a channel with multiple threads
207192
String channelId = UUID.randomUUID().toString();
208193
Channel.ChannelGetResponse channel =
209194
Channel.getOrCreate("messaging", channelId)
210195
.data(
211196
ChannelRequestObject.builder()
212-
.createdBy(user)
213-
.members(List.of(ChannelMemberRequestObject.builder().user(user).build()))
197+
.createdBy(testUserRequestObject)
198+
.members(
199+
List.of(
200+
ChannelMemberRequestObject.builder()
201+
.user(testUserRequestObject)
202+
.build()))
214203
.build())
215204
.request();
216205

217206
// Create a parent message for the first thread
218207
Message.MessageRequestObject parentMessage1 =
219208
Message.MessageRequestObject.builder()
220209
.text("Parent message for thread 1")
221-
.userId(user.getId())
210+
.userId(testUserRequestObject.getId())
222211
.build();
223212

224213
Message.MessageSendResponse parentMessageResponse1 =
@@ -230,7 +219,7 @@ void whenQueryingThreadsWithFilterAndSort_thenNoException() throws StreamExcepti
230219
Message.MessageRequestObject replyMessage1 =
231220
Message.MessageRequestObject.builder()
232221
.text("Reply in thread 1")
233-
.userId(user.getId())
222+
.userId(testUserRequestObject.getId())
234223
.parentId(parentMessageResponse1.getMessage().getId())
235224
.build();
236225

@@ -242,7 +231,7 @@ void whenQueryingThreadsWithFilterAndSort_thenNoException() throws StreamExcepti
242231
Message.MessageRequestObject parentMessage2 =
243232
Message.MessageRequestObject.builder()
244233
.text("Parent message for thread 2")
245-
.userId(user.getId())
234+
.userId(testUserRequestObject.getId())
246235
.build();
247236

248237
Message.MessageSendResponse parentMessageResponse2 =
@@ -254,7 +243,7 @@ void whenQueryingThreadsWithFilterAndSort_thenNoException() throws StreamExcepti
254243
Message.MessageRequestObject replyMessage2 =
255244
Message.MessageRequestObject.builder()
256245
.text("Reply in thread 2")
257-
.userId(user.getId())
246+
.userId(testUserRequestObject.getId())
258247
.parentId(parentMessageResponse2.getMessage().getId())
259248
.build();
260249

@@ -265,7 +254,7 @@ void whenQueryingThreadsWithFilterAndSort_thenNoException() throws StreamExcepti
265254
// Query threads with filter for the specific channel and sort by created_at in descending order
266255
Thread.QueryThreadsResponse response =
267256
Thread.queryThreads()
268-
.userId(user.getId())
257+
.userId(testUserRequestObject.getId())
269258
.filter(FilterCondition.eq("channel_cid", channel.getChannel().getCId()))
270259
.sort(Sort.builder().field("created_at").direction(Sort.Direction.DESC).build())
271260
.request();

0 commit comments

Comments
 (0)