diff --git a/src/core/tests/it/fixtures/MSC4297-problem-A/pdus-hydra.json b/src/core/tests/state_res/fixtures/MSC4297-problem-A/pdus-hydra.json similarity index 100% rename from src/core/tests/it/fixtures/MSC4297-problem-A/pdus-hydra.json rename to src/core/tests/state_res/fixtures/MSC4297-problem-A/pdus-hydra.json diff --git a/src/core/tests/it/fixtures/MSC4297-problem-A/pdus-v11.json b/src/core/tests/state_res/fixtures/MSC4297-problem-A/pdus-v11.json similarity index 100% rename from src/core/tests/it/fixtures/MSC4297-problem-A/pdus-v11.json rename to src/core/tests/state_res/fixtures/MSC4297-problem-A/pdus-v11.json diff --git a/src/core/tests/it/fixtures/MSC4297-problem-A/state-bob.json b/src/core/tests/state_res/fixtures/MSC4297-problem-A/state-bob.json similarity index 100% rename from src/core/tests/it/fixtures/MSC4297-problem-A/state-bob.json rename to src/core/tests/state_res/fixtures/MSC4297-problem-A/state-bob.json diff --git a/src/core/tests/it/fixtures/MSC4297-problem-A/state-charlie.json b/src/core/tests/state_res/fixtures/MSC4297-problem-A/state-charlie.json similarity index 100% rename from src/core/tests/it/fixtures/MSC4297-problem-A/state-charlie.json rename to src/core/tests/state_res/fixtures/MSC4297-problem-A/state-charlie.json diff --git a/src/core/tests/it/fixtures/MSC4297-problem-B/pdus-hydra.json b/src/core/tests/state_res/fixtures/MSC4297-problem-B/pdus-hydra.json similarity index 100% rename from src/core/tests/it/fixtures/MSC4297-problem-B/pdus-hydra.json rename to src/core/tests/state_res/fixtures/MSC4297-problem-B/pdus-hydra.json diff --git a/src/core/tests/it/fixtures/MSC4297-problem-B/pdus-v11.json b/src/core/tests/state_res/fixtures/MSC4297-problem-B/pdus-v11.json similarity index 100% rename from src/core/tests/it/fixtures/MSC4297-problem-B/pdus-v11.json rename to src/core/tests/state_res/fixtures/MSC4297-problem-B/pdus-v11.json diff --git a/src/core/tests/it/fixtures/MSC4297-problem-B/state-eve.json b/src/core/tests/state_res/fixtures/MSC4297-problem-B/state-eve.json similarity index 100% rename from src/core/tests/it/fixtures/MSC4297-problem-B/state-eve.json rename to src/core/tests/state_res/fixtures/MSC4297-problem-B/state-eve.json diff --git a/src/core/tests/it/fixtures/MSC4297-problem-B/state-zara.json b/src/core/tests/state_res/fixtures/MSC4297-problem-B/state-zara.json similarity index 100% rename from src/core/tests/it/fixtures/MSC4297-problem-B/state-zara.json rename to src/core/tests/state_res/fixtures/MSC4297-problem-B/state-zara.json diff --git a/src/core/tests/it/fixtures/bootstrap-private-chat.json b/src/core/tests/state_res/fixtures/bootstrap-private-chat.json similarity index 100% rename from src/core/tests/it/fixtures/bootstrap-private-chat.json rename to src/core/tests/state_res/fixtures/bootstrap-private-chat.json diff --git a/src/core/tests/it/fixtures/origin-server-ts-tiebreak.json b/src/core/tests/state_res/fixtures/origin-server-ts-tiebreak.json similarity index 100% rename from src/core/tests/it/fixtures/origin-server-ts-tiebreak.json rename to src/core/tests/state_res/fixtures/origin-server-ts-tiebreak.json diff --git a/src/core/tests/it/fixtures/state-res-v2.1-includes-conflicted-state-subgraph.json b/src/core/tests/state_res/fixtures/state-res-v2.1-includes-conflicted-state-subgraph.json similarity index 100% rename from src/core/tests/it/fixtures/state-res-v2.1-includes-conflicted-state-subgraph.json rename to src/core/tests/state_res/fixtures/state-res-v2.1-includes-conflicted-state-subgraph.json diff --git a/src/core/tests/it/fixtures/state-res-v2.1-starts-from-empty-set.json b/src/core/tests/state_res/fixtures/state-res-v2.1-starts-from-empty-set.json similarity index 100% rename from src/core/tests/it/fixtures/state-res-v2.1-starts-from-empty-set.json rename to src/core/tests/state_res/fixtures/state-res-v2.1-starts-from-empty-set.json diff --git a/src/core/tests/it/main.rs b/src/core/tests/state_res/main.rs similarity index 100% rename from src/core/tests/it/main.rs rename to src/core/tests/state_res/main.rs diff --git a/src/core/tests/it/resolve.rs b/src/core/tests/state_res/resolve.rs similarity index 97% rename from src/core/tests/it/resolve.rs rename to src/core/tests/state_res/resolve.rs index 78633fed..c8913870 100644 --- a/src/core/tests/it/resolve.rs +++ b/src/core/tests/state_res/resolve.rs @@ -35,8 +35,8 @@ use tuwunel_core::{ /// # Arguments /// /// * The test function's name. -/// * A list of JSON files relative to `tests/it/fixtures` to load PDUs to -/// resolve from. +/// * A list of JSON files relative to `tests/state_res/fixtures` to load PDUs +/// to resolve from. macro_rules! snapshot_test { ($name:ident, $paths:expr $(,)?) => { #[tokio::test] @@ -61,10 +61,10 @@ macro_rules! snapshot_test { /// # Arguments /// /// * The test function's name. -/// * A list of JSON files relative to `tests/it/fixtures` to load PDUs to -/// resolve from. -/// * A list of JSON files relative to `tests/it/fixtures` to load event IDs -/// forming contrived states to resolve. +/// * A list of JSON files relative to `tests/state_res/fixtures` to load PDUs +/// to resolve from. +/// * A list of JSON files relative to `tests/state_res/fixtures` to load event +/// IDs forming contrived states to resolve. macro_rules! snapshot_test_contrived_states { ($name:ident, $pdus_path:expr, $state_set_paths:expr $(,)?) => { #[tokio::test] @@ -146,7 +146,7 @@ fn snapshot_test_prelude( tracing::subscriber::set_global_default(subscriber).ok(); - let fixtures_path = Path::new("tests/it/fixtures"); + let fixtures_path = Path::new("tests/state_res/fixtures"); let pdu_batches = paths .iter() @@ -313,7 +313,7 @@ async fn test_contrived_states(pdus_paths: &[&str], state_sets_paths: &[&str]) - .map(|pdu| (pdu.event_id().to_owned(), pdu.clone())) .collect(); - let fixtures_path = Path::new("tests/it/fixtures"); + let fixtures_path = Path::new("tests/state_res/fixtures"); let state_sets = state_sets_paths .iter() diff --git a/src/core/tests/it/resolve/snapshot_tests.rs b/src/core/tests/state_res/resolve/snapshot_tests.rs similarity index 100% rename from src/core/tests/it/resolve/snapshot_tests.rs rename to src/core/tests/state_res/resolve/snapshot_tests.rs diff --git a/src/core/tests/it/resolve/snapshots/it__resolve__snapshot_tests__minimal_private_chat@resolved_state.snap b/src/core/tests/state_res/resolve/snapshots/it__resolve__snapshot_tests__minimal_private_chat@resolved_state.snap similarity index 100% rename from src/core/tests/it/resolve/snapshots/it__resolve__snapshot_tests__minimal_private_chat@resolved_state.snap rename to src/core/tests/state_res/resolve/snapshots/it__resolve__snapshot_tests__minimal_private_chat@resolved_state.snap diff --git a/src/core/tests/it/resolve/snapshots/it__resolve__snapshot_tests__msc4297_problem_a_state_res_v2_0@resolved_state.snap b/src/core/tests/state_res/resolve/snapshots/it__resolve__snapshot_tests__msc4297_problem_a_state_res_v2_0@resolved_state.snap similarity index 100% rename from src/core/tests/it/resolve/snapshots/it__resolve__snapshot_tests__msc4297_problem_a_state_res_v2_0@resolved_state.snap rename to src/core/tests/state_res/resolve/snapshots/it__resolve__snapshot_tests__msc4297_problem_a_state_res_v2_0@resolved_state.snap diff --git a/src/core/tests/it/resolve/snapshots/it__resolve__snapshot_tests__msc4297_problem_a_state_res_v2_1@resolved_state.snap b/src/core/tests/state_res/resolve/snapshots/it__resolve__snapshot_tests__msc4297_problem_a_state_res_v2_1@resolved_state.snap similarity index 100% rename from src/core/tests/it/resolve/snapshots/it__resolve__snapshot_tests__msc4297_problem_a_state_res_v2_1@resolved_state.snap rename to src/core/tests/state_res/resolve/snapshots/it__resolve__snapshot_tests__msc4297_problem_a_state_res_v2_1@resolved_state.snap diff --git a/src/core/tests/it/resolve/snapshots/it__resolve__snapshot_tests__msc4297_problem_b_state_res_v2_0@resolved_state.snap b/src/core/tests/state_res/resolve/snapshots/it__resolve__snapshot_tests__msc4297_problem_b_state_res_v2_0@resolved_state.snap similarity index 100% rename from src/core/tests/it/resolve/snapshots/it__resolve__snapshot_tests__msc4297_problem_b_state_res_v2_0@resolved_state.snap rename to src/core/tests/state_res/resolve/snapshots/it__resolve__snapshot_tests__msc4297_problem_b_state_res_v2_0@resolved_state.snap diff --git a/src/core/tests/it/resolve/snapshots/it__resolve__snapshot_tests__msc4297_problem_b_state_res_v2_1@resolved_state.snap b/src/core/tests/state_res/resolve/snapshots/it__resolve__snapshot_tests__msc4297_problem_b_state_res_v2_1@resolved_state.snap similarity index 100% rename from src/core/tests/it/resolve/snapshots/it__resolve__snapshot_tests__msc4297_problem_b_state_res_v2_1@resolved_state.snap rename to src/core/tests/state_res/resolve/snapshots/it__resolve__snapshot_tests__msc4297_problem_b_state_res_v2_1@resolved_state.snap diff --git a/src/core/tests/it/resolve/snapshots/it__resolve__snapshot_tests__origin_server_ts_tiebreak@resolved_state.snap b/src/core/tests/state_res/resolve/snapshots/it__resolve__snapshot_tests__origin_server_ts_tiebreak@resolved_state.snap similarity index 100% rename from src/core/tests/it/resolve/snapshots/it__resolve__snapshot_tests__origin_server_ts_tiebreak@resolved_state.snap rename to src/core/tests/state_res/resolve/snapshots/it__resolve__snapshot_tests__origin_server_ts_tiebreak@resolved_state.snap diff --git a/src/core/tests/state_res/resolve/snapshots/state_res__resolve__snapshot_tests__minimal_private_chat@resolved_state.snap b/src/core/tests/state_res/resolve/snapshots/state_res__resolve__snapshot_tests__minimal_private_chat@resolved_state.snap new file mode 100644 index 00000000..e671ba8f --- /dev/null +++ b/src/core/tests/state_res/resolve/snapshots/state_res__resolve__snapshot_tests__minimal_private_chat@resolved_state.snap @@ -0,0 +1,58 @@ +--- +source: src/core/tests/state_res/resolve/snapshot_tests.rs +description: Resolved state +--- +[ + { + "kind": "m.room.create", + "state_key": "", + "event_id": "$00-m-room-create", + "content": { + "creator": "@alice:example.com", + "room_version": "10" + } + }, + { + "kind": "m.room.guest_access", + "state_key": "", + "event_id": "$00-m-room-guest_access", + "content": { + "guest_access": "can_join" + } + }, + { + "kind": "m.room.history_visibility", + "state_key": "", + "event_id": "$00-m-room-history_visibility", + "content": { + "history_visibility": "shared" + } + }, + { + "kind": "m.room.join_rules", + "state_key": "", + "event_id": "$00-m-room-join_rules", + "content": { + "join_rule": "invite" + } + }, + { + "kind": "m.room.member", + "state_key": "@alice:example.com", + "event_id": "$00-m-room-member-join-alice", + "content": { + "displayname": "alice", + "membership": "join" + } + }, + { + "kind": "m.room.power_levels", + "state_key": "", + "event_id": "$00-m-room-power_levels", + "content": { + "users": { + "@alice:example.com": 100 + } + } + } +] diff --git a/src/core/tests/state_res/resolve/snapshots/state_res__resolve__snapshot_tests__msc4297_problem_a_state_res_v2_0@resolved_state.snap b/src/core/tests/state_res/resolve/snapshots/state_res__resolve__snapshot_tests__msc4297_problem_a_state_res_v2_0@resolved_state.snap new file mode 100644 index 00000000..3674e36f --- /dev/null +++ b/src/core/tests/state_res/resolve/snapshots/state_res__resolve__snapshot_tests__msc4297_problem_a_state_res_v2_0@resolved_state.snap @@ -0,0 +1,51 @@ +--- +source: src/core/tests/state_res/resolve/snapshot_tests.rs +description: Resolved state +--- +[ + { + "kind": "m.room.create", + "state_key": "", + "event_id": "$00-m-room-create", + "content": { + "room_version": "11" + } + }, + { + "kind": "m.room.member", + "state_key": "@alice:example.com", + "event_id": "$01-m-room-member-leave-alice", + "content": { + "displayname": "alice", + "membership": "leave" + } + }, + { + "kind": "m.room.member", + "state_key": "@bob:example.com", + "event_id": "$01-m-room-member-change-display-name-bob", + "content": { + "displayname": "bob++", + "membership": "join" + } + }, + { + "kind": "m.room.member", + "state_key": "@charlie:example.com", + "event_id": "$01-m-room-member-change-display-name-charlie", + "content": { + "displayname": "charlie++", + "membership": "join" + } + }, + { + "kind": "m.room.power_levels", + "state_key": "", + "event_id": "$00-m-room-power_levels", + "content": { + "users": { + "@alice:example.com": 100 + } + } + } +] diff --git a/src/core/tests/state_res/resolve/snapshots/state_res__resolve__snapshot_tests__msc4297_problem_a_state_res_v2_1@resolved_state.snap b/src/core/tests/state_res/resolve/snapshots/state_res__resolve__snapshot_tests__msc4297_problem_a_state_res_v2_1@resolved_state.snap new file mode 100644 index 00000000..d5e4b783 --- /dev/null +++ b/src/core/tests/state_res/resolve/snapshots/state_res__resolve__snapshot_tests__msc4297_problem_a_state_res_v2_1@resolved_state.snap @@ -0,0 +1,55 @@ +--- +source: src/core/tests/state_res/resolve/snapshot_tests.rs +description: Resolved state +--- +[ + { + "kind": "m.room.create", + "state_key": "", + "event_id": "$00-m-room-create", + "content": { + "room_version": "12" + } + }, + { + "kind": "m.room.join_rules", + "state_key": "", + "event_id": "$01-m-room-join_rules", + "content": { + "join_rule": "invite" + } + }, + { + "kind": "m.room.member", + "state_key": "@alice:example.com", + "event_id": "$01-m-room-member-leave-alice", + "content": { + "displayname": "alice", + "membership": "leave" + } + }, + { + "kind": "m.room.member", + "state_key": "@bob:example.com", + "event_id": "$01-m-room-member-change-display-name-bob", + "content": { + "displayname": "bob++", + "membership": "join" + } + }, + { + "kind": "m.room.member", + "state_key": "@charlie:example.com", + "event_id": "$01-m-room-member-change-display-name-charlie", + "content": { + "displayname": "charlie++", + "membership": "join" + } + }, + { + "kind": "m.room.power_levels", + "state_key": "", + "event_id": "$00-m-room-power_levels", + "content": {} + } +] diff --git a/src/core/tests/state_res/resolve/snapshots/state_res__resolve__snapshot_tests__msc4297_problem_b_state_res_v2_0@resolved_state.snap b/src/core/tests/state_res/resolve/snapshots/state_res__resolve__snapshot_tests__msc4297_problem_b_state_res_v2_0@resolved_state.snap new file mode 100644 index 00000000..16d87d36 --- /dev/null +++ b/src/core/tests/state_res/resolve/snapshots/state_res__resolve__snapshot_tests__msc4297_problem_b_state_res_v2_0@resolved_state.snap @@ -0,0 +1,77 @@ +--- +source: src/core/tests/state_res/resolve/snapshot_tests.rs +description: Resolved state +--- +[ + { + "kind": "m.room.create", + "state_key": "", + "event_id": "$00-m-room-create", + "content": { + "room_version": "11" + } + }, + { + "kind": "m.room.join_rules", + "state_key": "", + "event_id": "$00-m-room-join_rules", + "content": { + "join_rule": "public" + } + }, + { + "kind": "m.room.member", + "state_key": "@alice:example.com", + "event_id": "$00-m-room-member-join-alice", + "content": { + "displayname": "alice", + "membership": "join" + } + }, + { + "kind": "m.room.member", + "state_key": "@bob:example.com", + "event_id": "$00-m-room-member-join-bob", + "content": { + "displayname": "bob", + "membership": "join" + } + }, + { + "kind": "m.room.member", + "state_key": "@charlie:example.com", + "event_id": "$00-m-room-member-join-charlie", + "content": { + "displayname": "charlie", + "membership": "join" + } + }, + { + "kind": "m.room.member", + "state_key": "@eve:example.com", + "event_id": "$01-m-room-member-change-display-name-eve", + "content": { + "displayname": "eve++", + "membership": "join" + } + }, + { + "kind": "m.room.member", + "state_key": "@zara:example.com", + "event_id": "$00-m-room-member-join-zara", + "content": { + "displayname": "zara", + "membership": "join" + } + }, + { + "kind": "m.room.power_levels", + "state_key": "", + "event_id": "$00-m-room-power_levels", + "content": { + "users": { + "@alice:example.com": 100 + } + } + } +] diff --git a/src/core/tests/state_res/resolve/snapshots/state_res__resolve__snapshot_tests__msc4297_problem_b_state_res_v2_1@resolved_state.snap b/src/core/tests/state_res/resolve/snapshots/state_res__resolve__snapshot_tests__msc4297_problem_b_state_res_v2_1@resolved_state.snap new file mode 100644 index 00000000..01156350 --- /dev/null +++ b/src/core/tests/state_res/resolve/snapshots/state_res__resolve__snapshot_tests__msc4297_problem_b_state_res_v2_1@resolved_state.snap @@ -0,0 +1,78 @@ +--- +source: src/core/tests/state_res/resolve/snapshot_tests.rs +description: Resolved state +--- +[ + { + "kind": "m.room.create", + "state_key": "", + "event_id": "$00-m-room-create", + "content": { + "room_version": "12" + } + }, + { + "kind": "m.room.join_rules", + "state_key": "", + "event_id": "$00-m-room-join_rules", + "content": { + "join_rule": "public" + } + }, + { + "kind": "m.room.member", + "state_key": "@alice:example.com", + "event_id": "$00-m-room-member-join-alice", + "content": { + "displayname": "alice", + "membership": "join" + } + }, + { + "kind": "m.room.member", + "state_key": "@bob:example.com", + "event_id": "$00-m-room-member-join-bob", + "content": { + "displayname": "bob", + "membership": "join" + } + }, + { + "kind": "m.room.member", + "state_key": "@charlie:example.com", + "event_id": "$00-m-room-member-join-charlie", + "content": { + "displayname": "charlie", + "membership": "join" + } + }, + { + "kind": "m.room.member", + "state_key": "@eve:example.com", + "event_id": "$01-m-room-member-change-display-name-eve", + "content": { + "displayname": "eve++", + "membership": "join" + } + }, + { + "kind": "m.room.member", + "state_key": "@zara:example.com", + "event_id": "$00-m-room-member-join-zara", + "content": { + "displayname": "zara", + "membership": "join" + } + }, + { + "kind": "m.room.power_levels", + "state_key": "", + "event_id": "$02-m-room-power_levels", + "content": { + "users": { + "@bob:example.com": 50, + "@charlie:example.com": 50 + } + } + } +] diff --git a/src/core/tests/state_res/resolve/snapshots/state_res__resolve__snapshot_tests__origin_server_ts_tiebreak@resolved_state.snap b/src/core/tests/state_res/resolve/snapshots/state_res__resolve__snapshot_tests__origin_server_ts_tiebreak@resolved_state.snap new file mode 100644 index 00000000..451dccce --- /dev/null +++ b/src/core/tests/state_res/resolve/snapshots/state_res__resolve__snapshot_tests__origin_server_ts_tiebreak@resolved_state.snap @@ -0,0 +1,58 @@ +--- +source: src/core/tests/state_res/resolve/snapshot_tests.rs +description: Resolved state +--- +[ + { + "kind": "m.room.create", + "state_key": "", + "event_id": "$00-m-room-create", + "content": { + "creator": "@alice:example.com", + "room_version": "10" + } + }, + { + "kind": "m.room.guest_access", + "state_key": "", + "event_id": "$00-m-room-guest_access", + "content": { + "guest_access": "can_join" + } + }, + { + "kind": "m.room.history_visibility", + "state_key": "", + "event_id": "$00-m-room-history_visibility", + "content": { + "history_visibility": "shared" + } + }, + { + "kind": "m.room.join_rules", + "state_key": "", + "event_id": "$01-m-room-join_rules", + "content": { + "join_rule": "public" + } + }, + { + "kind": "m.room.member", + "state_key": "@alice:example.com", + "event_id": "$00-m-room-member-join-alice", + "content": { + "displayname": "alice", + "membership": "join" + } + }, + { + "kind": "m.room.power_levels", + "state_key": "", + "event_id": "$00-m-room-power_levels", + "content": { + "users": { + "@alice:example.com": 100 + } + } + } +]