mirror of
https://github.com/mattermost/mattermost.git
synced 2025-02-25 18:55:24 -06:00
* Posts * Add missing translation * Fix internal store marshaling * [MM-22051] Remove To/From JSON (Channels) (#18116) * Channels * Channel members * ChannelSearch * Channel categories, list, sidebar, stats, view * Fix conversions * [MM-22051] Remove To/From JSON (Users) (#18121) * User related structs * Fix return * Team related structures (#18127) * [MM-22051] Remove To/From JSON (Status, Bot, Reaction, Thread, FileInfo) (#18130) * Status * Bot * Reaction * Thread * FileInfo * Some fixes * Translations update from Weblate (#18143) * Translated using Weblate (German) Currently translated at 100.0% (2309 of 2309 strings) Translation: mattermost-languages-shipped/mattermost-server Translate-URL: https://translate.mattermost.com/projects/mattermost/mattermost-server_master/de/ * Translated using Weblate (Turkish) Currently translated at 100.0% (2309 of 2309 strings) Translation: mattermost-languages-shipped/mattermost-server Translate-URL: https://translate.mattermost.com/projects/mattermost/mattermost-server_master/tr/ * Translated using Weblate (Hungarian) Currently translated at 100.0% (2309 of 2309 strings) Translation: mattermost-languages-shipped/mattermost-server Translate-URL: https://translate.mattermost.com/projects/mattermost/mattermost-server_master/hu/ * Update translation files Updated by "Cleanup translation files" hook in Weblate. Translation: mattermost-languages-shipped/mattermost-server Translate-URL: https://translate.mattermost.com/projects/mattermost/mattermost-server_master/ Update translation files Updated by "Cleanup translation files" hook in Weblate. Translation: mattermost-languages-shipped/mattermost-server Translate-URL: https://translate.mattermost.com/projects/mattermost/mattermost-server_master/ Update translation files Updated by "Cleanup translation files" hook in Weblate. Translation: mattermost-languages-shipped/mattermost-server Translate-URL: https://translate.mattermost.com/projects/mattermost/mattermost-server_master/ Update translation files Updated by "Cleanup translation files" hook in Weblate. Translation: mattermost-languages-shipped/mattermost-server Translate-URL: https://translate.mattermost.com/projects/mattermost/mattermost-server_master/ * Translated using Weblate (German) Currently translated at 100.0% (2301 of 2301 strings) Translation: mattermost-languages-shipped/mattermost-server Translate-URL: https://translate.mattermost.com/projects/mattermost/mattermost-server_master/de/ * Translated using Weblate (Turkish) Currently translated at 100.0% (2301 of 2301 strings) Translation: mattermost-languages-shipped/mattermost-server Translate-URL: https://translate.mattermost.com/projects/mattermost/mattermost-server_master/tr/ * Translated using Weblate (Hungarian) Currently translated at 100.0% (2301 of 2301 strings) Translation: mattermost-languages-shipped/mattermost-server Translate-URL: https://translate.mattermost.com/projects/mattermost/mattermost-server_master/hu/ * Translated using Weblate (English (Australia)) Currently translated at 100.0% (2301 of 2301 strings) Translation: mattermost-languages-shipped/mattermost-server Translate-URL: https://translate.mattermost.com/projects/mattermost/mattermost-server_master/en_AU/ * Translated using Weblate (Bulgarian) Currently translated at 100.0% (2301 of 2301 strings) Translation: mattermost-languages-shipped/mattermost-server Translate-URL: https://translate.mattermost.com/projects/mattermost/mattermost-server_master/bg/ * Translated using Weblate (Japanese) Currently translated at 100.0% (2301 of 2301 strings) Translation: mattermost-languages-shipped/mattermost-server Translate-URL: https://translate.mattermost.com/projects/mattermost/mattermost-server_master/ja/ * Translated using Weblate (Chinese (Simplified)) Currently translated at 100.0% (2301 of 2301 strings) Translation: mattermost-languages-shipped/mattermost-server Translate-URL: https://translate.mattermost.com/projects/mattermost/mattermost-server_master/zh_Hans/ Co-authored-by: JtheBAB <srast@bioc.uzh.ch> Co-authored-by: Kaya Zeren <kayazeren@gmail.com> Co-authored-by: Tóth Csaba // Online ERP Hungary Kft <csaba.toth@online-erp.hu> Co-authored-by: Matthew Williams <Matthew.Williams@outlook.com.au> Co-authored-by: Nikolai Zahariev <nikolaiz@yahoo.com> Co-authored-by: kaakaa <stooner.hoe@gmail.com> Co-authored-by: aeomin <lin@aeomin.net> Co-authored-by: Weblate (bot) <hosted@weblate.org> Co-authored-by: JtheBAB <srast@bioc.uzh.ch> Co-authored-by: Kaya Zeren <kayazeren@gmail.com> Co-authored-by: Tóth Csaba // Online ERP Hungary Kft <csaba.toth@online-erp.hu> Co-authored-by: Matthew Williams <Matthew.Williams@outlook.com.au> Co-authored-by: Nikolai Zahariev <nikolaiz@yahoo.com> Co-authored-by: kaakaa <stooner.hoe@gmail.com> Co-authored-by: aeomin <lin@aeomin.net> * [MM-22051] Remove To/From JSON methods from model (#18138) * Scheme * Role * Session * Config * Status * Fix logic * Emoji * GuestsInvite * Group * Command * ClusterInfo * License * Job * System * Plugin * Command2 * IncomingWebhook * OutgoingWebhook * Fix tests * Update traslation * Some fixes * Add missing return * Simplify * Make Config.ToJSONFiltered() return []byte * Make Busy.ToJSON() return []byte * Include error in log * Split logic * [MM-22051] Remove To/From JSON (final) (#18150) * SwitchRequest * PluginEventData * Permalink * PushNotification * SuggestCommand * PluginsResponse * WebSocketMessage * RemoteCluster * SharedChannel * PluginStatuses * InitialLoad * ClusterDiscovery * ClusterStats * MfaSecret * GroupSyncable * SAML * WebSocketRequest * TypingRequest * SecurityBulletin * OAuthApp * IntegrationAction * DataRetention * Preference * FileInfoList * Compliance * Preferences * FileInfoSearchResults * TermsOfService * InstallMarketplacePluginRequest * GitLabUser * UploadSessions * Remove unused helpers * Fix tests * [MM-23280] Fix linting for ToJSON/FromJSON (#18153) * SwitchRequest * PluginEventData * Permalink * PushNotification * SuggestCommand * PluginsResponse * WebSocketMessage * RemoteCluster * SharedChannel * PluginStatuses * InitialLoad * ClusterDiscovery * ClusterStats * MfaSecret * GroupSyncable * SAML * WebSocketRequest * TypingRequest * SecurityBulletin * OAuthApp * IntegrationAction * DataRetention * Preference * FileInfoList * Compliance * Preferences * FileInfoSearchResults * TermsOfService * InstallMarketplacePluginRequest * GitLabUser * UploadSessions * Remove unused helpers * Fix tests * Fix linting for ToJSON/FromJSON * Fix conversions Co-authored-by: Weblate (bot) <hosted@weblate.org> Co-authored-by: JtheBAB <srast@bioc.uzh.ch> Co-authored-by: Kaya Zeren <kayazeren@gmail.com> Co-authored-by: Tóth Csaba // Online ERP Hungary Kft <csaba.toth@online-erp.hu> Co-authored-by: Matthew Williams <Matthew.Williams@outlook.com.au> Co-authored-by: Nikolai Zahariev <nikolaiz@yahoo.com> Co-authored-by: kaakaa <stooner.hoe@gmail.com> Co-authored-by: aeomin <lin@aeomin.net> Co-authored-by: Mattermod <mattermod@users.noreply.github.com>
160 lines
4.5 KiB
Go
160 lines
4.5 KiB
Go
// Copyright (c) 2015-present Mattermost, Inc. All Rights Reserved.
|
|
// See LICENSE.txt for license information.
|
|
|
|
package model
|
|
|
|
import (
|
|
"bytes"
|
|
"testing"
|
|
|
|
"github.com/stretchr/testify/assert"
|
|
"github.com/stretchr/testify/require"
|
|
)
|
|
|
|
func TestWebSocketEvent(t *testing.T) {
|
|
userId := NewId()
|
|
m := NewWebSocketEvent("some_event", NewId(), NewId(), userId, nil)
|
|
m.Add("RootId", NewId())
|
|
user := &User{
|
|
Id: userId,
|
|
}
|
|
m.Add("user", user)
|
|
json, err := m.ToJSON()
|
|
require.NoError(t, err)
|
|
|
|
result, err := WebSocketEventFromJSON(bytes.NewReader(json))
|
|
require.NoError(t, err)
|
|
|
|
require.True(t, m.IsValid(), "should be valid")
|
|
require.Equal(t, m.GetBroadcast().TeamId, result.GetBroadcast().TeamId, "Team ids do not match")
|
|
require.Equal(t, m.GetData()["RootId"], result.GetData()["RootId"], "Root ids do not match")
|
|
require.Equal(t, m.GetData()["user"].(*User).Id, result.GetData()["user"].(*User).Id, "User ids do not match")
|
|
}
|
|
|
|
func TestWebSocketEventImmutable(t *testing.T) {
|
|
m := NewWebSocketEvent("some_event", NewId(), NewId(), NewId(), nil)
|
|
|
|
new := m.SetEvent("new_event")
|
|
if new == m {
|
|
require.Fail(t, "pointers should not be the same")
|
|
}
|
|
require.NotEqual(t, m.EventType(), new.EventType())
|
|
require.Equal(t, new.EventType(), "new_event")
|
|
|
|
new = m.SetSequence(45)
|
|
if new == m {
|
|
require.Fail(t, "pointers should not be the same")
|
|
}
|
|
require.NotEqual(t, m.GetSequence(), new.GetSequence())
|
|
require.Equal(t, new.GetSequence(), int64(45))
|
|
|
|
broadcast := &WebsocketBroadcast{}
|
|
new = m.SetBroadcast(broadcast)
|
|
if new == m {
|
|
require.Fail(t, "pointers should not be the same")
|
|
}
|
|
require.NotEqual(t, m.GetBroadcast(), new.GetBroadcast())
|
|
require.Equal(t, new.GetBroadcast(), broadcast)
|
|
|
|
data := map[string]interface{}{
|
|
"key": "val",
|
|
"key2": "val2",
|
|
}
|
|
new = m.SetData(data)
|
|
if new == m {
|
|
require.Fail(t, "pointers should not be the same")
|
|
}
|
|
require.NotEqual(t, m, new)
|
|
require.Equal(t, new.data, data)
|
|
require.Equal(t, new.data, new.GetData())
|
|
|
|
copy := m.Copy()
|
|
if copy == m {
|
|
require.Fail(t, "pointers should not be the same")
|
|
}
|
|
require.Equal(t, m, copy)
|
|
}
|
|
|
|
func TestWebSocketEventFromJSON(t *testing.T) {
|
|
ev, err := WebSocketEventFromJSON(bytes.NewReader([]byte("junk")))
|
|
require.Error(t, err)
|
|
require.Nil(t, ev, "should not have parsed")
|
|
data := []byte(`{"event": "test", "data": {"key": "val"}, "seq": 45, "broadcast": {"user_id": "userid"}}`)
|
|
ev, err = WebSocketEventFromJSON(bytes.NewReader(data))
|
|
require.NoError(t, err)
|
|
require.NotNil(t, ev, "should have parsed")
|
|
require.Equal(t, ev.EventType(), "test")
|
|
require.Equal(t, ev.GetSequence(), int64(45))
|
|
require.Equal(t, ev.data, map[string]interface{}{"key": "val"})
|
|
require.Equal(t, ev.GetBroadcast(), &WebsocketBroadcast{UserId: "userid"})
|
|
}
|
|
|
|
func TestWebSocketResponse(t *testing.T) {
|
|
m := NewWebSocketResponse("OK", 1, map[string]interface{}{})
|
|
e := NewWebSocketError(1, &AppError{})
|
|
m.Add("RootId", NewId())
|
|
json, err := m.ToJSON()
|
|
require.NoError(t, err)
|
|
result, err := WebSocketResponseFromJSON(bytes.NewReader(json))
|
|
require.NoError(t, err)
|
|
json2, err := e.ToJSON()
|
|
require.NoError(t, err)
|
|
WebSocketResponseFromJSON(bytes.NewReader(json2))
|
|
|
|
badresult, err := WebSocketResponseFromJSON(bytes.NewReader([]byte("junk")))
|
|
require.Error(t, err)
|
|
require.Nil(t, badresult, "should not have parsed")
|
|
|
|
require.True(t, m.IsValid(), "should be valid")
|
|
|
|
require.Equal(t, m.Data["RootId"], result.Data["RootId"], "Ids do not match")
|
|
}
|
|
|
|
func TestWebSocketEvent_PrecomputeJSON(t *testing.T) {
|
|
event := NewWebSocketEvent(WebsocketEventPosted, "foo", "bar", "baz", nil)
|
|
event = event.SetSequence(7)
|
|
|
|
before, err := event.ToJSON()
|
|
require.NoError(t, err)
|
|
event.PrecomputeJSON()
|
|
after, err := event.ToJSON()
|
|
require.NoError(t, err)
|
|
|
|
assert.Equal(t, before, after)
|
|
}
|
|
|
|
var stringSink []byte
|
|
|
|
func BenchmarkWebSocketEvent_ToJSON(b *testing.B) {
|
|
event := NewWebSocketEvent(WebsocketEventPosted, "foo", "bar", "baz", nil)
|
|
for i := 0; i < 100; i++ {
|
|
event.GetData()[NewId()] = NewId()
|
|
}
|
|
|
|
b.Run("SerializedNTimes", func(b *testing.B) {
|
|
for i := 0; i < b.N; i++ {
|
|
stringSink, _ = event.ToJSON()
|
|
}
|
|
})
|
|
|
|
b.Run("PrecomputedNTimes", func(b *testing.B) {
|
|
for i := 0; i < b.N; i++ {
|
|
event.PrecomputeJSON()
|
|
}
|
|
})
|
|
|
|
b.Run("PrecomputedAndSerializedNTimes", func(b *testing.B) {
|
|
for i := 0; i < b.N; i++ {
|
|
event.PrecomputeJSON()
|
|
stringSink, _ = event.ToJSON()
|
|
}
|
|
})
|
|
|
|
event.PrecomputeJSON()
|
|
b.Run("PrecomputedOnceAndSerializedNTimes", func(b *testing.B) {
|
|
for i := 0; i < b.N; i++ {
|
|
stringSink, _ = event.ToJSON()
|
|
}
|
|
})
|
|
}
|