Yehowshua/ZIm
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Make DAG tests order independent

Browse source
This commit is contained in:
Mikayla 2023-09-15 13:44:01 -07:00
parent 52057c5619
commit 363867c65b
No known key found for this signature in database
1 changed files with 22 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

28
crates/collab/src/db/tests/channel_tests.rs
View file

@ -1,3 +1,4 @@
use collections::{HashMap, HashSet};
use rpc::{proto, ConnectionId}; use rpc::{proto, ConnectionId};
use crate::{ use crate::{
@ -459,12 +460,12 @@ async fn test_channel_renames(db: &Arc<Database>) {
} }
test_both_dbs!( test_both_dbs!(
test_channels_moving, test_db_channel_moving,
test_channels_moving_postgres, test_channels_moving_postgres,
test_channels_moving_sqlite test_channels_moving_sqlite
); );
async fn test_channels_moving(db: &Arc<Database>) { async fn test_db_channel_moving(db: &Arc<Database>) {
let a_id = db let a_id = db
.create_user( .create_user(
"user1@example.com", "user1@example.com",
@ -661,9 +662,9 @@ async fn test_channels_moving(db: &Arc<Database>) {
(zed_id, None), (zed_id, None),
(crdb_id, Some(zed_id)), (crdb_id, Some(zed_id)),
(gpui2_id, Some(zed_id)), (gpui2_id, Some(zed_id)),
(livestreaming_id, Some(gpui2_id)),
(livestreaming_id, Some(zed_id)), (livestreaming_id, Some(zed_id)),
(livestreaming_id, Some(crdb_id)), (livestreaming_id, Some(crdb_id)),
(livestreaming_id, Some(gpui2_id)),
(livestreaming_dag_id, Some(livestreaming_id)), (livestreaming_dag_id, Some(livestreaming_id)),
(livestreaming_dag_sub_id, Some(livestreaming_id)), (livestreaming_dag_sub_id, Some(livestreaming_id)),
(livestreaming_dag_sub_id, Some(livestreaming_dag_id)), (livestreaming_dag_sub_id, Some(livestreaming_dag_id)),
@ -836,10 +837,25 @@ async fn test_channels_moving(db: &Arc<Database>) {
#[track_caller] #[track_caller]
fn assert_dag(actual: Vec<Channel>, expected: &[(ChannelId, Option<ChannelId>)]) { fn assert_dag(actual: Vec<Channel>, expected: &[(ChannelId, Option<ChannelId>)]) {
/// This is used to allow tests to be ordering independent
fn make_parents_map(association_table: impl IntoIterator<Item= (ChannelId, Option<ChannelId>)>) -> HashMap<ChannelId, HashSet<ChannelId>> {
let mut map: HashMap<ChannelId, HashSet<ChannelId>> = HashMap::default();
for (child, parent) in association_table {
let entry = map.entry(child).or_default();
if let Some(parent) = parent {
entry.insert(parent);
}
}
map
}
let actual = actual let actual = actual
.iter() .iter()
.map(|channel| (channel.id, channel.parent_id)) .map(|channel| (channel.id, channel.parent_id));
.collect::<Vec<_>>();
pretty_assertions::assert_eq!(actual, expected) let actual_map = make_parents_map(actual);
let expected_map = make_parents_map(expected.iter().copied());
pretty_assertions::assert_eq!(actual_map, expected_map)
} }