From 8267abe5bee9448a8d5cc395a34c0d174c0cd811 Mon Sep 17 00:00:00 2001
From: Nikita Tokarchuk <tokarchuk+bitbucket@nevisq.com>
Date: Tue, 10 Mar 2020 00:01:36 +0100
Subject: [PATCH] Ephemeral database for testing in the testing package

---
 .../database/ephemeral.go                        | 16 ++++++++--------
 mongox/base/jsonbased/id_test.go                 |  4 ++--
 mongox/base/oidbased/id_test.go                  |  4 ++--
 mongox/base/stringbased/id_test.go               |  4 ++--
 4 files changed, 14 insertions(+), 14 deletions(-)
 rename mongox/tempdb/tempdb.go => mongox-testing/database/ephemeral.go (51%)

diff --git a/mongox/tempdb/tempdb.go b/mongox-testing/database/ephemeral.go
similarity index 51%
rename from mongox/tempdb/tempdb.go
rename to mongox-testing/database/ephemeral.go
index 76a816c..2eae584 100644
--- a/mongox/tempdb/tempdb.go
+++ b/mongox-testing/database/ephemeral.go
@@ -1,4 +1,4 @@
-package tempdb
+package database
 
 import (
 	"context"
@@ -12,24 +12,24 @@ import (
 	"github.com/mainnika/mongox-go-driver/v2/mongox/database"
 )
 
-// TempDB is a temporary database connection that will be destroyed after close
-type TempDB struct {
+// EphemeralDatabase is a temporary database connection that will be destroyed after close
+type EphemeralDatabase struct {
 	mongox.Database
 }
 
-// NewTempDB creates new mongo connection
-func NewTempDB(URI string) (tempdb *TempDB, err error) {
+// NewEphemeral creates new mongo connection
+func NewEphemeral(URI string) (db *EphemeralDatabase, err error) {
 
 	name := strconv.Itoa(rand.Int())
 	opts := options.Client().ApplyURI(URI)
 	client, err := mongo.Connect(context.Background(), opts)
 
-	tempdb = &TempDB{Database: database.NewDatabase(client, name)}
+	db = &EphemeralDatabase{Database: database.NewDatabase(client, name)}
 
 	return
 }
 
 // Close the connection and drop database
-func (tdb *TempDB) Close() {
-	_ = tdb.Client().Database(tdb.Name()).Drop(tdb.Context())
+func (e *EphemeralDatabase) Close() error {
+	return e.Client().Database(e.Name()).Drop(e.Context())
 }
diff --git a/mongox/base/jsonbased/id_test.go b/mongox/base/jsonbased/id_test.go
index cb9a241..08480b0 100644
--- a/mongox/base/jsonbased/id_test.go
+++ b/mongox/base/jsonbased/id_test.go
@@ -7,7 +7,7 @@ import (
 	"github.com/stretchr/testify/assert"
 	"go.mongodb.org/mongo-driver/bson/primitive"
 
-	"github.com/mainnika/mongox-go-driver/v2/mongox/tempdb"
+	"github.com/mainnika/mongox-go-driver/v2/mongox-testing/database"
 )
 
 func Test_GetID(t *testing.T) {
@@ -41,7 +41,7 @@ func Test_SaveLoad(t *testing.T) {
 		Primary `bson:",inline" json:",inline" collection:"1"`
 	}
 
-	db, err := tempdb.NewTempDB("mongodb://localhost")
+	db, err := database.NewEphemeral("mongodb://localhost")
 	if err != nil {
 		t.Fatal(err)
 	}
diff --git a/mongox/base/oidbased/id_test.go b/mongox/base/oidbased/id_test.go
index 276d0d9..ba5bef6 100644
--- a/mongox/base/oidbased/id_test.go
+++ b/mongox/base/oidbased/id_test.go
@@ -7,7 +7,7 @@ import (
 	"github.com/stretchr/testify/assert"
 	"go.mongodb.org/mongo-driver/bson/primitive"
 
-	"github.com/mainnika/mongox-go-driver/v2/mongox/tempdb"
+	"github.com/mainnika/mongox-go-driver/v2/mongox-testing/database"
 )
 
 func Test_GetID(t *testing.T) {
@@ -41,7 +41,7 @@ func Test_SaveLoad(t *testing.T) {
 		Primary `bson:",inline" json:",inline" collection:"1"`
 	}
 
-	db, err := tempdb.NewTempDB("mongodb://localhost")
+	db, err := database.NewEphemeral("mongodb://localhost")
 	if err != nil {
 		t.Fatal(err)
 	}
diff --git a/mongox/base/stringbased/id_test.go b/mongox/base/stringbased/id_test.go
index 791812f..25f7cc3 100644
--- a/mongox/base/stringbased/id_test.go
+++ b/mongox/base/stringbased/id_test.go
@@ -6,7 +6,7 @@ import (
 
 	"github.com/stretchr/testify/assert"
 
-	"github.com/mainnika/mongox-go-driver/v2/mongox/tempdb"
+	"github.com/mainnika/mongox-go-driver/v2/mongox-testing/database"
 )
 
 func Test_GetID(t *testing.T) {
@@ -40,7 +40,7 @@ func Test_SaveLoad(t *testing.T) {
 		Primary `bson:",inline" json:",inline" collection:"1"`
 	}
 
-	db, err := tempdb.NewTempDB("mongodb://localhost")
+	db, err := database.NewEphemeral("mongodb://localhost")
 	if err != nil {
 		t.Fatal(err)
 	}