tests: refactor test suite and move them to their own directory. (#727)

Author: xiam

.github/workflows/test.yml

@@ -26,11 +26,11 @@ jobs:
         with:
           go-version: ${{ matrix.go-version }}
 
-      - name: Set env vars
+      - name: Configure environment
         run: |
           echo "GOARCH=amd64" >> $GITHUB_ENV
           echo "DB_HOST=127.0.0.1" >> $GITHUB_ENV
           echo "UPPER_DB_LOG=ERROR" >> $GITHUB_ENV
 
-      - name: Run target
+      - name: Run tests
         run: make test

.gitignore

@@ -1,4 +1,4 @@
 *.sw?
 *.db
 *.tmp
-generated_*.go
+.venv

Makefile

@@ -1,43 +1,9 @@
-SHELL                 ?= bash
-CPU_CORES             ?= $(shell nproc)
+UPPER_DB_LOG          ?= ERROR
 
-PARALLEL_FLAGS        ?= --halt-on-error 2 --jobs=$(CPU_CORES) -v -u
-
-TEST_FLAGS            ?= -v -failfast -race -timeout 20m
-
-UPPER_DB_LOG          ?= WARN
-
-export TEST_FLAGS
-export PARALLEL_FLAGS
 export UPPER_DB_LOG
 
-test: go-test-internal test-adapters
-
-benchmark: go-benchmark-internal
-
-go-benchmark-%:
-	go test -v -benchtime=500ms -bench=. ./$*/...
-
-go-test-%:
-	go test -v ./$*/...
-
-test-adapters: \
-	test-adapter-postgresql \
-	test-adapter-cockroachdb \
-	test-adapter-mysql \
-	test-adapter-mssql \
-	test-adapter-sqlite \
-	test-adapter-ql \
-	test-adapter-mongo
-
-test-adapter-%:
-	($(MAKE) -C adapter/$* test-extended || exit 1)
-
-test-generic:
-	export TEST_FLAGS="-run TestGeneric"; \
-	$(MAKE) test-adapters
+bench:
+	go test -v -benchtime=500ms -bench=. ./internal/...
 
-goimports:
-	for FILE in $$(find -name "*.go" | grep -v vendor); do \
-		goimports -w $$FILE; \
-	done
+test:
+	$(MAKE) -C tests

adapter/cockroachdb/Makefile

@@ -24,9 +24,7 @@ package mongo
 import (
 	"context"
 	"fmt"
-	"reflect"
 	"strings"
-	"sync"
 
 	db "github.com/upper/db/v4"
 	"github.com/upper/db/v4/internal/adapter"
@@ -40,13 +38,6 @@ type Collection struct {
 	collection *mongo.Collection
 }
 
-var (
-	// idCache should be a struct if we're going to cache more than just
-	// _id field here
-	idCache      = make(map[reflect.Type]string)
-	idCacheMutex sync.RWMutex
-)
-
 // Find creates a result set with the given conditions.
 func (col *Collection) Find(terms ...interface{}) db.Result {
 	fields := []string{"*"}

adapter/cockroachdb/docker-compose.yml

@@ -97,7 +97,7 @@ func ParseURL(s string) (conn ConnectionURL, err error) {
 	}
 
 	if u, err = url.Parse(s); err != nil {
-		return conn, fmt.Errorf("invalid URL: %v", err)
+		return conn, fmt.Errorf("invalid URL: %w", err)
 	}
 
 	conn.Scheme = u.Scheme
@@ -118,7 +118,7 @@ func ParseURL(s string) (conn ConnectionURL, err error) {
 	var vv url.Values
 
 	if vv, err = url.ParseQuery(u.RawQuery); err != nil {
-		return conn, fmt.Errorf("invalid query: %v", err)
+		return conn, fmt.Errorf("invalid query: %w", err)
 	}
 
 	for k := range vv {

adapter/cockroachdb/generic_test.go

@@ -178,7 +178,7 @@ func (s *Source) open() error {
 	}
 
 	s.collections = map[string]*Collection{}
-	s.database = s.session.Database(settings.Database)
+	s.database = s.session.Database(s.connURL.(ConnectionURL).Database)
 
 	// ping
 	if err = s.Ping(); err != nil {
@@ -191,7 +191,7 @@ func (s *Source) open() error {
 // Close terminates the current database session.
 func (s *Source) Close() error {
 	if s.session != nil {
-		s.session.Disconnect(context.Background())
+		return s.session.Disconnect(context.Background())
 	}
 
 	return nil