diff options
author | Ben Johnson <benbjohnson@yahoo.com> | 2014-04-15 23:45:06 -0400 |
---|---|---|
committer | Ben Johnson <benbjohnson@yahoo.com> | 2014-04-15 23:45:06 -0400 |
commit | 2505b9a7dcca1e5d9d80ebfc6be7afcd97ba02dd (patch) | |
tree | 4d351709b0ec5d5eb1803b59c84e868c07889208 /cursor_test.go | |
parent | Fix race detector CI. (diff) | |
download | dedo-2505b9a7dcca1e5d9d80ebfc6be7afcd97ba02dd.tar.gz dedo-2505b9a7dcca1e5d9d80ebfc6be7afcd97ba02dd.tar.xz |
Return bucket from CreateBucket() functions.
This commit changes the API for:
Tx.CreateBucket()
Tx.CreateBucketIfNotExists()
Bucket.CreateBucket()
Bucket.CreateBucketIfNotExists()
These functions now return the *Bucket and error instead of just the error.
Diffstat (limited to 'cursor_test.go')
-rw-r--r-- | cursor_test.go | 39 |
1 files changed, 24 insertions, 15 deletions
diff --git a/cursor_test.go b/cursor_test.go index d9d258c..00fc561 100644 --- a/cursor_test.go +++ b/cursor_test.go @@ -12,12 +12,13 @@ import ( func TestCursor_Seek(t *testing.T) { withOpenDB(func(db *DB, path string) { db.Update(func(tx *Tx) error { - assert.NoError(t, tx.CreateBucket([]byte("widgets"))) - b := tx.Bucket([]byte("widgets")) + b, err := tx.CreateBucket([]byte("widgets")) + assert.NoError(t, err) assert.NoError(t, b.Put([]byte("foo"), []byte("0001"))) assert.NoError(t, b.Put([]byte("bar"), []byte("0002"))) assert.NoError(t, b.Put([]byte("baz"), []byte("0003"))) - assert.NoError(t, b.CreateBucket([]byte("bkt"))) + _, err = b.CreateBucket([]byte("bkt")) + assert.NoError(t, err) return nil }) db.View(func(tx *Tx) error { @@ -57,7 +58,8 @@ func TestCursor_Seek(t *testing.T) { func TestCursor_EmptyBucket(t *testing.T) { withOpenDB(func(db *DB, path string) { db.Update(func(tx *Tx) error { - return tx.CreateBucket([]byte("widgets")) + _, err := tx.CreateBucket([]byte("widgets")) + return err }) db.View(func(tx *Tx) error { c := tx.Bucket([]byte("widgets")).Cursor() @@ -73,7 +75,8 @@ func TestCursor_EmptyBucket(t *testing.T) { func TestCursor_EmptyBucketReverse(t *testing.T) { withOpenDB(func(db *DB, path string) { db.Update(func(tx *Tx) error { - return tx.CreateBucket([]byte("widgets")) + _, err := tx.CreateBucket([]byte("widgets")) + return err }) db.View(func(tx *Tx) error { c := tx.Bucket([]byte("widgets")).Cursor() @@ -262,11 +265,14 @@ func TestCursor_Iterate_Reverse(t *testing.T) { func TestCursor_Iterate_BucketsOnly(t *testing.T) { withOpenDB(func(db *DB, path string) { db.Update(func(tx *Tx) error { - assert.NoError(t, tx.CreateBucket([]byte("widgets"))) - b := tx.Bucket([]byte("widgets")) - assert.NoError(t, b.CreateBucket([]byte("foo"))) - assert.NoError(t, b.CreateBucket([]byte("bar"))) - assert.NoError(t, b.CreateBucket([]byte("baz"))) + b, err := tx.CreateBucket([]byte("widgets")) + assert.NoError(t, err) + _, err = b.CreateBucket([]byte("foo")) + assert.NoError(t, err) + _, err = b.CreateBucket([]byte("bar")) + assert.NoError(t, err) + _, err = b.CreateBucket([]byte("baz")) + assert.NoError(t, err) return nil }) db.View(func(tx *Tx) error { @@ -286,11 +292,14 @@ func TestCursor_Iterate_BucketsOnly(t *testing.T) { func TestCursor_Iterate_BucketsOnly_Reverse(t *testing.T) { withOpenDB(func(db *DB, path string) { db.Update(func(tx *Tx) error { - assert.NoError(t, tx.CreateBucket([]byte("widgets"))) - b := tx.Bucket([]byte("widgets")) - assert.NoError(t, b.CreateBucket([]byte("foo"))) - assert.NoError(t, b.CreateBucket([]byte("bar"))) - assert.NoError(t, b.CreateBucket([]byte("baz"))) + b, err := tx.CreateBucket([]byte("widgets")) + assert.NoError(t, err) + _, err = b.CreateBucket([]byte("foo")) + assert.NoError(t, err) + _, err = b.CreateBucket([]byte("bar")) + assert.NoError(t, err) + _, err = b.CreateBucket([]byte("baz")) + assert.NoError(t, err) return nil }) db.View(func(tx *Tx) error { |