diff --git a/test/unit/internal/collector/service_test.go b/internal/collector/service_test.go similarity index 98% rename from test/unit/internal/collector/service_test.go rename to internal/collector/service_test.go index 8d307cda..3b5adfff 100644 --- a/test/unit/internal/collector/service_test.go +++ b/internal/collector/service_test.go @@ -1,4 +1,4 @@ -package document_test +package collector_test import ( "context" diff --git a/test/unit/internal/contextfull/creator_test.go b/internal/contextFull/creator_test.go similarity index 97% rename from test/unit/internal/contextfull/creator_test.go rename to internal/contextFull/creator_test.go index e09cf28f..5cfbae4e 100644 --- a/test/unit/internal/contextfull/creator_test.go +++ b/internal/contextFull/creator_test.go @@ -1,4 +1,4 @@ -package document_test +package contextfull_test import ( "context" diff --git a/test/unit/internal/contextfull/process_test.go b/internal/contextFull/process_test.go similarity index 97% rename from test/unit/internal/contextfull/process_test.go rename to internal/contextFull/process_test.go index 0683beff..654bddb8 100644 --- a/test/unit/internal/contextfull/process_test.go +++ b/internal/contextFull/process_test.go @@ -1,4 +1,4 @@ -package document_test +package contextfull_test import ( "context" diff --git a/test/unit/internal/contextfull/updator_test.go b/internal/contextFull/updator_test.go similarity index 97% rename from test/unit/internal/contextfull/updator_test.go rename to internal/contextFull/updator_test.go index aab5e241..20de3781 100644 --- a/test/unit/internal/contextfull/updator_test.go +++ b/internal/contextFull/updator_test.go @@ -1,4 +1,4 @@ -package document_test +package contextfull_test import ( "context" diff --git a/test/unit/internal/database/connection_test.go b/internal/database/connection_test.go similarity index 100% rename from test/unit/internal/database/connection_test.go rename to internal/database/connection_test.go diff --git a/test/unit/internal/database/migrations_test.go b/internal/database/migrations_test.go similarity index 78% rename from test/unit/internal/database/migrations_test.go rename to internal/database/migrations_test.go index c1aaf0bf..cfce2d29 100644 --- a/test/unit/internal/database/migrations_test.go +++ b/internal/database/migrations_test.go @@ -13,5 +13,5 @@ func TestRunMigrations(t *testing.T) { _, container := createDB(t, ctx) defer container.Terminate(ctx) - database.RunMigrations(path.Join(os.Getenv("PWD"), "../../../..")) + database.RunMigrations(path.Join(os.Getenv("PWD"), "../..")) } diff --git a/test/unit/internal/database/parseuuid_test.go b/internal/database/parseuuid_test.go similarity index 100% rename from test/unit/internal/database/parseuuid_test.go rename to internal/database/parseuuid_test.go diff --git a/test/unit/internal/database/repository/querytype_test.go b/internal/database/repository/querytype_test.go similarity index 96% rename from test/unit/internal/database/repository/querytype_test.go rename to internal/database/repository/querytype_test.go index 81b77b17..3bec35dd 100644 --- a/test/unit/internal/database/repository/querytype_test.go +++ b/internal/database/repository/querytype_test.go @@ -1,4 +1,4 @@ -package database_test +package repository_test import ( "fmt" diff --git a/internal/document/service.go b/internal/document/service.go index ba127ce1..96809cf1 100644 --- a/internal/document/service.go +++ b/internal/document/service.go @@ -5,7 +5,7 @@ import ( "queryorchestration/internal/collector" "queryorchestration/internal/database" "queryorchestration/internal/database/repository" - "queryorchestration/internal/queryQueue" + queryqueue "queryorchestration/internal/queryQueue" "queryorchestration/internal/result" "github.com/google/uuid" @@ -40,7 +40,7 @@ func (s *Service) Sync(ctx context.Context, doc *Document) error { return err } - queue, err := queryQueue.New(ctx, s.db, collector, results, doc.ID, doc.CleanVersion, doc.TextVersion) + queue, err := queryqueue.New(ctx, s.db, collector, results, doc.ID, doc.CleanVersion, doc.TextVersion) if err != nil { return err } diff --git a/test/unit/internal/document/sync_test.go b/internal/document/sync_test.go similarity index 100% rename from test/unit/internal/document/sync_test.go rename to internal/document/sync_test.go diff --git a/test/unit/internal/env/get_test.go b/internal/env/get_test.go similarity index 100% rename from test/unit/internal/env/get_test.go rename to internal/env/get_test.go diff --git a/test/unit/internal/env/getfatal_test.go b/internal/env/getfatal_test.go similarity index 100% rename from test/unit/internal/env/getfatal_test.go rename to internal/env/getfatal_test.go diff --git a/test/unit/internal/jsonextractor/creator_test.go b/internal/jsonExtractor/creator_test.go similarity index 97% rename from test/unit/internal/jsonextractor/creator_test.go rename to internal/jsonExtractor/creator_test.go index 59fedf5a..382052bc 100644 --- a/test/unit/internal/jsonextractor/creator_test.go +++ b/internal/jsonExtractor/creator_test.go @@ -1,4 +1,4 @@ -package document_test +package jsonextractor_test import ( "context" diff --git a/test/unit/internal/jsonextractor/process_test.go b/internal/jsonExtractor/process_test.go similarity index 99% rename from test/unit/internal/jsonextractor/process_test.go rename to internal/jsonExtractor/process_test.go index eb27bc0f..f9eae4ca 100644 --- a/test/unit/internal/jsonextractor/process_test.go +++ b/internal/jsonExtractor/process_test.go @@ -1,4 +1,4 @@ -package document_test +package jsonextractor_test import ( "context" diff --git a/test/unit/internal/jsonextractor/updator_test.go b/internal/jsonExtractor/updator_test.go similarity index 97% rename from test/unit/internal/jsonextractor/updator_test.go rename to internal/jsonExtractor/updator_test.go index ec907c09..588e6f43 100644 --- a/test/unit/internal/jsonextractor/updator_test.go +++ b/internal/jsonExtractor/updator_test.go @@ -1,4 +1,4 @@ -package document_test +package jsonextractor_test import ( "context" diff --git a/test/unit/internal/query/create_test.go b/internal/query/create_test.go similarity index 97% rename from test/unit/internal/query/create_test.go rename to internal/query/create_test.go index b84c1a02..72921fe6 100644 --- a/test/unit/internal/query/create_test.go +++ b/internal/query/create_test.go @@ -1,4 +1,4 @@ -package document_test +package query_test import ( "context" @@ -59,6 +59,7 @@ func TestCreate(t *testing.T) { } pool.ExpectExec("name: CreateQueryConfig :exec").WithArgs(database.MustToDBUUID(q.ID), []byte(create.Config), int32(1)). WillReturnResult(pgxmock.NewResult("", 1)) + pool.ExpectCommit() id, err := svc.Create(ctx, create) assert.Nil(t, err) diff --git a/test/unit/internal/query/deprecate_test.go b/internal/query/deprecate_test.go similarity index 98% rename from test/unit/internal/query/deprecate_test.go rename to internal/query/deprecate_test.go index f17cd82b..a1da1601 100644 --- a/test/unit/internal/query/deprecate_test.go +++ b/internal/query/deprecate_test.go @@ -1,4 +1,4 @@ -package document_test +package query_test import ( "context" diff --git a/test/unit/internal/query/get_test.go b/internal/query/get_test.go similarity index 98% rename from test/unit/internal/query/get_test.go rename to internal/query/get_test.go index 1f038670..8dd2e997 100644 --- a/test/unit/internal/query/get_test.go +++ b/internal/query/get_test.go @@ -1,4 +1,4 @@ -package document_test +package query_test import ( "context" diff --git a/test/unit/internal/query/list_test.go b/internal/query/list_test.go similarity index 98% rename from test/unit/internal/query/list_test.go rename to internal/query/list_test.go index 66dff32c..a51a3a0e 100644 --- a/test/unit/internal/query/list_test.go +++ b/internal/query/list_test.go @@ -1,4 +1,4 @@ -package document_test +package query_test import ( "context" diff --git a/test/unit/internal/query/parse_test.go b/internal/query/parse_test.go similarity index 99% rename from test/unit/internal/query/parse_test.go rename to internal/query/parse_test.go index 7c8134ca..76ae7a2a 100644 --- a/test/unit/internal/query/parse_test.go +++ b/internal/query/parse_test.go @@ -1,4 +1,4 @@ -package document_test +package query_test import ( "queryorchestration/internal/database" diff --git a/test/unit/internal/query/service_test.go b/internal/query/service_test.go similarity index 95% rename from test/unit/internal/query/service_test.go rename to internal/query/service_test.go index cd5f43ca..59252891 100644 --- a/test/unit/internal/query/service_test.go +++ b/internal/query/service_test.go @@ -1,4 +1,4 @@ -package document_test +package query_test import ( "queryorchestration/internal/database" diff --git a/test/unit/internal/query/test_test.go b/internal/query/test_test.go similarity index 97% rename from test/unit/internal/query/test_test.go rename to internal/query/test_test.go index ed8349e8..a6dc40b0 100644 --- a/test/unit/internal/query/test_test.go +++ b/internal/query/test_test.go @@ -1,4 +1,4 @@ -package document_test +package query_test import ( "context" diff --git a/test/unit/internal/query/update_test.go b/internal/query/update_test.go similarity index 98% rename from test/unit/internal/query/update_test.go rename to internal/query/update_test.go index 6bbef7e6..01a910e0 100644 --- a/test/unit/internal/query/update_test.go +++ b/internal/query/update_test.go @@ -1,4 +1,4 @@ -package document_test +package query_test import ( "context" diff --git a/test/unit/internal/queryProcessor/parse_test.go b/internal/queryProcessor/parse_test.go similarity index 99% rename from test/unit/internal/queryProcessor/parse_test.go rename to internal/queryProcessor/parse_test.go index 8f0d37fb..9e56420c 100644 --- a/test/unit/internal/queryProcessor/parse_test.go +++ b/internal/queryProcessor/parse_test.go @@ -1,4 +1,4 @@ -package document_test +package queryprocessor_test import ( "queryorchestration/internal/database/repository" diff --git a/internal/queryQueue/create.go b/internal/queryQueue/create.go index 4aec4db8..74f220f6 100644 --- a/internal/queryQueue/create.go +++ b/internal/queryQueue/create.go @@ -1,4 +1,4 @@ -package queryQueue +package queryqueue import ( "context" diff --git a/internal/queryQueue/execute.go b/internal/queryQueue/execute.go index ddd58bb9..a7ae461e 100644 --- a/internal/queryQueue/execute.go +++ b/internal/queryQueue/execute.go @@ -1,4 +1,4 @@ -package queryQueue +package queryqueue import ( "context" diff --git a/test/unit/internal/queryQueue/queue_test.go b/internal/queryQueue/queue_test.go similarity index 97% rename from test/unit/internal/queryQueue/queue_test.go rename to internal/queryQueue/queue_test.go index e1297c39..5113500a 100644 --- a/test/unit/internal/queryQueue/queue_test.go +++ b/internal/queryQueue/queue_test.go @@ -1,4 +1,4 @@ -package document_test +package queryqueue_test import ( "context" @@ -8,7 +8,7 @@ import ( "queryorchestration/internal/database" "queryorchestration/internal/database/repository" queryprocessor "queryorchestration/internal/queryProcessor" - "queryorchestration/internal/queryQueue" + queryqueue "queryorchestration/internal/queryQueue" "queryorchestration/internal/result" "testing" @@ -103,7 +103,7 @@ func TestQueue(t *testing.T) { cleanVersion := int32(1) textVersion := int32(1) - q, err := queryQueue.New(ctx, db, coll, results, docID, cleanVersion, textVersion) + q, err := queryqueue.New(ctx, db, coll, results, docID, cleanVersion, textVersion) assert.Nil(t, err) assert.Equal(t, expectedQueries, q.GetQueue()) @@ -218,6 +218,6 @@ func TestQueueFail(t *testing.T) { cleanVersion := int32(1) textVersion := int32(1) - _, err = queryQueue.New(ctx, db, coll, results, docID, cleanVersion, textVersion) + _, err = queryqueue.New(ctx, db, coll, results, docID, cleanVersion, textVersion) assert.EqualError(t, err, errr) } diff --git a/internal/queryQueue/result.go b/internal/queryQueue/result.go index 633770df..90c1fd52 100644 --- a/internal/queryQueue/result.go +++ b/internal/queryQueue/result.go @@ -1,4 +1,4 @@ -package queryQueue +package queryqueue import ( "context" diff --git a/internal/queryQueue/service.go b/internal/queryQueue/service.go index 581b4e53..8e3d5af7 100644 --- a/internal/queryQueue/service.go +++ b/internal/queryQueue/service.go @@ -1,4 +1,4 @@ -package queryQueue +package queryqueue import ( "context" diff --git a/test/unit/internal/result/parse_test.go b/internal/result/parse_test.go similarity index 96% rename from test/unit/internal/result/parse_test.go rename to internal/result/parse_test.go index e86e81d3..7f19846c 100644 --- a/test/unit/internal/result/parse_test.go +++ b/internal/result/parse_test.go @@ -1,4 +1,4 @@ -package document_test +package result_test import ( "queryorchestration/internal/database/repository" diff --git a/test/unit/internal/result/store_test.go b/internal/result/store_test.go similarity index 98% rename from test/unit/internal/result/store_test.go rename to internal/result/store_test.go index 8fc59313..d5d286bc 100644 --- a/test/unit/internal/result/store_test.go +++ b/internal/result/store_test.go @@ -1,4 +1,4 @@ -package document_test +package result_test import ( "context" diff --git a/scripts/tests.yml b/scripts/tests.yml index 30139a48..c761a737 100644 --- a/scripts/tests.yml +++ b/scripts/tests.yml @@ -12,9 +12,13 @@ vars: tasks: unit: + vars: + INTERNAL: "{{.CONTEXT}}/internal/..." + API: "{{.CONTEXT}}/api/..." + CMD: "{{.CONTEXT}}/cmd/..." cmds: - mkdir -p {{.CONTEXT}}/{{.OUT_DIR}} - - go test {{.CONTEXT}}/test/unit/... -coverpkg={{.CONTEXT}}/internal/...,{{.CONTEXT}}/pkg/... -coverprofile={{.COVERAGE_FILE}} + - go test {{.INTERNAL}} {{.API}} {{.CMD}} -coverpkg={{.INTERNAL}},{{.API}},{{.CMD}} -coverprofile={{.COVERAGE_FILE}} unit:coverage: deps: - unit @@ -34,13 +38,15 @@ tasks: fi silent: true integration: - cmds: - - go test -v {{.CONTEXT}}/test/integration/... - integration:nocache: - cmds: - - go test -count=1 -v {{.CONTEXT}}/test/integration/... - integration:build: deps: - docker:build cmds: - - task test:integration \ No newline at end of file + - task test:integration:nobuild + integration:nocache: + deps: + - docker:build + cmds: + - go test -count=1 -v {{.CONTEXT}}/test/... + integration:nobuild: + cmds: + - go test -v {{.CONTEXT}}/test/... \ No newline at end of file diff --git a/test/integration/apiContainer_test.go b/test/apiContainer_test.go similarity index 100% rename from test/integration/apiContainer_test.go rename to test/apiContainer_test.go diff --git a/test/integration/container_test.go b/test/container_test.go similarity index 100% rename from test/integration/container_test.go rename to test/container_test.go diff --git a/test/integration/queryrunner_test.go b/test/queryrunner_test.go similarity index 100% rename from test/integration/queryrunner_test.go rename to test/queryrunner_test.go diff --git a/test/integration/queryservice_test.go b/test/queryservice_test.go similarity index 100% rename from test/integration/queryservice_test.go rename to test/queryservice_test.go diff --git a/test/integration/queueContainer_test.go b/test/queueContainer_test.go similarity index 100% rename from test/integration/queueContainer_test.go rename to test/queueContainer_test.go