fix tests

gofiber · Sep 15, 2023 · 8326651 · 8326651
1 parent 09e12a7
commit 8326651
Show file tree

Hide file tree

Showing 13 changed files with 74 additions and 152 deletions.
diff --git a/arangodb/arangodb_test.go b/arangodb/arangodb_test.go
@@ -1,25 +1,15 @@
 package arangodb
 
 import (
-	"os"
 	"testing"
 	"time"
 
 	"github.com/stretchr/testify/require"
 )
 
-var testStore *Storage
-
-func TestMain(m *testing.M) {
-	testStore = New(Config{
-		Reset: true,
-	})
-
-	code := m.Run()
-
-	_ = testStore.Close()
-	os.Exit(code)
-}
+var testStore = New(Config{
+	Reset: true,
+})
 
 func Test_ArangoDB_Set(t *testing.T) {
 	var (

diff --git a/badger/badger_test.go b/badger/badger_test.go
@@ -1,25 +1,15 @@
 package badger
 
 import (
-	"os"
 	"testing"
 	"time"
 
 	"github.com/stretchr/testify/require"
 )
 
-var testStore *Storage
-
-func TestMain(m *testing.M) {
-	testStore = New(Config{
-		Reset: true,
-	})
-
-	code := m.Run()
-
-	_ = testStore.Close()
-	os.Exit(code)
-}
+var testStore = New(Config{
+	Reset: true,
+})
 
 func Test_Badger_Set(t *testing.T) {
 	var (

diff --git a/bbolt/bbolt_test.go b/bbolt/bbolt_test.go
@@ -11,7 +11,8 @@ var testStore *Storage
 
 func TestMain(m *testing.M) {
 	testStore = New(Config{
-		Reset: true,
+		Bucket: "fiber-bucket",
+		Reset:  true,
 	})
 
 	code := m.Run()

diff --git a/bbolt/utils.go b/bbolt/utils.go
@@ -1,6 +1,7 @@
 package bbolt
 
 import (
+	"errors"
 	"github.com/gofiber/utils/v2"
 	"go.etcd.io/bbolt"
 )
@@ -15,6 +16,11 @@ func createBucket(cfg Config, conn *bbolt.DB) error {
 
 func removeBucket(cfg Config, conn *bbolt.DB) error {
 	return conn.Update(func(tx *bbolt.Tx) error {
-		return tx.DeleteBucket(utils.UnsafeBytes(cfg.Bucket))
+		err := tx.DeleteBucket(utils.UnsafeBytes(cfg.Bucket))
+		if errors.Is(err, bbolt.ErrBucketNotFound) {
+			return nil
+		}
+
+		return err
 	})
 }
diff --git a/couchbase/couchbase_test.go b/couchbase/couchbase_test.go
@@ -1,44 +1,42 @@
 package couchbase
 
 import (
-	"os"
 	"testing"
 	"time"
 
 	"github.com/stretchr/testify/require"
 )
 
-var testStore *Storage
-
-func TestMain(m *testing.M) {
-	testStore = New(Config{
+func newTestStore(t testing.TB) *Storage {
+	t.Helper()
+	return New(Config{
 		Username: "admin",
 		Password: "123456",
 		Host:     "127.0.0.1:8091",
 		Bucket:   "fiber_storage",
 	})
-
-	code := m.Run()
-
-	_ = testStore.Reset()
-	_ = testStore.Close()
-	os.Exit(code)
 }
 
 func TestSetCouchbase_ShouldReturnNoError(t *testing.T) {
+	testStore := newTestStore(t)
+
 	err := testStore.Set("test", []byte("test"), 0)
 
 	require.NoError(t, err)
 }
 
 func TestGetCouchbase_ShouldReturnNil_WhenDocumentNotFound(t *testing.T) {
+	testStore := newTestStore(t)
+
 	val, err := testStore.Get("not_found_key")
 
 	require.NoError(t, err)
 	require.Zero(t, len(val))
 }
 
-func TestSetAndGet_GetShouldReturn_SettedValueWithoutError(t *testing.T) {
+func TestSetAndGet_GetShouldReturn_SetValueWithoutError(t *testing.T) {
+	testStore := newTestStore(t)
+
 	err := testStore.Set("test", []byte("fiber_test_value"), 0)
 	require.NoError(t, err)
 
@@ -49,6 +47,8 @@ func TestSetAndGet_GetShouldReturn_SettedValueWithoutError(t *testing.T) {
 }
 
 func TestSetAndGet_GetShouldReturnNil_WhenTTLExpired(t *testing.T) {
+	testStore := newTestStore(t)
+
 	err := testStore.Set("test", []byte("fiber_test_value"), 3*time.Second)
 	require.NoError(t, err)
 
@@ -61,6 +61,8 @@ func TestSetAndGet_GetShouldReturnNil_WhenTTLExpired(t *testing.T) {
 }
 
 func TestSetAndDelete_DeleteShouldReturn_NoError(t *testing.T) {
+	testStore := newTestStore(t)
+
 	err := testStore.Set("test", []byte("fiber_test_value"), 0)
 	require.NoError(t, err)
 
@@ -72,6 +74,8 @@ func TestSetAndDelete_DeleteShouldReturn_NoError(t *testing.T) {
 }
 
 func TestSetAndReset_ResetShouldReturn_NoError(t *testing.T) {
+	testStore := newTestStore(t)
+
 	err := testStore.Set("test", []byte("fiber_test_value"), 0)
 	require.NoError(t, err)
 
@@ -83,15 +87,21 @@ func TestSetAndReset_ResetShouldReturn_NoError(t *testing.T) {
 }
 
 func TestClose_CloseShouldReturn_NoError(t *testing.T) {
+	testStore := newTestStore(t)
+
 	err := testStore.Close()
 	require.NoError(t, err)
 }
 
-func TestGetConn_ReturnsNotNill(t *testing.T) {
+func TestGetConn_ReturnsNotNil(t *testing.T) {
+	testStore := newTestStore(t)
+
 	require.True(t, testStore.Conn() != nil)
 }
 
 func Benchmark_Couchbase_Set(b *testing.B) {
+	testStore := newTestStore(b)
+
 	b.ReportAllocs()
 	b.ResetTimer()
 
@@ -104,6 +114,8 @@ func Benchmark_Couchbase_Set(b *testing.B) {
 }
 
 func Benchmark_Couchbase_Get(b *testing.B) {
+	testStore := newTestStore(b)
+
 	err := testStore.Set("john", []byte("doe"), 0)
 	require.NoError(b, err)
 
@@ -118,6 +130,8 @@ func Benchmark_Couchbase_Get(b *testing.B) {
 }
 
 func Benchmark_Couchbase_Delete(b *testing.B) {
+	testStore := newTestStore(b)
+
 	err := testStore.Set("john", []byte("doe"), 0)
 	require.NoError(b, err)
 

diff --git a/memory/memory_test.go b/memory/memory_test.go
@@ -1,25 +1,14 @@
 package memory
 
 import (
-	"os"
 	"testing"
 	"time"
 
 	"github.com/gofiber/utils/v2"
 	"github.com/stretchr/testify/require"
 )
 
-var testStore *Storage
-
-func TestMain(m *testing.M) {
-	testStore = New()
-
-	code := m.Run()
-
-	_ = testStore.Reset()
-	_ = testStore.Close()
-	os.Exit(code)
-}
+var testStore = New()
 
 func Test_Storage_Memory_Set(t *testing.T) {
 	var (

diff --git a/mssql/mssql_test.go b/mssql/mssql_test.go
@@ -9,21 +9,12 @@ import (
 	"github.com/stretchr/testify/require"
 )
 
-var testStore *Storage
-
-func TestMain(m *testing.M) {
-	testStore = New(Config{
-		Database: os.Getenv("MSSQL_DATABASE"),
-		Username: os.Getenv("MSSQL_USERNAME"),
-		Password: os.Getenv("MSSQL_PASSWORD"),
-		Reset:    true,
-	})
-
-	code := m.Run()
-
-	_ = testStore.Close()
-	os.Exit(code)
-}
+var testStore = New(Config{
+	Database: os.Getenv("MSSQL_DATABASE"),
+	Username: os.Getenv("MSSQL_USERNAME"),
+	Password: os.Getenv("MSSQL_PASSWORD"),
+	Reset:    true,
+})
 
 func Test_MSSQL_Set(t *testing.T) {
 	var (

diff --git a/mysql/mysql_test.go b/mysql/mysql_test.go
@@ -10,21 +10,12 @@ import (
 	"github.com/stretchr/testify/require"
 )
 
-var testStore *Storage
-
-func TestMain(m *testing.M) {
-	testStore = New(Config{
-		Database: os.Getenv("MYSQL_DATABASE"),
-		Username: os.Getenv("MYSQL_USERNAME"),
-		Password: os.Getenv("MYSQL_PASSWORD"),
-		Reset:    true,
-	})
-
-	code := m.Run()
-
-	_ = testStore.Close()
-	os.Exit(code)
-}
+var testStore = New(Config{
+	Database: os.Getenv("MYSQL_DATABASE"),
+	Username: os.Getenv("MYSQL_USERNAME"),
+	Password: os.Getenv("MYSQL_PASSWORD"),
+	Reset:    true,
+})
 
 func Test_MYSQL_New(t *testing.T) {
 	newConfigStore := New(Config{

diff --git a/pebble/pebble_test.go b/pebble/pebble_test.go
@@ -1,27 +1,16 @@
 package pebble
 
 import (
-	"os"
 	"testing"
 	"time"
 
 	"github.com/stretchr/testify/require"
 )
 
-var testStore *Storage
-
-func TestMain(m *testing.M) {
-	testStore = New(Config{
-		Path:         "test.db",
-		WriteOptions: nil,
-	})
-
-	code := m.Run()
-
-	_ = testStore.Reset()
-	_ = testStore.Close()
-	os.Exit(code)
-}
+var testStore = New(Config{
+	Path:         "test.db",
+	WriteOptions: nil,
+})
 
 func Test_Pebble_Set(t *testing.T) {
 	var (

diff --git a/postgres/postgres_test.go b/postgres/postgres_test.go
@@ -10,21 +10,12 @@ import (
 	"github.com/stretchr/testify/require"
 )
 
-var testStore *Storage
-
-func TestMain(m *testing.M) {
-	testStore = New(Config{
-		Database: os.Getenv("POSTGRES_DATABASE"),
-		Username: os.Getenv("POSTGRES_USERNAME"),
-		Password: os.Getenv("POSTGRES_PASSWORD"),
-		Reset:    true,
-	})
-
-	code := m.Run()
-
-	_ = testStore.Close()
-	os.Exit(code)
-}
+var testStore = New(Config{
+	Database: os.Getenv("POSTGRES_DATABASE"),
+	Username: os.Getenv("POSTGRES_USERNAME"),
+	Password: os.Getenv("POSTGRES_PASSWORD"),
+	Reset:    true,
+})
 
 func Test_Postgres_Set(t *testing.T) {
 	var (

diff --git a/redis/redis_test.go b/redis/redis_test.go
@@ -3,25 +3,15 @@ package redis
 import (
 	"crypto/tls"
 	"log"
-	"os"
 	"testing"
 	"time"
 
 	"github.com/stretchr/testify/require"
 )
 
-var testStore *Storage
-
-func TestMain(m *testing.M) {
-	testStore = New(Config{
-		Reset: true,
-	})
-
-	code := m.Run()
-
-	_ = testStore.Close()
-	os.Exit(code)
-}
+var testStore = New(Config{
+	Reset: true,
+})
 
 func Test_Redis_Set(t *testing.T) {
 	var (