Skip to content

Commit 9514388

Browse files
bnjbvrbnjbvr
committed
tests: rename RoomMessagesResponse to RoomMessagesResponseTemplate 
1 parent e6dc109 commit 9514388

File tree

5 files changed

+34
-29
lines changed

5 files changed

+34
-29
lines changed

‎crates/matrix-sdk-ui/tests/integration/room_list_service.rs

+2-2
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ use matrix_sdk::{
77
config::RequestConfig,
88
test_utils::{
99
logged_in_client_with_server,
10-
mocks::{MatrixMockServer, RoomMessagesResponse},
10+
mocks::{MatrixMockServer, RoomMessagesResponseTemplate},
1111
set_client_session, test_client_builder,
1212
},
1313
Client,
@@ -2846,7 +2846,7 @@ async fn test_multiple_timeline_init() {
28462846
// Send back-pagination responses with a small delay.
28472847
server
28482848
.mock_room_messages()
2849-
.ok(RoomMessagesResponse::default()
2849+
.ok(RoomMessagesResponseTemplate::default()
28502850
.events(vec![f.text_msg("hello").into_raw_timeline()])
28512851
.delayed(Duration::from_millis(500)))
28522852
.mount()

‎crates/matrix-sdk-ui/tests/integration/timeline/edit.rs

+2-2
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ use matrix_sdk::{
2424
room::edit::EditedContent,
2525
test_utils::{
2626
logged_in_client_with_server,
27-
mocks::{MatrixMockServer, RoomMessagesResponse},
27+
mocks::{MatrixMockServer, RoomMessagesResponseTemplate},
2828
},
2929
Client,
3030
};
@@ -870,7 +870,7 @@ impl PendingEditHelper {
870870
async fn handle_backpagination(&mut self, events: Vec<Raw<AnyTimelineEvent>>, batch_size: u16) {
871871
self.server
872872
.mock_room_messages()
873-
.ok(RoomMessagesResponse::default().end_token("yolo").events(events))
873+
.ok(RoomMessagesResponseTemplate::default().end_token("yolo").events(events))
874874
.mock_once()
875875
.mount()
876876
.await;

‎crates/matrix-sdk/src/test_utils/mocks.rs

+4-4
Original file line numberDiff line numberDiff line change
@@ -1895,7 +1895,7 @@ impl<'a> MockEndpoint<'a, RoomMessagesEndpoint> {
18951895
///
18961896
/// Note: pass `chunk` in the correct order: topological for forward
18971897
/// pagination, reverse topological for backwards pagination.
1898-
pub fn ok(self, response: RoomMessagesResponse) -> MatrixMock<'a> {
1898+
pub fn ok(self, response: RoomMessagesResponseTemplate) -> MatrixMock<'a> {
18991899
let mut template = ResponseTemplate::new(200).set_body_json(json!({
19001900
"start": response.start,
19011901
"end": response.end,
@@ -1913,7 +1913,7 @@ impl<'a> MockEndpoint<'a, RoomMessagesEndpoint> {
19131913
}
19141914

19151915
/// A response to a [`RoomMessagesEndpoint`] query.
1916-
pub struct RoomMessagesResponse {
1916+
pub struct RoomMessagesResponseTemplate {
19171917
/// The start token for this /messages query.
19181918
pub start: String,
19191919
/// The end token for this /messages query (previous batch for back
@@ -1927,7 +1927,7 @@ pub struct RoomMessagesResponse {
19271927
pub delay: Option<Duration>,
19281928
}
19291929

1930-
impl RoomMessagesResponse {
1930+
impl RoomMessagesResponseTemplate {
19311931
/// Fill the events returned as part of this response.
19321932
pub fn events(mut self, chunk: Vec<impl Into<Raw<AnyTimelineEvent>>>) -> Self {
19331933
self.chunk = chunk.into_iter().map(Into::into).collect();
@@ -1947,7 +1947,7 @@ impl RoomMessagesResponse {
19471947
}
19481948
}
19491949

1950-
impl Default for RoomMessagesResponse {
1950+
impl Default for RoomMessagesResponseTemplate {
19511951
fn default() -> Self {
19521952
Self {
19531953
start: "start-token-unused".to_owned(),

‎crates/matrix-sdk/tests/integration/event_cache.rs

+24-19
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ use matrix_sdk::{
1616
},
1717
test_utils::{
1818
assert_event_matches_msg,
19-
mocks::{MatrixMockServer, RoomMessagesResponse},
19+
mocks::{MatrixMockServer, RoomMessagesResponseTemplate},
2020
},
2121
};
2222
use matrix_sdk_test::{
@@ -261,7 +261,7 @@ async fn test_backpaginate_once() {
261261
server
262262
.mock_room_messages()
263263
.from("prev_batch")
264-
.ok(RoomMessagesResponse::default().events(vec![
264+
.ok(RoomMessagesResponseTemplate::default().events(vec![
265265
f.text_msg("world").event_id(event_id!("$2")),
266266
f.text_msg("hello").event_id(event_id!("$3")),
267267
]))
@@ -349,7 +349,7 @@ async fn test_backpaginate_many_times_with_many_iterations() {
349349
server
350350
.mock_room_messages()
351351
.from("prev_batch")
352-
.ok(RoomMessagesResponse::default().end_token("prev_batch2").events(vec![
352+
.ok(RoomMessagesResponseTemplate::default().end_token("prev_batch2").events(vec![
353353
f.text_msg("world").event_id(event_id!("$2")),
354354
f.text_msg("hello").event_id(event_id!("$3")),
355355
]))
@@ -361,7 +361,7 @@ async fn test_backpaginate_many_times_with_many_iterations() {
361361
server
362362
.mock_room_messages()
363363
.from("prev_batch2")
364-
.ok(RoomMessagesResponse::default()
364+
.ok(RoomMessagesResponseTemplate::default()
365365
.events(vec![f.text_msg("oh well").event_id(event_id!("$4"))]))
366366
.mock_once()
367367
.mount()
@@ -487,7 +487,7 @@ async fn test_backpaginate_many_times_with_one_iteration() {
487487
server
488488
.mock_room_messages()
489489
.from("prev_batch")
490-
.ok(RoomMessagesResponse::default().end_token("prev_batch2").events(vec![
490+
.ok(RoomMessagesResponseTemplate::default().end_token("prev_batch2").events(vec![
491491
f.text_msg("world").event_id(event_id!("$2")),
492492
f.text_msg("hello").event_id(event_id!("$3")),
493493
]))
@@ -499,7 +499,7 @@ async fn test_backpaginate_many_times_with_one_iteration() {
499499
server
500500
.mock_room_messages()
501501
.from("prev_batch2")
502-
.ok(RoomMessagesResponse::default()
502+
.ok(RoomMessagesResponseTemplate::default()
503503
.events(vec![f.text_msg("oh well").event_id(event_id!("$4"))]))
504504
.mock_once()
505505
.mount()
@@ -641,7 +641,7 @@ async fn test_reset_while_backpaginating() {
641641
server
642642
.mock_room_messages()
643643
.from("first_backpagination")
644-
.ok(RoomMessagesResponse::default()
644+
.ok(RoomMessagesResponseTemplate::default()
645645
.events(vec![f.text_msg("lalala").into_raw_timeline()])
646646
.delayed(Duration::from_millis(500)))
647647
.mock_once()
@@ -653,7 +653,7 @@ async fn test_reset_while_backpaginating() {
653653
server
654654
.mock_room_messages()
655655
.from("second_backpagination")
656-
.ok(RoomMessagesResponse::default()
656+
.ok(RoomMessagesResponseTemplate::default()
657657
.end_token("third_backpagination")
658658
.events(vec![f.text_msg("finally!").into_raw_timeline()]))
659659
.mock_once()
@@ -764,7 +764,7 @@ async fn test_backpaginating_without_token() {
764764

765765
server
766766
.mock_room_messages()
767-
.ok(RoomMessagesResponse::default()
767+
.ok(RoomMessagesResponseTemplate::default()
768768
.events(vec![f.text_msg("hi").event_id(event_id!("$2")).into_raw_timeline()]))
769769
.mock_once()
770770
.mount()
@@ -822,7 +822,7 @@ async fn test_limited_timeline_resets_pagination() {
822822

823823
server
824824
.mock_room_messages()
825-
.ok(RoomMessagesResponse::default()
825+
.ok(RoomMessagesResponseTemplate::default()
826826
.events(vec![f.text_msg("hi").event_id(event_id!("$2")).into_raw_timeline()]))
827827
.mock_once()
828828
.mount()
@@ -992,7 +992,7 @@ async fn test_limited_timeline_without_storage() {
992992
server
993993
.mock_room_messages()
994994
.from("prev-batch")
995-
.ok(RoomMessagesResponse::default()
995+
.ok(RoomMessagesResponseTemplate::default()
996996
.events(vec![f.text_msg("oh well").event_id(event_id!("$1"))]))
997997
.mock_once()
998998
.mount()
@@ -1058,7 +1058,7 @@ async fn test_backpaginate_with_no_initial_events() {
10581058
let wait_time = Duration::from_millis(500);
10591059
server
10601060
.mock_room_messages()
1061-
.ok(RoomMessagesResponse::default()
1061+
.ok(RoomMessagesResponseTemplate::default()
10621062
.end_token("prev_batch")
10631063
.events(vec![
10641064
f.text_msg("world").event_id(event_id!("$2")).into_raw_timeline(),
@@ -1073,7 +1073,7 @@ async fn test_backpaginate_with_no_initial_events() {
10731073
server
10741074
.mock_room_messages()
10751075
.from("prev_batch")
1076-
.ok(RoomMessagesResponse::default()
1076+
.ok(RoomMessagesResponseTemplate::default()
10771077
.events(vec![f.text_msg("oh well").event_id(event_id!("$1"))]))
10781078
.mock_once()
10791079
.mount()
@@ -1146,7 +1146,7 @@ async fn test_backpaginate_replace_empty_gap() {
11461146
// The first back-pagination will return a previous-batch token, but no events.
11471147
server
11481148
.mock_room_messages()
1149-
.ok(RoomMessagesResponse::default().end_token("prev_batch"))
1149+
.ok(RoomMessagesResponseTemplate::default().end_token("prev_batch"))
11501150
.mock_once()
11511151
.mount()
11521152
.await;
@@ -1155,7 +1155,7 @@ async fn test_backpaginate_replace_empty_gap() {
11551155
server
11561156
.mock_room_messages()
11571157
.from("prev_batch")
1158-
.ok(RoomMessagesResponse::default()
1158+
.ok(RoomMessagesResponseTemplate::default()
11591159
.events(vec![f.text_msg("hello").event_id(event_id!("$1"))]))
11601160
.mock_once()
11611161
.mount()
@@ -1218,7 +1218,12 @@ async fn test_no_gap_stored_after_deduplicated_sync() {
12181218
drop(events);
12191219

12201220
// Backpagination will return nothing.
1221-
server.mock_room_messages().ok(RoomMessagesResponse::default()).mock_once().mount().await;
1221+
server
1222+
.mock_room_messages()
1223+
.ok(RoomMessagesResponseTemplate::default())
1224+
.mock_once()
1225+
.mount()
1226+
.await;
12221227

12231228
let pagination = room_event_cache.pagination();
12241229

@@ -1328,7 +1333,7 @@ async fn test_no_gap_stored_after_deduplicated_backpagination() {
13281333
server
13291334
.mock_room_messages()
13301335
.from("prev-batch2")
1331-
.ok(RoomMessagesResponse::default())
1336+
.ok(RoomMessagesResponseTemplate::default())
13321337
.mock_once()
13331338
.mount()
13341339
.await;
@@ -1338,7 +1343,7 @@ async fn test_no_gap_stored_after_deduplicated_backpagination() {
13381343
server
13391344
.mock_room_messages()
13401345
.from("prev-batch")
1341-
.ok(RoomMessagesResponse::default().end_token("prev-batch3").events(vec![
1346+
.ok(RoomMessagesResponseTemplate::default().end_token("prev-batch3").events(vec![
13421347
// Items in reverse order, since this is back-pagination.
13431348
f.text_msg("world").event_id(event_id!("$2")).into_raw_timeline(),
13441349
f.text_msg("hello").event_id(event_id!("$1")).into_raw_timeline(),
@@ -1424,7 +1429,7 @@ async fn test_dont_delete_gap_that_wasnt_inserted() {
14241429
server
14251430
.mock_room_messages()
14261431
.from("prev-batch")
1427-
.ok(RoomMessagesResponse::default())
1432+
.ok(RoomMessagesResponseTemplate::default())
14281433
.mock_once()
14291434
.mount()
14301435
.await;

‎crates/matrix-sdk/tests/integration/widget.rs

+2-2
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ use assert_matches::assert_matches;
1818
use async_trait::async_trait;
1919
use futures_util::FutureExt;
2020
use matrix_sdk::{
21-
test_utils::mocks::{MatrixMockServer, RoomMessagesResponse},
21+
test_utils::mocks::{MatrixMockServer, RoomMessagesResponseTemplate},
2222
widget::{
2323
Capabilities, CapabilitiesProvider, WidgetDriver, WidgetDriverHandle, WidgetSettings,
2424
},
@@ -313,7 +313,7 @@ async fn test_read_messages_with_msgtype_capabilities() {
313313
mock_server
314314
.mock_room_messages()
315315
.limit(3)
316-
.ok(RoomMessagesResponse::default().end_token(end).events(chunk2))
316+
.ok(RoomMessagesResponseTemplate::default().end_token(end).events(chunk2))
317317
.mock_once()
318318
.mount()
319319
.await;

0 commit comments

Comments
 (0)