Merged in feature/queuetest (pull request #14)

Add tests for queuing

* startingtest

* queuerunnertest

* addedtestfuncs

* testtests

* passintegration

* unittests

internal/database/repository/collector_test.go

@@ -4,6 +4,7 @@ import (
 	"context"
 	"queryorchestration/internal/database"
 	"queryorchestration/internal/database/repository"
+	"queryorchestration/internal/test"
 	"testing"
 
 	"github.com/google/uuid"
@@ -12,9 +13,13 @@ import (
 
 func TestCollector(t *testing.T) {
 	ctx := context.Background()
-	db, cleanup := createDB(t, ctx)
+	db, cleanup := test.CreateDB(t, ctx, &test.CreateDatabaseConfig{
+		Migrations: &database.MigrationConfig{
+			BasePath: "../../..",
+		}})
 	defer cleanup()
-	queries := repository.New(db.pool)
+
+	queries := repository.New(db.Pool)
 
 	collectorID := database.MustToDBUUID(uuid.New())
 

internal/database/repository/query_test.go

@@ -3,7 +3,9 @@ package repository_test
 import (
 	"context"
 	"log"
+	"queryorchestration/internal/database"
 	"queryorchestration/internal/database/repository"
+	"queryorchestration/internal/test"
 	"testing"
 
 	"github.com/jackc/pgx/v5/pgtype"
@@ -12,9 +14,14 @@ import (
 
 func TestQueries(t *testing.T) {
 	ctx := context.Background()
-	db, cleanup := createDB(t, ctx)
+
+	db, cleanup := test.CreateDB(t, ctx, &test.CreateDatabaseConfig{
+		Migrations: &database.MigrationConfig{
+			BasePath: "../../..",
+		}})
 	defer cleanup()
-	queries := repository.New(db.pool)
+
+	queries := repository.New(db.Pool)
 
 	contextQueryID, err := queries.CreateQuery(ctx, repository.Querytype(repository.QuerytypeContextFull))
 	assert.Nil(t, err)

internal/database/repository/result_test.go

@@ -4,6 +4,7 @@ import (
 	"context"
 	"queryorchestration/internal/database"
 	"queryorchestration/internal/database/repository"
+	"queryorchestration/internal/test"
 	"testing"
 
 	"github.com/google/uuid"
@@ -13,9 +14,14 @@ import (
 
 func TestResults(t *testing.T) {
 	ctx := context.Background()
-	db, cleanup := createDB(t, ctx)
+
+	db, cleanup := test.CreateDB(t, ctx, &test.CreateDatabaseConfig{
+		Migrations: &database.MigrationConfig{
+			BasePath: "../../..",
+		}})
 	defer cleanup()
-	queries := repository.New(db.pool)
+
+	queries := repository.New(db.Pool)
 
 	jsonQueryID, err := queries.CreateQuery(ctx, repository.Querytype(repository.QuerytypeJsonExtractor))
 	assert.Nil(t, err)

internal/database/repository/sqlquery_test.go

@@ -1,82 +0,0 @@
-package repository_test
-
-import (
-	"context"
-	"fmt"
-	"os"
-	"path"
-	"queryorchestration/internal/database"
-	"testing"
-
-	"github.com/docker/go-connections/nat"
-	"github.com/jackc/pgx/v5/pgxpool"
-	"github.com/testcontainers/testcontainers-go"
-	"github.com/testcontainers/testcontainers-go/wait"
-)
-
-type db struct {
-	pool      *pgxpool.Pool
-	container *testcontainers.Container
-}
-
-func createDB(t *testing.T, ctx context.Context) (*db, func()) {
-	port, err := nat.NewPort("tcp", "5432")
-	if err != nil {
-		t.Fatalf("Failed to create port: %v", err)
-	}
-
-	name := "queryorchestration"
-	pass := "pass"
-	user := "postgres"
-
-	req := testcontainers.ContainerRequest{
-		Image: "postgres:17.2-alpine3.21",
-		Env: map[string]string{
-			"POSTGRES_DB":       name,
-			"POSTGRES_USER":     user,
-			"POSTGRES_PASSWORD": pass,
-		},
-		ExposedPorts: []string{port.Port()},
-		WaitingFor:   wait.ForListeningPort(port),
-	}
-
-	container, err := testcontainers.GenericContainer(ctx, testcontainers.GenericContainerRequest{
-		ContainerRequest: req,
-		Started:          true,
-	})
-	if err != nil {
-		t.Fatalf("Failed to start container: %v", err)
-	}
-
-	host, err := container.Host(ctx)
-	if err != nil {
-		t.Fatalf("Failed to extract host: %v", err)
-	}
-	mappedPort, err := container.MappedPort(ctx, port)
-	if err != nil {
-		t.Fatalf("Failed to extract port: %v", err)
-	}
-
-	t.Setenv("DB_USER", user)
-	t.Setenv("DB_PASS", pass)
-	t.Setenv("DB_HOST", host)
-	t.Setenv("DB_PORT", fmt.Sprint(mappedPort.Int()))
-	t.Setenv("DB_NAME", name)
-	t.Setenv("DB_NOSSL", "1")
-
-	database.RunMigrations(&database.MigrationConfig{
-		BasePath: path.Join(os.Getenv("PWD"), "../../.."),
-	})
-
-	pool := database.GetDBPool(ctx)
-
-	return &db{
-			pool:      pool,
-			container: &container,
-		}, func() {
-			err := container.Terminate(ctx)
-			if err != nil {
-				t.Error(err)
-			}
-		}
-}