go/sliding-sync
go/sliding-sync
1
0
Fork 0
mirror of https://github.com/matrix-org/sliding-sync.git synced 2025-03-10 13:37:11 +00:00
Code Issues Packages Projects Releases Wiki Activity

Add NewJoinEvent shorthand for tests

Browse Source
This commit is contained in:
Kegan Dougal 2022-07-12 15:12:02 +01:00
parent d480ae170d
commit 1a55076478
11 changed files with 49 additions and 49 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
filters_test.go
View File

@ -232,9 +232,7 @@ func TestFiltersInvite(t *testing.T) {
Rooms: sync2.SyncRoomsResponse{
Join: v2JoinTimeline(roomEvents{
roomID: roomID,
events: []json.RawMessage{testutils.NewStateEvent(t, "m.room.member", alice, alice, map[string]interface{}{
"membership": "join",
})},
events: []json.RawMessage{testutils.NewJoinEvent(t, alice)},
}),
},
})

6
lists_test.go
View File

@ -193,10 +193,8 @@ func TestMultipleListsDMUpdate(t *testing.T) {
dmRoom := roomEvents{
roomID: dmRoomID,
events: append(createRoomState(t, alice, ts), []json.RawMessage{
testutils.NewStateEvent(
t, "m.room.member", dmUser, dmUser, map[string]interface{}{
"membership": "join",
}, testutils.WithTimestamp(ts),
testutils.NewJoinEvent(
t, dmUser, testutils.WithTimestamp(ts),
),
}...),
}

6
membership_transitions_test.go
View File

@ -36,14 +36,14 @@ func TestRoomStateTransitions(t *testing.T) {
{
roomID: "!TestRoomStateTransitions_kicked:localhost",
events: append(createRoomState(t, alice, latestTimestamp), []json.RawMessage{
testutils.NewStateEvent(t, "m.room.member", bob, bob, map[string]interface{}{"membership": "join"}, testutils.WithTimestamp(latestTimestamp.Add(-5*time.Second))),
testutils.NewJoinEvent(t, bob, testutils.WithTimestamp(latestTimestamp.Add(-5*time.Second))),
testutils.NewStateEvent(t, "m.room.member", bob, alice, map[string]interface{}{"membership": "leave"}, testutils.WithTimestamp(latestTimestamp.Add(-4*time.Second))),
}...),
},
{
roomID: "!TestRoomStateTransitions_banned:localhost",
events: append(createRoomState(t, alice, latestTimestamp), []json.RawMessage{
testutils.NewStateEvent(t, "m.room.member", bob, bob, map[string]interface{}{"membership": "join"}, testutils.WithTimestamp(latestTimestamp.Add(-3*time.Second))),
testutils.NewJoinEvent(t, bob, testutils.WithTimestamp(latestTimestamp.Add(-3*time.Second))),
testutils.NewStateEvent(t, "m.room.member", bob, alice, map[string]interface{}{"membership": "ban"}, testutils.WithTimestamp(latestTimestamp.Add(-2*time.Second))),
}...),
},
@ -117,7 +117,7 @@ func TestRoomStateTransitions(t *testing.T) {
)
// now bob accepts the invite
bobJoinEvent := testutils.NewStateEvent(t, "m.room.member", bob, bob, map[string]interface{}{"membership": "join"}, testutils.WithTimestamp(latestTimestamp.Add(2*time.Second)))
bobJoinEvent := testutils.NewJoinEvent(t, bob, testutils.WithTimestamp(latestTimestamp.Add(2*time.Second)))
allRoomsAlicePerspective[indexBobInvited].events = append(allRoomsAlicePerspective[indexBobInvited].events, bobJoinEvent)
v2.queueResponse(bob, sync2.SyncResponse{
Rooms: sync2.SyncRoomsResponse{

2
room_names_test.go
View File

@ -46,7 +46,7 @@ func TestRoomNames(t *testing.T) {
roomID: "!TestRoomNames_dm_name_set_after_join:localhost",
name: "Bob",
state: append(createRoomState(t, alice, latestTimestamp), []json.RawMessage{
testutils.NewStateEvent(t, "m.room.member", bob, bob, map[string]interface{}{"membership": "join"}, testutils.WithTimestamp(latestTimestamp)),
testutils.NewJoinEvent(t, bob, testutils.WithTimestamp(latestTimestamp)),
}...),
events: []json.RawMessage{
testutils.NewStateEvent(

6
security_test.go
View File

@ -35,10 +35,8 @@ func TestSecurityLiveStreamEventLeftLeak(t *testing.T) {
eveToken := "EVE_BEARER_TOKEN_TestSecurityLiveStreamEventLeftLeak"
v2.addAccount(alice, aliceToken)
v2.addAccount(eve, eveToken)
eveJoinEvent := testutils.NewStateEvent(
t, "m.room.member", eve, eve, map[string]interface{}{"membership": "join"},
testutils.WithTimestamp(time.Now().Add(5*time.Second)),
)
eveJoinEvent := testutils.NewJoinEvent(t, eve, testutils.WithTimestamp(time.Now().Add(5*time.Second)))
// Alice and Eve in the room
theRoom := roomEvents{
roomID: roomID,

11
state/event_table_test.go
View File

@ -436,7 +436,7 @@ func TestEventTableMembershipDetection(t *testing.T) {
events := []Event{
{
RoomID: roomID,
JSON: testutils.NewStateEvent(t, "m.room.member", alice, alice, map[string]interface{}{"membership": "join"}),
JSON: testutils.NewJoinEvent(t, alice),
},
{
RoomID: roomID,
@ -444,8 +444,7 @@ func TestEventTableMembershipDetection(t *testing.T) {
},
{
RoomID: roomID,
JSON: testutils.NewStateEvent(
t, "m.room.member", alice, alice, map[string]interface{}{"membership": "join"},
JSON: testutils.NewJoinEvent(t, alice,
testutils.WithUnsigned(map[string]interface{}{
"prev_content": map[string]interface{}{
"membership": "join",
@ -574,15 +573,15 @@ func TestEventTableSelectEventsWithTypeStateKey(t *testing.T) {
},
{
RoomID: roomA,
JSON: testutils.NewStateEvent(t, "m.room.member", userID, userID, map[string]interface{}{"membership": "join"}),
JSON: testutils.NewJoinEvent(t, userID),
},
{
RoomID: roomB,
JSON: testutils.NewStateEvent(t, "m.room.member", userID, userID, map[string]interface{}{"membership": "join"}),
JSON: testutils.NewJoinEvent(t, userID),
},
{
RoomID: roomC,
JSON: testutils.NewStateEvent(t, "m.room.member", userID, userID, map[string]interface{}{"membership": "join"}),
JSON: testutils.NewJoinEvent(t, userID),
},
{
RoomID: roomD,

40
state/storage_test.go
View File

@ -24,7 +24,7 @@ func TestStorageRoomStateBeforeAndAfterEventPosition(t *testing.T) {
bob := "@bob:localhost"
events := []json.RawMessage{
testutils.NewStateEvent(t, "m.room.create", "", alice, map[string]interface{}{"creator": alice}),
testutils.NewStateEvent(t, "m.room.member", alice, alice, map[string]interface{}{"membership": "join"}),
testutils.NewJoinEvent(t, alice),
testutils.NewStateEvent(t, "m.room.join_rules", "", alice, map[string]interface{}{"join_rule": "invite"}),
testutils.NewStateEvent(t, "m.room.member", bob, alice, map[string]interface{}{"membership": "invite"}),
}
@ -122,28 +122,28 @@ func TestStorageJoinedRoomsAfterPosition(t *testing.T) {
roomIDToEventMap := map[string][]json.RawMessage{
joinedRoomID: {
testutils.NewStateEvent(t, "m.room.create", "", alice, map[string]interface{}{"creator": alice}),
testutils.NewStateEvent(t, "m.room.member", alice, alice, map[string]interface{}{"membership": "join"}),
testutils.NewJoinEvent(t, alice),
},
invitedRoomID: {
testutils.NewStateEvent(t, "m.room.create", "", bob, map[string]interface{}{"creator": bob}),
testutils.NewStateEvent(t, "m.room.member", bob, bob, map[string]interface{}{"membership": "join"}),
testutils.NewJoinEvent(t, bob),
testutils.NewStateEvent(t, "m.room.member", alice, bob, map[string]interface{}{"membership": "invite"}),
},
leftRoomID: {
testutils.NewStateEvent(t, "m.room.create", "", alice, map[string]interface{}{"creator": alice}),
testutils.NewStateEvent(t, "m.room.member", alice, alice, map[string]interface{}{"membership": "join"}),
testutils.NewJoinEvent(t, alice),
testutils.NewStateEvent(t, "m.room.member", alice, alice, map[string]interface{}{"membership": "leave"}),
},
banRoomID: {
testutils.NewStateEvent(t, "m.room.create", "", bob, map[string]interface{}{"creator": bob}),
testutils.NewStateEvent(t, "m.room.member", bob, bob, map[string]interface{}{"membership": "join"}),
testutils.NewStateEvent(t, "m.room.member", alice, alice, map[string]interface{}{"membership": "join"}),
testutils.NewJoinEvent(t, bob),
testutils.NewJoinEvent(t, alice),
testutils.NewStateEvent(t, "m.room.member", alice, bob, map[string]interface{}{"membership": "ban"}),
},
bobJoinedRoomID: {
testutils.NewStateEvent(t, "m.room.create", "", bob, map[string]interface{}{"creator": bob}),
testutils.NewStateEvent(t, "m.room.member", bob, bob, map[string]interface{}{"membership": "join"}),
testutils.NewStateEvent(t, "m.room.member", charlie, charlie, map[string]interface{}{"membership": "join"}),
testutils.NewJoinEvent(t, bob),
testutils.NewJoinEvent(t, charlie),
},
}
var latestPos int64
@ -238,24 +238,24 @@ func TestVisibleEventNIDsBetween(t *testing.T) {
roomIDToEventMap := map[string][]json.RawMessage{
roomA: {
testutils.NewStateEvent(t, "m.room.create", "", bob, map[string]interface{}{"creator": bob}),
testutils.NewStateEvent(t, "m.room.member", bob, bob, map[string]interface{}{"membership": "join"}),
testutils.NewJoinEvent(t, bob),
},
roomB: {
testutils.NewStateEvent(t, "m.room.create", "", bob, map[string]interface{}{"creator": bob}),
testutils.NewStateEvent(t, "m.room.member", bob, bob, map[string]interface{}{"membership": "join"}),
testutils.NewJoinEvent(t, bob),
},
roomC: {
testutils.NewStateEvent(t, "m.room.create", "", bob, map[string]interface{}{"creator": bob}),
testutils.NewStateEvent(t, "m.room.member", bob, bob, map[string]interface{}{"membership": "join"}),
testutils.NewStateEvent(t, "m.room.member", alice, alice, map[string]interface{}{"membership": "join"}),
testutils.NewJoinEvent(t, bob),
testutils.NewJoinEvent(t, alice),
},
roomD: {
testutils.NewStateEvent(t, "m.room.create", "", bob, map[string]interface{}{"creator": bob}),
testutils.NewStateEvent(t, "m.room.member", bob, bob, map[string]interface{}{"membership": "join"}),
testutils.NewJoinEvent(t, bob),
},
roomE: {
testutils.NewStateEvent(t, "m.room.create", "", bob, map[string]interface{}{"creator": bob}),
testutils.NewStateEvent(t, "m.room.member", bob, bob, map[string]interface{}{"membership": "join"}),
testutils.NewJoinEvent(t, bob),
},
}
for roomID, eventMap := range roomIDToEventMap {
@ -283,7 +283,7 @@ func TestVisibleEventNIDsBetween(t *testing.T) {
{
RoomID: roomA,
Events: []json.RawMessage{
testutils.NewStateEvent(t, "m.room.member", alice, alice, map[string]interface{}{"membership": "join"}),
testutils.NewJoinEvent(t, alice),
testutils.NewEvent(t, "m.room.message", bob, map[string]interface{}{}, testutils.WithTimestamp(baseTimestamp)),
testutils.NewEvent(t, "m.room.message", bob, map[string]interface{}{}, testutils.WithTimestamp(baseTimestamp)),
},
@ -292,7 +292,7 @@ func TestVisibleEventNIDsBetween(t *testing.T) {
RoomID: roomB,
Events: []json.RawMessage{
testutils.NewEvent(t, "m.room.message", bob, map[string]interface{}{}, testutils.WithTimestamp(baseTimestamp)),
testutils.NewStateEvent(t, "m.room.member", alice, alice, map[string]interface{}{"membership": "join"}),
testutils.NewJoinEvent(t, alice),
testutils.NewEvent(t, "m.room.message", bob, map[string]interface{}{}, testutils.WithTimestamp(baseTimestamp)),
},
},
@ -377,7 +377,7 @@ func TestVisibleEventNIDsBetween(t *testing.T) {
{
RoomID: roomD,
Events: []json.RawMessage{
testutils.NewStateEvent(t, "m.room.member", alice, alice, map[string]interface{}{"membership": "join"}),
testutils.NewJoinEvent(t, alice),
},
},
{
@ -394,7 +394,7 @@ func TestVisibleEventNIDsBetween(t *testing.T) {
testutils.NewEvent(t, "m.room.message", bob, map[string]interface{}{}, testutils.WithTimestamp(baseTimestamp)),
testutils.NewStateEvent(t, "m.room.member", alice, alice, map[string]interface{}{"membership": "leave"}),
testutils.NewEvent(t, "m.room.message", bob, map[string]interface{}{}, testutils.WithTimestamp(baseTimestamp)),
testutils.NewStateEvent(t, "m.room.member", alice, alice, map[string]interface{}{"membership": "join"}),
testutils.NewJoinEvent(t, alice),
testutils.NewEvent(t, "m.room.message", bob, map[string]interface{}{}, testutils.WithTimestamp(baseTimestamp.Add(1*time.Second))),
testutils.NewStateEvent(t, "m.room.member", alice, alice, map[string]interface{}{"membership": "leave"}),
testutils.NewEvent(t, "m.room.message", bob, map[string]interface{}{}, testutils.WithTimestamp(baseTimestamp.Add(1*time.Second))),
@ -404,7 +404,7 @@ func TestVisibleEventNIDsBetween(t *testing.T) {
RoomID: roomE,
Events: []json.RawMessage{
testutils.NewEvent(t, "m.room.message", bob, map[string]interface{}{}, testutils.WithTimestamp(baseTimestamp)),
testutils.NewStateEvent(t, "m.room.member", alice, alice, map[string]interface{}{"membership": "join"}),
testutils.NewJoinEvent(t, alice),
testutils.NewEvent(t, "m.room.message", bob, map[string]interface{}{}, testutils.WithTimestamp(baseTimestamp)),
testutils.NewEvent(t, "m.room.message", bob, map[string]interface{}{}, testutils.WithTimestamp(baseTimestamp)),
},
@ -459,7 +459,7 @@ func TestStorageLatestEventsInRoomsPrevBatch(t *testing.T) {
alice := "@alice_TestStorageLatestEventsInRoomsPrevBatch:localhost"
stateEvents := []json.RawMessage{
testutils.NewStateEvent(t, "m.room.create", "", alice, map[string]interface{}{"creator": alice}),
testutils.NewStateEvent(t, "m.room.member", alice, alice, map[string]interface{}{"membership": "join"}),
testutils.NewJoinEvent(t, alice),
}
timelines := []struct {
timeline []json.RawMessage

12
sync3/caches/global_test.go
View File

@ -22,19 +22,19 @@ func TestGlobalCacheLoadState(t *testing.T) {
charlie := "@charlie:localhost"
events := []json.RawMessage{
testutils.NewStateEvent(t, "m.room.create", "", alice, map[string]interface{}{"creator": alice}),
testutils.NewStateEvent(t, "m.room.member", alice, alice, map[string]interface{}{"membership": "join"}),
testutils.NewJoinEvent(t, alice),
testutils.NewStateEvent(t, "m.room.join_rules", "", alice, map[string]interface{}{"join_rule": "public"}),
testutils.NewStateEvent(t, "m.room.member", bob, bob, map[string]interface{}{"membership": "join"}),
testutils.NewStateEvent(t, "m.room.member", charlie, charlie, map[string]interface{}{"membership": "join"}),
testutils.NewJoinEvent(t, bob),
testutils.NewJoinEvent(t, charlie),
testutils.NewStateEvent(t, "m.room.name", "", alice, map[string]interface{}{"name": "The Room Name"}),
testutils.NewStateEvent(t, "m.room.name", "", alice, map[string]interface{}{"name": "The Updated Room Name"}),
}
moreEvents := []json.RawMessage{
testutils.NewStateEvent(t, "m.room.create", "", alice, map[string]interface{}{"creator": alice}),
testutils.NewStateEvent(t, "m.room.member", alice, alice, map[string]interface{}{"membership": "join"}),
testutils.NewJoinEvent(t, alice),
testutils.NewStateEvent(t, "m.room.join_rules", "", alice, map[string]interface{}{"join_rule": "public"}),
testutils.NewStateEvent(t, "m.room.member", bob, bob, map[string]interface{}{"membership": "join"}),
testutils.NewStateEvent(t, "m.room.member", charlie, charlie, map[string]interface{}{"membership": "join"}),
testutils.NewJoinEvent(t, bob),
testutils.NewJoinEvent(t, charlie),
testutils.NewStateEvent(t, "m.room.name", "", alice, map[string]interface{}{"name": "The Room Name"}),
testutils.NewStateEvent(t, "m.room.name", "", alice, map[string]interface{}{"name": "The Updated Room Name"}),
}

7
testutils/event.go
View File

@ -56,6 +56,13 @@ func WithUnsigned(unsigned interface{}) eventMockModifier {
}
}
// Create a new m.room.member state event with membership: join for the given userID.
func NewJoinEvent(t TestBenchInterface, userID string, modifiers ...eventMockModifier) json.RawMessage {
return NewStateEvent(t, "m.room.member", userID, userID, map[string]interface{}{
"membership": "join",
}, modifiers...)
}
func NewStateEvent(t TestBenchInterface, evType, stateKey, sender string, content interface{}, modifiers ...eventMockModifier) json.RawMessage {
t.Helper()
e := &eventMock{

2
timeline_test.go
View File

@ -534,7 +534,7 @@ func TestTimelineTxnID(t *testing.T) {
roomID: roomID,
events: append(
createRoomState(t, alice, latestTimestamp),
testutils.NewStateEvent(t, "m.room.member", bob, bob, map[string]interface{}{"membership": "join"}),
testutils.NewJoinEvent(t, bob),
),
}
v2.addAccount(alice, aliceToken)

2
v3_test.go
View File

@ -266,7 +266,7 @@ func createRoomState(t testutils.TestBenchInterface, creator string, baseTimesta
// all with the same timestamp as they get made atomically
return []json.RawMessage{
testutils.NewStateEvent(t, "m.room.create", "", creator, map[string]interface{}{"creator": creator}, testutils.WithTimestamp(baseTimestamp)),
testutils.NewStateEvent(t, "m.room.member", creator, creator, map[string]interface{}{"membership": "join"}, testutils.WithTimestamp(baseTimestamp)),
testutils.NewJoinEvent(t, creator, testutils.WithTimestamp(baseTimestamp)),
testutils.NewStateEvent(t, "m.room.power_levels", "", creator, pl, testutils.WithTimestamp(baseTimestamp)),
testutils.NewStateEvent(t, "m.room.join_rules", "", creator, map[string]interface{}{"join_rule": "public"}, testutils.WithTimestamp(baseTimestamp)),
}