Merged in feature/moveUnitTests (pull request #6)

Move Unit Tests

internal/collector/service_test.go

@@ -1,4 +1,4 @@
-package document_test
+package collector_test
 
 import (
 	"context"

internal/contextFull/creator_test.go

@@ -1,4 +1,4 @@
-package document_test
+package contextfull_test
 
 import (
 	"context"

internal/contextFull/process_test.go

@@ -1,4 +1,4 @@
-package document_test
+package contextfull_test
 
 import (
 	"context"

internal/contextFull/updator_test.go

@@ -1,4 +1,4 @@
-package document_test
+package contextfull_test
 
 import (
 	"context"

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"), "../.."))
 }

internal/database/repository/querytype_test.go

@@ -1,4 +1,4 @@
-package database_test
+package repository_test
 
 import (
 	"fmt"

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
 	}

internal/jsonExtractor/creator_test.go

@@ -1,4 +1,4 @@
-package document_test
+package jsonextractor_test
 
 import (
 	"context"

internal/jsonExtractor/process_test.go

@@ -1,4 +1,4 @@
-package document_test
+package jsonextractor_test
 
 import (
 	"context"

internal/jsonExtractor/updator_test.go

@@ -1,4 +1,4 @@
-package document_test
+package jsonextractor_test
 
 import (
 	"context"

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)

internal/query/deprecate_test.go

@@ -1,4 +1,4 @@
-package document_test
+package query_test
 
 import (
 	"context"

internal/query/get_test.go

@@ -1,4 +1,4 @@
-package document_test
+package query_test
 
 import (
 	"context"

internal/query/list_test.go

@@ -1,4 +1,4 @@
-package document_test
+package query_test
 
 import (
 	"context"

internal/query/parse_test.go

@@ -1,4 +1,4 @@
-package document_test
+package query_test
 
 import (
 	"queryorchestration/internal/database"

internal/query/service_test.go

@@ -1,4 +1,4 @@
-package document_test
+package query_test
 
 import (
 	"queryorchestration/internal/database"

internal/query/test_test.go

@@ -1,4 +1,4 @@
-package document_test
+package query_test
 
 import (
 	"context"

internal/query/update_test.go

@@ -1,4 +1,4 @@
-package document_test
+package query_test
 
 import (
 	"context"

internal/queryProcessor/parse_test.go

@@ -1,4 +1,4 @@
-package document_test
+package queryprocessor_test
 
 import (
 	"queryorchestration/internal/database/repository"

internal/queryQueue/create.go

@@ -1,4 +1,4 @@
-package queryQueue
+package queryqueue
 
 import (
 	"context"

internal/queryQueue/execute.go

@@ -1,4 +1,4 @@
-package queryQueue
+package queryqueue
 
 import (
 	"context"

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)
 }

internal/queryQueue/result.go

@@ -1,4 +1,4 @@
-package queryQueue
+package queryqueue
 
 import (
 	"context"

internal/queryQueue/service.go

@@ -1,4 +1,4 @@
-package queryQueue
+package queryqueue
 
 import (
 	"context"

internal/result/parse_test.go

@@ -1,4 +1,4 @@
-package document_test
+package result_test
 
 import (
 	"queryorchestration/internal/database/repository"

internal/result/store_test.go

@@ -1,4 +1,4 @@
-package document_test
+package result_test
 
 import (
 	"context"

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
+      - 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/...