fix tests now new models are added, add more status edit DB tests

internal/db/bundb/account_test.go

@@ -46,7 +46,7 @@ type AccountTestSuite struct {
 func (suite *AccountTestSuite) TestGetAccountStatuses() {
 	statuses, err := suite.db.GetAccountStatuses(context.Background(), suite.testAccounts["local_account_1"].ID, 20, false, false, "", "", false, false)
 	suite.NoError(err)
-	suite.Len(statuses, 8)
+	suite.Len(statuses, 9)
 }
 
 func (suite *AccountTestSuite) TestGetAccountStatusesPageDown() {
@@ -69,7 +69,7 @@ func (suite *AccountTestSuite) TestGetAccountStatusesPageDown() {
 	if err != nil {
 		suite.FailNow(err.Error())
 	}
-	suite.Len(statuses, 2)
+	suite.Len(statuses, 3)
 
 	// try to get the last page (should be empty)
 	statuses, err = suite.db.GetAccountStatuses(context.Background(), suite.testAccounts["local_account_1"].ID, 3, false, false, statuses[len(statuses)-1].ID, "", false, false)
@@ -80,13 +80,13 @@ func (suite *AccountTestSuite) TestGetAccountStatusesPageDown() {
 func (suite *AccountTestSuite) TestGetAccountStatusesExcludeRepliesAndReblogs() {
 	statuses, err := suite.db.GetAccountStatuses(context.Background(), suite.testAccounts["local_account_1"].ID, 20, true, true, "", "", false, false)
 	suite.NoError(err)
-	suite.Len(statuses, 7)
+	suite.Len(statuses, 8)
 }
 
 func (suite *AccountTestSuite) TestGetAccountStatusesExcludeRepliesAndReblogsPublicOnly() {
 	statuses, err := suite.db.GetAccountStatuses(context.Background(), suite.testAccounts["local_account_1"].ID, 20, true, true, "", "", false, true)
 	suite.NoError(err)
-	suite.Len(statuses, 3)
+	suite.Len(statuses, 4)
 }
 
 // populateTestStatus adds mandatory fields to a partially populated status.
@@ -173,7 +173,7 @@ func (suite *AccountTestSuite) TestGetAccountStatusesExcludeRepliesExcludesSelfR
 	testAccount := suite.testAccounts["local_account_1"]
 	statuses, err := suite.db.GetAccountStatuses(context.Background(), testAccount.ID, 20, true, true, "", "", false, false)
 	suite.NoError(err)
-	suite.Len(statuses, 8)
+	suite.Len(statuses, 9)
 	for _, status := range statuses {
 		if status.InReplyToID != "" && status.InReplyToAccountID != testAccount.ID {
 			suite.FailNowf("", "Status with ID %s is a non-self reply and should have been excluded", status.ID)

internal/db/bundb/basic_test.go

@@ -114,7 +114,7 @@ func (suite *BasicTestSuite) TestGetAllStatuses() {
 	s := []*gtsmodel.Status{}
 	err := suite.db.GetAll(context.Background(), &s)
 	suite.NoError(err)
-	suite.Len(s, 25)
+	suite.Len(s, 28)
 }
 
 func (suite *BasicTestSuite) TestGetAllNotNull() {

internal/db/bundb/instance_test.go

@@ -47,13 +47,13 @@ func (suite *InstanceTestSuite) TestCountInstanceUsersRemote() {
 func (suite *InstanceTestSuite) TestCountInstanceStatuses() {
 	count, err := suite.db.CountInstanceStatuses(context.Background(), config.GetHost())
 	suite.NoError(err)
-	suite.Equal(19, count)
+	suite.Equal(21, count)
 }
 
 func (suite *InstanceTestSuite) TestCountInstanceStatusesRemote() {
 	count, err := suite.db.CountInstanceStatuses(context.Background(), "fossbros-anonymous.io")
 	suite.NoError(err)
-	suite.Equal(3, count)
+	suite.Equal(4, count)
 }
 
 func (suite *InstanceTestSuite) TestCountInstanceDomains() {

internal/db/bundb/statusedit.go

@@ -53,7 +53,7 @@ func (s *statusEditDB) GetStatusEditByID(ctx context.Context, id string) (*gtsmo
 			}
 
 			return &edit, nil
-		},
+		}, id,
 	)
 	if err != nil {
 		return nil, err

internal/db/bundb/statusedit_test.go

@@ -21,6 +21,7 @@ import (
 	"context"
 	"errors"
 	"reflect"
+	"slices"
 	"testing"
 	"time"
 
@@ -42,20 +43,6 @@ func (suite *StatusEditTestSuite) TestGetStatusEditBy() {
 	// Sentinel error to mark avoiding a test case.
 	sentinelErr := errors.New("sentinel")
 
-	// isEqual checks if 2 status edit models are equal.
-	isEqual := func(e1, e2 gtsmodel.StatusEdit) bool {
-
-		// Clear populated sub-models.
-		e1.Attachments = nil
-		e2.Attachments = nil
-
-		// Clear database-set fields.
-		e1.CreatedAt = time.Time{}
-		e2.CreatedAt = time.Time{}
-
-		return reflect.DeepEqual(e1, e2)
-	}
-
 	for _, edit := range suite.testStatusEdits {
 		for lookup, dbfunc := range map[string]func() (*gtsmodel.StatusEdit, error){
 			"id": func() (*gtsmodel.StatusEdit, error) {
@@ -79,7 +66,7 @@ func (suite *StatusEditTestSuite) TestGetStatusEditBy() {
 			}
 
 			// Check received account data.
-			if !isEqual(*checkEdit, *edit) {
+			if !areEditsEqual(edit, checkEdit) {
 				t.Errorf("edit does not contain expected data: %+v", checkEdit)
 				continue
 			}
@@ -87,6 +74,45 @@ func (suite *StatusEditTestSuite) TestGetStatusEditBy() {
 	}
 }
 
+func (suite *StatusEditTestSuite) TestGetStatusEditsByIDs() {
+	t := suite.T()
+
+	// Create a new context for this test.
+	ctx, cncl := context.WithCancel(context.Background())
+	defer cncl()
+
+	// editsByStatus returns all test edits by the given status with ID.
+	editsByStatus := func(status *gtsmodel.Status) []*gtsmodel.StatusEdit {
+		var edits []*gtsmodel.StatusEdit
+		for _, edit := range suite.testStatusEdits {
+			if edit.StatusID == status.ID {
+				edits = append(edits, edit)
+			}
+		}
+		return edits
+	}
+
+	for _, status := range suite.testStatuses {
+		// Get test status edit models
+		// that should be found for status.
+		check := editsByStatus(status)
+
+		// Fetch edits for the slice of IDs attached to status from database.
+		edits, err := suite.state.DB.GetStatusEditsByIDs(ctx, status.EditIDs)
+		suite.NoError(err)
+
+		// Ensure both slices
+		// sorted the same.
+		sortEdits(check)
+		sortEdits(edits)
+
+		// Check whether slices of status edits match.
+		if !slices.EqualFunc(check, edits, areEditsEqual) {
+			t.Error("status edit slices do not match")
+		}
+	}
+}
+
 func (suite *StatusEditTestSuite) TestDeleteStatusEdits() {
 
 }
@@ -94,3 +120,36 @@ func (suite *StatusEditTestSuite) TestDeleteStatusEdits() {
 func TestStatusEditTestSuite(t *testing.T) {
 	suite.Run(t, new(StatusEditTestSuite))
 }
+
+func areEditsEqual(e1, e2 *gtsmodel.StatusEdit) bool {
+	// Clone the 1st status edit.
+	e1Copy := new(gtsmodel.StatusEdit)
+	*e1Copy = *e1
+	e1 = e1Copy
+
+	// Clone the 2nd status edit.
+	e2Copy := new(gtsmodel.StatusEdit)
+	*e2Copy = *e2
+	e2 = e2Copy
+
+	// Clear populated sub-models.
+	e1.Attachments = nil
+	e2.Attachments = nil
+
+	// Clear database-set fields.
+	e1.CreatedAt = time.Time{}
+	e2.CreatedAt = time.Time{}
+
+	return reflect.DeepEqual(*e1, *e2)
+}
+
+func sortEdits(edits []*gtsmodel.StatusEdit) {
+	slices.SortFunc(edits, func(a, b *gtsmodel.StatusEdit) int {
+		if a.CreatedAt.Before(b.CreatedAt) {
+			return +1
+		} else if b.CreatedAt.Before(a.CreatedAt) {
+			return -1
+		}
+		return 0
+	})
+}

internal/db/bundb/timeline_test.go

@@ -179,7 +179,7 @@ func (suite *TimelineTestSuite) TestGetHomeTimelineIgnoreExclusive() {
 	if err != nil {
 		suite.FailNow(err.Error())
 	}
-	suite.checkStatuses(s, id.Highest, id.Lowest, 8)
+	suite.checkStatuses(s, id.Highest, id.Lowest, 9)
 
 	// Remove admin account from the exclusive list.
 	listEntry := suite.testListEntries["local_account_1_list_1_entry_2"]
@@ -225,7 +225,7 @@ func (suite *TimelineTestSuite) TestGetHomeTimelineNoFollowing() {
 		suite.FailNow(err.Error())
 	}
 
-	suite.checkStatuses(s, id.Highest, id.Lowest, 8)
+	suite.checkStatuses(s, id.Highest, id.Lowest, 9)
 }
 
 func (suite *TimelineTestSuite) TestGetHomeTimelineWithFutureStatus() {
@@ -293,7 +293,7 @@ func (suite *TimelineTestSuite) TestGetListTimelineNoParams() {
 		suite.FailNow(err.Error())
 	}
 
-	suite.checkStatuses(s, id.Highest, id.Lowest, 12)
+	suite.checkStatuses(s, id.Highest, id.Lowest, 13)
 }
 
 func (suite *TimelineTestSuite) TestGetListTimelineMaxID() {