From fa95d733cad8bb107eec9fa691b20f1ae670a3c7 Mon Sep 17 00:00:00 2001 From: Michael McGuinness Date: Fri, 17 Jan 2025 12:00:32 +0000 Subject: [PATCH] Merged in feature/shorttestsanddirtidy (pull request #26) Add short tests and Tidy internal directories * complete the tasks --- api/queryRunner/queryrunner.go | 4 ++-- api/queryRunner/queryrunner_test.go | 7 +++++-- api/queryService/controllers.go | 2 +- api/queryService/parse.go | 2 +- api/queryService/parse_test.go | 2 +- api/queryService/query.go | 2 +- cmd/queryRunner/main.go | 4 ++-- cmd/queryService/main.go | 4 ++-- internal/database/connection.go | 2 +- internal/database/connection_test.go | 3 +++ internal/database/migrations_test.go | 3 +++ internal/{ => job}/collector/collector.go | 0 internal/{ => job}/collector/service.go | 0 internal/{ => job}/collector/service_test.go | 2 +- internal/query/create.go | 6 +++--- internal/query/create_test.go | 2 +- internal/query/createprivate_test.go | 2 +- internal/{ => query}/document/service.go | 6 +++--- internal/{ => query}/document/sync_test.go | 2 +- internal/query/get.go | 2 +- internal/query/get_test.go | 2 +- internal/query/list_test.go | 2 +- internal/query/parse_test.go | 2 +- .../{queryProcessor => query/processor}/parse.go | 0 .../processor}/parse_test.go | 2 +- .../{queryProcessor => query/processor}/service.go | 2 +- internal/{queryQueue => query/queue}/create.go | 2 +- .../{queryQueue => query/queue}/create_test.go | 6 +++--- internal/{queryQueue => query/queue}/execute.go | 4 ++-- .../{queryQueue => query/queue}/execute_test.go | 8 ++++---- .../queue}/executeprivate_test.go | 2 +- internal/{queryQueue => query/queue}/result.go | 8 ++++---- .../queue}/resultprivate_test.go | 4 ++-- internal/{queryQueue => query/queue}/service.go | 6 +++--- .../{queryQueue => query/queue}/service_test.go | 8 ++++---- internal/{ => query}/result/parse.go | 0 internal/{ => query}/result/parse_test.go | 2 +- internal/{ => query}/result/service.go | 0 internal/{ => query}/result/store_test.go | 2 +- internal/{ => query/types}/contextFull/creator.go | 2 +- .../{ => query/types}/contextFull/creator_test.go | 4 ++-- .../{ => query/types}/contextFull/process_test.go | 6 +++--- internal/{ => query/types}/contextFull/result.go | 0 internal/{ => query/types}/contextFull/service.go | 4 ++-- internal/{ => query/types}/contextFull/updator.go | 2 +- .../{ => query/types}/contextFull/updator_test.go | 4 ++-- .../{ => query/types}/jsonExtractor/creator.go | 2 +- .../types}/jsonExtractor/creator_test.go | 4 ++-- .../types}/jsonExtractor/process_test.go | 8 ++++---- internal/{ => query/types}/jsonExtractor/result.go | 0 .../{ => query/types}/jsonExtractor/service.go | 4 ++-- .../{ => query/types}/jsonExtractor/updator.go | 2 +- .../types}/jsonExtractor/updator_test.go | 4 ++-- internal/query/update.go | 6 +++--- internal/query/update_test.go | 2 +- internal/query/updateprivate_test.go | 2 +- internal/{ => server}/api/listener.go | 0 internal/{ => server}/api/listener_test.go | 3 +++ internal/{ => server}/env/get.go | 0 internal/{ => server}/env/get_test.go | 2 +- internal/{ => server}/env/getfatal_test.go | 2 +- internal/{ => server}/otel/service.go | 0 internal/{ => server}/otel/service_test.go | 2 +- internal/{ => server}/queue/config.go | 0 internal/{ => server}/queue/delete.go | 0 internal/{ => server}/queue/delete_test.go | 5 ++++- internal/{ => server}/queue/listener.go | 2 +- internal/{ => server}/queue/listener_test.go | 5 ++++- internal/{ => server}/queue/poll.go | 0 internal/{ => server}/queue/poll_test.go | 8 +++++++- internal/{ => server}/queue/receive.go | 0 internal/{ => server}/queue/receive_test.go | 5 ++++- internal/{ => server}/queue/send.go | 0 internal/{ => server}/queue/send_test.go | 5 ++++- internal/server/server.go | 2 +- internal/server/server_test.go | 3 +++ internal/test/api_test.go | 6 ++++++ internal/test/container_test.go | 3 +++ internal/test/database_test.go | 6 ++++++ internal/test/queue.go | 2 +- internal/test/queue_test.go | 14 +++++++++++++- internal/test/queuecontainer_test.go | 6 ++++++ scripts/tests.yml | 12 ++++++++---- test/queryRunner/queryrunner_test.go | 4 ++-- 84 files changed, 171 insertions(+), 101 deletions(-) rename internal/{ => job}/collector/collector.go (100%) rename internal/{ => job}/collector/service.go (100%) rename internal/{ => job}/collector/service_test.go (97%) rename internal/{ => query}/document/service.go (92%) rename internal/{ => query}/document/sync_test.go (99%) rename internal/{queryProcessor => query/processor}/parse.go (100%) rename internal/{queryProcessor => query/processor}/parse_test.go (98%) rename internal/{queryProcessor => query/processor}/service.go (94%) rename internal/{queryQueue => query/queue}/create.go (96%) rename internal/{queryQueue => query/queue}/create_test.go (95%) rename internal/{queryQueue => query/queue}/execute.go (92%) rename internal/{queryQueue => query/queue}/execute_test.go (97%) rename internal/{queryQueue => query/queue}/executeprivate_test.go (97%) rename internal/{queryQueue => query/queue}/result.go (87%) rename internal/{queryQueue => query/queue}/resultprivate_test.go (94%) rename internal/{queryQueue => query/queue}/service.go (86%) rename internal/{queryQueue => query/queue}/service_test.go (96%) rename internal/{ => query}/result/parse.go (100%) rename internal/{ => query}/result/parse_test.go (92%) rename internal/{ => query}/result/service.go (100%) rename internal/{ => query}/result/store_test.go (97%) rename internal/{ => query/types}/contextFull/creator.go (85%) rename internal/{ => query/types}/contextFull/creator_test.go (86%) rename internal/{ => query/types}/contextFull/process_test.go (80%) rename internal/{ => query/types}/contextFull/result.go (100%) rename internal/{ => query/types}/contextFull/service.go (77%) rename internal/{ => query/types}/contextFull/updator.go (86%) rename internal/{ => query/types}/contextFull/updator_test.go (88%) rename internal/{ => query/types}/jsonExtractor/creator.go (83%) rename internal/{ => query/types}/jsonExtractor/creator_test.go (85%) rename internal/{ => query/types}/jsonExtractor/process_test.go (96%) rename internal/{ => query/types}/jsonExtractor/result.go (100%) rename internal/{ => query/types}/jsonExtractor/service.go (92%) rename internal/{ => query/types}/jsonExtractor/updator.go (84%) rename internal/{ => query/types}/jsonExtractor/updator_test.go (88%) rename internal/{ => server}/api/listener.go (100%) rename internal/{ => server}/api/listener_test.go (93%) rename internal/{ => server}/env/get.go (100%) rename internal/{ => server}/env/get_test.go (90%) rename internal/{ => server}/env/getfatal_test.go (89%) rename internal/{ => server}/otel/service.go (100%) rename internal/{ => server}/otel/service_test.go (82%) rename internal/{ => server}/queue/config.go (100%) rename internal/{ => server}/queue/delete.go (100%) rename internal/{ => server}/queue/delete_test.go (84%) rename internal/{ => server}/queue/listener.go (96%) rename internal/{ => server}/queue/listener_test.go (88%) rename internal/{ => server}/queue/poll.go (100%) rename internal/{ => server}/queue/poll_test.go (86%) rename internal/{ => server}/queue/receive.go (100%) rename internal/{ => server}/queue/receive_test.go (86%) rename internal/{ => server}/queue/send.go (100%) rename internal/{ => server}/queue/send_test.go (81%) diff --git a/api/queryRunner/queryrunner.go b/api/queryRunner/queryrunner.go index 926ce331..3b5a2acd 100644 --- a/api/queryRunner/queryrunner.go +++ b/api/queryRunner/queryrunner.go @@ -3,8 +3,8 @@ package controllers import ( "context" "encoding/json" - "queryorchestration/internal/document" - "queryorchestration/internal/queue" + "queryorchestration/internal/query/document" + "queryorchestration/internal/server/queue" "github.com/go-playground/validator/v10" diff --git a/api/queryRunner/queryrunner_test.go b/api/queryRunner/queryrunner_test.go index e02fe99b..8e8bdca0 100644 --- a/api/queryRunner/queryrunner_test.go +++ b/api/queryRunner/queryrunner_test.go @@ -6,8 +6,8 @@ import ( controllers "queryorchestration/api/queryRunner" "queryorchestration/internal/database" "queryorchestration/internal/database/repository" - "queryorchestration/internal/document" - "queryorchestration/internal/queue" + "queryorchestration/internal/query/document" + "queryorchestration/internal/server/queue" "queryorchestration/internal/test" "testing" @@ -20,6 +20,9 @@ import ( ) func TestQueryRunner(t *testing.T) { + if testing.Short() { + t.Skip("Skipping long test in short mode") + } ctx := context.Background() qCfg, cleanup := test.CreateQueue(t, ctx, &test.CreateQueueConfig{}) diff --git a/api/queryService/controllers.go b/api/queryService/controllers.go index 8ed8e431..1ff96354 100644 --- a/api/queryService/controllers.go +++ b/api/queryService/controllers.go @@ -1,8 +1,8 @@ package queryservice import ( - "queryorchestration/internal/collector" "queryorchestration/internal/export" + "queryorchestration/internal/job/collector" "queryorchestration/internal/query" "github.com/go-playground/validator/v10" diff --git a/api/queryService/parse.go b/api/queryService/parse.go index d769f15d..148e4ca5 100644 --- a/api/queryService/parse.go +++ b/api/queryService/parse.go @@ -3,7 +3,7 @@ package queryservice import ( "errors" "queryorchestration/internal/query" - queryprocessor "queryorchestration/internal/queryProcessor" + queryprocessor "queryorchestration/internal/query/processor" ) func parseQueries(queries []*query.Query) ([]Query, error) { diff --git a/api/queryService/parse_test.go b/api/queryService/parse_test.go index 931b3c03..27be7f2a 100644 --- a/api/queryService/parse_test.go +++ b/api/queryService/parse_test.go @@ -2,7 +2,7 @@ package queryservice import ( "queryorchestration/internal/query" - queryprocessor "queryorchestration/internal/queryProcessor" + queryprocessor "queryorchestration/internal/query/processor" "testing" "github.com/google/uuid" diff --git a/api/queryService/query.go b/api/queryService/query.go index 57a69618..81d894df 100644 --- a/api/queryService/query.go +++ b/api/queryService/query.go @@ -4,7 +4,7 @@ import ( "fmt" "net/http" "queryorchestration/internal/query" - queryprocessor "queryorchestration/internal/queryProcessor" + queryprocessor "queryorchestration/internal/query/processor" "github.com/google/uuid" "github.com/labstack/echo/v4" diff --git a/cmd/queryRunner/main.go b/cmd/queryRunner/main.go index f8a8d4e9..7161df08 100644 --- a/cmd/queryRunner/main.go +++ b/cmd/queryRunner/main.go @@ -3,9 +3,9 @@ package main import ( "context" controllers "queryorchestration/api/queryRunner" - "queryorchestration/internal/document" - "queryorchestration/internal/queue" + "queryorchestration/internal/query/document" "queryorchestration/internal/server" + "queryorchestration/internal/server/queue" _ "github.com/lib/pq" ) diff --git a/cmd/queryService/main.go b/cmd/queryService/main.go index 4e2bdd1c..0bd85322 100644 --- a/cmd/queryService/main.go +++ b/cmd/queryService/main.go @@ -4,11 +4,11 @@ import ( "context" "log" queryservice "queryorchestration/api/queryService" - "queryorchestration/internal/api" - "queryorchestration/internal/collector" "queryorchestration/internal/export" + "queryorchestration/internal/job/collector" "queryorchestration/internal/query" "queryorchestration/internal/server" + "queryorchestration/internal/server/api" "github.com/labstack/echo/v4" _ "github.com/lib/pq" diff --git a/internal/database/connection.go b/internal/database/connection.go index 40ba6a70..47344e6e 100644 --- a/internal/database/connection.go +++ b/internal/database/connection.go @@ -5,7 +5,7 @@ import ( "fmt" "log" "net/url" - "queryorchestration/internal/env" + "queryorchestration/internal/server/env" "github.com/docker/go-connections/nat" "github.com/jackc/pgx/v5" diff --git a/internal/database/connection_test.go b/internal/database/connection_test.go index f7f0ddb7..a7a20140 100644 --- a/internal/database/connection_test.go +++ b/internal/database/connection_test.go @@ -12,6 +12,9 @@ import ( ) func TestDBConn(t *testing.T) { + if testing.Short() { + t.Skip("Skipping long test in short mode") + } ctx := context.Background() _, cleanup := test.CreateDB(t, ctx, &test.CreateDatabaseConfig{ Migrations: &database.MigrationConfig{ diff --git a/internal/database/migrations_test.go b/internal/database/migrations_test.go index c06db865..b496b2f8 100644 --- a/internal/database/migrations_test.go +++ b/internal/database/migrations_test.go @@ -12,6 +12,9 @@ import ( ) func TestRunMigrations(t *testing.T) { + if testing.Short() { + t.Skip("Skipping long test in short mode") + } ctx := context.Background() _, cleanup := test.CreateDB(t, ctx, &test.CreateDatabaseConfig{}) diff --git a/internal/collector/collector.go b/internal/job/collector/collector.go similarity index 100% rename from internal/collector/collector.go rename to internal/job/collector/collector.go diff --git a/internal/collector/service.go b/internal/job/collector/service.go similarity index 100% rename from internal/collector/service.go rename to internal/job/collector/service.go diff --git a/internal/collector/service_test.go b/internal/job/collector/service_test.go similarity index 97% rename from internal/collector/service_test.go rename to internal/job/collector/service_test.go index 3b5adfff..8a11c358 100644 --- a/internal/collector/service_test.go +++ b/internal/job/collector/service_test.go @@ -2,9 +2,9 @@ package collector_test import ( "context" - "queryorchestration/internal/collector" "queryorchestration/internal/database" "queryorchestration/internal/database/repository" + "queryorchestration/internal/job/collector" "testing" "github.com/google/uuid" diff --git a/internal/query/create.go b/internal/query/create.go index aec46032..ede8d12c 100644 --- a/internal/query/create.go +++ b/internal/query/create.go @@ -3,11 +3,11 @@ package query import ( "context" "fmt" - contextfull "queryorchestration/internal/contextFull" "queryorchestration/internal/database" "queryorchestration/internal/database/repository" - jsonextractor "queryorchestration/internal/jsonExtractor" - queryprocessor "queryorchestration/internal/queryProcessor" + queryprocessor "queryorchestration/internal/query/processor" + contextfull "queryorchestration/internal/query/types/contextFull" + jsonextractor "queryorchestration/internal/query/types/jsonExtractor" "github.com/google/uuid" "github.com/jackc/pgx/v5/pgtype" diff --git a/internal/query/create_test.go b/internal/query/create_test.go index 36ffa0d9..fe64b2a1 100644 --- a/internal/query/create_test.go +++ b/internal/query/create_test.go @@ -5,7 +5,7 @@ import ( "queryorchestration/internal/database" "queryorchestration/internal/database/repository" "queryorchestration/internal/query" - queryprocessor "queryorchestration/internal/queryProcessor" + queryprocessor "queryorchestration/internal/query/processor" "testing" "github.com/google/uuid" diff --git a/internal/query/createprivate_test.go b/internal/query/createprivate_test.go index b0fce7bf..58f5a1de 100644 --- a/internal/query/createprivate_test.go +++ b/internal/query/createprivate_test.go @@ -4,7 +4,7 @@ import ( "context" "queryorchestration/internal/database" "queryorchestration/internal/database/repository" - queryprocessor "queryorchestration/internal/queryProcessor" + queryprocessor "queryorchestration/internal/query/processor" "testing" "github.com/google/uuid" diff --git a/internal/document/service.go b/internal/query/document/service.go similarity index 92% rename from internal/document/service.go rename to internal/query/document/service.go index dfb1c993..c5d50c52 100644 --- a/internal/document/service.go +++ b/internal/query/document/service.go @@ -2,11 +2,11 @@ package document import ( "context" - "queryorchestration/internal/collector" "queryorchestration/internal/database" "queryorchestration/internal/database/repository" - queryqueue "queryorchestration/internal/queryQueue" - "queryorchestration/internal/result" + "queryorchestration/internal/job/collector" + queryqueue "queryorchestration/internal/query/queue" + "queryorchestration/internal/query/result" "github.com/google/uuid" ) diff --git a/internal/document/sync_test.go b/internal/query/document/sync_test.go similarity index 99% rename from internal/document/sync_test.go rename to internal/query/document/sync_test.go index 239a81e7..45db40d8 100644 --- a/internal/document/sync_test.go +++ b/internal/query/document/sync_test.go @@ -5,7 +5,7 @@ import ( "errors" "queryorchestration/internal/database" "queryorchestration/internal/database/repository" - "queryorchestration/internal/document" + "queryorchestration/internal/query/document" "testing" "github.com/google/uuid" diff --git a/internal/query/get.go b/internal/query/get.go index b54f5bf9..c4f447d6 100644 --- a/internal/query/get.go +++ b/internal/query/get.go @@ -4,7 +4,7 @@ import ( "context" "queryorchestration/internal/database" "queryorchestration/internal/database/repository" - queryprocessor "queryorchestration/internal/queryProcessor" + queryprocessor "queryorchestration/internal/query/processor" "github.com/google/uuid" ) diff --git a/internal/query/get_test.go b/internal/query/get_test.go index e6d8fd76..c0de3da6 100644 --- a/internal/query/get_test.go +++ b/internal/query/get_test.go @@ -5,7 +5,7 @@ import ( "queryorchestration/internal/database" "queryorchestration/internal/database/repository" "queryorchestration/internal/query" - queryprocessor "queryorchestration/internal/queryProcessor" + queryprocessor "queryorchestration/internal/query/processor" "testing" "github.com/google/uuid" diff --git a/internal/query/list_test.go b/internal/query/list_test.go index bea144c0..bd159512 100644 --- a/internal/query/list_test.go +++ b/internal/query/list_test.go @@ -5,7 +5,7 @@ import ( "queryorchestration/internal/database" "queryorchestration/internal/database/repository" "queryorchestration/internal/query" - queryprocessor "queryorchestration/internal/queryProcessor" + queryprocessor "queryorchestration/internal/query/processor" "testing" "github.com/google/uuid" diff --git a/internal/query/parse_test.go b/internal/query/parse_test.go index d5b4d62a..e5f746e4 100644 --- a/internal/query/parse_test.go +++ b/internal/query/parse_test.go @@ -4,7 +4,7 @@ import ( "queryorchestration/internal/database" "queryorchestration/internal/database/repository" "queryorchestration/internal/query" - queryprocessor "queryorchestration/internal/queryProcessor" + queryprocessor "queryorchestration/internal/query/processor" "testing" "github.com/google/uuid" diff --git a/internal/queryProcessor/parse.go b/internal/query/processor/parse.go similarity index 100% rename from internal/queryProcessor/parse.go rename to internal/query/processor/parse.go diff --git a/internal/queryProcessor/parse_test.go b/internal/query/processor/parse_test.go similarity index 98% rename from internal/queryProcessor/parse_test.go rename to internal/query/processor/parse_test.go index f1dc1af8..b0a9c2ca 100644 --- a/internal/queryProcessor/parse_test.go +++ b/internal/query/processor/parse_test.go @@ -2,7 +2,7 @@ package queryprocessor_test import ( "queryorchestration/internal/database/repository" - queryprocessor "queryorchestration/internal/queryProcessor" + queryprocessor "queryorchestration/internal/query/processor" "testing" "github.com/google/uuid" diff --git a/internal/queryProcessor/service.go b/internal/query/processor/service.go similarity index 94% rename from internal/queryProcessor/service.go rename to internal/query/processor/service.go index 7f502b96..77109403 100644 --- a/internal/queryProcessor/service.go +++ b/internal/query/processor/service.go @@ -2,7 +2,7 @@ package queryprocessor import ( "context" - "queryorchestration/internal/result" + "queryorchestration/internal/query/result" "github.com/google/uuid" ) diff --git a/internal/queryQueue/create.go b/internal/query/queue/create.go similarity index 96% rename from internal/queryQueue/create.go rename to internal/query/queue/create.go index f9647e0d..4a52b653 100644 --- a/internal/queryQueue/create.go +++ b/internal/query/queue/create.go @@ -3,7 +3,7 @@ package queryqueue import ( "context" "queryorchestration/internal/database" - queryprocessor "queryorchestration/internal/queryProcessor" + queryprocessor "queryorchestration/internal/query/processor" ) func (q *Queue) getUnsyncedQueries() { diff --git a/internal/queryQueue/create_test.go b/internal/query/queue/create_test.go similarity index 95% rename from internal/queryQueue/create_test.go rename to internal/query/queue/create_test.go index bdaa80a3..7aa73a7b 100644 --- a/internal/queryQueue/create_test.go +++ b/internal/query/queue/create_test.go @@ -2,11 +2,11 @@ package queryqueue import ( "context" - "queryorchestration/internal/collector" "queryorchestration/internal/database" "queryorchestration/internal/database/repository" - queryprocessor "queryorchestration/internal/queryProcessor" - "queryorchestration/internal/result" + "queryorchestration/internal/job/collector" + queryprocessor "queryorchestration/internal/query/processor" + "queryorchestration/internal/query/result" "testing" "github.com/google/uuid" diff --git a/internal/queryQueue/execute.go b/internal/query/queue/execute.go similarity index 92% rename from internal/queryQueue/execute.go rename to internal/query/queue/execute.go index cdf6b361..a26b5999 100644 --- a/internal/queryQueue/execute.go +++ b/internal/query/queue/execute.go @@ -3,8 +3,8 @@ package queryqueue import ( "context" "queryorchestration/internal/database" - queryprocessor "queryorchestration/internal/queryProcessor" - "queryorchestration/internal/result" + queryprocessor "queryorchestration/internal/query/processor" + "queryorchestration/internal/query/result" "github.com/jackc/pgx/v5/pgtype" ) diff --git a/internal/queryQueue/execute_test.go b/internal/query/queue/execute_test.go similarity index 97% rename from internal/queryQueue/execute_test.go rename to internal/query/queue/execute_test.go index f8c4b31d..78914e82 100644 --- a/internal/queryQueue/execute_test.go +++ b/internal/query/queue/execute_test.go @@ -3,12 +3,12 @@ package queryqueue_test import ( "context" "fmt" - "queryorchestration/internal/collector" "queryorchestration/internal/database" "queryorchestration/internal/database/repository" - queryprocessor "queryorchestration/internal/queryProcessor" - queryqueue "queryorchestration/internal/queryQueue" - "queryorchestration/internal/result" + "queryorchestration/internal/job/collector" + queryprocessor "queryorchestration/internal/query/processor" + queryqueue "queryorchestration/internal/query/queue" + "queryorchestration/internal/query/result" "testing" "github.com/google/uuid" diff --git a/internal/queryQueue/executeprivate_test.go b/internal/query/queue/executeprivate_test.go similarity index 97% rename from internal/queryQueue/executeprivate_test.go rename to internal/query/queue/executeprivate_test.go index 6f326d7a..770ec982 100644 --- a/internal/queryQueue/executeprivate_test.go +++ b/internal/query/queue/executeprivate_test.go @@ -4,7 +4,7 @@ import ( "context" "queryorchestration/internal/database" "queryorchestration/internal/database/repository" - queryprocessor "queryorchestration/internal/queryProcessor" + queryprocessor "queryorchestration/internal/query/processor" "testing" "github.com/google/uuid" diff --git a/internal/queryQueue/result.go b/internal/query/queue/result.go similarity index 87% rename from internal/queryQueue/result.go rename to internal/query/queue/result.go index d18e0fd7..a9ee716a 100644 --- a/internal/queryQueue/result.go +++ b/internal/query/queue/result.go @@ -3,12 +3,12 @@ package queryqueue import ( "context" "fmt" - contextfull "queryorchestration/internal/contextFull" "queryorchestration/internal/database" "queryorchestration/internal/database/repository" - jsonextractor "queryorchestration/internal/jsonExtractor" - queryprocessor "queryorchestration/internal/queryProcessor" - "queryorchestration/internal/result" + queryprocessor "queryorchestration/internal/query/processor" + "queryorchestration/internal/query/result" + contextfull "queryorchestration/internal/query/types/contextFull" + jsonextractor "queryorchestration/internal/query/types/jsonExtractor" ) func (q *Queue) setResult(ctx context.Context, qu *queryprocessor.Query, resultValues []result.Value) error { diff --git a/internal/queryQueue/resultprivate_test.go b/internal/query/queue/resultprivate_test.go similarity index 94% rename from internal/queryQueue/resultprivate_test.go rename to internal/query/queue/resultprivate_test.go index aece9c2f..b9aa8083 100644 --- a/internal/queryQueue/resultprivate_test.go +++ b/internal/query/queue/resultprivate_test.go @@ -4,8 +4,8 @@ import ( "context" "queryorchestration/internal/database" "queryorchestration/internal/database/repository" - queryprocessor "queryorchestration/internal/queryProcessor" - "queryorchestration/internal/result" + queryprocessor "queryorchestration/internal/query/processor" + "queryorchestration/internal/query/result" "testing" "github.com/google/uuid" diff --git a/internal/queryQueue/service.go b/internal/query/queue/service.go similarity index 86% rename from internal/queryQueue/service.go rename to internal/query/queue/service.go index 8e3d5af7..eef3e421 100644 --- a/internal/queryQueue/service.go +++ b/internal/query/queue/service.go @@ -2,10 +2,10 @@ package queryqueue import ( "context" - "queryorchestration/internal/collector" "queryorchestration/internal/database" - queryprocessor "queryorchestration/internal/queryProcessor" - "queryorchestration/internal/result" + "queryorchestration/internal/job/collector" + queryprocessor "queryorchestration/internal/query/processor" + "queryorchestration/internal/query/result" "github.com/google/uuid" ) diff --git a/internal/queryQueue/service_test.go b/internal/query/queue/service_test.go similarity index 96% rename from internal/queryQueue/service_test.go rename to internal/query/queue/service_test.go index 706619bf..a273e261 100644 --- a/internal/queryQueue/service_test.go +++ b/internal/query/queue/service_test.go @@ -3,12 +3,12 @@ package queryqueue_test import ( "context" "errors" - "queryorchestration/internal/collector" "queryorchestration/internal/database" "queryorchestration/internal/database/repository" - queryprocessor "queryorchestration/internal/queryProcessor" - queryqueue "queryorchestration/internal/queryQueue" - "queryorchestration/internal/result" + "queryorchestration/internal/job/collector" + queryprocessor "queryorchestration/internal/query/processor" + queryqueue "queryorchestration/internal/query/queue" + "queryorchestration/internal/query/result" "testing" "github.com/google/uuid" diff --git a/internal/result/parse.go b/internal/query/result/parse.go similarity index 100% rename from internal/result/parse.go rename to internal/query/result/parse.go diff --git a/internal/result/parse_test.go b/internal/query/result/parse_test.go similarity index 92% rename from internal/result/parse_test.go rename to internal/query/result/parse_test.go index 7f19846c..18edfd98 100644 --- a/internal/result/parse_test.go +++ b/internal/query/result/parse_test.go @@ -2,7 +2,7 @@ package result_test import ( "queryorchestration/internal/database/repository" - "queryorchestration/internal/result" + "queryorchestration/internal/query/result" "testing" "github.com/google/uuid" diff --git a/internal/result/service.go b/internal/query/result/service.go similarity index 100% rename from internal/result/service.go rename to internal/query/result/service.go diff --git a/internal/result/store_test.go b/internal/query/result/store_test.go similarity index 97% rename from internal/result/store_test.go rename to internal/query/result/store_test.go index 34cc94ee..a95ffd70 100644 --- a/internal/result/store_test.go +++ b/internal/query/result/store_test.go @@ -5,7 +5,7 @@ import ( "errors" "queryorchestration/internal/database" "queryorchestration/internal/database/repository" - "queryorchestration/internal/result" + "queryorchestration/internal/query/result" "testing" "github.com/google/uuid" diff --git a/internal/contextFull/creator.go b/internal/query/types/contextFull/creator.go similarity index 85% rename from internal/contextFull/creator.go rename to internal/query/types/contextFull/creator.go index 67793db0..3e08fac4 100644 --- a/internal/contextFull/creator.go +++ b/internal/query/types/contextFull/creator.go @@ -3,7 +3,7 @@ package contextfull import ( "context" "queryorchestration/internal/database" - queryprocessor "queryorchestration/internal/queryProcessor" + queryprocessor "queryorchestration/internal/query/processor" ) type Creator struct { diff --git a/internal/contextFull/creator_test.go b/internal/query/types/contextFull/creator_test.go similarity index 86% rename from internal/contextFull/creator_test.go rename to internal/query/types/contextFull/creator_test.go index 5cfbae4e..a7d6a794 100644 --- a/internal/contextFull/creator_test.go +++ b/internal/query/types/contextFull/creator_test.go @@ -2,10 +2,10 @@ package contextfull_test import ( "context" - contextfull "queryorchestration/internal/contextFull" "queryorchestration/internal/database" "queryorchestration/internal/database/repository" - queryprocessor "queryorchestration/internal/queryProcessor" + queryprocessor "queryorchestration/internal/query/processor" + contextfull "queryorchestration/internal/query/types/contextFull" "testing" "github.com/google/uuid" diff --git a/internal/contextFull/process_test.go b/internal/query/types/contextFull/process_test.go similarity index 80% rename from internal/contextFull/process_test.go rename to internal/query/types/contextFull/process_test.go index 654bddb8..b86b056e 100644 --- a/internal/contextFull/process_test.go +++ b/internal/query/types/contextFull/process_test.go @@ -2,9 +2,9 @@ package contextfull_test import ( "context" - contextfull "queryorchestration/internal/contextFull" - queryprocessor "queryorchestration/internal/queryProcessor" - "queryorchestration/internal/result" + queryprocessor "queryorchestration/internal/query/processor" + "queryorchestration/internal/query/result" + contextfull "queryorchestration/internal/query/types/contextFull" "testing" "github.com/google/uuid" diff --git a/internal/contextFull/result.go b/internal/query/types/contextFull/result.go similarity index 100% rename from internal/contextFull/result.go rename to internal/query/types/contextFull/result.go diff --git a/internal/contextFull/service.go b/internal/query/types/contextFull/service.go similarity index 77% rename from internal/contextFull/service.go rename to internal/query/types/contextFull/service.go index bc23e1b9..fec67137 100644 --- a/internal/contextFull/service.go +++ b/internal/query/types/contextFull/service.go @@ -3,8 +3,8 @@ package contextfull import ( "context" "errors" - queryprocessor "queryorchestration/internal/queryProcessor" - "queryorchestration/internal/result" + queryprocessor "queryorchestration/internal/query/processor" + "queryorchestration/internal/query/result" ) type Extractor struct { diff --git a/internal/contextFull/updator.go b/internal/query/types/contextFull/updator.go similarity index 86% rename from internal/contextFull/updator.go rename to internal/query/types/contextFull/updator.go index ac24fc4a..b0f47515 100644 --- a/internal/contextFull/updator.go +++ b/internal/query/types/contextFull/updator.go @@ -3,7 +3,7 @@ package contextfull import ( "context" "queryorchestration/internal/database" - queryprocessor "queryorchestration/internal/queryProcessor" + queryprocessor "queryorchestration/internal/query/processor" ) type Updator struct { diff --git a/internal/contextFull/updator_test.go b/internal/query/types/contextFull/updator_test.go similarity index 88% rename from internal/contextFull/updator_test.go rename to internal/query/types/contextFull/updator_test.go index 20de3781..b6eb78d8 100644 --- a/internal/contextFull/updator_test.go +++ b/internal/query/types/contextFull/updator_test.go @@ -2,10 +2,10 @@ package contextfull_test import ( "context" - contextfull "queryorchestration/internal/contextFull" "queryorchestration/internal/database" "queryorchestration/internal/database/repository" - queryprocessor "queryorchestration/internal/queryProcessor" + queryprocessor "queryorchestration/internal/query/processor" + contextfull "queryorchestration/internal/query/types/contextFull" "testing" "github.com/google/uuid" diff --git a/internal/jsonExtractor/creator.go b/internal/query/types/jsonExtractor/creator.go similarity index 83% rename from internal/jsonExtractor/creator.go rename to internal/query/types/jsonExtractor/creator.go index 8a328dde..6ef0f5b4 100644 --- a/internal/jsonExtractor/creator.go +++ b/internal/query/types/jsonExtractor/creator.go @@ -3,7 +3,7 @@ package jsonextractor import ( "context" "queryorchestration/internal/database" - queryprocessor "queryorchestration/internal/queryProcessor" + queryprocessor "queryorchestration/internal/query/processor" ) type Creator struct { diff --git a/internal/jsonExtractor/creator_test.go b/internal/query/types/jsonExtractor/creator_test.go similarity index 85% rename from internal/jsonExtractor/creator_test.go rename to internal/query/types/jsonExtractor/creator_test.go index 382052bc..7697ac22 100644 --- a/internal/jsonExtractor/creator_test.go +++ b/internal/query/types/jsonExtractor/creator_test.go @@ -4,8 +4,8 @@ import ( "context" "queryorchestration/internal/database" "queryorchestration/internal/database/repository" - jsonextractor "queryorchestration/internal/jsonExtractor" - queryprocessor "queryorchestration/internal/queryProcessor" + queryprocessor "queryorchestration/internal/query/processor" + jsonextractor "queryorchestration/internal/query/types/jsonExtractor" "testing" "github.com/google/uuid" diff --git a/internal/jsonExtractor/process_test.go b/internal/query/types/jsonExtractor/process_test.go similarity index 96% rename from internal/jsonExtractor/process_test.go rename to internal/query/types/jsonExtractor/process_test.go index 177cdc94..b53a3adf 100644 --- a/internal/jsonExtractor/process_test.go +++ b/internal/query/types/jsonExtractor/process_test.go @@ -3,12 +3,12 @@ package jsonextractor_test import ( "context" "fmt" - contextfull "queryorchestration/internal/contextFull" "queryorchestration/internal/database" "queryorchestration/internal/database/repository" - jsonextractor "queryorchestration/internal/jsonExtractor" - queryprocessor "queryorchestration/internal/queryProcessor" - "queryorchestration/internal/result" + queryprocessor "queryorchestration/internal/query/processor" + "queryorchestration/internal/query/result" + contextfull "queryorchestration/internal/query/types/contextFull" + jsonextractor "queryorchestration/internal/query/types/jsonExtractor" "testing" "github.com/google/uuid" diff --git a/internal/jsonExtractor/result.go b/internal/query/types/jsonExtractor/result.go similarity index 100% rename from internal/jsonExtractor/result.go rename to internal/query/types/jsonExtractor/result.go diff --git a/internal/jsonExtractor/service.go b/internal/query/types/jsonExtractor/service.go similarity index 92% rename from internal/jsonExtractor/service.go rename to internal/query/types/jsonExtractor/service.go index 86fe20de..f43cb6c1 100644 --- a/internal/jsonExtractor/service.go +++ b/internal/query/types/jsonExtractor/service.go @@ -6,8 +6,8 @@ import ( "fmt" "queryorchestration/internal/database" "queryorchestration/internal/database/repository" - queryprocessor "queryorchestration/internal/queryProcessor" - "queryorchestration/internal/result" + queryprocessor "queryorchestration/internal/query/processor" + "queryorchestration/internal/query/result" "github.com/tidwall/gjson" ) diff --git a/internal/jsonExtractor/updator.go b/internal/query/types/jsonExtractor/updator.go similarity index 84% rename from internal/jsonExtractor/updator.go rename to internal/query/types/jsonExtractor/updator.go index 10697050..0c656dda 100644 --- a/internal/jsonExtractor/updator.go +++ b/internal/query/types/jsonExtractor/updator.go @@ -3,7 +3,7 @@ package jsonextractor import ( "context" "queryorchestration/internal/database" - queryprocessor "queryorchestration/internal/queryProcessor" + queryprocessor "queryorchestration/internal/query/processor" ) type Updator struct { diff --git a/internal/jsonExtractor/updator_test.go b/internal/query/types/jsonExtractor/updator_test.go similarity index 88% rename from internal/jsonExtractor/updator_test.go rename to internal/query/types/jsonExtractor/updator_test.go index 588e6f43..280682a9 100644 --- a/internal/jsonExtractor/updator_test.go +++ b/internal/query/types/jsonExtractor/updator_test.go @@ -4,8 +4,8 @@ import ( "context" "queryorchestration/internal/database" "queryorchestration/internal/database/repository" - jsonextractor "queryorchestration/internal/jsonExtractor" - queryprocessor "queryorchestration/internal/queryProcessor" + queryprocessor "queryorchestration/internal/query/processor" + jsonextractor "queryorchestration/internal/query/types/jsonExtractor" "testing" "github.com/google/uuid" diff --git a/internal/query/update.go b/internal/query/update.go index e8c88634..2c7713a2 100644 --- a/internal/query/update.go +++ b/internal/query/update.go @@ -3,9 +3,9 @@ package query import ( "context" "fmt" - contextfull "queryorchestration/internal/contextFull" - jsonextractor "queryorchestration/internal/jsonExtractor" - queryprocessor "queryorchestration/internal/queryProcessor" + queryprocessor "queryorchestration/internal/query/processor" + contextfull "queryorchestration/internal/query/types/contextFull" + jsonextractor "queryorchestration/internal/query/types/jsonExtractor" ) func (s *Service) Update(ctx context.Context, entity *queryprocessor.Update) error { diff --git a/internal/query/update_test.go b/internal/query/update_test.go index 01a910e0..6acfe263 100644 --- a/internal/query/update_test.go +++ b/internal/query/update_test.go @@ -5,7 +5,7 @@ import ( "queryorchestration/internal/database" "queryorchestration/internal/database/repository" "queryorchestration/internal/query" - queryprocessor "queryorchestration/internal/queryProcessor" + queryprocessor "queryorchestration/internal/query/processor" "testing" "github.com/google/uuid" diff --git a/internal/query/updateprivate_test.go b/internal/query/updateprivate_test.go index d91196ee..eb7b4dcb 100644 --- a/internal/query/updateprivate_test.go +++ b/internal/query/updateprivate_test.go @@ -4,7 +4,7 @@ import ( "context" "queryorchestration/internal/database" "queryorchestration/internal/database/repository" - queryprocessor "queryorchestration/internal/queryProcessor" + queryprocessor "queryorchestration/internal/query/processor" "testing" "github.com/google/uuid" diff --git a/internal/api/listener.go b/internal/server/api/listener.go similarity index 100% rename from internal/api/listener.go rename to internal/server/api/listener.go diff --git a/internal/api/listener_test.go b/internal/server/api/listener_test.go similarity index 93% rename from internal/api/listener_test.go rename to internal/server/api/listener_test.go index 9096262a..cecfacbe 100644 --- a/internal/api/listener_test.go +++ b/internal/server/api/listener_test.go @@ -14,6 +14,9 @@ import ( ) func TestNew(t *testing.T) { + if testing.Short() { + t.Skip("Skipping long test in short mode") + } ctx := context.Background() _, cleanup := test.CreateDB(t, ctx, &test.CreateDatabaseConfig{ diff --git a/internal/env/get.go b/internal/server/env/get.go similarity index 100% rename from internal/env/get.go rename to internal/server/env/get.go diff --git a/internal/env/get_test.go b/internal/server/env/get_test.go similarity index 90% rename from internal/env/get_test.go rename to internal/server/env/get_test.go index daaef96e..7bb1489c 100644 --- a/internal/env/get_test.go +++ b/internal/server/env/get_test.go @@ -1,7 +1,7 @@ package env_test import ( - "queryorchestration/internal/env" + "queryorchestration/internal/server/env" "testing" "github.com/stretchr/testify/assert" diff --git a/internal/env/getfatal_test.go b/internal/server/env/getfatal_test.go similarity index 89% rename from internal/env/getfatal_test.go rename to internal/server/env/getfatal_test.go index 79978c9c..583ef895 100644 --- a/internal/env/getfatal_test.go +++ b/internal/server/env/getfatal_test.go @@ -1,7 +1,7 @@ package env_test import ( - "queryorchestration/internal/env" + "queryorchestration/internal/server/env" "testing" "github.com/stretchr/testify/assert" diff --git a/internal/otel/service.go b/internal/server/otel/service.go similarity index 100% rename from internal/otel/service.go rename to internal/server/otel/service.go diff --git a/internal/otel/service_test.go b/internal/server/otel/service_test.go similarity index 82% rename from internal/otel/service_test.go rename to internal/server/otel/service_test.go index 90d9a343..f8f7dca7 100644 --- a/internal/otel/service_test.go +++ b/internal/server/otel/service_test.go @@ -2,7 +2,7 @@ package otel_test import ( "context" - "queryorchestration/internal/otel" + "queryorchestration/internal/server/otel" "testing" "github.com/stretchr/testify/assert" diff --git a/internal/queue/config.go b/internal/server/queue/config.go similarity index 100% rename from internal/queue/config.go rename to internal/server/queue/config.go diff --git a/internal/queue/delete.go b/internal/server/queue/delete.go similarity index 100% rename from internal/queue/delete.go rename to internal/server/queue/delete.go diff --git a/internal/queue/delete_test.go b/internal/server/queue/delete_test.go similarity index 84% rename from internal/queue/delete_test.go rename to internal/server/queue/delete_test.go index b708b6e5..0fa7b365 100644 --- a/internal/queue/delete_test.go +++ b/internal/server/queue/delete_test.go @@ -2,7 +2,7 @@ package queue_test import ( "context" - "queryorchestration/internal/queue" + "queryorchestration/internal/server/queue" "queryorchestration/internal/test" "testing" @@ -11,6 +11,9 @@ import ( ) func TestDelete(t *testing.T) { + if testing.Short() { + t.Skip("Skipping long test in short mode") + } ctx := context.Background() queueConfig, cleanup := test.CreateQueue(t, ctx, &test.CreateQueueConfig{}) defer cleanup() diff --git a/internal/queue/listener.go b/internal/server/queue/listener.go similarity index 96% rename from internal/queue/listener.go rename to internal/server/queue/listener.go index 7dc28d98..24bd8f1d 100644 --- a/internal/queue/listener.go +++ b/internal/server/queue/listener.go @@ -3,8 +3,8 @@ package queue import ( "context" "log" - "queryorchestration/internal/env" "queryorchestration/internal/server" + "queryorchestration/internal/server/env" "github.com/aws/aws-sdk-go-v2/config" "github.com/aws/aws-sdk-go-v2/service/sqs" diff --git a/internal/queue/listener_test.go b/internal/server/queue/listener_test.go similarity index 88% rename from internal/queue/listener_test.go rename to internal/server/queue/listener_test.go index 41450625..605bbdf8 100644 --- a/internal/queue/listener_test.go +++ b/internal/server/queue/listener_test.go @@ -4,8 +4,8 @@ import ( "context" "os" "path" - "queryorchestration/internal/queue" "queryorchestration/internal/server" + "queryorchestration/internal/server/queue" "queryorchestration/internal/test" "testing" "time" @@ -14,6 +14,9 @@ import ( ) func TestNew(t *testing.T) { + if testing.Short() { + t.Skip("Skipping long test in short mode") + } ctx := context.Background() _, cleanup := test.CreateQueue(t, ctx, &test.CreateQueueConfig{}) defer cleanup() diff --git a/internal/queue/poll.go b/internal/server/queue/poll.go similarity index 100% rename from internal/queue/poll.go rename to internal/server/queue/poll.go diff --git a/internal/queue/poll_test.go b/internal/server/queue/poll_test.go similarity index 86% rename from internal/queue/poll_test.go rename to internal/server/queue/poll_test.go index 82793366..dfcfeed6 100644 --- a/internal/queue/poll_test.go +++ b/internal/server/queue/poll_test.go @@ -2,7 +2,7 @@ package queue_test import ( "context" - "queryorchestration/internal/queue" + "queryorchestration/internal/server/queue" "queryorchestration/internal/test" "testing" "time" @@ -18,6 +18,9 @@ func (s MockController) Process(ctx context.Context, config *queue.Config, msg * } func TestPollMessages(t *testing.T) { + if testing.Short() { + t.Skip("Skipping long test in short mode") + } ctx := context.Background() queueConfig, cleanup := test.CreateQueue(t, ctx, &test.CreateQueueConfig{}) defer cleanup() @@ -38,6 +41,9 @@ func TestPollMessages(t *testing.T) { } func TestPollMessage(t *testing.T) { + if testing.Short() { + t.Skip("Skipping long test in short mode") + } ctx := context.Background() queueConfig, cleanup := test.CreateQueue(t, ctx, &test.CreateQueueConfig{}) defer cleanup() diff --git a/internal/queue/receive.go b/internal/server/queue/receive.go similarity index 100% rename from internal/queue/receive.go rename to internal/server/queue/receive.go diff --git a/internal/queue/receive_test.go b/internal/server/queue/receive_test.go similarity index 86% rename from internal/queue/receive_test.go rename to internal/server/queue/receive_test.go index ed3f69d9..d0450645 100644 --- a/internal/queue/receive_test.go +++ b/internal/server/queue/receive_test.go @@ -2,7 +2,7 @@ package queue_test import ( "context" - "queryorchestration/internal/queue" + "queryorchestration/internal/server/queue" "queryorchestration/internal/test" "testing" @@ -11,6 +11,9 @@ import ( ) func TestReceive(t *testing.T) { + if testing.Short() { + t.Skip("Skipping long test in short mode") + } ctx := context.Background() queueConfig, cleanup := test.CreateQueue(t, ctx, &test.CreateQueueConfig{}) defer cleanup() diff --git a/internal/queue/send.go b/internal/server/queue/send.go similarity index 100% rename from internal/queue/send.go rename to internal/server/queue/send.go diff --git a/internal/queue/send_test.go b/internal/server/queue/send_test.go similarity index 81% rename from internal/queue/send_test.go rename to internal/server/queue/send_test.go index c6acf8bc..e4ff3666 100644 --- a/internal/queue/send_test.go +++ b/internal/server/queue/send_test.go @@ -2,7 +2,7 @@ package queue_test import ( "context" - "queryorchestration/internal/queue" + "queryorchestration/internal/server/queue" "queryorchestration/internal/test" "testing" @@ -11,6 +11,9 @@ import ( ) func TestSend(t *testing.T) { + if testing.Short() { + t.Skip("Skipping long test in short mode") + } ctx := context.Background() queueConfig, cleanup := test.CreateQueue(t, ctx, &test.CreateQueueConfig{}) defer cleanup() diff --git a/internal/server/server.go b/internal/server/server.go index b6833084..2412662e 100644 --- a/internal/server/server.go +++ b/internal/server/server.go @@ -5,7 +5,7 @@ import ( "log" "queryorchestration/internal/database" "queryorchestration/internal/database/repository" - "queryorchestration/internal/otel" + "queryorchestration/internal/server/otel" "github.com/go-playground/validator/v10" ) diff --git a/internal/server/server_test.go b/internal/server/server_test.go index 5bc3c269..cc9edd17 100644 --- a/internal/server/server_test.go +++ b/internal/server/server_test.go @@ -12,6 +12,9 @@ import ( ) func TestNew(t *testing.T) { + if testing.Short() { + t.Skip("Skipping long test in short mode") + } ctx := context.Background() _, cleanup := test.CreateDB(t, ctx, &test.CreateDatabaseConfig{}) diff --git a/internal/test/api_test.go b/internal/test/api_test.go index d08f808f..7d6da905 100644 --- a/internal/test/api_test.go +++ b/internal/test/api_test.go @@ -12,6 +12,9 @@ import ( ) func TestCreateAPIContainer(t *testing.T) { + if testing.Short() { + t.Skip("Skipping long test in short mode") + } ctx := context.Background() ncfg, ncleanup := test.CreateNetwork(t, ctx) @@ -37,6 +40,9 @@ func TestCreateAPIContainer(t *testing.T) { cleanup() } func TestCreateAPIWithDependencies(t *testing.T) { + if testing.Short() { + t.Skip("Skipping long test in short mode") + } ctx := context.Background() conn, cleanup := test.CreateAPIWithDependencies(t, ctx, "queryService") diff --git a/internal/test/container_test.go b/internal/test/container_test.go index a8ef33df..d2e5a03e 100644 --- a/internal/test/container_test.go +++ b/internal/test/container_test.go @@ -11,6 +11,9 @@ import ( ) func TestCreateContainer(t *testing.T) { + if testing.Short() { + t.Skip("Skipping long test in short mode") + } ctx := context.Background() ncfg, ncleanup := CreateNetwork(t, ctx) diff --git a/internal/test/database_test.go b/internal/test/database_test.go index deb6c55b..a45f6420 100644 --- a/internal/test/database_test.go +++ b/internal/test/database_test.go @@ -12,6 +12,9 @@ import ( ) func TestCreateDB(t *testing.T) { + if testing.Short() { + t.Skip("Skipping long test in short mode") + } ctx := context.Background() dbcfg, cleanup := test.CreateDB(t, ctx, &test.CreateDatabaseConfig{}) @@ -23,6 +26,9 @@ func TestCreateDB(t *testing.T) { } func TestCreateDBWithMigrations(t *testing.T) { + if testing.Short() { + t.Skip("Skipping long test in short mode") + } ctx := context.Background() dbcfg, cleanup := test.CreateDB(t, ctx, &test.CreateDatabaseConfig{ diff --git a/internal/test/queue.go b/internal/test/queue.go index 310be069..5d58a1d6 100644 --- a/internal/test/queue.go +++ b/internal/test/queue.go @@ -3,7 +3,7 @@ package test import ( "context" "fmt" - "queryorchestration/internal/queue" + "queryorchestration/internal/server/queue" "testing" "time" diff --git a/internal/test/queue_test.go b/internal/test/queue_test.go index 90900cc0..c00b5a10 100644 --- a/internal/test/queue_test.go +++ b/internal/test/queue_test.go @@ -2,7 +2,7 @@ package test_test import ( "context" - "queryorchestration/internal/queue" + "queryorchestration/internal/server/queue" "queryorchestration/internal/test" "testing" @@ -12,6 +12,9 @@ import ( ) func TestCreateQueue(t *testing.T) { + if testing.Short() { + t.Skip("Skipping long test in short mode") + } ctx := context.Background() qcfg, cleanup := test.CreateQueue(t, ctx, &test.CreateQueueConfig{}) @@ -22,6 +25,9 @@ func TestCreateQueue(t *testing.T) { } func TestAssertMessageWait(t *testing.T) { + if testing.Short() { + t.Skip("Skipping long test in short mode") + } ctx := context.Background() qcfg, cleanup := test.CreateQueue(t, ctx, &test.CreateQueueConfig{}) @@ -40,6 +46,9 @@ func TestAssertMessageWait(t *testing.T) { } func TestAssertMessageBodyWait(t *testing.T) { + if testing.Short() { + t.Skip("Skipping long test in short mode") + } ctx := context.Background() qcfg, cleanup := test.CreateQueue(t, ctx, &test.CreateQueueConfig{}) @@ -57,6 +66,9 @@ func TestAssertMessageBodyWait(t *testing.T) { } func TestAssertMessageAttrWait(t *testing.T) { + if testing.Short() { + t.Skip("Skipping long test in short mode") + } ctx := context.Background() qcfg, cleanup := test.CreateQueue(t, ctx, &test.CreateQueueConfig{}) diff --git a/internal/test/queuecontainer_test.go b/internal/test/queuecontainer_test.go index 9b024f86..d956cebb 100644 --- a/internal/test/queuecontainer_test.go +++ b/internal/test/queuecontainer_test.go @@ -11,6 +11,9 @@ import ( ) func TestCreateQueueContainer(t *testing.T) { + if testing.Short() { + t.Skip("Skipping long test in short mode") + } ctx := context.Background() ncfg, ncleanup := CreateNetwork(t, ctx) @@ -47,6 +50,9 @@ func TestCreateQueueContainer(t *testing.T) { } func TestCreateQueueWithDependencies(t *testing.T) { + if testing.Short() { + t.Skip("Skipping long test in short mode") + } ctx := context.Background() conn, cleanup := CreateQueueWithDependencies(t, ctx, "queryRunner") diff --git a/scripts/tests.yml b/scripts/tests.yml index cac9514a..ce5f34c2 100644 --- a/scripts/tests.yml +++ b/scripts/tests.yml @@ -5,18 +5,22 @@ version: '3' vars: COVERAGE_FILE: "{{.OUT_DIR}}/coverage.out" + INTERNAL: "./internal/..." + API: "./api/..." + PKG: "./pkg/..." tasks: mocks:generate: cmds: - mockery + unit:short: + deps: + - mocks:generate + cmds: + - go test -short {{.INTERNAL}} {{.API}} {{.PKG}} unit:nocoverage: deps: - mocks:generate - vars: - INTERNAL: "./internal/..." - API: "./api/..." - PKG: "./pkg/..." cmds: - mkdir -p {{.OUT_DIR}} - | diff --git a/test/queryRunner/queryrunner_test.go b/test/queryRunner/queryrunner_test.go index b7d0c76c..06d8c6c4 100644 --- a/test/queryRunner/queryrunner_test.go +++ b/test/queryRunner/queryrunner_test.go @@ -3,8 +3,8 @@ package integration_test import ( "context" "encoding/json" - "queryorchestration/internal/document" - "queryorchestration/internal/queue" + "queryorchestration/internal/query/document" + "queryorchestration/internal/server/queue" "queryorchestration/internal/test" "testing"