forks/go-ethereum
1
0
Fork 1
mirror of https://github.com/ethereum/go-ethereum.git synced 2026-08-20 10:52:25 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

ethdb: Move testsuite to dbtest, fix lints

Browse source
This commit is contained in:
Andrey Petrov 2019-08-15 12:56:27 -04:00
parent f660fe1400
commit 85ae6e2578
3 changed files with 13 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
ethdb/testsuite.go → ethdb/dbtest/testsuite.go
View file

@ -14,18 +14,20 @@
// You should have received a copy of the GNU Lesser General Public License // You should have received a copy of the GNU Lesser General Public License
// along with the go-ethereum library. If not, see <http://www.gnu.org/licenses/>. // along with the go-ethereum library. If not, see <http://www.gnu.org/licenses/>.
package ethdb package dbtest
import ( import (
"bytes" "bytes"
"reflect" "reflect"
"sort" "sort"
"testing" "testing"
"github.com/ethereum/go-ethereum/ethdb"
) )
// TestDatabaseSuite runs a suite of tests against a KeyValueStore database // TestDatabaseSuite runs a suite of tests against a KeyValueStore database
// implementation. // implementation.
func TestDatabaseSuite(t *testing.T, New func() KeyValueStore) { func TestDatabaseSuite(t *testing.T, New func() ethdb.KeyValueStore) {
t.Run("Iterator", func(t *testing.T) { t.Run("Iterator", func(t *testing.T) {
tests := []struct { tests := []struct {
content map[string]string content map[string]string
@ -166,7 +168,7 @@ func TestDatabaseSuite(t *testing.T, New func() KeyValueStore) {
if got, err := db.Has(key); err != nil { if got, err := db.Has(key); err != nil {
t.Error(err) t.Error(err)
} else if got != false { } else if got {
t.Errorf("wrong value: %t", got) t.Errorf("wrong value: %t", got)
} }
@ -177,13 +179,13 @@ func TestDatabaseSuite(t *testing.T, New func() KeyValueStore) {
if got, err := db.Has(key); err != nil { if got, err := db.Has(key); err != nil {
t.Error(err) t.Error(err)
} else if got != true { } else if !got {
t.Errorf("wrong value: %t", got) t.Errorf("wrong value: %t", got)
} }
if got, err := db.Get(key); err != nil { if got, err := db.Get(key); err != nil {
t.Error(err) t.Error(err)
} else if bytes.Compare(got, value) != 0 { } else if !bytes.Equal(got, value) {
t.Errorf("wrong value: %q", got) t.Errorf("wrong value: %q", got)
} }
@ -193,7 +195,7 @@ func TestDatabaseSuite(t *testing.T, New func() KeyValueStore) {
if got, err := db.Has(key); err != nil { if got, err := db.Has(key); err != nil {
t.Error(err) t.Error(err)
} else if got != false { } else if got {
t.Errorf("wrong value: %t", got) t.Errorf("wrong value: %t", got)
} }
}) })
@ -279,7 +281,7 @@ func TestDatabaseSuite(t *testing.T, New func() KeyValueStore) {
} }
func iterateKeys(it Iterator) []string { func iterateKeys(it ethdb.Iterator) []string {
keys := []string{} keys := []string{}
for it.Next() { for it.Next() {
keys = append(keys, string(it.Key())) keys = append(keys, string(it.Key()))

3
ethdb/leveldb/leveldb_test.go
View file

@ -20,13 +20,14 @@ import (
"testing" "testing"
"github.com/ethereum/go-ethereum/ethdb" "github.com/ethereum/go-ethereum/ethdb"
"github.com/ethereum/go-ethereum/ethdb/dbtest"
"github.com/syndtr/goleveldb/leveldb" "github.com/syndtr/goleveldb/leveldb"
"github.com/syndtr/goleveldb/leveldb/storage" "github.com/syndtr/goleveldb/leveldb/storage"
) )
func TestLevelDB(t *testing.T) { func TestLevelDB(t *testing.T) {
t.Run("DatabaseSuite", func(t *testing.T) { t.Run("DatabaseSuite", func(t *testing.T) {
ethdb.TestDatabaseSuite(t, func() ethdb.KeyValueStore { dbtest.TestDatabaseSuite(t, func() ethdb.KeyValueStore {
db, err := leveldb.Open(storage.NewMemStorage(), nil) db, err := leveldb.Open(storage.NewMemStorage(), nil)
if err != nil { if err != nil {
t.Fatal(err) t.Fatal(err)

3
ethdb/memorydb/memorydb_test.go
View file

@ -20,11 +20,12 @@ import (
"testing" "testing"
"github.com/ethereum/go-ethereum/ethdb" "github.com/ethereum/go-ethereum/ethdb"
"github.com/ethereum/go-ethereum/ethdb/dbtest"
) )
func TestMemoryDB(t *testing.T) { func TestMemoryDB(t *testing.T) {
t.Run("DatabaseSuite", func(t *testing.T) { t.Run("DatabaseSuite", func(t *testing.T) {
ethdb.TestDatabaseSuite(t, func() ethdb.KeyValueStore { dbtest.TestDatabaseSuite(t, func() ethdb.KeyValueStore {
return New() return New()
}) })
}) })