update tests

Author: bfabio

logs_test.go

@@ -397,6 +397,11 @@ func TestLogsEndpoints(t *testing.T) {
 func addLogsForPaginationCapTest(t *testing.T) {
 	t.Helper()
 
+	const (
+		insertCount = 110
+		message     = "Pagination cap test log"
+	)
+
 	query := fmt.Sprintf(
 		"INSERT INTO logs (id, message, created_at, updated_at) VALUES (%s, %s, %s, %s)",
 		placeholder(1),
@@ -405,17 +410,21 @@ func addLogsForPaginationCapTest(t *testing.T) {
 		placeholder(4),
 	)
 
-	for i := range 100 {
+	for i := range insertCount {
 		createdAt := time.Date(2011, 1, 1, 0, 0, 0, 0, time.UTC).Add(time.Duration(i) * time.Second)
 		_, err := db.Exec(
 			query,
 			fmt.Sprintf("00000000-0000-0000-0000-%012d", i),
-			"Pagination cap test log",
+			message,
 			createdAt,
 			createdAt,
 		)
 		require.NoError(t, err)
 	}
+
+	t.Cleanup(func() {
+		_, _ = db.Exec("DELETE FROM logs WHERE message = "+placeholder(1), message)
+	})
 }
 
 func TestLogsDBChecks(t *testing.T) {

publishers_test.go

@@ -1,8 +1,10 @@
 package main
 
 import (
+	"fmt"
 	"strings"
 	"testing"
+	"time"
 
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/require"
@@ -114,9 +116,10 @@ func TestPublishersEndpoints(t *testing.T) {
 
 			expectedCode:        200,
 			expectedContentType: "application/json",
+			setupFunc:           addPublishersForPaginationCapTest,
 			validateFunc: func(t *testing.T, response map[string]interface{}) {
 				items := assertListResponse(t, response)
-				assert.LessOrEqual(t, len(items), 100)
+				assert.Equal(t, 100, len(items))
 			},
 		},
 		{
@@ -1165,3 +1168,40 @@ func TestPublishersDeleteDBChecks(t *testing.T) {
 		assert.Equal(t, 0, dbCount(t, "publishers_code_hosting", "publisher_id", publisherID))
 	})
 }
+
+func addPublishersForPaginationCapTest(t *testing.T) {
+	t.Helper()
+
+	const (
+		insertCount       = 110
+		descriptionPrefix = "Pagination cap test publisher "
+	)
+
+	query := fmt.Sprintf(
+		"INSERT INTO publishers (id, description, email, active, created_at, updated_at) VALUES (%s, %s, %s, %s, %s, %s)",
+		placeholder(1),
+		placeholder(2),
+		placeholder(3),
+		placeholder(4),
+		placeholder(5),
+		placeholder(6),
+	)
+
+	for i := range insertCount {
+		createdAt := time.Date(2020, 1, 1, 0, 0, 0, 0, time.UTC).Add(time.Duration(i) * time.Second)
+		_, err := db.Exec(
+			query,
+			fmt.Sprintf("11111111-1111-1111-1111-%012d", i),
+			fmt.Sprintf("%s%d", descriptionPrefix, i),
+			fmt.Sprintf("cap-test-%d@example.org", i),
+			true,
+			createdAt,
+			createdAt,
+		)
+		require.NoError(t, err)
+	}
+
+	t.Cleanup(func() {
+		_, _ = db.Exec("DELETE FROM publishers WHERE description LIKE "+placeholder(1), descriptionPrefix+"%")
+	})
+}

software_test.go

@@ -2,6 +2,7 @@ package main
 
 import (
 	"encoding/json"
+	"fmt"
 	"strings"
 	"testing"
 	"time"
@@ -200,9 +201,10 @@ func TestSoftwareEndpoints(t *testing.T) {
 
 			expectedCode:        200,
 			expectedContentType: "application/json",
+			setupFunc:           addSoftwareForPaginationCapTest,
 			validateFunc: func(t *testing.T, response map[string]interface{}) {
 				items := assertListResponse(t, response)
-				assert.LessOrEqual(t, len(items), 100)
+				assert.Equal(t, 100, len(items))
 			},
 		},
 		{
@@ -1669,3 +1671,47 @@ func TestSoftwareDeleteDBChecks(t *testing.T) {
 		assert.Equal(t, 0, dbCount(t, "software_urls", "software_id", softwareID))
 	})
 }
+
+func addSoftwareForPaginationCapTest(t *testing.T) {
+	t.Helper()
+
+	const (
+		insertCount = 110
+		urlPrefix   = "https://cap-test.example.org/repo-"
+	)
+
+	swQuery := fmt.Sprintf(
+		"INSERT INTO software (id, software_url_id, publiccode_yml, active, created_at, updated_at) VALUES (%s, %s, %s, %s, %s, %s)",
+		placeholder(1),
+		placeholder(2),
+		placeholder(3),
+		placeholder(4),
+		placeholder(5),
+		placeholder(6),
+	)
+	urlQuery := fmt.Sprintf(
+		"INSERT INTO software_urls (id, url, software_id, created_at, updated_at) VALUES (%s, %s, %s, %s, %s)",
+		placeholder(1),
+		placeholder(2),
+		placeholder(3),
+		placeholder(4),
+		placeholder(5),
+	)
+
+	for i := range insertCount {
+		swID := fmt.Sprintf("11111111-1111-1111-1111-%012d", i)
+		urlID := fmt.Sprintf("22222222-2222-2222-2222-%012d", i)
+		createdAt := time.Date(2020, 1, 1, 0, 0, 0, 0, time.UTC).Add(time.Duration(i) * time.Second)
+
+		_, err := db.Exec(swQuery, swID, urlID, "-", true, createdAt, createdAt)
+		require.NoError(t, err)
+
+		_, err = db.Exec(urlQuery, urlID, fmt.Sprintf("%s%d", urlPrefix, i), swID, createdAt, createdAt)
+		require.NoError(t, err)
+	}
+
+	t.Cleanup(func() {
+		_, _ = db.Exec("DELETE FROM software_urls WHERE url LIKE "+placeholder(1), urlPrefix+"%")
+		_, _ = db.Exec("DELETE FROM software WHERE id LIKE "+placeholder(1), "11111111-1111-1111-1111-%")
+	})
+}