From 85bc3546803dae012f0caeea8c5593a8958960a1 Mon Sep 17 00:00:00 2001 From: Ibrahim Serdar Acikgoz Date: Fri, 26 Mar 2021 10:02:52 +0300 Subject: [PATCH] [MM-33640] storetest/team_store: use NewTestId for fields like names etc. (#17204) * storetest/team_store: use NewTestId for fields like names etc. * reflect review comments * fix tests * we love good old C * remove rand --- store/storetest/team_store.go | 268 +++++++++++++++++----------------- store/storetest/utils.go | 20 +++ store/storetest/utils_test.go | 21 +++ 3 files changed, 175 insertions(+), 134 deletions(-) create mode 100644 store/storetest/utils.go create mode 100644 store/storetest/utils_test.go diff --git a/store/storetest/team_store.go b/store/storetest/team_store.go index 21a65f5124..3e03b76bdf 100644 --- a/store/storetest/team_store.go +++ b/store/storetest/team_store.go @@ -76,7 +76,7 @@ func TestTeamStore(t *testing.T, ss store.Store) { func testTeamStoreSave(t *testing.T, ss store.Store) { o1 := model.Team{} o1.DisplayName = "DisplayName" - o1.Name = "z-z-z" + model.NewId() + "b" + o1.Name = NewTestId() o1.Email = MakeEmail() o1.Type = model.TEAM_OPEN @@ -94,7 +94,7 @@ func testTeamStoreSave(t *testing.T, ss store.Store) { func testTeamStoreUpdate(t *testing.T, ss store.Store) { o1 := model.Team{} o1.DisplayName = "DisplayName" - o1.Name = "z-z-z" + model.NewId() + "b" + o1.Name = NewTestId() o1.Email = MakeEmail() o1.Type = model.TEAM_OPEN _, err := ss.Team().Save(&o1) @@ -117,7 +117,7 @@ func testTeamStoreUpdate(t *testing.T, ss store.Store) { func testTeamStoreGet(t *testing.T, ss store.Store) { o1 := model.Team{} o1.DisplayName = "DisplayName" - o1.Name = "z-z-z" + model.NewId() + "b" + o1.Name = NewTestId() o1.Email = MakeEmail() o1.Type = model.TEAM_OPEN _, err := ss.Team().Save(&o1) @@ -134,7 +134,7 @@ func testTeamStoreGet(t *testing.T, ss store.Store) { func testTeamStoreGetByNames(t *testing.T, ss store.Store) { o1 := model.Team{} o1.DisplayName = "DisplayName" - o1.Name = "z-z-z" + model.NewId() + "b" + o1.Name = NewTestId() o1.Email = MakeEmail() o1.Type = model.TEAM_OPEN @@ -143,7 +143,7 @@ func testTeamStoreGetByNames(t *testing.T, ss store.Store) { o2 := model.Team{} o2.DisplayName = "DisplayName2" - o2.Name = "z-z-z" + model.NewId() + "b" + o2.Name = NewTestId() o2.Email = MakeEmail() o2.Type = model.TEAM_OPEN @@ -187,7 +187,7 @@ func testTeamStoreGetByNames(t *testing.T, ss store.Store) { func testTeamStoreGetByName(t *testing.T, ss store.Store) { o1 := model.Team{} o1.DisplayName = "DisplayName" - o1.Name = "z-z-z" + model.NewId() + "b" + o1.Name = NewTestId() o1.Email = MakeEmail() o1.Type = model.TEAM_OPEN @@ -214,8 +214,8 @@ func testTeamStoreGetByName(t *testing.T, ss store.Store) { func testTeamStoreSearchAll(t *testing.T, ss store.Store) { o := model.Team{} - o.DisplayName = "ADisplayName" + model.NewId() - o.Name = "zzzzzz-" + model.NewId() + "a" + o.DisplayName = "ADisplayName" + NewTestId() + o.Name = "searchterm-" + NewTestId() o.Email = MakeEmail() o.Type = model.TEAM_OPEN o.AllowOpenInvite = true @@ -224,8 +224,8 @@ func testTeamStoreSearchAll(t *testing.T, ss store.Store) { require.NoError(t, err) p := model.Team{} - p.DisplayName = "BDisplayName" + model.NewId() - p.Name = "zzzzzz-" + model.NewId() + "a" + p.DisplayName = "BDisplayName" + NewTestId() + p.Name = "searchterm-" + NewTestId() p.Email = MakeEmail() p.Type = model.TEAM_OPEN p.AllowOpenInvite = false @@ -234,8 +234,8 @@ func testTeamStoreSearchAll(t *testing.T, ss store.Store) { require.NoError(t, err) g := model.Team{} - g.DisplayName = "CDisplayName" + model.NewId() - g.Name = "zzzzzz-" + model.NewId() + "a" + g.DisplayName = "CDisplayName" + NewTestId() + g.Name = "searchterm-" + NewTestId() g.Email = MakeEmail() g.Type = model.TEAM_OPEN g.AllowOpenInvite = false @@ -315,56 +315,56 @@ func testTeamStoreSearchAll(t *testing.T, ss store.Store) { []string{p.Id}, }, { - "Search for all 3 z teams", - &model.TeamSearch{Term: "zzzzzz"}, + "Search for all 3 searchterm teams", + &model.TeamSearch{Term: "searchterm"}, 3, []string{o.Id, p.Id, g.Id}, }, { "Search for all 3 teams filter by allow open invite", - &model.TeamSearch{Term: "zzzzzz", AllowOpenInvite: model.NewBool(true)}, + &model.TeamSearch{Term: "searchterm", AllowOpenInvite: model.NewBool(true)}, 1, []string{o.Id}, }, { "Search for all 3 teams filter by allow open invite = false", - &model.TeamSearch{Term: "zzzzzz", AllowOpenInvite: model.NewBool(false)}, + &model.TeamSearch{Term: "searchterm", AllowOpenInvite: model.NewBool(false)}, 1, []string{p.Id}, }, { "Search for all 3 teams filter by group constrained", - &model.TeamSearch{Term: "zzzzzz", GroupConstrained: model.NewBool(true)}, + &model.TeamSearch{Term: "searchterm", GroupConstrained: model.NewBool(true)}, 1, []string{g.Id}, }, { "Search for all 3 teams filter by group constrained = false", - &model.TeamSearch{Term: "zzzzzz", GroupConstrained: model.NewBool(false)}, + &model.TeamSearch{Term: "searchterm", GroupConstrained: model.NewBool(false)}, 2, []string{o.Id, p.Id}, }, { "Search for all 3 teams filter by allow open invite and include group constrained", - &model.TeamSearch{Term: "zzzzzz", AllowOpenInvite: model.NewBool(true), GroupConstrained: model.NewBool(true)}, + &model.TeamSearch{Term: "searchterm", AllowOpenInvite: model.NewBool(true), GroupConstrained: model.NewBool(true)}, 2, []string{o.Id, g.Id}, }, { "Search for all 3 teams filter by group constrained and not open invite", - &model.TeamSearch{Term: "zzzzzz", GroupConstrained: model.NewBool(true), AllowOpenInvite: model.NewBool(false)}, + &model.TeamSearch{Term: "searchterm", GroupConstrained: model.NewBool(true), AllowOpenInvite: model.NewBool(false)}, 2, []string{g.Id, p.Id}, }, { "Search for all 3 teams filter by group constrained false and open invite", - &model.TeamSearch{Term: "zzzzzz", GroupConstrained: model.NewBool(false), AllowOpenInvite: model.NewBool(true)}, + &model.TeamSearch{Term: "searchterm", GroupConstrained: model.NewBool(false), AllowOpenInvite: model.NewBool(true)}, 2, []string{o.Id, p.Id}, }, { "Search for all 3 teams filter by group constrained false and open invite false", - &model.TeamSearch{Term: "zzzzzz", GroupConstrained: model.NewBool(false), AllowOpenInvite: model.NewBool(false)}, + &model.TeamSearch{Term: "searchterm", GroupConstrained: model.NewBool(false), AllowOpenInvite: model.NewBool(false)}, 2, []string{p.Id, o.Id}, }, @@ -386,8 +386,8 @@ func testTeamStoreSearchAll(t *testing.T, ss store.Store) { func testTeamStoreSearchOpen(t *testing.T, ss store.Store) { o := model.Team{} - o.DisplayName = "ADisplayName" + model.NewId() - o.Name = "zz" + model.NewId() + "a" + o.DisplayName = "ADisplayName" + NewTestId() + o.Name = NewTestId() o.Email = MakeEmail() o.Type = model.TEAM_OPEN o.AllowOpenInvite = true @@ -396,8 +396,8 @@ func testTeamStoreSearchOpen(t *testing.T, ss store.Store) { require.NoError(t, err) p := model.Team{} - p.DisplayName = "ADisplayName" + model.NewId() - p.Name = "zz" + model.NewId() + "a" + p.DisplayName = "ADisplayName" + NewTestId() + p.Name = NewTestId() p.Email = MakeEmail() p.Type = model.TEAM_OPEN p.AllowOpenInvite = false @@ -492,8 +492,8 @@ func testTeamStoreSearchOpen(t *testing.T, ss store.Store) { func testTeamStoreSearchPrivate(t *testing.T, ss store.Store) { o := model.Team{} - o.DisplayName = "ADisplayName" + model.NewId() - o.Name = "zz" + model.NewId() + "a" + o.DisplayName = "ADisplayName" + NewTestId() + o.Name = NewTestId() o.Email = MakeEmail() o.Type = model.TEAM_OPEN o.AllowOpenInvite = true @@ -502,8 +502,8 @@ func testTeamStoreSearchPrivate(t *testing.T, ss store.Store) { require.NoError(t, err) p := model.Team{} - p.DisplayName = "ADisplayName" + model.NewId() - p.Name = "zz" + model.NewId() + "a" + p.DisplayName = "ADisplayName" + NewTestId() + p.Name = NewTestId() p.Email = MakeEmail() p.Type = model.TEAM_OPEN p.AllowOpenInvite = false @@ -599,7 +599,7 @@ func testTeamStoreSearchPrivate(t *testing.T, ss store.Store) { func testTeamStoreGetByInviteId(t *testing.T, ss store.Store) { o1 := model.Team{} o1.DisplayName = "DisplayName" - o1.Name = "z-z-z" + model.NewId() + "b" + o1.Name = NewTestId() o1.Email = MakeEmail() o1.Type = model.TEAM_OPEN o1.InviteId = model.NewId() @@ -609,7 +609,7 @@ func testTeamStoreGetByInviteId(t *testing.T, ss store.Store) { o2 := model.Team{} o2.DisplayName = "DisplayName" - o2.Name = "zz" + model.NewId() + "b" + o2.Name = NewTestId() o2.Email = MakeEmail() o2.Type = model.TEAM_OPEN @@ -624,7 +624,7 @@ func testTeamStoreGetByInviteId(t *testing.T, ss store.Store) { func testTeamStoreByUserId(t *testing.T, ss store.Store) { o1 := &model.Team{} o1.DisplayName = "DisplayName" - o1.Name = "z-z-z" + model.NewId() + "b" + o1.Name = NewTestId() o1.Email = MakeEmail() o1.Type = model.TEAM_OPEN o1.InviteId = model.NewId() @@ -644,7 +644,7 @@ func testTeamStoreByUserId(t *testing.T, ss store.Store) { func testGetAllTeamListing(t *testing.T, ss store.Store) { o1 := model.Team{} o1.DisplayName = "DisplayName" - o1.Name = "z-z-z" + model.NewId() + "b" + o1.Name = NewTestId() o1.Email = MakeEmail() o1.Type = model.TEAM_OPEN o1.AllowOpenInvite = true @@ -653,7 +653,7 @@ func testGetAllTeamListing(t *testing.T, ss store.Store) { o2 := model.Team{} o2.DisplayName = "DisplayName" - o2.Name = "zz" + model.NewId() + "b" + o2.Name = NewTestId() o2.Email = MakeEmail() o2.Type = model.TEAM_OPEN _, err = ss.Team().Save(&o2) @@ -661,7 +661,7 @@ func testGetAllTeamListing(t *testing.T, ss store.Store) { o3 := model.Team{} o3.DisplayName = "DisplayName" - o3.Name = "z-z-z" + model.NewId() + "b" + o3.Name = NewTestId() o3.Email = MakeEmail() o3.Type = model.TEAM_INVITE o3.AllowOpenInvite = true @@ -670,7 +670,7 @@ func testGetAllTeamListing(t *testing.T, ss store.Store) { o4 := model.Team{} o4.DisplayName = "DisplayName" - o4.Name = "zz" + model.NewId() + "b" + o4.Name = NewTestId() o4.Email = MakeEmail() o4.Type = model.TEAM_INVITE _, err = ss.Team().Save(&o4) @@ -688,7 +688,7 @@ func testGetAllTeamListing(t *testing.T, ss store.Store) { func testGetAllTeamPageListing(t *testing.T, ss store.Store) { o1 := model.Team{} o1.DisplayName = "DisplayName" - o1.Name = "z-z-z" + model.NewId() + "b" + o1.Name = NewTestId() o1.Email = MakeEmail() o1.Type = model.TEAM_OPEN o1.AllowOpenInvite = true @@ -697,7 +697,7 @@ func testGetAllTeamPageListing(t *testing.T, ss store.Store) { o2 := model.Team{} o2.DisplayName = "DisplayName" - o2.Name = "zz" + model.NewId() + "b" + o2.Name = NewTestId() o2.Email = MakeEmail() o2.Type = model.TEAM_OPEN o2.AllowOpenInvite = false @@ -706,7 +706,7 @@ func testGetAllTeamPageListing(t *testing.T, ss store.Store) { o3 := model.Team{} o3.DisplayName = "DisplayName" - o3.Name = "z-z-z" + model.NewId() + "b" + o3.Name = NewTestId() o3.Email = MakeEmail() o3.Type = model.TEAM_INVITE o3.AllowOpenInvite = true @@ -715,7 +715,7 @@ func testGetAllTeamPageListing(t *testing.T, ss store.Store) { o4 := model.Team{} o4.DisplayName = "DisplayName" - o4.Name = "zz" + model.NewId() + "b" + o4.Name = NewTestId() o4.Email = MakeEmail() o4.Type = model.TEAM_INVITE o4.AllowOpenInvite = false @@ -733,7 +733,7 @@ func testGetAllTeamPageListing(t *testing.T, ss store.Store) { o5 := model.Team{} o5.DisplayName = "DisplayName" - o5.Name = "z-z-z" + model.NewId() + "b" + o5.Name = NewTestId() o5.Email = MakeEmail() o5.Type = model.TEAM_OPEN o5.AllowOpenInvite = true @@ -762,7 +762,7 @@ func testGetAllTeamPageListing(t *testing.T, ss store.Store) { func testGetAllPrivateTeamListing(t *testing.T, ss store.Store) { o1 := model.Team{} o1.DisplayName = "DisplayName" - o1.Name = "z-z-z" + model.NewId() + "b" + o1.Name = NewTestId() o1.Email = MakeEmail() o1.Type = model.TEAM_OPEN o1.AllowOpenInvite = true @@ -771,7 +771,7 @@ func testGetAllPrivateTeamListing(t *testing.T, ss store.Store) { o2 := model.Team{} o2.DisplayName = "DisplayName" - o2.Name = "zz" + model.NewId() + "b" + o2.Name = NewTestId() o2.Email = MakeEmail() o2.Type = model.TEAM_OPEN _, err = ss.Team().Save(&o2) @@ -779,7 +779,7 @@ func testGetAllPrivateTeamListing(t *testing.T, ss store.Store) { o3 := model.Team{} o3.DisplayName = "DisplayName" - o3.Name = "z-z-z" + model.NewId() + "b" + o3.Name = NewTestId() o3.Email = MakeEmail() o3.Type = model.TEAM_INVITE o3.AllowOpenInvite = true @@ -788,7 +788,7 @@ func testGetAllPrivateTeamListing(t *testing.T, ss store.Store) { o4 := model.Team{} o4.DisplayName = "DisplayName" - o4.Name = "zz" + model.NewId() + "b" + o4.Name = NewTestId() o4.Email = MakeEmail() o4.Type = model.TEAM_INVITE _, err = ss.Team().Save(&o4) @@ -806,7 +806,7 @@ func testGetAllPrivateTeamListing(t *testing.T, ss store.Store) { func testGetAllPrivateTeamPageListing(t *testing.T, ss store.Store) { o1 := model.Team{} o1.DisplayName = "DisplayName" - o1.Name = "z-z-z" + model.NewId() + "b" + o1.Name = NewTestId() o1.Email = MakeEmail() o1.Type = model.TEAM_OPEN o1.AllowOpenInvite = true @@ -815,7 +815,7 @@ func testGetAllPrivateTeamPageListing(t *testing.T, ss store.Store) { o2 := model.Team{} o2.DisplayName = "DisplayName" - o2.Name = "zz" + model.NewId() + "b" + o2.Name = NewTestId() o2.Email = MakeEmail() o2.Type = model.TEAM_OPEN o2.AllowOpenInvite = false @@ -824,7 +824,7 @@ func testGetAllPrivateTeamPageListing(t *testing.T, ss store.Store) { o3 := model.Team{} o3.DisplayName = "DisplayName" - o3.Name = "z-z-z" + model.NewId() + "b" + o3.Name = NewTestId() o3.Email = MakeEmail() o3.Type = model.TEAM_INVITE o3.AllowOpenInvite = true @@ -833,7 +833,7 @@ func testGetAllPrivateTeamPageListing(t *testing.T, ss store.Store) { o4 := model.Team{} o4.DisplayName = "DisplayName" - o4.Name = "zz" + model.NewId() + "b" + o4.Name = NewTestId() o4.Email = MakeEmail() o4.Type = model.TEAM_INVITE o4.AllowOpenInvite = false @@ -850,7 +850,7 @@ func testGetAllPrivateTeamPageListing(t *testing.T, ss store.Store) { o5 := model.Team{} o5.DisplayName = "DisplayName" - o5.Name = "z-z-z" + model.NewId() + "b" + o5.Name = NewTestId() o5.Email = MakeEmail() o5.Type = model.TEAM_OPEN o5.AllowOpenInvite = true @@ -879,7 +879,7 @@ func testGetAllPublicTeamPageListing(t *testing.T, ss store.Store) { o1 := model.Team{} o1.DisplayName = "DisplayName1" - o1.Name = "z-z-z" + model.NewId() + "b" + o1.Name = NewTestId() o1.Email = MakeEmail() o1.Type = model.TEAM_OPEN o1.AllowOpenInvite = true @@ -888,7 +888,7 @@ func testGetAllPublicTeamPageListing(t *testing.T, ss store.Store) { o2 := model.Team{} o2.DisplayName = "DisplayName2" - o2.Name = "zz" + model.NewId() + "b" + o2.Name = NewTestId() o2.Email = MakeEmail() o2.Type = model.TEAM_OPEN o2.AllowOpenInvite = false @@ -897,7 +897,7 @@ func testGetAllPublicTeamPageListing(t *testing.T, ss store.Store) { o3 := model.Team{} o3.DisplayName = "DisplayName3" - o3.Name = "z-z-z" + model.NewId() + "b" + o3.Name = NewTestId() o3.Email = MakeEmail() o3.Type = model.TEAM_INVITE o3.AllowOpenInvite = true @@ -906,7 +906,7 @@ func testGetAllPublicTeamPageListing(t *testing.T, ss store.Store) { o4 := model.Team{} o4.DisplayName = "DisplayName4" - o4.Name = "zz" + model.NewId() + "b" + o4.Name = NewTestId() o4.Email = MakeEmail() o4.Type = model.TEAM_INVITE o4.AllowOpenInvite = false @@ -919,7 +919,7 @@ func testGetAllPublicTeamPageListing(t *testing.T, ss store.Store) { o5 := model.Team{} o5.DisplayName = "DisplayName5" - o5.Name = "z-z-z" + model.NewId() + "b" + o5.Name = NewTestId() o5.Email = MakeEmail() o5.Type = model.TEAM_OPEN o5.AllowOpenInvite = true @@ -937,7 +937,7 @@ func testGetAllPublicTeamPageListing(t *testing.T, ss store.Store) { func testDelete(t *testing.T, ss store.Store) { o1 := model.Team{} o1.DisplayName = "DisplayName" - o1.Name = "z-z-z" + model.NewId() + "b" + o1.Name = NewTestId() o1.Email = MakeEmail() o1.Type = model.TEAM_OPEN o1.AllowOpenInvite = true @@ -946,7 +946,7 @@ func testDelete(t *testing.T, ss store.Store) { o2 := model.Team{} o2.DisplayName = "DisplayName" - o2.Name = "zz" + model.NewId() + "b" + o2.Name = NewTestId() o2.Email = MakeEmail() o2.Type = model.TEAM_OPEN _, err = ss.Team().Save(&o2) @@ -961,7 +961,7 @@ func testPublicTeamCount(t *testing.T, ss store.Store) { o1 := model.Team{} o1.DisplayName = "DisplayName" - o1.Name = "z-z-z" + model.NewId() + "b" + o1.Name = NewTestId() o1.Email = MakeEmail() o1.Type = model.TEAM_OPEN o1.AllowOpenInvite = true @@ -970,7 +970,7 @@ func testPublicTeamCount(t *testing.T, ss store.Store) { o2 := model.Team{} o2.DisplayName = "DisplayName" - o2.Name = "z-z-z" + model.NewId() + "b" + o2.Name = NewTestId() o2.Email = MakeEmail() o2.Type = model.TEAM_OPEN o2.AllowOpenInvite = false @@ -979,7 +979,7 @@ func testPublicTeamCount(t *testing.T, ss store.Store) { o3 := model.Team{} o3.DisplayName = "DisplayName" - o3.Name = "z-z-z" + model.NewId() + "b" + o3.Name = NewTestId() o3.Email = MakeEmail() o3.Type = model.TEAM_OPEN o3.AllowOpenInvite = true @@ -996,7 +996,7 @@ func testPrivateTeamCount(t *testing.T, ss store.Store) { o1 := model.Team{} o1.DisplayName = "DisplayName" - o1.Name = "z-z-z" + model.NewId() + "b" + o1.Name = NewTestId() o1.Email = MakeEmail() o1.Type = model.TEAM_OPEN o1.AllowOpenInvite = false @@ -1005,7 +1005,7 @@ func testPrivateTeamCount(t *testing.T, ss store.Store) { o2 := model.Team{} o2.DisplayName = "DisplayName" - o2.Name = "z-z-z" + model.NewId() + "b" + o2.Name = NewTestId() o2.Email = MakeEmail() o2.Type = model.TEAM_OPEN o2.AllowOpenInvite = true @@ -1014,7 +1014,7 @@ func testPrivateTeamCount(t *testing.T, ss store.Store) { o3 := model.Team{} o3.DisplayName = "DisplayName" - o3.Name = "z-z-z" + model.NewId() + "b" + o3.Name = NewTestId() o3.Email = MakeEmail() o3.Type = model.TEAM_OPEN o3.AllowOpenInvite = false @@ -1029,7 +1029,7 @@ func testPrivateTeamCount(t *testing.T, ss store.Store) { func testTeamCount(t *testing.T, ss store.Store) { o1 := model.Team{} o1.DisplayName = "DisplayName" - o1.Name = "z-z-z" + model.NewId() + "b" + o1.Name = NewTestId() o1.Email = MakeEmail() o1.Type = model.TEAM_OPEN o1.AllowOpenInvite = true @@ -1296,7 +1296,7 @@ func testTeamSaveMember(t *testing.T, ss store.Store) { t.Run("insert member correctly (in team without scheme)", func(t *testing.T) { team := &model.Team{ DisplayName: "Name", - Name: "zz" + model.NewId(), + Name: NewTestId(), Email: MakeEmail(), Type: model.TEAM_OPEN, } @@ -1436,9 +1436,9 @@ func testTeamSaveMember(t *testing.T, ss store.Store) { t.Run("insert member correctly (in team with scheme)", func(t *testing.T) { ts := &model.Scheme{ - Name: model.NewId(), - DisplayName: model.NewId(), - Description: model.NewId(), + Name: NewTestId(), + DisplayName: NewTestId(), + Description: NewTestId(), Scope: model.SCHEME_SCOPE_TEAM, } ts, nErr := ss.Scheme().Save(ts) @@ -1446,7 +1446,7 @@ func testTeamSaveMember(t *testing.T, ss store.Store) { team := &model.Team{ DisplayName: "Name", - Name: "zz" + model.NewId(), + Name: NewTestId(), Email: MakeEmail(), Type: model.TEAM_OPEN, SchemeId: &ts.Id, @@ -1652,7 +1652,7 @@ func testTeamSaveMultipleMembers(t *testing.T, ss store.Store) { t.Run("insert members correctly (in team without scheme)", func(t *testing.T) { team := &model.Team{ DisplayName: "Name", - Name: "zz" + model.NewId(), + Name: NewTestId(), Email: MakeEmail(), Type: model.TEAM_OPEN, } @@ -1804,9 +1804,9 @@ func testTeamSaveMultipleMembers(t *testing.T, ss store.Store) { t.Run("insert members correctly (in team with scheme)", func(t *testing.T) { ts := &model.Scheme{ - Name: model.NewId(), - DisplayName: model.NewId(), - Description: model.NewId(), + Name: NewTestId(), + DisplayName: NewTestId(), + Description: NewTestId(), Scope: model.SCHEME_SCOPE_TEAM, } ts, nErr := ss.Scheme().Save(ts) @@ -1814,7 +1814,7 @@ func testTeamSaveMultipleMembers(t *testing.T, ss store.Store) { team := &model.Team{ DisplayName: "Name", - Name: "zz" + model.NewId(), + Name: NewTestId(), Email: MakeEmail(), Type: model.TEAM_OPEN, SchemeId: &ts.Id, @@ -1981,7 +1981,7 @@ func testTeamUpdateMember(t *testing.T, ss store.Store) { t.Run("insert member correctly (in team without scheme)", func(t *testing.T) { team := &model.Team{ DisplayName: "Name", - Name: "zz" + model.NewId(), + Name: NewTestId(), Email: MakeEmail(), Type: model.TEAM_OPEN, } @@ -2121,9 +2121,9 @@ func testTeamUpdateMember(t *testing.T, ss store.Store) { t.Run("insert member correctly (in team with scheme)", func(t *testing.T) { ts := &model.Scheme{ - Name: model.NewId(), - DisplayName: model.NewId(), - Description: model.NewId(), + Name: NewTestId(), + DisplayName: NewTestId(), + Description: NewTestId(), Scope: model.SCHEME_SCOPE_TEAM, } ts, nErr := ss.Scheme().Save(ts) @@ -2131,7 +2131,7 @@ func testTeamUpdateMember(t *testing.T, ss store.Store) { team := &model.Team{ DisplayName: "Name", - Name: "zz" + model.NewId(), + Name: NewTestId(), Email: MakeEmail(), Type: model.TEAM_OPEN, SchemeId: &ts.Id, @@ -2290,7 +2290,7 @@ func testTeamUpdateMultipleMembers(t *testing.T, ss store.Store) { t.Run("update members correctly (in team without scheme)", func(t *testing.T) { team := &model.Team{ DisplayName: "Name", - Name: "zz" + model.NewId(), + Name: NewTestId(), Email: MakeEmail(), Type: model.TEAM_OPEN, } @@ -2438,9 +2438,9 @@ func testTeamUpdateMultipleMembers(t *testing.T, ss store.Store) { t.Run("insert members correctly (in team with scheme)", func(t *testing.T) { ts := &model.Scheme{ - Name: model.NewId(), - DisplayName: model.NewId(), - Description: model.NewId(), + Name: NewTestId(), + DisplayName: NewTestId(), + Description: NewTestId(), Scope: model.SCHEME_SCOPE_TEAM, } ts, nErr := ss.Scheme().Save(ts) @@ -2448,7 +2448,7 @@ func testTeamUpdateMultipleMembers(t *testing.T, ss store.Store) { team := &model.Team{ DisplayName: "Name", - Name: "zz" + model.NewId(), + Name: NewTestId(), Email: MakeEmail(), Type: model.TEAM_OPEN, SchemeId: &ts.Id, @@ -2750,7 +2750,7 @@ func testSaveTeamMemberMaxMembers(t *testing.T, ss store.Store) { team, errSave := ss.Team().Save(&model.Team{ DisplayName: "DisplayName", - Name: "z-z-z" + model.NewId() + "b", + Name: NewTestId(), Type: model.TEAM_OPEN, }) require.NoError(t, errSave) @@ -2762,7 +2762,7 @@ func testSaveTeamMemberMaxMembers(t *testing.T, ss store.Store) { for i := 0; i < maxUsersPerTeam; i++ { user, err := ss.User().Save(&model.User{ - Username: model.NewId(), + Username: NewTestId(), Email: MakeEmail(), }) require.NoError(t, err) @@ -2788,7 +2788,7 @@ func testSaveTeamMemberMaxMembers(t *testing.T, ss store.Store) { require.Equal(t, int(totalMemberCount), maxUsersPerTeam, "should start with 5 team members, had %v instead", totalMemberCount) user, nErr := ss.User().Save(&model.User{ - Username: model.NewId(), + Username: NewTestId(), Email: MakeEmail(), }) require.NoError(t, nErr) @@ -2836,7 +2836,7 @@ func testSaveTeamMemberMaxMembers(t *testing.T, ss store.Store) { require.NoError(t, nErr) user, nErr = ss.User().Save(&model.User{ - Username: model.NewId(), + Username: NewTestId(), Email: MakeEmail(), }) require.NoError(t, nErr) @@ -2870,9 +2870,9 @@ func testGetTeamMember(t *testing.T, ss store.Store) { // Test with a custom team scheme. s2 := &model.Scheme{ - Name: model.NewId(), - DisplayName: model.NewId(), - Description: model.NewId(), + Name: NewTestId(), + DisplayName: NewTestId(), + Description: NewTestId(), Scope: model.SCHEME_SCOPE_TEAM, } s2, nErr = ss.Scheme().Save(s2) @@ -2881,7 +2881,7 @@ func testGetTeamMember(t *testing.T, ss store.Store) { t2, nErr := ss.Team().Save(&model.Team{ DisplayName: "DisplayName", - Name: "z-z-z" + model.NewId() + "b", + Name: NewTestId(), Type: model.TEAM_OPEN, SchemeId: &s2.Id, }) @@ -3099,16 +3099,16 @@ func testUpdateLastTeamIconUpdate(t *testing.T, ss store.Store) { func testGetTeamsByScheme(t *testing.T, ss store.Store) { // Create some schemes. s1 := &model.Scheme{ - DisplayName: model.NewId(), - Name: model.NewId(), - Description: model.NewId(), + DisplayName: NewTestId(), + Name: NewTestId(), + Description: NewTestId(), Scope: model.SCHEME_SCOPE_TEAM, } s2 := &model.Scheme{ - DisplayName: model.NewId(), - Name: model.NewId(), - Description: model.NewId(), + DisplayName: NewTestId(), + Name: NewTestId(), + Description: NewTestId(), Scope: model.SCHEME_SCOPE_TEAM, } @@ -3119,24 +3119,24 @@ func testGetTeamsByScheme(t *testing.T, ss store.Store) { // Create and save some teams. t1 := &model.Team{ - Name: "zz" + model.NewId(), - DisplayName: model.NewId(), + Name: NewTestId(), + DisplayName: NewTestId(), Email: MakeEmail(), Type: model.TEAM_OPEN, SchemeId: &s1.Id, } t2 := &model.Team{ - Name: "zz" + model.NewId(), - DisplayName: model.NewId(), + Name: NewTestId(), + DisplayName: NewTestId(), Email: MakeEmail(), Type: model.TEAM_OPEN, SchemeId: &s1.Id, } t3 := &model.Team{ - Name: "zz" + model.NewId(), - DisplayName: model.NewId(), + Name: NewTestId(), + DisplayName: NewTestId(), Email: MakeEmail(), Type: model.TEAM_OPEN, } @@ -3170,7 +3170,7 @@ func testTeamStoreMigrateTeamMembers(t *testing.T, ss store.Store) { s1 := model.NewId() t1 := &model.Team{ DisplayName: "Name", - Name: "z-z-z" + model.NewId() + "b", + Name: NewTestId(), Email: MakeEmail(), Type: model.TEAM_OPEN, InviteId: model.NewId(), @@ -3181,17 +3181,17 @@ func testTeamStoreMigrateTeamMembers(t *testing.T, ss store.Store) { tm1 := &model.TeamMember{ TeamId: t1.Id, - UserId: model.NewId(), + UserId: NewTestId(), ExplicitRoles: "team_admin team_user", } tm2 := &model.TeamMember{ TeamId: t1.Id, - UserId: model.NewId(), + UserId: NewTestId(), ExplicitRoles: "team_user", } tm3 := &model.TeamMember{ TeamId: t1.Id, - UserId: model.NewId(), + UserId: NewTestId(), ExplicitRoles: "something_else", } @@ -3237,25 +3237,25 @@ func testTeamStoreMigrateTeamMembers(t *testing.T, ss store.Store) { func testResetAllTeamSchemes(t *testing.T, ss store.Store) { s1 := &model.Scheme{ - Name: model.NewId(), - DisplayName: model.NewId(), - Description: model.NewId(), + Name: NewTestId(), + DisplayName: NewTestId(), + Description: NewTestId(), Scope: model.SCHEME_SCOPE_TEAM, } s1, err := ss.Scheme().Save(s1) require.NoError(t, err) t1 := &model.Team{ - Name: "zz" + model.NewId(), - DisplayName: model.NewId(), + Name: NewTestId(), + DisplayName: NewTestId(), Email: MakeEmail(), Type: model.TEAM_OPEN, SchemeId: &s1.Id, } t2 := &model.Team{ - Name: "zz" + model.NewId(), - DisplayName: model.NewId(), + Name: NewTestId(), + DisplayName: NewTestId(), Email: MakeEmail(), Type: model.TEAM_OPEN, SchemeId: &s1.Id, @@ -3328,9 +3328,9 @@ func testTeamStoreClearAllCustomRoleAssignments(t *testing.T, ss store.Store) { func testTeamStoreAnalyticsGetTeamCountForScheme(t *testing.T, ss store.Store) { s1 := &model.Scheme{ - DisplayName: model.NewId(), - Name: model.NewId(), - Description: model.NewId(), + DisplayName: NewTestId(), + Name: NewTestId(), + Description: NewTestId(), Scope: model.SCHEME_SCOPE_TEAM, } s1, err := ss.Scheme().Save(s1) @@ -3341,8 +3341,8 @@ func testTeamStoreAnalyticsGetTeamCountForScheme(t *testing.T, ss store.Store) { assert.Equal(t, int64(0), count1) t1 := &model.Team{ - Name: "zz" + model.NewId(), - DisplayName: model.NewId(), + Name: NewTestId(), + DisplayName: NewTestId(), Email: MakeEmail(), Type: model.TEAM_OPEN, SchemeId: &s1.Id, @@ -3355,8 +3355,8 @@ func testTeamStoreAnalyticsGetTeamCountForScheme(t *testing.T, ss store.Store) { assert.Equal(t, int64(1), count2) t2 := &model.Team{ - Name: "zz" + model.NewId(), - DisplayName: model.NewId(), + Name: NewTestId(), + DisplayName: NewTestId(), Email: MakeEmail(), Type: model.TEAM_OPEN, SchemeId: &s1.Id, @@ -3369,8 +3369,8 @@ func testTeamStoreAnalyticsGetTeamCountForScheme(t *testing.T, ss store.Store) { assert.Equal(t, int64(2), count3) t3 := &model.Team{ - Name: "zz" + model.NewId(), - DisplayName: model.NewId(), + Name: NewTestId(), + DisplayName: NewTestId(), Email: MakeEmail(), Type: model.TEAM_OPEN, } @@ -3382,8 +3382,8 @@ func testTeamStoreAnalyticsGetTeamCountForScheme(t *testing.T, ss store.Store) { assert.Equal(t, int64(2), count4) t4 := &model.Team{ - Name: "zz" + model.NewId(), - DisplayName: model.NewId(), + Name: NewTestId(), + DisplayName: NewTestId(), Email: MakeEmail(), Type: model.TEAM_OPEN, SchemeId: &s1.Id, @@ -3400,7 +3400,7 @@ func testTeamStoreAnalyticsGetTeamCountForScheme(t *testing.T, ss store.Store) { func testTeamStoreGetAllForExportAfter(t *testing.T, ss store.Store) { t1 := model.Team{} t1.DisplayName = "Name" - t1.Name = "zz" + model.NewId() + t1.Name = NewTestId() t1.Email = MakeEmail() t1.Type = model.TEAM_OPEN _, err := ss.Team().Save(&t1) @@ -3424,7 +3424,7 @@ func testTeamStoreGetAllForExportAfter(t *testing.T, ss store.Store) { func testTeamStoreGetTeamMembersForExport(t *testing.T, ss store.Store) { t1 := model.Team{} t1.DisplayName = "Name" - t1.Name = "zz" + model.NewId() + t1.Name = NewTestId() t1.Email = MakeEmail() t1.Type = model.TEAM_OPEN _, err := ss.Team().Save(&t1) @@ -3432,13 +3432,13 @@ func testTeamStoreGetTeamMembersForExport(t *testing.T, ss store.Store) { u1 := model.User{} u1.Email = MakeEmail() - u1.Nickname = model.NewId() + u1.Nickname = NewTestId() _, err = ss.User().Save(&u1) require.NoError(t, err) u2 := model.User{} u2.Email = MakeEmail() - u2.Nickname = model.NewId() + u2.Nickname = NewTestId() _, err = ss.User().Save(&u2) require.NoError(t, err) @@ -3460,8 +3460,8 @@ func testTeamStoreGetTeamMembersForExport(t *testing.T, ss store.Store) { func testGroupSyncedTeamCount(t *testing.T, ss store.Store) { team1, err := ss.Team().Save(&model.Team{ - DisplayName: model.NewId(), - Name: "zz" + model.NewId(), + DisplayName: NewTestId(), + Name: NewTestId(), Email: MakeEmail(), Type: model.TEAM_INVITE, GroupConstrained: model.NewBool(true), @@ -3471,7 +3471,7 @@ func testGroupSyncedTeamCount(t *testing.T, ss store.Store) { defer ss.Team().PermanentDelete(team1.Id) team2, err := ss.Team().Save(&model.Team{ - DisplayName: model.NewId(), + DisplayName: NewTestId(), Name: "zz" + model.NewId(), Email: MakeEmail(), Type: model.TEAM_INVITE, diff --git a/store/storetest/utils.go b/store/storetest/utils.go new file mode 100644 index 0000000000..bd0713f71d --- /dev/null +++ b/store/storetest/utils.go @@ -0,0 +1,20 @@ +// Copyright (c) 2015-present Mattermost, Inc. All Rights Reserved. +// See LICENSE.txt for license information. + +package storetest + +import ( + "github.com/mattermost/mattermost-server/v5/model" +) + +// NewTestId is used for testing as a replacement for model.NewId(). It is a [A-Z0-9] string 26 +// characters long. It replaces every odd character with a digit. +func NewTestId() string { + newId := []byte(model.NewId()) + + for i := 1; i < len(newId); i = i + 2 { + newId[i] = 48 + newId[i-1]%10 + } + + return string(newId) +} diff --git a/store/storetest/utils_test.go b/store/storetest/utils_test.go new file mode 100644 index 0000000000..85944f997b --- /dev/null +++ b/store/storetest/utils_test.go @@ -0,0 +1,21 @@ +// Copyright (c) 2015-present Mattermost, Inc. All Rights Reserved. +// See LICENSE.txt for license information. + +package storetest + +import ( + "regexp" + "testing" + + "github.com/stretchr/testify/require" +) + +func TestNewTestId(t *testing.T) { + rg := regexp.MustCompile(`(\S\d){13}`) + + for i := 0; i < 1000; i++ { + id := NewTestId() + require.LessOrEqual(t, len(id), 26, "test ids shouldn't be longer than 26 chars") + require.Regexp(t, rg, id, "test ids should have pattern e.g a1b2c3...") + } +}