make helper NewTestDB more helpful with t.TempDir

driver.go

@@ -3,7 +3,7 @@ package main
 import (
 	"context"
 	"io/ioutil"
-	"os"
+	"path"
 	"time"
 
 	"go.etcd.io/bbolt"
@@ -20,12 +20,12 @@ type BBolt struct {
 	db *bbolt.DB
 }
 
-func NewTestDB() BBolt {
+func NewTestDBIn(d string) BBolt {
-	d, err := ioutil.TempDir(os.TempDir(), "test-db-*")
+	d, err := ioutil.TempDir(d, "test-db-*")
 	if err != nil {
 		panic(err)
 	}
-	db, err := NewDB(d)
+	db, err := NewDB(path.Join(d, "bb"))
 	if err != nil {
 		panic(err)
 	}

driver_test.go

@@ -4,18 +4,11 @@ import (
 	"context"
 	"errors"
 	"io"
-	"path"
 	"testing"
 )
 
 func TestDriverBBolt(t *testing.T) {
-	bb, err := NewDB(path.Join(t.TempDir(), "bb"))
+	testDriver(t, NewTestDBIn(t.TempDir()))
-	if err != nil {
-		t.Fatal(err)
-	}
-	defer bb.Close()
-
-	testDriver(t, bb)
 }
 
 func testDriver(t *testing.T, d Driver) {

queue.go

@@ -11,8 +11,8 @@ type Queue struct {
 	driver Driver
 }
 
-func NewTestQueue() Queue {
+func NewTestQueueIn(d string) Queue {
-	return Queue{driver: NewTestDB()}
+	return Queue{driver: NewTestDBIn(d)}
 }
 
 func NewQueue(driver Driver) Queue {

queue_test.go

@@ -2,7 +2,6 @@ package main
 
 import (
 	"context"
-	"path"
 	"strconv"
 	"testing"
 	"time"
@@ -12,10 +11,7 @@ func TestQueue(t *testing.T) {
 	ctx, can := context.WithTimeout(context.Background(), time.Second*10)
 	defer can()
 
-	db, err := NewDB(path.Join(t.TempDir(), "q"))
+	db := NewTestDBIn(t.TempDir())
-	if err != nil {
-		t.Fatal(err)
-	}
 	defer db.Close()
 
 	q := NewQueue(db)

storage.go

@@ -13,8 +13,8 @@ type Storage struct {
 	driver Driver
 }
 
-func NewTestStorage() Storage {
+func NewTestStorageIn(d string) Storage {
-	return Storage{driver: NewTestDB()}
+	return Storage{driver: NewTestDBIn(d)}
 }
 
 func NewStorage(driver Driver) Storage {

storage_test.go

@@ -0,0 +1,6 @@
+package main
+
+import "testing"
+
+func TestStorage(t *testing.T) {
+}

writer.go

@@ -1,3 +0,0 @@
-package main
-
-type Writer struct{}