Skip to content

Commit 42d2b93

Browse files
jplattejplatte
authored
refactor: Introduce TestResult and use it in a couple random places
1 parent 872713c commit 42d2b93

File tree

6 files changed

+737
-716
lines changed

6 files changed

+737
-716
lines changed

‎crates/matrix-sdk-base/src/response_processors/state_events.rs

Lines changed: 49 additions & 31 deletions
Original file line numberDiff line numberDiff line change
@@ -434,15 +434,15 @@ pub fn is_tombstone_event_valid(
434434
mod tests {
435435
use assert_matches2::assert_matches;
436436
use matrix_sdk_test::{
437-
DEFAULT_TEST_ROOM_ID, JoinedRoomBuilder, StateTestEvent, SyncResponseBuilder, async_test,
438-
event_factory::EventFactory,
437+
DEFAULT_TEST_ROOM_ID, JoinedRoomBuilder, StateTestEvent, SyncResponseBuilder, TestResult,
438+
async_test, event_factory::EventFactory,
439439
};
440440
use ruma::{RoomVersionId, event_id, room_id, user_id};
441441

442442
use crate::test_utils::logged_in_base_client;
443443

444444
#[async_test]
445-
async fn test_not_possible_to_overwrite_m_room_create() {
445+
async fn test_not_possible_to_overwrite_m_room_create() -> TestResult {
446446
let sender = user_id!("@mnt_io:matrix.org");
447447
let event_factory = EventFactory::new().sender(sender);
448448
let mut response_builder = SyncResponseBuilder::new();
@@ -460,14 +460,14 @@ mod tests {
460460
.add_joined_room(
461461
JoinedRoomBuilder::new(room_id_0)
462462
.add_timeline_event(
463-
event_factory.create(sender, RoomVersionId::try_from("42").unwrap()),
463+
event_factory.create(sender, RoomVersionId::try_from("42")?),
464464
)
465465
.add_timeline_event(
466-
event_factory.create(sender, RoomVersionId::try_from("43").unwrap()),
466+
event_factory.create(sender, RoomVersionId::try_from("43")?),
467467
),
468468
)
469469
.add_joined_room(JoinedRoomBuilder::new(room_id_1).add_timeline_event(
470-
event_factory.create(sender, RoomVersionId::try_from("44").unwrap()),
470+
event_factory.create(sender, RoomVersionId::try_from("44")?),
471471
))
472472
.add_joined_room(JoinedRoomBuilder::new(room_id_2))
473473
.build_sync_response();
@@ -495,13 +495,13 @@ mod tests {
495495
{
496496
let response = response_builder
497497
.add_joined_room(JoinedRoomBuilder::new(room_id_0).add_timeline_event(
498-
event_factory.create(sender, RoomVersionId::try_from("45").unwrap()),
498+
event_factory.create(sender, RoomVersionId::try_from("45")?),
499499
))
500500
.add_joined_room(JoinedRoomBuilder::new(room_id_1).add_timeline_event(
501-
event_factory.create(sender, RoomVersionId::try_from("46").unwrap()),
501+
event_factory.create(sender, RoomVersionId::try_from("46")?),
502502
))
503503
.add_joined_room(JoinedRoomBuilder::new(room_id_2).add_timeline_event(
504-
event_factory.create(sender, RoomVersionId::try_from("47").unwrap()),
504+
event_factory.create(sender, RoomVersionId::try_from("47")?),
505505
))
506506
.build_sync_response();
507507

@@ -525,6 +525,8 @@ mod tests {
525525
"47"
526526
);
527527
}
528+
529+
Ok(())
528530
}
529531

530532
#[async_test]
@@ -542,7 +544,7 @@ mod tests {
542544
}
543545

544546
#[async_test]
545-
async fn test_check_room_upgrades_no_error() {
547+
async fn test_check_room_upgrades_no_error() -> TestResult {
546548
let sender = user_id!("@mnt_io:matrix.org");
547549
let event_factory = EventFactory::new().sender(sender);
548550
let mut response_builder = SyncResponseBuilder::new();
@@ -557,7 +559,7 @@ mod tests {
557559
let response = response_builder
558560
.add_joined_room(JoinedRoomBuilder::new(room_id_0).add_timeline_event(
559561
// Room 0 has no predecessor.
560-
event_factory.create(sender, RoomVersionId::try_from("41").unwrap()),
562+
event_factory.create(sender, RoomVersionId::try_from("41")?),
561563
))
562564
.build_sync_response();
563565

@@ -581,7 +583,7 @@ mod tests {
581583
JoinedRoomBuilder::new(room_id_1).add_timeline_event(
582584
// Predecessor of room 1 is room 0.
583585
event_factory
584-
.create(sender, RoomVersionId::try_from("42").unwrap())
586+
.create(sender, RoomVersionId::try_from("42")?)
585587
.predecessor(room_id_0),
586588
),
587589
)
@@ -620,7 +622,7 @@ mod tests {
620622
JoinedRoomBuilder::new(room_id_2).add_timeline_event(
621623
// Predecessor of room 2 is room 1.
622624
event_factory
623-
.create(sender, RoomVersionId::try_from("43").unwrap())
625+
.create(sender, RoomVersionId::try_from("43")?)
624626
.predecessor(room_id_1),
625627
),
626628
)
@@ -650,10 +652,12 @@ mod tests {
650652
);
651653
assert!(room_2.successor_room().is_none(), "room 2 must not have a successor");
652654
}
655+
656+
Ok(())
653657
}
654658

655659
#[async_test]
656-
async fn test_check_room_upgrades_no_loop_within_misordered_rooms() {
660+
async fn test_check_room_upgrades_no_loop_within_misordered_rooms() -> TestResult {
657661
let sender = user_id!("@mnt_io:matrix.org");
658662
let event_factory = EventFactory::new().sender(sender);
659663
let mut response_builder = SyncResponseBuilder::new();
@@ -674,7 +678,7 @@ mod tests {
674678
JoinedRoomBuilder::new(room_id_0)
675679
.add_timeline_event(
676680
// No predecessor for room 0.
677-
event_factory.create(sender, RoomVersionId::try_from("41").unwrap()),
681+
event_factory.create(sender, RoomVersionId::try_from("41")?),
678682
)
679683
.add_timeline_event(
680684
// Successor of room 0 is room 1.
@@ -689,7 +693,7 @@ mod tests {
689693
.add_timeline_event(
690694
// Predecessor of room 1 is room 0.
691695
event_factory
692-
.create(sender, RoomVersionId::try_from("42").unwrap())
696+
.create(sender, RoomVersionId::try_from("42")?)
693697
.predecessor(room_id_0),
694698
)
695699
.add_timeline_event(
@@ -704,7 +708,7 @@ mod tests {
704708
JoinedRoomBuilder::new(room_id_2).add_timeline_event(
705709
// Predecessor of room 2 is room 1.
706710
event_factory
707-
.create(sender, RoomVersionId::try_from("43").unwrap())
711+
.create(sender, RoomVersionId::try_from("43")?)
708712
.predecessor(room_id_1),
709713
),
710714
)
@@ -755,10 +759,12 @@ mod tests {
755759
);
756760
assert!(room_2.successor_room().is_none(), "room 2 must not have a successor");
757761
}
762+
763+
Ok(())
758764
}
759765

760766
#[async_test]
761-
async fn test_check_room_upgrades_shortest_invalid_successor() {
767+
async fn test_check_room_upgrades_shortest_invalid_successor() -> TestResult {
762768
let sender = user_id!("@mnt_io:matrix.org");
763769
let event_factory = EventFactory::new().sender(sender);
764770
let mut response_builder = SyncResponseBuilder::new();
@@ -790,10 +796,12 @@ mod tests {
790796
assert!(room_0.predecessor_room().is_none(), "room 0 must not have a predecessor");
791797
assert!(room_0.successor_room().is_none(), "room 0 must not have a successor");
792798
}
799+
800+
Ok(())
793801
}
794802

795803
#[async_test]
796-
async fn test_check_room_upgrades_invalid_successor() {
804+
async fn test_check_room_upgrades_invalid_successor() -> TestResult {
797805
let sender = user_id!("@mnt_io:matrix.org");
798806
let event_factory = EventFactory::new().sender(sender);
799807
let mut response_builder = SyncResponseBuilder::new();
@@ -815,7 +823,7 @@ mod tests {
815823
JoinedRoomBuilder::new(room_id_1).add_timeline_event(
816824
// Predecessor of room 1 is room 0.
817825
event_factory
818-
.create(sender, RoomVersionId::try_from("42").unwrap())
826+
.create(sender, RoomVersionId::try_from("42")?)
819827
.predecessor(room_id_0),
820828
),
821829
)
@@ -855,7 +863,7 @@ mod tests {
855863
.add_timeline_event(
856864
// Predecessor of room 2 is room 1.
857865
event_factory
858-
.create(sender, RoomVersionId::try_from("43").unwrap())
866+
.create(sender, RoomVersionId::try_from("43")?)
859867
.predecessor(room_id_1),
860868
)
861869
.add_timeline_event(
@@ -903,10 +911,12 @@ mod tests {
903911
// this state event is missing because it creates a loop
904912
assert!(room_2.successor_room().is_none(), "room 2 must not have a successor",);
905913
}
914+
915+
Ok(())
906916
}
907917

908918
#[async_test]
909-
async fn test_check_room_upgrades_shortest_invalid_predecessor() {
919+
async fn test_check_room_upgrades_shortest_invalid_predecessor() -> TestResult {
910920
let sender = user_id!("@mnt_io:matrix.org");
911921
let event_factory = EventFactory::new().sender(sender);
912922
let mut response_builder = SyncResponseBuilder::new();
@@ -923,7 +933,7 @@ mod tests {
923933
// No successor.
924934
JoinedRoomBuilder::new(room_id_0).add_timeline_event(
925935
event_factory
926-
.create(sender, RoomVersionId::try_from("42").unwrap())
936+
.create(sender, RoomVersionId::try_from("42")?)
927937
.predecessor(room_id_0)
928938
.event_id(tombstone_event_id),
929939
),
@@ -940,10 +950,12 @@ mod tests {
940950
assert!(room_0.successor_room().is_none(), "room 0 must not have a successor");
941951
assert_matches!(room_0.create_content(), Some(_), "room 0 must have a create content");
942952
}
953+
954+
Ok(())
943955
}
944956

945957
#[async_test]
946-
async fn test_check_room_upgrades_shortest_loop() {
958+
async fn test_check_room_upgrades_shortest_loop() -> TestResult {
947959
let sender = user_id!("@mnt_io:matrix.org");
948960
let event_factory = EventFactory::new().sender(sender);
949961
let mut response_builder = SyncResponseBuilder::new();
@@ -966,7 +978,7 @@ mod tests {
966978
.add_timeline_event(
967979
// Predecessor of room 0 is room 0
968980
event_factory
969-
.create(sender, RoomVersionId::try_from("42").unwrap())
981+
.create(sender, RoomVersionId::try_from("42")?)
970982
.predecessor(room_id_0),
971983
),
972984
)
@@ -982,10 +994,12 @@ mod tests {
982994
assert!(room_0.successor_room().is_none(), "room 0 must not have a successor");
983995
assert_matches!(room_0.create_content(), Some(_), "room 0 must have a create content");
984996
}
997+
998+
Ok(())
985999
}
9861000

9871001
#[async_test]
988-
async fn test_check_room_upgrades_loop() {
1002+
async fn test_check_room_upgrades_loop() -> TestResult {
9891003
let sender = user_id!("@mnt_io:matrix.org");
9901004
let event_factory = EventFactory::new().sender(sender);
9911005
let mut response_builder = SyncResponseBuilder::new();
@@ -1007,7 +1021,7 @@ mod tests {
10071021
.add_timeline_event(
10081022
// Predecessor of room 0 is room 2
10091023
event_factory
1010-
.create(sender, RoomVersionId::try_from("42").unwrap())
1024+
.create(sender, RoomVersionId::try_from("42")?)
10111025
.predecessor(room_id_2),
10121026
)
10131027
.add_timeline_event(
@@ -1022,7 +1036,7 @@ mod tests {
10221036
.add_timeline_event(
10231037
// Predecessor of room 1 is room 0
10241038
event_factory
1025-
.create(sender, RoomVersionId::try_from("43").unwrap())
1039+
.create(sender, RoomVersionId::try_from("43")?)
10261040
.predecessor(room_id_0),
10271041
)
10281042
.add_timeline_event(
@@ -1037,7 +1051,7 @@ mod tests {
10371051
.add_timeline_event(
10381052
// Predecessor of room 2 is room 1
10391053
event_factory
1040-
.create(sender, RoomVersionId::try_from("44").unwrap())
1054+
.create(sender, RoomVersionId::try_from("44")?)
10411055
.predecessor(room_id_1),
10421056
)
10431057
.add_timeline_event(
@@ -1087,10 +1101,12 @@ mod tests {
10871101
assert!(room_2.successor_room().is_none(), "room 2 must not have a successor",);
10881102
assert_matches!(room_2.create_content(), Some(_), "room 2 must have a create content");
10891103
}
1104+
1105+
Ok(())
10901106
}
10911107

10921108
#[async_test]
1093-
async fn test_state_events_after_sync() {
1109+
async fn test_state_events_after_sync() -> TestResult {
10941110
// Given a room
10951111
let user_id = user_id!("@u:u.to");
10961112

@@ -1111,7 +1127,7 @@ mod tests {
11111127
.add_state_event(StateTestEvent::PowerLevels),
11121128
)
11131129
.build_sync_response();
1114-
client.receive_sync_response(response).await.unwrap();
1130+
client.receive_sync_response(response).await?;
11151131

11161132
let room = client.get_room(&DEFAULT_TEST_ROOM_ID).expect("Just-created room not found!");
11171133

@@ -1120,5 +1136,7 @@ mod tests {
11201136

11211137
// ensure that we have the topic
11221138
assert_eq!(room.topic().unwrap(), "this is the test topic in the timeline");
1139+
1140+
Ok(())
11231141
}
11241142
}

0 commit comments

Comments
 (0)