Issue #18191 and #18193 fixed (#18217)

Automatic Merge

store/storetest/compliance_store.go

@@ -104,7 +104,7 @@ func testComplianceExport(t *testing.T, ss store.Store) {
 
 	t1 := &model.Team{}
 	t1.DisplayName = "DisplayName"
-	t1.Name = "zz" + model.NewId() + "b"
+	t1.Name = NewTestId()
 	t1.Email = MakeEmail()
 	t1.Type = model.TeamOpen
 	t1, err := ss.Team().Save(t1)
@@ -129,7 +129,7 @@ func testComplianceExport(t *testing.T, ss store.Store) {
 	c1 := &model.Channel{}
 	c1.TeamId = t1.Id
 	c1.DisplayName = "Channel2"
-	c1.Name = "zz" + model.NewId() + "b"
+	c1.Name = NewTestId()
 	c1.Type = model.ChannelTypeOpen
 	c1, nErr = ss.Channel().Save(c1, -1)
 	require.NoError(t, nErr)
@@ -138,7 +138,7 @@ func testComplianceExport(t *testing.T, ss store.Store) {
 	o1.ChannelId = c1.Id
 	o1.UserId = u1.Id
 	o1.CreateAt = model.GetMillis()
-	o1.Message = "zz" + model.NewId() + "b"
+	o1.Message = NewTestId()
 	o1, nErr = ss.Post().Save(o1)
 	require.NoError(t, nErr)
 
@@ -146,7 +146,7 @@ func testComplianceExport(t *testing.T, ss store.Store) {
 	o1a.ChannelId = c1.Id
 	o1a.UserId = u1.Id
 	o1a.CreateAt = o1.CreateAt + 10
-	o1a.Message = "zz" + model.NewId() + "b"
+	o1a.Message = NewTestId()
 	_, nErr = ss.Post().Save(o1a)
 	require.NoError(t, nErr)
 
@@ -154,7 +154,7 @@ func testComplianceExport(t *testing.T, ss store.Store) {
 	o2.ChannelId = c1.Id
 	o2.UserId = u1.Id
 	o2.CreateAt = o1.CreateAt + 20
-	o2.Message = "zz" + model.NewId() + "b"
+	o2.Message = NewTestId()
 	_, nErr = ss.Post().Save(o2)
 	require.NoError(t, nErr)
 
@@ -162,7 +162,7 @@ func testComplianceExport(t *testing.T, ss store.Store) {
 	o2a.ChannelId = c1.Id
 	o2a.UserId = u2.Id
 	o2a.CreateAt = o1.CreateAt + 30
-	o2a.Message = "zz" + model.NewId() + "b"
+	o2a.Message = NewTestId()
 	o2a, nErr = ss.Post().Save(o2a)
 	require.NoError(t, nErr)
 
@@ -233,7 +233,7 @@ func testComplianceExportDirectMessages(t *testing.T, ss store.Store) {
 
 	t1 := &model.Team{}
 	t1.DisplayName = "DisplayName"
-	t1.Name = "zz" + model.NewId() + "b"
+	t1.Name = NewTestId()
 	t1.Email = MakeEmail()
 	t1.Type = model.TeamOpen
 	t1, err := ss.Team().Save(t1)
@@ -258,7 +258,7 @@ func testComplianceExportDirectMessages(t *testing.T, ss store.Store) {
 	c1 := &model.Channel{}
 	c1.TeamId = t1.Id
 	c1.DisplayName = "Channel2"
-	c1.Name = "zz" + model.NewId() + "b"
+	c1.Name = NewTestId()
 	c1.Type = model.ChannelTypeOpen
 	c1, nErr = ss.Channel().Save(c1, -1)
 	require.NoError(t, nErr)
@@ -269,7 +269,7 @@ func testComplianceExportDirectMessages(t *testing.T, ss store.Store) {
 	o1.ChannelId = c1.Id
 	o1.UserId = u1.Id
 	o1.CreateAt = model.GetMillis()
-	o1.Message = "zz" + model.NewId() + "b"
+	o1.Message = NewTestId()
 	o1, nErr = ss.Post().Save(o1)
 	require.NoError(t, nErr)
 
@@ -277,7 +277,7 @@ func testComplianceExportDirectMessages(t *testing.T, ss store.Store) {
 	o1a.ChannelId = c1.Id
 	o1a.UserId = u1.Id
 	o1a.CreateAt = o1.CreateAt + 10
-	o1a.Message = "zz" + model.NewId() + "b"
+	o1a.Message = NewTestId()
 	_, nErr = ss.Post().Save(o1a)
 	require.NoError(t, nErr)
 
@@ -285,7 +285,7 @@ func testComplianceExportDirectMessages(t *testing.T, ss store.Store) {
 	o2.ChannelId = c1.Id
 	o2.UserId = u1.Id
 	o2.CreateAt = o1.CreateAt + 20
-	o2.Message = "zz" + model.NewId() + "b"
+	o2.Message = NewTestId()
 	_, nErr = ss.Post().Save(o2)
 	require.NoError(t, nErr)
 
@@ -293,7 +293,7 @@ func testComplianceExportDirectMessages(t *testing.T, ss store.Store) {
 	o2a.ChannelId = c1.Id
 	o2a.UserId = u2.Id
 	o2a.CreateAt = o1.CreateAt + 30
-	o2a.Message = "zz" + model.NewId() + "b"
+	o2a.Message = NewTestId()
 	_, nErr = ss.Post().Save(o2a)
 	require.NoError(t, nErr)
 
@@ -301,7 +301,7 @@ func testComplianceExportDirectMessages(t *testing.T, ss store.Store) {
 	o3.ChannelId = cDM.Id
 	o3.UserId = u1.Id
 	o3.CreateAt = o1.CreateAt + 40
-	o3.Message = "zz" + model.NewId() + "b"
+	o3.Message = NewTestId()
 	o3, nErr = ss.Post().Save(o3)
 	require.NoError(t, nErr)
 
@@ -356,7 +356,7 @@ func testComplianceExportDirectMessages(t *testing.T, ss store.Store) {
 			post.ChannelId = c1.Id
 			post.UserId = u1.Id
 			post.CreateAt = createAt
-			post.Message = "zz" + model.NewId() + "b"
+			post.Message = NewTestId()
 			_, nErr = ss.Post().Save(post)
 			require.NoError(t, nErr)
 		}
@@ -401,7 +401,7 @@ func testMessageExportPublicChannel(t *testing.T, ss store.Store) {
 	// need a team
 	team := &model.Team{
 		DisplayName: "DisplayName",
-		Name:        "zz" + model.NewId() + "b",
+		Name:        NewTestId(),
 		Email:       MakeEmail(),
 		Type:        model.TeamOpen,
 	}
@@ -448,7 +448,7 @@ func testMessageExportPublicChannel(t *testing.T, ss store.Store) {
 		ChannelId: channel.Id,
 		UserId:    user1.Id,
 		CreateAt:  startTime,
-		Message:   "zz" + model.NewId() + "a",
+		Message:   NewTestId(),
 	}
 	post1, err = ss.Post().Save(post1)
 	require.NoError(t, err)
@@ -457,7 +457,7 @@ func testMessageExportPublicChannel(t *testing.T, ss store.Store) {
 		ChannelId: channel.Id,
 		UserId:    user1.Id,
 		CreateAt:  startTime + 10,
-		Message:   "zz" + model.NewId() + "b",
+		Message:   NewTestId(),
 	}
 	post2, err = ss.Post().Save(post2)
 	require.NoError(t, err)
@@ -505,7 +505,7 @@ func testMessageExportPrivateChannel(t *testing.T, ss store.Store) {
 	// need a team
 	team := &model.Team{
 		DisplayName: "DisplayName",
-		Name:        "zz" + model.NewId() + "b",
+		Name:        NewTestId(),
 		Email:       MakeEmail(),
 		Type:        model.TeamOpen,
 	}
@@ -552,7 +552,7 @@ func testMessageExportPrivateChannel(t *testing.T, ss store.Store) {
 		ChannelId: channel.Id,
 		UserId:    user1.Id,
 		CreateAt:  startTime,
-		Message:   "zz" + model.NewId() + "a",
+		Message:   NewTestId(),
 	}
 	post1, err = ss.Post().Save(post1)
 	require.NoError(t, err)
@@ -561,7 +561,7 @@ func testMessageExportPrivateChannel(t *testing.T, ss store.Store) {
 		ChannelId: channel.Id,
 		UserId:    user1.Id,
 		CreateAt:  startTime + 10,
-		Message:   "zz" + model.NewId() + "b",
+		Message:   NewTestId(),
 	}
 	post2, err = ss.Post().Save(post2)
 	require.NoError(t, err)
@@ -611,7 +611,7 @@ func testMessageExportDirectMessageChannel(t *testing.T, ss store.Store) {
 	// need a team
 	team := &model.Team{
 		DisplayName: "DisplayName",
-		Name:        "zz" + model.NewId() + "b",
+		Name:        NewTestId(),
 		Email:       MakeEmail(),
 		Type:        model.TeamOpen,
 	}
@@ -652,7 +652,7 @@ func testMessageExportDirectMessageChannel(t *testing.T, ss store.Store) {
 		ChannelId: directMessageChannel.Id,
 		UserId:    user1.Id,
 		CreateAt:  startTime + 20,
-		Message:   "zz" + model.NewId() + "c",
+		Message:   NewTestId(),
 	}
 	post, err = ss.Post().Save(post)
 	require.NoError(t, err)
@@ -692,7 +692,7 @@ func testMessageExportGroupMessageChannel(t *testing.T, ss store.Store) {
 	// need a team
 	team := &model.Team{
 		DisplayName: "DisplayName",
-		Name:        "zz" + model.NewId() + "b",
+		Name:        NewTestId(),
 		Email:       MakeEmail(),
 		Type:        model.TeamOpen,
 	}
@@ -750,7 +750,7 @@ func testMessageExportGroupMessageChannel(t *testing.T, ss store.Store) {
 		ChannelId: groupMessageChannel.Id,
 		UserId:    user1.Id,
 		CreateAt:  startTime + 20,
-		Message:   "zz" + model.NewId() + "c",
+		Message:   NewTestId(),
 	}
 	post, err = ss.Post().Save(post)
 	require.NoError(t, err)
@@ -789,7 +789,7 @@ func testEditExportMessage(t *testing.T, ss store.Store) {
 	// need a team
 	team := &model.Team{
 		DisplayName: "DisplayName",
-		Name:        "zz" + model.NewId() + "b",
+		Name:        NewTestId(),
 		Email:       MakeEmail(),
 		Type:        model.TeamOpen,
 	}
@@ -824,7 +824,7 @@ func testEditExportMessage(t *testing.T, ss store.Store) {
 		ChannelId: channel.Id,
 		UserId:    user1.Id,
 		CreateAt:  startTime,
-		Message:   "zz" + model.NewId() + "a",
+		Message:   NewTestId(),
 	}
 	post1, err = ss.Post().Save(post1)
 	require.NoError(t, err)
@@ -881,7 +881,7 @@ func testEditAfterExportMessage(t *testing.T, ss store.Store) {
 	// need a team
 	team := &model.Team{
 		DisplayName: "DisplayName",
-		Name:        "zz" + model.NewId() + "b",
+		Name:        NewTestId(),
 		Email:       MakeEmail(),
 		Type:        model.TeamOpen,
 	}
@@ -916,7 +916,7 @@ func testEditAfterExportMessage(t *testing.T, ss store.Store) {
 		ChannelId: channel.Id,
 		UserId:    user1.Id,
 		CreateAt:  startTime,
-		Message:   "zz" + model.NewId() + "a",
+		Message:   NewTestId(),
 	}
 	post1, err = ss.Post().Save(post1)
 	require.NoError(t, err)
@@ -992,7 +992,7 @@ func testDeleteExportMessage(t *testing.T, ss store.Store) {
 	// need a team
 	team := &model.Team{
 		DisplayName: "DisplayName",
-		Name:        "zz" + model.NewId() + "b",
+		Name:        NewTestId(),
 		Email:       MakeEmail(),
 		Type:        model.TeamOpen,
 	}
@@ -1027,7 +1027,7 @@ func testDeleteExportMessage(t *testing.T, ss store.Store) {
 		ChannelId: channel.Id,
 		UserId:    user1.Id,
 		CreateAt:  startTime,
-		Message:   "zz" + model.NewId() + "a",
+		Message:   NewTestId(),
 	}
 	post1, err = ss.Post().Save(post1)
 	require.NoError(t, err)
@@ -1077,7 +1077,7 @@ func testDeleteAfterExportMessage(t *testing.T, ss store.Store) {
 	// need a team
 	team := &model.Team{
 		DisplayName: "DisplayName",
-		Name:        "zz" + model.NewId() + "b",
+		Name:        NewTestId(),
 		Email:       MakeEmail(),
 		Type:        model.TeamOpen,
 	}
@@ -1112,7 +1112,7 @@ func testDeleteAfterExportMessage(t *testing.T, ss store.Store) {
 		ChannelId: channel.Id,
 		UserId:    user1.Id,
 		CreateAt:  startTime,
-		Message:   "zz" + model.NewId() + "a",
+		Message:   NewTestId(),
 	}
 	post1, err = ss.Post().Save(post1)
 	require.NoError(t, err)