mirror of
https://github.com/matrix-org/dendrite
synced 2024-07-02 11:18:23 +02:00
50963b724b
* Update sync responses
* Fix positions, add ApplyUpdates
* Fix MarshalText as non-pointer, PrevBatch is optional
* Increment by number of read receipts
* Merge branch 'master' into neilalexander/devicelist
* Tweak typing
* Include keyserver position tweak
* Fix typing next position in all cases
* Tweaks
* Fix typo
* Tweaks, restore StreamingToken.MarshalText which somehow went missing?
* Rely on positions from notifier rather than manually advancing them
* Revert "Rely on positions from notifier rather than manually advancing them"
This reverts commit 53112a62cc.
* Give invites their own position, fix other things
* Fix test
* Fix invites maybe
* Un-whitelist tests that look to be genuinely wrong
* Use real receipt positions
* Ensure send-to-device uses real positions too
99 lines
4.3 KiB
Go
99 lines
4.3 KiB
Go
package types
|
|
|
|
import (
|
|
"encoding/json"
|
|
"reflect"
|
|
"testing"
|
|
|
|
"github.com/matrix-org/gomatrixserverlib"
|
|
)
|
|
|
|
func TestNewSyncTokenWithLogs(t *testing.T) {
|
|
tests := map[string]*StreamingToken{
|
|
"s4_0_0_0_0": {
|
|
PDUPosition: 4,
|
|
},
|
|
"s4_0_0_0_0.dl-0-123": {
|
|
PDUPosition: 4,
|
|
DeviceListPosition: LogPosition{
|
|
Partition: 0,
|
|
Offset: 123,
|
|
},
|
|
},
|
|
}
|
|
for tok, want := range tests {
|
|
got, err := NewStreamTokenFromString(tok)
|
|
if err != nil {
|
|
if want == nil {
|
|
continue // error expected
|
|
}
|
|
t.Errorf("%s errored: %s", tok, err)
|
|
continue
|
|
}
|
|
if !reflect.DeepEqual(got, *want) {
|
|
t.Errorf("%s mismatch: got %v want %v", tok, got, want)
|
|
}
|
|
gotStr := got.String()
|
|
if gotStr != tok {
|
|
t.Errorf("%s reserialisation mismatch: got %s want %s", tok, gotStr, tok)
|
|
}
|
|
}
|
|
}
|
|
|
|
func TestSyncTokens(t *testing.T) {
|
|
shouldPass := map[string]string{
|
|
"s4_0_0_0_0": StreamingToken{4, 0, 0, 0, 0, LogPosition{}}.String(),
|
|
"s3_1_0_0_0.dl-1-2": StreamingToken{3, 1, 0, 0, 0, LogPosition{1, 2}}.String(),
|
|
"s3_1_2_3_5": StreamingToken{3, 1, 2, 3, 5, LogPosition{}}.String(),
|
|
"t3_1": TopologyToken{3, 1}.String(),
|
|
}
|
|
|
|
for a, b := range shouldPass {
|
|
if a != b {
|
|
t.Errorf("expected %q, got %q", a, b)
|
|
}
|
|
}
|
|
|
|
shouldFail := []string{
|
|
"",
|
|
"s_",
|
|
"a3_4",
|
|
"b",
|
|
"b-1",
|
|
"-4",
|
|
"2",
|
|
}
|
|
|
|
for _, f := range append(shouldFail, "t1_2") {
|
|
if _, err := NewStreamTokenFromString(f); err == nil {
|
|
t.Errorf("NewStreamTokenFromString %q should have failed", f)
|
|
}
|
|
}
|
|
|
|
for _, f := range append(shouldFail, "s1_2_3_4") {
|
|
if _, err := NewTopologyTokenFromString(f); err == nil {
|
|
t.Errorf("NewTopologyTokenFromString %q should have failed", f)
|
|
}
|
|
}
|
|
}
|
|
|
|
func TestNewInviteResponse(t *testing.T) {
|
|
event := `{"auth_events":["$SbSsh09j26UAXnjd3RZqf2lyA3Kw2sY_VZJVZQAV9yA","$EwL53onrLwQ5gL8Dv3VrOOCvHiueXu2ovLdzqkNi3lo","$l2wGmz9iAwevBDGpHT_xXLUA5O8BhORxWIGU1cGi1ZM","$GsWFJLXgdlF5HpZeyWkP72tzXYWW3uQ9X28HBuTztHE"],"content":{"avatar_url":"","displayname":"neilalexander","membership":"invite"},"depth":9,"hashes":{"sha256":"8p+Ur4f8vLFX6mkIXhxI0kegPG7X3tWy56QmvBkExAg"},"origin":"matrix.org","origin_server_ts":1602087113066,"prev_events":["$1v-O6tNwhOZcA8bvCYY-Dnj1V2ZDE58lLPxtlV97S28"],"prev_state":[],"room_id":"!XbeXirGWSPXbEaGokF:matrix.org","sender":"@neilalexander:matrix.org","signatures":{"dendrite.neilalexander.dev":{"ed25519:BMJi":"05KQ5lPw0cSFsE4A0x1z7vi/3cc8bG4WHUsFWYkhxvk/XkXMGIYAYkpNThIvSeLfdcHlbm/k10AsBSKH8Uq4DA"},"matrix.org":{"ed25519:a_RXGa":"jeovuHr9E/x0sHbFkdfxDDYV/EyoeLi98douZYqZ02iYddtKhfB7R3WLay/a+D3V3V7IW0FUmPh/A404x5sYCw"}},"state_key":"@neilalexander:dendrite.neilalexander.dev","type":"m.room.member","unsigned":{"age":2512,"invite_room_state":[{"content":{"join_rule":"invite"},"sender":"@neilalexander:matrix.org","state_key":"","type":"m.room.join_rules"},{"content":{"avatar_url":"mxc://matrix.org/BpDaozLwgLnlNStxDxvLzhPr","displayname":"neilalexander","membership":"join"},"sender":"@neilalexander:matrix.org","state_key":"@neilalexander:matrix.org","type":"m.room.member"},{"content":{"name":"Test room"},"sender":"@neilalexander:matrix.org","state_key":"","type":"m.room.name"}]},"_room_version":"5"}`
|
|
expected := `{"invite_state":{"events":[{"content":{"join_rule":"invite"},"sender":"@neilalexander:matrix.org","state_key":"","type":"m.room.join_rules"},{"content":{"avatar_url":"mxc://matrix.org/BpDaozLwgLnlNStxDxvLzhPr","displayname":"neilalexander","membership":"join"},"sender":"@neilalexander:matrix.org","state_key":"@neilalexander:matrix.org","type":"m.room.member"},{"content":{"name":"Test room"},"sender":"@neilalexander:matrix.org","state_key":"","type":"m.room.name"},{"content":{"avatar_url":"","displayname":"neilalexander","membership":"invite"},"event_id":"$GQmw8e8-26CQv1QuFoHBHpKF1hQj61Flg3kvv_v_XWs","origin_server_ts":1602087113066,"sender":"@neilalexander:matrix.org","state_key":"@neilalexander:dendrite.neilalexander.dev","type":"m.room.member"}]}}`
|
|
|
|
ev, err := gomatrixserverlib.NewEventFromTrustedJSON([]byte(event), false, gomatrixserverlib.RoomVersionV5)
|
|
if err != nil {
|
|
t.Fatal(err)
|
|
}
|
|
|
|
res := NewInviteResponse(ev.Headered(gomatrixserverlib.RoomVersionV5))
|
|
j, err := json.Marshal(res)
|
|
if err != nil {
|
|
t.Fatal(err)
|
|
}
|
|
|
|
if string(j) != expected {
|
|
t.Fatalf("Invite response didn't contain correct info")
|
|
}
|
|
}
|