Merged in feature/functestcov (pull request #84)

Function Test Coverage

* test

* scripts

internal/client/create_test.go

@@ -11,15 +11,14 @@ import (
 	"github.com/google/uuid"
 	"github.com/pashagolub/pgxmock/v3"
 	"github.com/stretchr/testify/assert"
+	"github.com/stretchr/testify/require"
 )
 
 func TestCreate(t *testing.T) {
 	ctx := context.Background()
 
 	pool, err := pgxmock.NewPool()
-	if err != nil {
-		t.Fatalf("failed to open pgxmock database: %v", err)
-	}
+	require.NoError(t, err)
 	cfg := &serviceconfig.BaseConfig{}
 	cfg.DBPool = pool
 	cfg.DBQueries = repository.New(pool)

internal/client/get_test.go

@@ -12,15 +12,14 @@ import (
 	"github.com/google/uuid"
 	"github.com/pashagolub/pgxmock/v3"
 	"github.com/stretchr/testify/assert"
+	"github.com/stretchr/testify/require"
 )
 
 func TestGet(t *testing.T) {
 	ctx := context.Background()
 
 	pool, err := pgxmock.NewPool()
-	if err != nil {
-		t.Fatalf("failed to open pgxmock database: %v", err)
-	}
+	require.NoError(t, err)
 	cfg := &serviceconfig.BaseConfig{}
 	cfg.DBPool = pool
 	cfg.DBQueries = repository.New(pool)

internal/client/service_test.go

@@ -8,13 +8,12 @@ import (
 
 	"github.com/pashagolub/pgxmock/v3"
 	"github.com/stretchr/testify/assert"
+	"github.com/stretchr/testify/require"
 )
 
 func TestService(t *testing.T) {
 	pool, err := pgxmock.NewPool()
-	if err != nil {
-		t.Fatalf("failed to open pgxmock database: %v", err)
-	}
+	require.NoError(t, err)
 	cfg := &serviceconfig.BaseConfig{}
 	cfg.DBPool = pool
 	cfg.DBQueries = repository.New(pool)

internal/client/update_test.go

@@ -10,15 +10,14 @@ import (
 	"github.com/google/uuid"
 	"github.com/pashagolub/pgxmock/v3"
 	"github.com/stretchr/testify/assert"
+	"github.com/stretchr/testify/require"
 )
 
 func TestUpdate(t *testing.T) {
 	ctx := context.Background()
 
 	pool, err := pgxmock.NewPool()
-	if err != nil {
-		t.Fatalf("failed to open pgxmock database: %v", err)
-	}
+	require.NoError(t, err)
 	cfg := &serviceconfig.BaseConfig{}
 	cfg.DBPool = pool
 	cfg.DBQueries = repository.New(pool)
@@ -115,9 +114,7 @@ func TestSubmitUpdate(t *testing.T) {
 	ctx := context.Background()
 
 	pool, err := pgxmock.NewPool()
-	if err != nil {
-		t.Fatalf("failed to open pgxmock database: %v", err)
-	}
+	require.NoError(t, err)
 	cfg := &serviceconfig.BaseConfig{}
 	cfg.DBPool = pool
 	cfg.DBQueries = repository.New(pool)

internal/database/repository/db_test.go

@@ -8,13 +8,12 @@ import (
 	"github.com/jackc/pgx/v5"
 	"github.com/pashagolub/pgxmock/v3"
 	"github.com/stretchr/testify/assert"
+	"github.com/stretchr/testify/require"
 )
 
 func TestQueriesNew(t *testing.T) {
 	pool, err := pgxmock.NewPool()
-	if err != nil {
-		t.Fatalf("failed to open pgxmock database: %v", err)
-	}
+	require.NoError(t, err)
 
 	queries := repository.New(pool)
 	assert.NotNil(t, queries)
@@ -24,9 +23,7 @@ func TestQueriesWithTx(t *testing.T) {
 	ctx := context.Background()
 
 	pool, err := pgxmock.NewPool()
-	if err != nil {
-		t.Fatalf("failed to open pgxmock database: %v", err)
-	}
+	require.NoError(t, err)
 
 	queries := repository.New(pool)
 	assert.NotNil(t, queries)

internal/database/repository/failtype_test.go

@@ -0,0 +1,41 @@
+package repository_test
+
+import (
+	"fmt"
+	"queryorchestration/internal/database/repository"
+	"testing"
+
+	"github.com/stretchr/testify/assert"
+)
+
+func TestFailTypeScan(t *testing.T) {
+	qType := repository.Cleanfailtype(fmt.Sprint(0))
+
+	stringType := "invalid_mimetype"
+	err := qType.Scan(stringType)
+	assert.NoError(t, err)
+}
+
+func TestNullFailTypeScan(t *testing.T) {
+	qType := repository.NullCleanfailtype{}
+
+	stringType := "invalid_mimetype"
+	err := qType.Scan(stringType)
+	assert.NoError(t, err)
+}
+
+func TestNullFailTypeValue(t *testing.T) {
+	qType := repository.NullCleanfailtype{}
+
+	stringType := "invalid_mimetype"
+	err := qType.Scan(stringType)
+	assert.NoError(t, err)
+
+	val, err := qType.Value()
+	assert.NoError(t, err)
+	assert.Equal(t, stringType, val)
+}
+
+func TestFailTypeValid(t *testing.T) {
+	assert.True(t, repository.CleanfailtypeInvalidMimetype.Valid())
+}

internal/database/repository/mimetype_test.go

@@ -0,0 +1,41 @@
+package repository_test
+
+import (
+	"fmt"
+	"queryorchestration/internal/database/repository"
+	"testing"
+
+	"github.com/stretchr/testify/assert"
+)
+
+func TestMimeTypeScan(t *testing.T) {
+	qType := repository.Cleanmimetype(fmt.Sprint(0))
+
+	stringType := "application/pdf"
+	err := qType.Scan(stringType)
+	assert.NoError(t, err)
+}
+
+func TestNullMimeTypeScan(t *testing.T) {
+	qType := repository.NullCleanmimetype{}
+
+	stringType := "application/pdf"
+	err := qType.Scan(stringType)
+	assert.NoError(t, err)
+}
+
+func TestNullMimeTypeValue(t *testing.T) {
+	qType := repository.NullCleanmimetype{}
+
+	stringType := "application/pdf"
+	err := qType.Scan(stringType)
+	assert.NoError(t, err)
+
+	val, err := qType.Value()
+	assert.NoError(t, err)
+	assert.Equal(t, stringType, val)
+}
+
+func TestMimeTypeValid(t *testing.T) {
+	assert.True(t, repository.CleanmimetypeApplicationPdf.Valid())
+}

internal/document/clean/clean_test.go

@@ -11,6 +11,8 @@ import (
 	"strings"
 	"testing"
 
+	"github.com/stretchr/testify/require"
+
 	"github.com/aws/aws-sdk-go-v2/service/s3"
 	"github.com/google/uuid"
 	"github.com/pashagolub/pgxmock/v3"
@@ -21,9 +23,7 @@ import (
 func TestClean(t *testing.T) {
 	ctx := context.Background()
 	pool, err := pgxmock.NewPool()
-	if err != nil {
-		t.Fatalf("failed to open pgxmock database: %v", err)
-	}
+	require.NoError(t, err)
 
 	cfg := &DocCleanConfig{}
 	cfg.DBPool = pool
@@ -166,9 +166,7 @@ func TestExecuteCleanTasks(t *testing.T) {
 func TestStoreClean(t *testing.T) {
 	ctx := context.Background()
 	pool, err := pgxmock.NewPool()
-	if err != nil {
-		t.Fatalf("failed to open pgxmock database: %v", err)
-	}
+	require.NoError(t, err)
 
 	cfg := &DocCleanConfig{}
 	cfg.DBPool = pool

internal/document/clean/create_test.go

@@ -22,6 +22,7 @@ import (
 	"github.com/pashagolub/pgxmock/v3"
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/mock"
+	"github.com/stretchr/testify/require"
 )
 
 type DocCleanConfig struct {
@@ -33,9 +34,7 @@ type DocCleanConfig struct {
 func TestCreate(t *testing.T) {
 	ctx := context.Background()
 	pool, err := pgxmock.NewPool()
-	if err != nil {
-		t.Fatalf("failed to open pgxmock database: %v", err)
-	}
+	require.NoError(t, err)
 
 	mockSQS := queuemock.NewMockSQSClient(t)
 

internal/document/get_test.go

@@ -8,6 +8,8 @@ import (
 	"queryorchestration/internal/serviceconfig"
 	"testing"
 
+	"github.com/stretchr/testify/require"
+
 	"github.com/google/uuid"
 	"github.com/pashagolub/pgxmock/v3"
 	"github.com/stretchr/testify/assert"
@@ -17,9 +19,7 @@ func TestGet(t *testing.T) {
 	ctx := context.Background()
 
 	pool, err := pgxmock.NewPool()
-	if err != nil {
-		t.Fatalf("failed to open pgxmock database: %v", err)
-	}
+	require.NoError(t, err)
 	cfg := &serviceconfig.BaseConfig{}
 	cfg.DBPool = pool
 	cfg.DBQueries = repository.New(pool)

internal/document/init/create_test.go

@@ -11,6 +11,8 @@ import (
 	queuemock "queryorchestration/mocks/queue"
 	"testing"
 
+	"github.com/stretchr/testify/require"
+
 	"github.com/aws/aws-sdk-go-v2/service/sqs"
 	"github.com/google/uuid"
 	"github.com/pashagolub/pgxmock/v3"
@@ -22,9 +24,7 @@ func TestCreate(t *testing.T) {
 	ctx := context.Background()
 
 	pool, err := pgxmock.NewPool()
-	if err != nil {
-		t.Fatalf("failed to open pgxmock database: %v", err)
-	}
+	require.NoError(t, err)
 	cfg := &DocInitConfig{}
 	cfg.DBPool = pool
 	cfg.DBQueries = repository.New(pool)
@@ -97,9 +97,7 @@ func TestGetCreateParams(t *testing.T) {
 	ctx := context.Background()
 
 	pool, err := pgxmock.NewPool()
-	if err != nil {
-		t.Fatalf("failed to open pgxmock database: %v", err)
-	}
+	require.NoError(t, err)
 	cfg := &DocInitConfig{}
 	cfg.DBPool = pool
 	cfg.DBQueries = repository.New(pool)
@@ -136,9 +134,7 @@ func TestGetCreateParamsExisting(t *testing.T) {
 	ctx := context.Background()
 
 	pool, err := pgxmock.NewPool()
-	if err != nil {
-		t.Fatalf("failed to open pgxmock database: %v", err)
-	}
+	require.NoError(t, err)
 	cfg := &DocInitConfig{}
 	cfg.DBPool = pool
 	cfg.DBQueries = repository.New(pool)
@@ -179,9 +175,7 @@ func TestGetCreateParamsCurrentDocErr(t *testing.T) {
 	ctx := context.Background()
 
 	pool, err := pgxmock.NewPool()
-	if err != nil {
-		t.Fatalf("failed to open pgxmock database: %v", err)
-	}
+	require.NoError(t, err)
 	cfg := &DocInitConfig{}
 	cfg.DBPool = pool
 	cfg.DBQueries = repository.New(pool)
@@ -211,9 +205,7 @@ func TestSubmitCreate(t *testing.T) {
 	ctx := context.Background()
 
 	pool, err := pgxmock.NewPool()
-	if err != nil {
-		t.Fatalf("failed to open pgxmock database: %v", err)
-	}
+	require.NoError(t, err)
 	cfg := &DocInitConfig{}
 	cfg.DBPool = pool
 	cfg.DBQueries = repository.New(pool)
@@ -253,9 +245,7 @@ func TestSubmitCreateExists(t *testing.T) {
 	ctx := context.Background()
 
 	pool, err := pgxmock.NewPool()
-	if err != nil {
-		t.Fatalf("failed to open pgxmock database: %v", err)
-	}
+	require.NoError(t, err)
 	cfg := &DocInitConfig{}
 	cfg.DBPool = pool
 	cfg.DBQueries = repository.New(pool)

internal/document/list_test.go

@@ -11,15 +11,14 @@ import (
 	"github.com/google/uuid"
 	"github.com/pashagolub/pgxmock/v3"
 	"github.com/stretchr/testify/assert"
+	"github.com/stretchr/testify/require"
 )
 
 func TestListByJobId(t *testing.T) {
 	ctx := context.Background()
 
 	pool, err := pgxmock.NewPool()
-	if err != nil {
-		t.Fatalf("failed to open pgxmock database: %v", err)
-	}
+	require.NoError(t, err)
 	cfg := &serviceconfig.BaseConfig{}
 	cfg.DBPool = pool
 	cfg.DBQueries = repository.New(pool)

internal/document/sync/sync_test.go

@@ -12,6 +12,8 @@ import (
 	queuemock "queryorchestration/mocks/queue"
 	"testing"
 
+	"github.com/stretchr/testify/require"
+
 	"github.com/aws/aws-sdk-go-v2/service/sqs"
 	"github.com/google/uuid"
 	"github.com/pashagolub/pgxmock/v3"
@@ -23,9 +25,7 @@ func TestSync(t *testing.T) {
 	ctx := context.Background()
 
 	pool, err := pgxmock.NewPool()
-	if err != nil {
-		t.Fatalf("failed to open pgxmock database: %v", err)
-	}
+	require.NoError(t, err)
 	cfg := &DocSyncConfig{}
 	cfg.DBPool = pool
 	cfg.DBQueries = repository.New(pool)

internal/document/text/create_test.go

@@ -12,6 +12,8 @@ import (
 	queuemock "queryorchestration/mocks/queue"
 	"testing"
 
+	"github.com/stretchr/testify/require"
+
 	"github.com/aws/aws-sdk-go-v2/service/sqs"
 	"github.com/google/uuid"
 	"github.com/pashagolub/pgxmock/v3"
@@ -27,9 +29,7 @@ type DocTextConfig struct {
 func TestCreate(t *testing.T) {
 	ctx := context.Background()
 	pool, err := pgxmock.NewPool()
-	if err != nil {
-		t.Fatalf("failed to open pgxmock database: %v", err)
-	}
+	require.NoError(t, err)
 
 	mockSQS := queuemock.NewMockSQSClient(t)
 

internal/document/text/extract_test.go

@@ -8,6 +8,8 @@ import (
 	textversion "queryorchestration/internal/document/text/version"
 	"testing"
 
+	"github.com/stretchr/testify/require"
+
 	"github.com/google/uuid"
 	"github.com/pashagolub/pgxmock/v3"
 	"github.com/stretchr/testify/assert"
@@ -16,9 +18,7 @@ import (
 func TestExtract(t *testing.T) {
 	ctx := context.Background()
 	pool, err := pgxmock.NewPool()
-	if err != nil {
-		t.Fatalf("failed to open pgxmock database: %v", err)
-	}
+	require.NoError(t, err)
 
 	cfg := &DocTextConfig{}
 	cfg.DBPool = pool

internal/job/collector/create_test.go

@@ -8,6 +8,8 @@ import (
 	"queryorchestration/internal/serviceconfig"
 	"testing"
 
+	"github.com/stretchr/testify/require"
+
 	"github.com/google/uuid"
 	"github.com/jackc/pgx/v5"
 	"github.com/pashagolub/pgxmock/v3"
@@ -18,9 +20,7 @@ func TestCreate(t *testing.T) {
 	ctx := context.Background()
 
 	pool, err := pgxmock.NewPool()
-	if err != nil {
-		t.Fatalf("failed to open pgxmock database: %v", err)
-	}
+	require.NoError(t, err)
 	cfg := &serviceconfig.BaseConfig{}
 	cfg.DBPool = pool
 	cfg.DBQueries = repository.New(pool)

internal/job/collector/createprivate_test.go

@@ -12,15 +12,14 @@ import (
 	"github.com/jackc/pgx/v5/pgtype"
 	"github.com/pashagolub/pgxmock/v3"
 	"github.com/stretchr/testify/assert"
+	"github.com/stretchr/testify/require"
 )
 
 func TestGetCreateParams(t *testing.T) {
 	ctx := context.Background()
 
 	pool, err := pgxmock.NewPool()
-	if err != nil {
-		t.Fatalf("failed to open pgxmock database: %v", err)
-	}
+	require.NoError(t, err)
 	cfg := &serviceconfig.BaseConfig{}
 	cfg.DBPool = pool
 	cfg.DBQueries = repository.New(pool)
@@ -67,9 +66,7 @@ func TestSubmitCreate(t *testing.T) {
 	ctx := context.Background()
 
 	pool, err := pgxmock.NewPool()
-	if err != nil {
-		t.Fatalf("failed to open pgxmock database: %v", err)
-	}
+	require.NoError(t, err)
 	cfg := &serviceconfig.BaseConfig{}
 	cfg.DBPool = pool
 	cfg.DBQueries = repository.New(pool)
@@ -113,9 +110,7 @@ func TestNormalizeFieldsToDB(t *testing.T) {
 	ctx := context.Background()
 
 	pool, err := pgxmock.NewPool()
-	if err != nil {
-		t.Fatalf("failed to open pgxmock database: %v", err)
-	}
+	require.NoError(t, err)
 	cfg := &serviceconfig.BaseConfig{}
 	cfg.DBPool = pool
 	cfg.DBQueries = repository.New(pool)

internal/job/collector/get_test.go

@@ -6,21 +6,21 @@ import (
 	"queryorchestration/internal/database"
 	"queryorchestration/internal/database/repository"
 	"queryorchestration/internal/job/collector"
+	resultprocessor "queryorchestration/internal/query/result/processor"
 	"queryorchestration/internal/serviceconfig"
 	"testing"
 
 	"github.com/google/uuid"
 	"github.com/pashagolub/pgxmock/v3"
 	"github.com/stretchr/testify/assert"
+	"github.com/stretchr/testify/require"
 )
 
 func TestGet(t *testing.T) {
 	ctx := context.Background()
 
 	pool, err := pgxmock.NewPool()
-	if err != nil {
-		t.Fatalf("failed to open pgxmock database: %v", err)
-	}
+	require.NoError(t, err)
 	cfg := &serviceconfig.BaseConfig{}
 	cfg.DBPool = pool
 	cfg.DBQueries = repository.New(pool)
@@ -53,9 +53,7 @@ func TestGetByJobID(t *testing.T) {
 	ctx := context.Background()
 
 	pool, err := pgxmock.NewPool()
-	if err != nil {
-		t.Fatalf("failed to open pgxmock database: %v", err)
-	}
+	require.NoError(t, err)
 	cfg := &serviceconfig.BaseConfig{}
 	cfg.DBPool = pool
 	cfg.DBQueries = repository.New(pool)
@@ -83,3 +81,34 @@ func TestGetByJobID(t *testing.T) {
 	assert.NoError(t, err)
 	assert.EqualExportedValues(t, ogc, *coll)
 }
+
+func TestListQueries(t *testing.T) {
+	ctx := context.Background()
+
+	pool, err := pgxmock.NewPool()
+	require.NoError(t, err)
+	cfg := &serviceconfig.BaseConfig{}
+	cfg.DBPool = pool
+	cfg.DBQueries = repository.New(pool)
+
+	svc := collector.New(cfg, &collector.Services{})
+
+	jobId := uuid.New()
+	ogc := []*resultprocessor.Query{
+		{
+			ID:      uuid.New(),
+			Type:    resultprocessor.TypeContextFull,
+			Version: 2,
+		},
+	}
+
+	pool.ExpectQuery("name: ListCollectorQueries :many").WithArgs(database.MustToDBUUID(jobId)).
+		WillReturnRows(
+			pgxmock.NewRows([]string{"jobId", "queryId", "type", "queryVersion", "requiredIds"}).
+				AddRow(database.MustToDBUUID(jobId), database.MustToDBUUID(ogc[0].ID), repository.QuerytypeContextFull, int32(2), nil),
+		)
+
+	qs, err := svc.ListQueries(ctx, jobId)
+	assert.NoError(t, err)
+	assert.EqualExportedValues(t, ogc, qs)
+}

internal/job/collector/service_test.go

@@ -8,13 +8,12 @@ import (
 
 	"github.com/pashagolub/pgxmock/v3"
 	"github.com/stretchr/testify/assert"
+	"github.com/stretchr/testify/require"
 )
 
 func TestService(t *testing.T) {
 	pool, err := pgxmock.NewPool()
-	if err != nil {
-		t.Fatalf("failed to open pgxmock database: %v", err)
-	}
+	require.NoError(t, err)
 	cfg := &serviceconfig.BaseConfig{}
 	cfg.DBPool = pool
 	cfg.DBQueries = repository.New(pool)

internal/job/collector/update/service_test.go

@@ -8,13 +8,12 @@ import (
 
 	"github.com/pashagolub/pgxmock/v3"
 	"github.com/stretchr/testify/assert"
+	"github.com/stretchr/testify/require"
 )
 
 func TestService(t *testing.T) {
 	pool, err := pgxmock.NewPool()
-	if err != nil {
-		t.Fatalf("failed to open pgxmock database: %v", err)
-	}
+	require.NoError(t, err)
 	cfg := &serviceconfig.BaseConfig{}
 	cfg.DBPool = pool
 	cfg.DBQueries = repository.New(pool)

internal/job/collector/update/update_test.go

@@ -18,6 +18,7 @@ import (
 	"github.com/pashagolub/pgxmock/v3"
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/mock"
+	"github.com/stretchr/testify/require"
 )
 
 type CollectorUpdateConfig struct {
@@ -29,9 +30,7 @@ func TestUpdate(t *testing.T) {
 	ctx := context.Background()
 
 	pool, err := pgxmock.NewPool()
-	if err != nil {
-		t.Fatalf("failed to open pgxmock database: %v", err)
-	}
+	require.NoError(t, err)
 	cfg := &CollectorUpdateConfig{}
 	cfg.DBPool = pool
 	cfg.DBQueries = repository.New(pool)

internal/job/collector/update/updateprivate_test.go

@@ -20,6 +20,7 @@ import (
 	"github.com/pashagolub/pgxmock/v3"
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/mock"
+	"github.com/stretchr/testify/require"
 )
 
 type CollectorUpdateConfig struct {
@@ -32,9 +33,7 @@ func TestGetUpdateParams(t *testing.T) {
 		ctx := context.Background()
 
 		pool, err := pgxmock.NewPool()
-		if err != nil {
-			t.Fatalf("failed to open pgxmock database: %v", err)
-		}
+		require.NoError(t, err)
 		cfg := &CollectorUpdateConfig{}
 		cfg.DBPool = pool
 		cfg.DBQueries = repository.New(pool)
@@ -90,9 +89,7 @@ func TestGetUpdateParams(t *testing.T) {
 		ctx := context.Background()
 
 		pool, err := pgxmock.NewPool()
-		if err != nil {
-			t.Fatalf("failed to open pgxmock database: %v", err)
-		}
+		require.NoError(t, err)
 		cfg := &CollectorUpdateConfig{}
 		cfg.DBPool = pool
 		cfg.DBQueries = repository.New(pool)
@@ -114,9 +111,7 @@ func TestGetUpdateParams(t *testing.T) {
 		ctx := context.Background()
 
 		pool, err := pgxmock.NewPool()
-		if err != nil {
-			t.Fatalf("failed to open pgxmock database: %v", err)
-		}
+		require.NoError(t, err)
 		cfg := &CollectorUpdateConfig{}
 		cfg.DBPool = pool
 		cfg.DBQueries = repository.New(pool)
@@ -143,9 +138,7 @@ func TestGetUpdateParams(t *testing.T) {
 		ctx := context.Background()
 
 		pool, err := pgxmock.NewPool()
-		if err != nil {
-			t.Fatalf("failed to open pgxmock database: %v", err)
-		}
+		require.NoError(t, err)
 		cfg := &CollectorUpdateConfig{}
 		cfg.DBPool = pool
 		cfg.DBQueries = repository.New(pool)
@@ -177,9 +170,7 @@ func TestSubmitUpdate(t *testing.T) {
 		ctx := context.Background()
 
 		pool, err := pgxmock.NewPool()
-		if err != nil {
-			t.Fatalf("failed to open pgxmock database: %v", err)
-		}
+		require.NoError(t, err)
 		cfg := &CollectorUpdateConfig{}
 		cfg.DBPool = pool
 		cfg.DBQueries = repository.New(pool)
@@ -247,9 +238,7 @@ func TestSubmitUpdate(t *testing.T) {
 		ctx := context.Background()
 
 		pool, err := pgxmock.NewPool()
-		if err != nil {
-			t.Fatalf("failed to open pgxmock database: %v", err)
-		}
+		require.NoError(t, err)
 		cfg := &CollectorUpdateConfig{}
 		cfg.DBPool = pool
 		cfg.DBQueries = repository.New(pool)
@@ -543,9 +532,7 @@ func TestNormalizeUpdateFieldsToDB(t *testing.T) {
 		ctx := context.Background()
 
 		pool, err := pgxmock.NewPool()
-		if err != nil {
-			t.Fatalf("failed to open pgxmock database: %v", err)
-		}
+		require.NoError(t, err)
 		cfg := &CollectorUpdateConfig{}
 		cfg.DBPool = pool
 		cfg.DBQueries = repository.New(pool)
@@ -578,9 +565,7 @@ func TestNormalizeUpdateFieldsToDB(t *testing.T) {
 		ctx := context.Background()
 
 		pool, err := pgxmock.NewPool()
-		if err != nil {
-			t.Fatalf("failed to open pgxmock database: %v", err)
-		}
+		require.NoError(t, err)
 		cfg := &CollectorUpdateConfig{}
 		cfg.DBPool = pool
 		cfg.DBQueries = repository.New(pool)
@@ -633,9 +618,7 @@ func TestInformUpdate(t *testing.T) {
 		ctx := context.Background()
 
 		pool, err := pgxmock.NewPool()
-		if err != nil {
-			t.Fatalf("failed to open pgxmock database: %v", err)
-		}
+		require.NoError(t, err)
 		cfg := &CollectorUpdateConfig{}
 		cfg.DBPool = pool
 		cfg.DBQueries = repository.New(pool)
@@ -668,9 +651,7 @@ func TestInformUpdate(t *testing.T) {
 		ctx := context.Background()
 
 		pool, err := pgxmock.NewPool()
-		if err != nil {
-			t.Fatalf("failed to open pgxmock database: %v", err)
-		}
+		require.NoError(t, err)
 		cfg := &CollectorUpdateConfig{}
 		cfg.DBPool = pool
 		cfg.DBQueries = repository.New(pool)

internal/job/create_test.go

@@ -13,15 +13,14 @@ import (
 	"github.com/jackc/pgx/v5"
 	"github.com/pashagolub/pgxmock/v3"
 	"github.com/stretchr/testify/assert"
+	"github.com/stretchr/testify/require"
 )
 
 func TestCreate(t *testing.T) {
 	ctx := context.Background()
 
 	pool, err := pgxmock.NewPool()
-	if err != nil {
-		t.Fatalf("failed to open pgxmock database: %v", err)
-	}
+	require.NoError(t, err)
 	cfg := &serviceconfig.BaseConfig{}
 	cfg.DBPool = pool
 	cfg.DBQueries = repository.New(pool)

internal/job/get_test.go

@@ -10,6 +10,8 @@ import (
 	"queryorchestration/internal/serviceconfig"
 	"testing"
 
+	"github.com/stretchr/testify/require"
+
 	"github.com/google/uuid"
 	"github.com/pashagolub/pgxmock/v3"
 	"github.com/stretchr/testify/assert"
@@ -19,9 +21,7 @@ func TestGet(t *testing.T) {
 	ctx := context.Background()
 
 	pool, err := pgxmock.NewPool()
-	if err != nil {
-		t.Fatalf("failed to open pgxmock database: %v", err)
-	}
+	require.NoError(t, err)
 	cfg := &serviceconfig.BaseConfig{}
 	cfg.DBPool = pool
 	cfg.DBQueries = repository.New(pool)
@@ -78,9 +78,7 @@ func TestGetWithStatus(t *testing.T) {
 	ctx := context.Background()
 
 	pool, err := pgxmock.NewPool()
-	if err != nil {
-		t.Fatalf("failed to open pgxmock database: %v", err)
-	}
+	require.NoError(t, err)
 	cfg := &serviceconfig.BaseConfig{}
 	cfg.DBPool = pool
 	cfg.DBQueries = repository.New(pool)

internal/job/service_test.go

@@ -8,13 +8,12 @@ import (
 
 	"github.com/pashagolub/pgxmock/v3"
 	"github.com/stretchr/testify/assert"
+	"github.com/stretchr/testify/require"
 )
 
 func TestService(t *testing.T) {
 	pool, err := pgxmock.NewPool()
-	if err != nil {
-		t.Fatalf("failed to open pgxmock database: %v", err)
-	}
+	require.NoError(t, err)
 	cfg := &serviceconfig.BaseConfig{}
 	cfg.DBPool = pool
 	cfg.DBQueries = repository.New(pool)

internal/job/status_test.go

@@ -12,6 +12,7 @@ import (
 	"github.com/google/uuid"
 	"github.com/pashagolub/pgxmock/v3"
 	"github.com/stretchr/testify/assert"
+	"github.com/stretchr/testify/require"
 )
 
 func TestGetStatus(t *testing.T) {
@@ -19,9 +20,7 @@ func TestGetStatus(t *testing.T) {
 		ctx := context.Background()
 
 		pool, err := pgxmock.NewPool()
-		if err != nil {
-			t.Fatalf("failed to open pgxmock database: %v", err)
-		}
+		require.NoError(t, err)
 		cfg := &serviceconfig.BaseConfig{}
 		cfg.DBPool = pool
 		cfg.DBQueries = repository.New(pool)
@@ -43,9 +42,7 @@ func TestGetStatus(t *testing.T) {
 		ctx := context.Background()
 
 		pool, err := pgxmock.NewPool()
-		if err != nil {
-			t.Fatalf("failed to open pgxmock database: %v", err)
-		}
+		require.NoError(t, err)
 		cfg := &serviceconfig.BaseConfig{}
 		cfg.DBPool = pool
 		cfg.DBQueries = repository.New(pool)
@@ -67,9 +64,7 @@ func TestGetStatus(t *testing.T) {
 		ctx := context.Background()
 
 		pool, err := pgxmock.NewPool()
-		if err != nil {
-			t.Fatalf("failed to open pgxmock database: %v", err)
-		}
+		require.NoError(t, err)
 		cfg := &serviceconfig.BaseConfig{}
 		cfg.DBPool = pool
 		cfg.DBQueries = repository.New(pool)

internal/job/sync/sync_test.go

@@ -16,6 +16,7 @@ import (
 	"github.com/pashagolub/pgxmock/v3"
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/mock"
+	"github.com/stretchr/testify/require"
 )
 
 type JobSyncConfig struct {
@@ -28,9 +29,7 @@ func TestTrigger(t *testing.T) {
 		ctx := context.Background()
 
 		pool, err := pgxmock.NewPool()
-		if err != nil {
-			t.Fatalf("failed to open pgxmock database: %v", err)
-		}
+		require.NoError(t, err)
 
 		cfg := &JobSyncConfig{}
 		cfg.DBPool = pool
@@ -91,9 +90,7 @@ func TestTrigger(t *testing.T) {
 		ctx := context.Background()
 
 		pool, err := pgxmock.NewPool()
-		if err != nil {
-			t.Fatalf("failed to open pgxmock database: %v", err)
-		}
+		require.NoError(t, err)
 
 		cfg := &JobSyncConfig{}
 		cfg.DBPool = pool

internal/job/update_test.go

@@ -12,15 +12,14 @@ import (
 	"github.com/google/uuid"
 	"github.com/pashagolub/pgxmock/v3"
 	"github.com/stretchr/testify/assert"
+	"github.com/stretchr/testify/require"
 )
 
 func TestUpdate(t *testing.T) {
 	ctx := context.Background()
 
 	pool, err := pgxmock.NewPool()
-	if err != nil {
-		t.Fatalf("failed to open pgxmock database: %v", err)
-	}
+	require.NoError(t, err)
 	cfg := &serviceconfig.BaseConfig{}
 	cfg.DBPool = pool
 	cfg.DBQueries = repository.New(pool)

internal/job/updateprivate_test.go

@@ -11,15 +11,14 @@ import (
 	"github.com/google/uuid"
 	"github.com/pashagolub/pgxmock/v3"
 	"github.com/stretchr/testify/assert"
+	"github.com/stretchr/testify/require"
 )
 
 func TestNormalizeCanSync(t *testing.T) {
 	ctx := context.Background()
 
 	pool, err := pgxmock.NewPool()
-	if err != nil {
-		t.Fatalf("failed to open pgxmock database: %v", err)
-	}
+	require.NoError(t, err)
 	cfg := &serviceconfig.BaseConfig{}
 	cfg.DBPool = pool
 	cfg.DBQueries = repository.New(pool)
@@ -95,9 +94,7 @@ func TestNormalizeUpdate(t *testing.T) {
 	ctx := context.Background()
 
 	pool, err := pgxmock.NewPool()
-	if err != nil {
-		t.Fatalf("failed to open pgxmock database: %v", err)
-	}
+	require.NoError(t, err)
 	cfg := &serviceconfig.BaseConfig{}
 	cfg.DBPool = pool
 	cfg.DBQueries = repository.New(pool)
@@ -128,9 +125,7 @@ func TestSubmitUpdate(t *testing.T) {
 	ctx := context.Background()
 
 	pool, err := pgxmock.NewPool()
-	if err != nil {
-		t.Fatalf("failed to open pgxmock database: %v", err)
-	}
+	require.NoError(t, err)
 	cfg := &serviceconfig.BaseConfig{}
 	cfg.DBPool = pool
 	cfg.DBQueries = repository.New(pool)

internal/query/create_test.go

@@ -10,6 +10,8 @@ import (
 	"queryorchestration/internal/serviceconfig"
 	"testing"
 
+	"github.com/stretchr/testify/require"
+
 	"github.com/google/uuid"
 	"github.com/jackc/pgx/v5"
 	"github.com/pashagolub/pgxmock/v3"
@@ -20,9 +22,7 @@ func TestCreate(t *testing.T) {
 	ctx := context.Background()
 
 	pool, err := pgxmock.NewPool()
-	if err != nil {
-		t.Fatalf("failed to open pgxmock database: %v", err)
-	}
+	require.NoError(t, err)
 	cfg := &serviceconfig.BaseConfig{}
 	cfg.DBPool = pool
 	cfg.DBQueries = repository.New(pool)
@@ -78,9 +78,7 @@ func TestCreateMinimal(t *testing.T) {
 	ctx := context.Background()
 
 	pool, err := pgxmock.NewPool()
-	if err != nil {
-		t.Fatalf("failed to open pgxmock database: %v", err)
-	}
+	require.NoError(t, err)
 	cfg := &serviceconfig.BaseConfig{}
 	cfg.DBPool = pool
 	cfg.DBQueries = repository.New(pool)
@@ -119,9 +117,7 @@ func TestCreateRollback(t *testing.T) {
 	ctx := context.Background()
 
 	pool, err := pgxmock.NewPool()
-	if err != nil {
-		t.Fatalf("failed to open pgxmock database: %v", err)
-	}
+	require.NoError(t, err)
 	cfg := &serviceconfig.BaseConfig{}
 	cfg.DBPool = pool
 	cfg.DBQueries = repository.New(pool)

internal/query/createprivate_test.go

@@ -12,13 +12,12 @@ import (
 	"github.com/jackc/pgx/v5"
 	"github.com/pashagolub/pgxmock/v3"
 	"github.com/stretchr/testify/assert"
+	"github.com/stretchr/testify/require"
 )
 
 func TestGetCreator(t *testing.T) {
 	pool, err := pgxmock.NewPool()
-	if err != nil {
-		t.Fatalf("failed to open pgxmock database: %v", err)
-	}
+	require.NoError(t, err)
 	cfg := &serviceconfig.BaseConfig{}
 	cfg.DBPool = pool
 	cfg.DBQueries = repository.New(pool)
@@ -78,9 +77,7 @@ func TestSubmitCreate(t *testing.T) {
 	ctx := context.Background()
 
 	pool, err := pgxmock.NewPool()
-	if err != nil {
-		t.Fatalf("failed to open pgxmock database: %v", err)
-	}
+	require.NoError(t, err)
 	cfg := &serviceconfig.BaseConfig{}
 	cfg.DBPool = pool
 	cfg.DBQueries = repository.New(pool)
@@ -132,9 +129,7 @@ func TestSubmitCreateNoReqsOrConfig(t *testing.T) {
 	ctx := context.Background()
 
 	pool, err := pgxmock.NewPool()
-	if err != nil {
-		t.Fatalf("failed to open pgxmock database: %v", err)
-	}
+	require.NoError(t, err)
 	cfg := &serviceconfig.BaseConfig{}
 	cfg.DBPool = pool
 	cfg.DBQueries = repository.New(pool)
@@ -173,9 +168,7 @@ func TestNormalizeCreate(t *testing.T) {
 	ctx := context.Background()
 
 	pool, err := pgxmock.NewPool()
-	if err != nil {
-		t.Fatalf("failed to open pgxmock database: %v", err)
-	}
+	require.NoError(t, err)
 	cfg := &serviceconfig.BaseConfig{}
 	cfg.DBPool = pool
 	cfg.DBQueries = repository.New(pool)

internal/query/get_test.go

@@ -12,15 +12,14 @@ import (
 	"github.com/google/uuid"
 	"github.com/pashagolub/pgxmock/v3"
 	"github.com/stretchr/testify/assert"
+	"github.com/stretchr/testify/require"
 )
 
 func TestGet(t *testing.T) {
 	ctx := context.Background()
 
 	pool, err := pgxmock.NewPool()
-	if err != nil {
-		t.Fatalf("failed to open pgxmock database: %v", err)
-	}
+	require.NoError(t, err)
 	cfg := &serviceconfig.BaseConfig{}
 	cfg.DBPool = pool
 	cfg.DBQueries = repository.New(pool)
@@ -55,9 +54,7 @@ func TestGetWithVersion(t *testing.T) {
 	ctx := context.Background()
 
 	pool, err := pgxmock.NewPool()
-	if err != nil {
-		t.Fatalf("failed to open pgxmock database: %v", err)
-	}
+	require.NoError(t, err)
 	cfg := &serviceconfig.BaseConfig{}
 	cfg.DBPool = pool
 	cfg.DBQueries = repository.New(pool)

internal/query/list_test.go

@@ -12,6 +12,8 @@ import (
 	"github.com/google/uuid"
 	"github.com/jackc/pgx/v5/pgtype"
 	"github.com/pashagolub/pgxmock/v3"
+	"github.com/stretchr/testify/require"
+
 	"github.com/stretchr/testify/assert"
 )
 
@@ -19,9 +21,7 @@ func TestList(t *testing.T) {
 	ctx := context.Background()
 
 	pool, err := pgxmock.NewPool()
-	if err != nil {
-		t.Fatalf("failed to open pgxmock database: %v", err)
-	}
+	require.NoError(t, err)
 	cfg := &serviceconfig.BaseConfig{}
 	cfg.DBPool = pool
 	cfg.DBQueries = repository.New(pool)
@@ -56,9 +56,7 @@ func TestListById(t *testing.T) {
 	ctx := context.Background()
 
 	pool, err := pgxmock.NewPool()
-	if err != nil {
-		t.Fatalf("failed to open pgxmock database: %v", err)
-	}
+	require.NoError(t, err)
 	cfg := &serviceconfig.BaseConfig{}
 	cfg.DBPool = pool
 	cfg.DBQueries = repository.New(pool)

internal/query/normalize_test.go

@@ -12,6 +12,7 @@ import (
 	"github.com/google/uuid"
 	"github.com/pashagolub/pgxmock/v3"
 	"github.com/stretchr/testify/assert"
+	"github.com/stretchr/testify/require"
 )
 
 func TestNormalizeConfig(t *testing.T) {
@@ -72,9 +73,7 @@ func TestNormalizeQueryIDs(t *testing.T) {
 	ctx := context.Background()
 
 	pool, err := pgxmock.NewPool()
-	if err != nil {
-		t.Fatalf("failed to open pgxmock database: %v", err)
-	}
+	require.NoError(t, err)
 	cfg := &serviceconfig.BaseConfig{}
 	cfg.DBPool = pool
 	cfg.DBQueries = repository.New(pool)

internal/query/result/get_test.go

@@ -13,6 +13,7 @@ import (
 	"github.com/jackc/pgx/v5/pgtype"
 	"github.com/pashagolub/pgxmock/v3"
 	"github.com/stretchr/testify/assert"
+	"github.com/stretchr/testify/require"
 )
 
 func TestGetValueByType(t *testing.T) {
@@ -32,9 +33,7 @@ func TestGetValueWithVersion(t *testing.T) {
 	ctx := context.Background()
 
 	pool, err := pgxmock.NewPool()
-	if err != nil {
-		t.Fatalf("failed to open pgxmock database: %v", err)
-	}
+	require.NoError(t, err)
 	cfg := &serviceconfig.BaseConfig{}
 	cfg.DBPool = pool
 	cfg.DBQueries = repository.New(pool)

internal/query/result/process_test.go

@@ -13,15 +13,14 @@ import (
 	"github.com/google/uuid"
 	"github.com/pashagolub/pgxmock/v3"
 	"github.com/stretchr/testify/assert"
+	"github.com/stretchr/testify/require"
 )
 
 func TestProcess(t *testing.T) {
 	ctx := context.Background()
 
 	pool, err := pgxmock.NewPool()
-	if err != nil {
-		t.Fatalf("failed to open pgxmock database: %v", err)
-	}
+	require.NoError(t, err)
 	cfg := &serviceconfig.BaseConfig{}
 	cfg.DBPool = pool
 	cfg.DBQueries = repository.New(pool)
@@ -71,9 +70,7 @@ func TestListRequiredValue(t *testing.T) {
 	ctx := context.Background()
 
 	pool, err := pgxmock.NewPool()
-	if err != nil {
-		t.Fatalf("failed to open pgxmock database: %v", err)
-	}
+	require.NoError(t, err)
 	cfg := &serviceconfig.BaseConfig{}
 	cfg.DBPool = pool
 	cfg.DBQueries = repository.New(pool)

internal/query/result/service_test.go

@@ -8,13 +8,12 @@ import (
 
 	"github.com/pashagolub/pgxmock/v3"
 	"github.com/stretchr/testify/assert"
+	"github.com/stretchr/testify/require"
 )
 
 func TestService(t *testing.T) {
 	pool, err := pgxmock.NewPool()
-	if err != nil {
-		t.Fatalf("failed to open pgxmock database: %v", err)
-	}
+	require.NoError(t, err)
 	cfg := &serviceconfig.BaseConfig{}
 	cfg.DBPool = pool
 	cfg.DBQueries = repository.New(pool)

internal/query/result/set/set_test.go

@@ -14,6 +14,8 @@ import (
 	queuemock "queryorchestration/mocks/queue"
 	"testing"
 
+	"github.com/stretchr/testify/require"
+
 	"github.com/aws/aws-sdk-go-v2/service/sqs"
 	"github.com/google/uuid"
 	"github.com/pashagolub/pgxmock/v3"
@@ -30,9 +32,7 @@ func TestSet(t *testing.T) {
 	ctx := context.Background()
 
 	pool, err := pgxmock.NewPool()
-	if err != nil {
-		t.Fatalf("failed to open pgxmock database: %v", err)
-	}
+	require.NoError(t, err)
 	cfg := &ResultSetConfig{}
 	cfg.DBPool = pool
 	cfg.DBQueries = repository.New(pool)
@@ -128,9 +128,7 @@ func TestInformQueryDependents(t *testing.T) {
 	ctx := context.Background()
 
 	pool, err := pgxmock.NewPool()
-	if err != nil {
-		t.Fatalf("failed to open pgxmock database: %v", err)
-	}
+	require.NoError(t, err)
 	cfg := &ResultSetConfig{}
 	cfg.DBPool = pool
 	cfg.DBQueries = repository.New(pool)

internal/query/result/sync/trigger_test.go

@@ -9,6 +9,8 @@ import (
 	queuemock "queryorchestration/mocks/queue"
 	"testing"
 
+	"github.com/stretchr/testify/require"
+
 	"github.com/aws/aws-sdk-go-v2/service/sqs"
 	"github.com/google/uuid"
 	"github.com/pashagolub/pgxmock/v3"
@@ -25,9 +27,7 @@ func TestTriggerSync(t *testing.T) {
 	ctx := context.Background()
 
 	pool, err := pgxmock.NewPool()
-	if err != nil {
-		t.Fatalf("failed to open pgxmock database: %v", err)
-	}
+	require.NoError(t, err)
 	cfg := &ResultSyncConfig{}
 	cfg.DBPool = pool
 	cfg.DBQueries = repository.New(pool)
@@ -62,9 +62,7 @@ func TestTriggerMultiSync(t *testing.T) {
 	ctx := context.Background()
 
 	pool, err := pgxmock.NewPool()
-	if err != nil {
-		t.Fatalf("failed to open pgxmock database: %v", err)
-	}
+	require.NoError(t, err)
 	cfg := &ResultSyncConfig{}
 	cfg.DBPool = pool
 	cfg.DBQueries = repository.New(pool)

internal/query/service_test.go

@@ -8,13 +8,12 @@ import (
 
 	"github.com/pashagolub/pgxmock/v3"
 	"github.com/stretchr/testify/assert"
+	"github.com/stretchr/testify/require"
 )
 
 func TestService(t *testing.T) {
 	pool, err := pgxmock.NewPool()
-	if err != nil {
-		t.Fatalf("failed to open pgxmock database: %v", err)
-	}
+	require.NoError(t, err)
 	cfg := &serviceconfig.BaseConfig{}
 	cfg.DBPool = pool
 	cfg.DBQueries = repository.New(pool)

internal/query/sync/service_test.go

@@ -9,6 +9,7 @@ import (
 
 	"github.com/pashagolub/pgxmock/v3"
 	"github.com/stretchr/testify/assert"
+	"github.com/stretchr/testify/require"
 )
 
 type QuerySyncConfig struct {
@@ -18,9 +19,7 @@ type QuerySyncConfig struct {
 
 func TestService(t *testing.T) {
 	pool, err := pgxmock.NewPool()
-	if err != nil {
-		t.Fatalf("failed to open pgxmock database: %v", err)
-	}
+	require.NoError(t, err)
 	cfg := &QuerySyncConfig{}
 	cfg.DBPool = pool
 	cfg.DBQueries = repository.New(pool)

internal/query/sync/sync_test.go

@@ -16,6 +16,7 @@ import (
 	"github.com/pashagolub/pgxmock/v3"
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/mock"
+	"github.com/stretchr/testify/require"
 )
 
 type QuerySyncConfig struct {
@@ -26,9 +27,7 @@ type QuerySyncConfig struct {
 func TestSync(t *testing.T) {
 	ctx := context.Background()
 	pool, err := pgxmock.NewPool()
-	if err != nil {
-		t.Fatalf("failed to open pgxmock database: %v", err)
-	}
+	require.NoError(t, err)
 	cfg := &QuerySyncConfig{}
 	cfg.DBPool = pool
 	cfg.DBQueries = repository.New(pool)

internal/query/test/service_test.go

@@ -6,15 +6,15 @@ import (
 	"queryorchestration/internal/serviceconfig"
 	"testing"
 
+	"github.com/stretchr/testify/require"
+
 	"github.com/pashagolub/pgxmock/v3"
 	"github.com/stretchr/testify/assert"
 )
 
 func TestService(t *testing.T) {
 	pool, err := pgxmock.NewPool()
-	if err != nil {
-		t.Fatalf("failed to open pgxmock database: %v", err)
-	}
+	require.NoError(t, err)
 	cfg := &serviceconfig.BaseConfig{}
 	cfg.DBPool = pool
 	cfg.DBQueries = repository.New(pool)

internal/query/test/test_test.go

@@ -14,6 +14,8 @@ import (
 	"queryorchestration/internal/serviceconfig"
 	"testing"
 
+	"github.com/stretchr/testify/require"
+
 	"github.com/google/uuid"
 	"github.com/jackc/pgx/v5/pgtype"
 	"github.com/pashagolub/pgxmock/v3"
@@ -24,9 +26,7 @@ func TestTest(t *testing.T) {
 	ctx := context.Background()
 
 	pool, err := pgxmock.NewPool()
-	if err != nil {
-		t.Fatalf("failed to open pgxmock database: %v", err)
-	}
+	require.NoError(t, err)
 	cfg := &serviceconfig.BaseConfig{}
 	cfg.DBPool = pool
 	cfg.DBQueries = repository.New(pool)

internal/query/types/contextFull/creator_test.go

@@ -10,15 +10,14 @@ import (
 
 	"github.com/pashagolub/pgxmock/v3"
 	"github.com/stretchr/testify/assert"
+	"github.com/stretchr/testify/require"
 )
 
 func TestCreatorValidate(t *testing.T) {
 	ctx := context.Background()
 
 	pool, err := pgxmock.NewPool()
-	if err != nil {
-		t.Fatalf("failed to open pgxmock database: %v", err)
-	}
+	require.NoError(t, err)
 	cfg := &serviceconfig.BaseConfig{}
 	cfg.DBPool = pool
 	cfg.DBQueries = repository.New(pool)

internal/query/types/contextFull/updator_test.go

@@ -9,6 +9,8 @@ import (
 	"testing"
 
 	"github.com/google/uuid"
+	"github.com/stretchr/testify/require"
+
 	"github.com/pashagolub/pgxmock/v3"
 	"github.com/stretchr/testify/assert"
 )
@@ -17,9 +19,7 @@ func TestUpdatorValidate(t *testing.T) {
 	ctx := context.Background()
 
 	pool, err := pgxmock.NewPool()
-	if err != nil {
-		t.Fatalf("failed to open pgxmock database: %v", err)
-	}
+	require.NoError(t, err)
 	cfg := &serviceconfig.BaseConfig{}
 	cfg.DBPool = pool
 	cfg.DBQueries = repository.New(pool)

internal/query/types/jsonExtractor/creator_test.go

@@ -8,6 +8,8 @@ import (
 	"queryorchestration/internal/serviceconfig"
 	"testing"
 
+	"github.com/stretchr/testify/require"
+
 	"github.com/pashagolub/pgxmock/v3"
 	"github.com/stretchr/testify/assert"
 )
@@ -16,9 +18,7 @@ func TestCreatorValidate(t *testing.T) {
 	ctx := context.Background()
 
 	pool, err := pgxmock.NewPool()
-	if err != nil {
-		t.Fatalf("failed to open pgxmock database: %v", err)
-	}
+	require.NoError(t, err)
 	cfg := &serviceconfig.BaseConfig{}
 	cfg.DBPool = pool
 	cfg.DBQueries = repository.New(pool)

internal/query/types/jsonExtractor/process_test.go

@@ -11,6 +11,8 @@ import (
 	"queryorchestration/internal/serviceconfig"
 	"testing"
 
+	"github.com/stretchr/testify/require"
+
 	"github.com/google/uuid"
 	"github.com/pashagolub/pgxmock/v3"
 	"github.com/stretchr/testify/assert"
@@ -20,9 +22,7 @@ func TestJSONProcess(t *testing.T) {
 	ctx := context.Background()
 
 	pool, err := pgxmock.NewPool()
-	if err != nil {
-		t.Fatalf("failed to open pgxmock database: %v", err)
-	}
+	require.NoError(t, err)
 	cfg := &serviceconfig.BaseConfig{}
 	cfg.DBPool = pool
 	cfg.DBQueries = repository.New(pool)
@@ -88,9 +88,7 @@ func TestJSONProcessJSON(t *testing.T) {
 	ctx := context.Background()
 
 	pool, err := pgxmock.NewPool()
-	if err != nil {
-		t.Fatalf("failed to open pgxmock database: %v", err)
-	}
+	require.NoError(t, err)
 	cfg := &serviceconfig.BaseConfig{}
 	cfg.DBPool = pool
 	cfg.DBQueries = repository.New(pool)
@@ -171,9 +169,7 @@ func TestJSONProcessResults(t *testing.T) {
 	ctx := context.Background()
 
 	pool, err := pgxmock.NewPool()
-	if err != nil {
-		t.Fatalf("failed to open pgxmock database: %v", err)
-	}
+	require.NoError(t, err)
 	cfg := &serviceconfig.BaseConfig{}
 	cfg.DBPool = pool
 	cfg.DBQueries = repository.New(pool)

internal/query/types/jsonExtractor/updator_test.go

@@ -11,15 +11,14 @@ import (
 	"github.com/google/uuid"
 	"github.com/pashagolub/pgxmock/v3"
 	"github.com/stretchr/testify/assert"
+	"github.com/stretchr/testify/require"
 )
 
 func TestUpdatorValidate(t *testing.T) {
 	ctx := context.Background()
 
 	pool, err := pgxmock.NewPool()
-	if err != nil {
-		t.Fatalf("failed to open pgxmock database: %v", err)
-	}
+	require.NoError(t, err)
 	cfg := &serviceconfig.BaseConfig{}
 	cfg.DBPool = pool
 	cfg.DBQueries = repository.New(pool)

internal/query/update/service_test.go

@@ -6,15 +6,15 @@ import (
 	"queryorchestration/internal/serviceconfig"
 	"testing"
 
+	"github.com/stretchr/testify/require"
+
 	"github.com/pashagolub/pgxmock/v3"
 	"github.com/stretchr/testify/assert"
 )
 
 func TestService(t *testing.T) {
 	pool, err := pgxmock.NewPool()
-	if err != nil {
-		t.Fatalf("failed to open pgxmock database: %v", err)
-	}
+	require.NoError(t, err)
 	cfg := &serviceconfig.BaseConfig{}
 	cfg.DBPool = pool
 	cfg.DBQueries = repository.New(pool)

internal/query/update/update_test.go

@@ -13,6 +13,8 @@ import (
 	queuemock "queryorchestration/mocks/queue"
 	"testing"
 
+	"github.com/stretchr/testify/require"
+
 	"github.com/aws/aws-sdk-go-v2/service/sqs"
 	"github.com/google/uuid"
 	"github.com/jackc/pgx/v5"
@@ -31,9 +33,7 @@ func TestUpdate(t *testing.T) {
 	ctx := context.Background()
 
 	pool, err := pgxmock.NewPool()
-	if err != nil {
-		t.Fatalf("failed to open pgxmock database: %v", err)
-	}
+	require.NoError(t, err)
 	cfg := &QueryUpdateConfig{}
 	cfg.DBPool = pool
 	cfg.DBQueries = repository.New(pool)

internal/query/update/updateprivate_test.go

@@ -13,6 +13,8 @@ import (
 	queuemock "queryorchestration/mocks/queue"
 	"testing"
 
+	"github.com/stretchr/testify/require"
+
 	"github.com/aws/aws-sdk-go-v2/service/sqs"
 	"github.com/google/uuid"
 	"github.com/jackc/pgx/v5"
@@ -28,9 +30,7 @@ type QueryUpdateConfig struct {
 
 func TestGetUpdator(t *testing.T) {
 	pool, err := pgxmock.NewPool()
-	if err != nil {
-		t.Fatalf("failed to open pgxmock database: %v", err)
-	}
+	require.NoError(t, err)
 	cfg := &QueryUpdateConfig{}
 	cfg.DBPool = pool
 	cfg.DBQueries = repository.New(pool)
@@ -57,9 +57,7 @@ func TestSubmitUpdate(t *testing.T) {
 	ctx := context.Background()
 
 	pool, err := pgxmock.NewPool()
-	if err != nil {
-		t.Fatalf("failed to open pgxmock database: %v", err)
-	}
+	require.NoError(t, err)
 	cfg := &QueryUpdateConfig{}
 	cfg.DBPool = pool
 	cfg.DBQueries = repository.New(pool)
@@ -110,9 +108,7 @@ func TestSubmitUpdateRollback(t *testing.T) {
 	ctx := context.Background()
 
 	pool, err := pgxmock.NewPool()
-	if err != nil {
-		t.Fatalf("failed to open pgxmock database: %v", err)
-	}
+	require.NoError(t, err)
 	cfg := &QueryUpdateConfig{}
 	cfg.DBPool = pool
 	cfg.DBQueries = repository.New(pool)
@@ -147,9 +143,7 @@ func TestSubmitUpdateRequiredQueries(t *testing.T) {
 		ctx := context.Background()
 
 		pool, err := pgxmock.NewPool()
-		if err != nil {
-			t.Fatalf("failed to open pgxmock database: %v", err)
-		}
+		require.NoError(t, err)
 		cfg := &QueryUpdateConfig{}
 		cfg.DBPool = pool
 		cfg.DBQueries = repository.New(pool)
@@ -201,9 +195,7 @@ func TestSubmitUpdateRequiredQueries(t *testing.T) {
 		ctx := context.Background()
 
 		pool, err := pgxmock.NewPool()
-		if err != nil {
-			t.Fatalf("failed to open pgxmock database: %v", err)
-		}
+		require.NoError(t, err)
 		cfg := &QueryUpdateConfig{}
 		cfg.DBPool = pool
 		cfg.DBQueries = repository.New(pool)
@@ -243,9 +235,7 @@ func TestSubmitUpdateActiveVersion(t *testing.T) {
 	ctx := context.Background()
 
 	pool, err := pgxmock.NewPool()
-	if err != nil {
-		t.Fatalf("failed to open pgxmock database: %v", err)
-	}
+	require.NoError(t, err)
 	cfg := &QueryUpdateConfig{}
 	cfg.DBPool = pool
 	cfg.DBQueries = repository.New(pool)
@@ -291,9 +281,7 @@ func TestNormalizeUpdate(t *testing.T) {
 		ctx := context.Background()
 
 		pool, err := pgxmock.NewPool()
-		if err != nil {
-			t.Fatalf("failed to open pgxmock database: %v", err)
-		}
+		require.NoError(t, err)
 		cfg := &QueryUpdateConfig{}
 		cfg.DBPool = pool
 		cfg.DBQueries = repository.New(pool)
@@ -330,9 +318,7 @@ func TestNormalizeUpdate(t *testing.T) {
 		ctx := context.Background()
 
 		pool, err := pgxmock.NewPool()
-		if err != nil {
-			t.Fatalf("failed to open pgxmock database: %v", err)
-		}
+		require.NoError(t, err)
 		cfg := &QueryUpdateConfig{}
 		cfg.DBPool = pool
 		cfg.DBQueries = repository.New(pool)
@@ -357,9 +343,7 @@ func TestNormalizeUpdate(t *testing.T) {
 		ctx := context.Background()
 
 		pool, err := pgxmock.NewPool()
-		if err != nil {
-			t.Fatalf("failed to open pgxmock database: %v", err)
-		}
+		require.NoError(t, err)
 		cfg := &QueryUpdateConfig{}
 		cfg.DBPool = pool
 		cfg.DBQueries = repository.New(pool)
@@ -386,9 +370,7 @@ func TestNormalizeUpdate(t *testing.T) {
 		ctx := context.Background()
 
 		pool, err := pgxmock.NewPool()
-		if err != nil {
-			t.Fatalf("failed to open pgxmock database: %v", err)
-		}
+		require.NoError(t, err)
 		cfg := &QueryUpdateConfig{}
 		cfg.DBPool = pool
 		cfg.DBQueries = repository.New(pool)
@@ -417,9 +399,7 @@ func TestNormalizeUpdateRequiredQueryIDs(t *testing.T) {
 		ctx := context.Background()
 
 		pool, err := pgxmock.NewPool()
-		if err != nil {
-			t.Fatalf("failed to open pgxmock database: %v", err)
-		}
+		require.NoError(t, err)
 		cfg := &QueryUpdateConfig{}
 		cfg.DBPool = pool
 		cfg.DBQueries = repository.New(pool)
@@ -447,9 +427,7 @@ func TestNormalizeUpdateRequiredQueryIDs(t *testing.T) {
 		ctx := context.Background()
 
 		pool, err := pgxmock.NewPool()
-		if err != nil {
-			t.Fatalf("failed to open pgxmock database: %v", err)
-		}
+		require.NoError(t, err)
 		cfg := &QueryUpdateConfig{}
 		cfg.DBPool = pool
 		cfg.DBQueries = repository.New(pool)
@@ -479,9 +457,7 @@ func TestNormalizeUpdateRequiredQueryIDs(t *testing.T) {
 		ctx := context.Background()
 
 		pool, err := pgxmock.NewPool()
-		if err != nil {
-			t.Fatalf("failed to open pgxmock database: %v", err)
-		}
+		require.NoError(t, err)
 		cfg := &QueryUpdateConfig{}
 		cfg.DBPool = pool
 		cfg.DBQueries = repository.New(pool)
@@ -514,9 +490,7 @@ func TestNormalizeUpdateRequiredQueryIDs(t *testing.T) {
 	t.Run("same update and current", func(t *testing.T) {
 		ctx := context.Background()
 		pool, err := pgxmock.NewPool()
-		if err != nil {
-			t.Fatalf("failed to open pgxmock database: %v", err)
-		}
+		require.NoError(t, err)
 		cfg := &QueryUpdateConfig{}
 		cfg.DBPool = pool
 		cfg.DBQueries = repository.New(pool)

internal/query/versionsync/sync_test.go

@@ -10,6 +10,8 @@ import (
 	queuemock "queryorchestration/mocks/queue"
 	"testing"
 
+	"github.com/stretchr/testify/require"
+
 	"github.com/aws/aws-sdk-go-v2/service/sqs"
 	"github.com/google/uuid"
 	"github.com/pashagolub/pgxmock/v3"
@@ -25,9 +27,7 @@ type QueryVersionSyncConfig struct {
 func TestSync(t *testing.T) {
 	ctx := context.Background()
 	pool, err := pgxmock.NewPool()
-	if err != nil {
-		t.Fatalf("failed to open pgxmock database: %v", err)
-	}
+	require.NoError(t, err)
 	cfg := &QueryVersionSyncConfig{}
 	cfg.DBPool = pool
 	cfg.DBQueries = repository.New(pool)

internal/serviceconfig/commonlog_test.go

@@ -7,6 +7,8 @@ import (
 	"queryorchestration/internal/serviceconfig"
 	"strings"
 	"testing"
+
+	"github.com/stretchr/testify/require"
 )
 
 // TestPrintConfigRecursive tests the PrintConfigRecursive function as a blackbox test.
@@ -42,9 +44,7 @@ func TestPrintConfigRecursive(t *testing.T) {
 	// Use BaseConfig instead of initializeConfigTestStruct
 	cfg := &serviceconfig.BaseConfig{}
 	err := serviceconfig.InitializeConfig(cfg)
-	if err != nil {
-		t.Fatalf("Error initializing config: %v", err)
-	}
+	require.NoError(t, err)
 
 	// Set logger after initialization
 	cfg.Logger = testLogger

internal/serviceconfig/database/transaction_test.go

@@ -10,15 +10,14 @@ import (
 	"github.com/google/uuid"
 	"github.com/pashagolub/pgxmock/v3"
 	"github.com/stretchr/testify/assert"
+	"github.com/stretchr/testify/require"
 )
 
 func TestExecuteTransaction(t *testing.T) {
 	ctx := context.Background()
 
 	pool, err := pgxmock.NewPool()
-	if err != nil {
-		t.Fatalf("failed to open pgxmock database: %v", err)
-	}
+	require.NoError(t, err)
 	cfg := &serviceconfig.BaseConfig{}
 	cfg.DBPool = pool
 	cfg.DBQueries = repository.New(pool)

internal/serviceconfig/logger/testlogger.go

@@ -8,11 +8,11 @@ import (
 
 type TestLogger struct {
 	T    *testing.T
-	Logs []map[string]interface{}
+	Logs []map[string]any
 }
 
 func (l *TestLogger) Handle(ctx context.Context, r slog.Record) error {
-	attrs := make(map[string]interface{})
+	attrs := make(map[string]any)
 	r.Attrs(func(a slog.Attr) bool {
 		attrs[a.Key] = a.Value.Any()
 		return true

internal/serviceconfig/logger/testlogger_test.go

@@ -22,4 +22,7 @@ func TestTestLogger(t *testing.T) {
 	assert.Equal(t, "second", tl.Logs[1]["field"])
 	assert.Equal(t, "warn", tl.Logs[2]["field"])
 	assert.Equal(t, "error", tl.Logs[3]["field"])
+
+	assert.NotNil(t, logger.Handler().WithAttrs([]slog.Attr{}))
+	assert.NotNil(t, logger.Handler().WithGroup("group"))
 }

internal/serviceconfig/objectstore/config_test.go

@@ -2,10 +2,13 @@ package objectstore_test
 
 import (
 	"context"
+	"errors"
 	"os"
+	"queryorchestration/internal/serviceconfig"
 	objectstore "queryorchestration/internal/serviceconfig/objectstore"
 	objectstoremock "queryorchestration/mocks/objectstore"
 	"testing"
+	"time"
 
 	"github.com/aws/aws-sdk-go-v2/service/s3"
 	"github.com/stretchr/testify/assert"
@@ -49,3 +52,28 @@ func TestPingStoreByName(t *testing.T) {
 	err := c.PingStoreByName(ctx, name)
 	assert.NoError(t, err)
 }
+
+func TestGetS3Client(t *testing.T) {
+	c := objectstore.ObjectStoreConfig{}
+	assert.Empty(t, c.GetS3Endpoint())
+	c.AWSEndpointUrlS3 = "s3_endpoint"
+	assert.Equal(t, "s3_endpoint", c.GetS3Endpoint())
+}
+
+type StoreConfig struct {
+	serviceconfig.BaseConfig
+	objectstore.ObjectStoreConfig
+}
+
+func TestSetStoreClientAndPingByName(t *testing.T) {
+	ctx, cancel := context.WithTimeout(context.Background(), 100*time.Millisecond)
+	defer cancel()
+	cfg := &StoreConfig{}
+	name := "bucket"
+
+	err := cfg.SetStoreClientAndPingByName(ctx, name)
+
+	if !errors.Is(err, context.DeadlineExceeded) {
+		t.Errorf("Expected timeout error, got: %v", err)
+	}
+}

internal/serviceconfig/observability/prometheus/prometheus_test.go

@@ -9,6 +9,8 @@ import (
 	"strings"
 	"testing"
 	"time"
+
+	"github.com/stretchr/testify/require"
 )
 
 func GetFreePortForTesting() (int, error) {
@@ -34,9 +36,7 @@ func TestMetricsIntegration(t *testing.T) {
 	defer cancel()
 
 	testingPort, errorGettingPort := GetFreePortForTesting()
-	if errorGettingPort != nil {
-		t.Fatalf("Failed to get a free port for testing: %v", errorGettingPort)
-	}
+	require.NoError(t, errorGettingPort)
 
 	// Step 1: Define our test metrics configuration
 	config := MetricsConfig{
@@ -84,9 +84,7 @@ func TestMetricsIntegration(t *testing.T) {
 
 	// Step 2: Create new metrics instance with context
 	metrics, err := New(ctx, config)
-	if err != nil {
-		t.Fatalf("Failed to create metrics: %v", err)
-	}
+	require.NoError(t, err)
 
 	// Ensure cleanup after test
 	defer func() {
@@ -104,33 +102,25 @@ func TestMetricsIntegration(t *testing.T) {
 		"type":   "user_login",
 		"status": "success",
 	})
-	if err != nil {
-		t.Fatalf("Failed to record counter metric: %v", err)
-	}
+	require.NoError(t, err)
 
 	// Record a gauge metric
 	err = metrics.RecordMetric("queue_size", 15, map[string]string{
 		"queue_name": "default",
 	})
-	if err != nil {
-		t.Fatalf("Failed to record gauge metric: %v", err)
-	}
+	require.NoError(t, err)
 
 	// Record a histogram metric
 	err = metrics.RecordMetric("response_time_seconds", 0.7, map[string]string{
 		"endpoint": "/api/users",
 	})
-	if err != nil {
-		t.Fatalf("Failed to record histogram metric: %v", err)
-	}
+	require.NoError(t, err)
 
 	// Record a summary metric
 	err = metrics.RecordMetric("request_size_bytes", 1024, map[string]string{
 		"method": "POST",
 	})
-	if err != nil {
-		t.Fatalf("Failed to record summary metric: %v", err)
-	}
+	require.NoError(t, err)
 
 	// Step 4: Wait for HTTP server to start
 	// Give the server a moment to start up
@@ -139,16 +129,12 @@ func TestMetricsIntegration(t *testing.T) {
 	// Step 5: Fetch metrics from the HTTP endpoint
 	URLForMetrics := fmt.Sprintf("http://localhost:%d/metrics", testingPort)
 	resp, err := http.Get(URLForMetrics)
-	if err != nil {
-		t.Fatalf("Failed to fetch metrics: %v", err)
-	}
+	require.NoError(t, err)
 	defer resp.Body.Close()
 
 	// Read the response body
 	body, err := io.ReadAll(resp.Body)
-	if err != nil {
-		t.Fatalf("Failed to read response body: %v", err)
-	}
+	require.NoError(t, err)
 
 	metricsOutput := string(body)
 	// if needed for debugging.
@@ -180,9 +166,7 @@ func TestMetricsIntegration(t *testing.T) {
 	t.Run("Context cancellation", func(t *testing.T) {
 		// Create a new metrics instance with a separate context
 		testingPort, errorGettingPort := GetFreePortForTesting()
-		if errorGettingPort != nil {
-			t.Fatalf("Failed to get a free port for testing: %v", errorGettingPort)
-		}
+		require.NoError(t, errorGettingPort)
 
 		cancelCtx, cancelFunc := context.WithCancel(context.Background())
 		_, err := New(cancelCtx, MetricsConfig{
@@ -190,9 +174,7 @@ func TestMetricsIntegration(t *testing.T) {
 			Port:      testingPort,
 			ServeHttp: true,
 		})
-		if err != nil {
-			t.Fatalf("Failed to create metrics for cancellation test: %v", err)
-		}
+		require.NoError(t, err)
 
 		// Wait for server to start
 		time.Sleep(time.Second)

internal/test/aws.go

@@ -10,6 +10,7 @@ import (
 	"time"
 
 	"github.com/docker/go-connections/nat"
+	"github.com/stretchr/testify/require"
 	"github.com/testcontainers/testcontainers-go"
 	"github.com/testcontainers/testcontainers-go/wait"
 )
@@ -29,9 +30,7 @@ func CreateAWSContainer(t testing.TB, ctx context.Context, cfg *CreateAWSConfig)
 	alias := "localstack"
 
 	port, err := nat.NewPort("tcp", "4566")
-	if err != nil {
-		t.Fatalf("Failed to create port: %v", err)
-	}
+	require.NoError(t, err)
 
 	req := testcontainers.ContainerRequest{
 		Image: "localstack/localstack:4.1.0",
@@ -77,18 +76,12 @@ func CreateAWSContainer(t testing.TB, ctx context.Context, cfg *CreateAWSConfig)
 		ContainerRequest: req,
 		Started:          true,
 	})
-	if err != nil {
-		t.Fatalf("Failed to start container: %v", err)
-	}
+	require.NoError(t, err)
 
 	host, err := container.Host(ctx)
-	if err != nil {
-		t.Fatalf("Failed to extract host: %v", err)
-	}
+	require.NoError(t, err)
 	mappedPort, err := container.MappedPort(ctx, port)
-	if err != nil {
-		t.Fatalf("Failed to extract port: %v", err)
-	}
+	require.NoError(t, err)
 
 	extEndpoint := fmt.Sprintf("http://%s:%s", host, mappedPort.Port())
 	t.Setenv("AWS_ENDPOINT_URL", extEndpoint)

internal/test/container.go

@@ -10,6 +10,7 @@ import (
 	"testing"
 
 	"github.com/docker/go-connections/nat"
+	"github.com/stretchr/testify/require"
 	"github.com/testcontainers/testcontainers-go"
 	"github.com/testcontainers/testcontainers-go/wait"
 )
@@ -81,7 +82,7 @@ func createContainer(t testing.TB, ctx context.Context, cfg *containerConfig) (t
 			slog.Error(line)
 		}
 
-		t.Fatalf("Failed to start container: %v", err)
+		require.NoError(t, err)
 	}
 
 	return container, func() {

internal/test/database.go

@@ -10,6 +10,7 @@ import (
 	"time"
 
 	"github.com/docker/go-connections/nat"
+	"github.com/stretchr/testify/require"
 	"github.com/testcontainers/testcontainers-go"
 	"github.com/testcontainers/testcontainers-go/wait"
 )
@@ -24,9 +25,7 @@ func CreateDB(t testing.TB, ctx context.Context, cfg *CreateDatabaseConfig) (tes
 	alias := "postgres"
 
 	port, err := nat.NewPort("tcp", "5432")
-	if err != nil {
-		t.Fatalf("Failed to create port: %v", err)
-	}
+	require.NoError(t, err)
 
 	name := "queryorchestration"
 	pass := "pass"
@@ -64,18 +63,12 @@ func CreateDB(t testing.TB, ctx context.Context, cfg *CreateDatabaseConfig) (tes
 		ContainerRequest: req,
 		Started:          true,
 	})
-	if err != nil {
-		t.Fatalf("Failed to start container: %v", err)
-	}
+	require.NoError(t, err)
 
 	host, err := container.Host(ctx)
-	if err != nil {
-		t.Fatalf("Failed to extract host: %v", err)
-	}
+	require.NoError(t, err)
 	mappedPort, err := container.MappedPort(ctx, port)
-	if err != nil {
-		t.Fatalf("Failed to extract port: %v", err)
-	}
+	require.NoError(t, err)
 
 	dbcfg := &database.DBConfig{
 		DBName:   name,
@@ -101,14 +94,10 @@ func CreateDB(t testing.TB, ctx context.Context, cfg *CreateDatabaseConfig) (tes
 
 	if cfg.RunMigrations {
 		err := migrations.Run(ctx, cfg.Cfg)
-		if err != nil {
-			t.Fatal(err)
-		}
+		require.NoError(t, err)
 
 		err = cfg.Cfg.SetDBPool(ctx)
-		if err != nil {
-			t.Fatal(err)
-		}
+		require.NoError(t, err)
 	}
 
 	if cfg.Network != nil {
@@ -119,8 +108,6 @@ func CreateDB(t testing.TB, ctx context.Context, cfg *CreateDatabaseConfig) (tes
 
 	return container, func() {
 		err := container.Terminate(ctx)
-		if err != nil {
-			t.Error(err)
-		}
+		require.NoError(t, err)
 	}
 }

internal/test/ecosystem.go

@@ -7,6 +7,7 @@ import (
 	"queryorchestration/internal/serviceconfig/database"
 	"testing"
 
+	"github.com/stretchr/testify/require"
 	"github.com/testcontainers/testcontainers-go"
 )
 
@@ -60,9 +61,7 @@ func CreateRunnersAndServicesNetwork(t testing.TB, ctx context.Context, ncfg *Ec
 
 	if ncfg.Cfg.GetQueueClient() == nil {
 		err := ncfg.Cfg.SetQueueClient(ctx)
-		if err != nil {
-			t.Fatal(err)
-		}
+		require.NoError(t, err)
 	}
 
 	qs := make(map[string]*Container, len(ncfg.Runners))
@@ -194,9 +193,7 @@ func CreateRunnerNetwork(t testing.TB, ctx context.Context, rcfg *RunnerNetworkC
 
 	if rcfg.Cfg.GetQueueClient() == nil {
 		err := rcfg.Cfg.SetQueueClient(ctx)
-		if err != nil {
-			t.Fatal(err)
-		}
+		require.NoError(t, err)
 	}
 
 	url := rcfg.QueueURL

internal/test/network.go

@@ -4,15 +4,14 @@ import (
 	"context"
 	"testing"
 
+	"github.com/stretchr/testify/require"
 	"github.com/testcontainers/testcontainers-go"
 	"github.com/testcontainers/testcontainers-go/network"
 )
 
 func CreateNetwork(t testing.TB, ctx context.Context) (*testcontainers.DockerNetwork, func()) {
 	network, err := network.New(ctx, network.WithDriver("bridge"))
-	if err != nil {
-		t.Fatal(err)
-	}
+	require.NoError(t, err)
 
 	return network, func() {
 		testcontainers.CleanupNetwork(t, network)

internal/test/objectstore.go

@@ -7,27 +7,22 @@ import (
 
 	"github.com/aws/aws-sdk-go-v2/aws"
 	"github.com/aws/aws-sdk-go-v2/service/s3"
+	"github.com/stretchr/testify/require"
 )
 
 func CreateBucket(t testing.TB, ctx context.Context, cfg objectstore.ConfigProvider, name string) {
 	_, err := cfg.GetStoreClient().CreateBucket(ctx, &s3.CreateBucketInput{
 		Bucket: aws.String(name),
 	})
-	if err != nil {
-		t.Fatal(err)
-	}
+	require.NoError(t, err)
 
 	err = cfg.PingStoreByName(ctx, name)
-	if err != nil {
-		t.Fatal(err)
-	}
+	require.NoError(t, err)
 }
 
 func CreateStoreClient(t testing.TB, ctx context.Context, cfg objectstore.ConfigProvider, endpoint string) {
 	cfg.SetS3Endpoint(endpoint)
 	cfg.SetS3UsePathStyle(true)
 	err := cfg.SetStoreClient(ctx)
-	if err != nil {
-		t.Fatal(err)
-	}
+	require.NoError(t, err)
 }

internal/test/queue.go

@@ -11,20 +11,17 @@ import (
 	"github.com/aws/aws-sdk-go-v2/service/sqs"
 	"github.com/aws/aws-sdk-go-v2/service/sqs/types"
 	"github.com/stretchr/testify/assert"
+	"github.com/stretchr/testify/require"
 )
 
 func CreateQueue(t testing.TB, ctx context.Context, cfg serviceconfig.ConfigProvider, name string) string {
 	queueM, err := cfg.GetQueueClient().CreateQueue(ctx, &sqs.CreateQueueInput{
 		QueueName: aws.String(name),
 	})
-	if err != nil {
-		t.Fatal(err)
-	}
+	require.NoError(t, err)
 
 	err = cfg.PingQueueByURL(ctx, *queueM.QueueUrl)
-	if err != nil {
-		t.Fatal(err)
-	}
+	require.NoError(t, err)
 
 	return *queueM.QueueUrl
 }

internal/test/service.go

@@ -8,6 +8,7 @@ import (
 	"testing"
 
 	"github.com/docker/go-connections/nat"
+	"github.com/stretchr/testify/require"
 	"github.com/testcontainers/testcontainers-go"
 )
 
@@ -26,9 +27,7 @@ type ServiceConfig struct {
 
 func CreateService(t testing.TB, ctx context.Context, config *ServiceConfig) (*Container, func()) {
 	port, err := nat.NewPort("tcp", "8080")
-	if err != nil {
-		t.Fatalf("Failed to create port: %v", err)
-	}
+	require.NoError(t, err)
 
 	container, cleanup := createContainer(t, ctx, &containerConfig{
 		Cfg:        config.Cfg,
@@ -39,13 +38,9 @@ func CreateService(t testing.TB, ctx context.Context, config *ServiceConfig) (*C
 	})
 
 	host, err := container.Host(ctx)
-	if err != nil {
-		t.Fatalf("Failed to extract host: %v", err)
-	}
+	require.NoError(t, err)
 	mappedPort, err := container.MappedPort(ctx, port)
-	if err != nil {
-		t.Fatalf("Failed to extract port: %v", err)
-	}
+	require.NoError(t, err)
 
 	address := fmt.Sprintf("http://%s:%s", host, mappedPort.Port())