aboutsummaryrefslogtreecommitdiff
path: root/tx_test.go
diff options
context:
space:
mode:
Diffstat (limited to 'tx_test.go')
-rw-r--r--tx_test.go103
1 files changed, 51 insertions, 52 deletions
diff --git a/tx_test.go b/tx_test.go
index 1046842..39f50c4 100644
--- a/tx_test.go
+++ b/tx_test.go
@@ -7,7 +7,6 @@ import (
"testing"
"github.com/boltdb/bolt"
- "github.com/stretchr/testify/assert"
)
// Ensure that committing a closed transaction returns an error.
@@ -16,8 +15,8 @@ func TestTx_Commit_Closed(t *testing.T) {
defer db.Close()
tx, _ := db.Begin(true)
tx.CreateBucket([]byte("foo"))
- assert.NoError(t, tx.Commit())
- assert.Equal(t, tx.Commit(), bolt.ErrTxClosed)
+ ok(t, tx.Commit())
+ equals(t, tx.Commit(), bolt.ErrTxClosed)
}
// Ensure that rolling back a closed transaction returns an error.
@@ -25,8 +24,8 @@ func TestTx_Rollback_Closed(t *testing.T) {
db := NewTestDB()
defer db.Close()
tx, _ := db.Begin(true)
- assert.NoError(t, tx.Rollback())
- assert.Equal(t, tx.Rollback(), bolt.ErrTxClosed)
+ ok(t, tx.Rollback())
+ equals(t, tx.Rollback(), bolt.ErrTxClosed)
}
// Ensure that committing a read-only transaction returns an error.
@@ -34,7 +33,7 @@ func TestTx_Commit_ReadOnly(t *testing.T) {
db := NewTestDB()
defer db.Close()
tx, _ := db.Begin(false)
- assert.Equal(t, tx.Commit(), bolt.ErrTxNotWritable)
+ equals(t, tx.Commit(), bolt.ErrTxNotWritable)
}
// Ensure that a transaction can retrieve a cursor on the root bucket.
@@ -47,16 +46,16 @@ func TestTx_Cursor(t *testing.T) {
c := tx.Cursor()
k, v := c.First()
- assert.Equal(t, "widgets", string(k))
- assert.Nil(t, v)
+ equals(t, "widgets", string(k))
+ assert(t, v == nil, "")
k, v = c.Next()
- assert.Equal(t, "woojits", string(k))
- assert.Nil(t, v)
+ equals(t, "woojits", string(k))
+ assert(t, v == nil, "")
k, v = c.Next()
- assert.Nil(t, k)
- assert.Nil(t, v)
+ assert(t, k == nil, "")
+ assert(t, v == nil, "")
return nil
})
@@ -68,8 +67,8 @@ func TestTx_CreateBucket_ReadOnly(t *testing.T) {
defer db.Close()
db.View(func(tx *bolt.Tx) error {
b, err := tx.CreateBucket([]byte("foo"))
- assert.Nil(t, b)
- assert.Equal(t, bolt.ErrTxNotWritable, err)
+ assert(t, b == nil, "")
+ equals(t, bolt.ErrTxNotWritable, err)
return nil
})
}
@@ -81,8 +80,8 @@ func TestTx_CreateBucket_Closed(t *testing.T) {
tx, _ := db.Begin(true)
tx.Commit()
b, err := tx.CreateBucket([]byte("foo"))
- assert.Nil(t, b)
- assert.Equal(t, bolt.ErrTxClosed, err)
+ assert(t, b == nil, "")
+ equals(t, bolt.ErrTxClosed, err)
}
// Ensure that a Tx can retrieve a bucket.
@@ -92,7 +91,7 @@ func TestTx_Bucket(t *testing.T) {
db.Update(func(tx *bolt.Tx) error {
tx.CreateBucket([]byte("widgets"))
b := tx.Bucket([]byte("widgets"))
- assert.NotNil(t, b)
+ assert(t, b != nil, "")
return nil
})
}
@@ -105,7 +104,7 @@ func TestTx_Get_Missing(t *testing.T) {
tx.CreateBucket([]byte("widgets"))
tx.Bucket([]byte("widgets")).Put([]byte("foo"), []byte("bar"))
value := tx.Bucket([]byte("widgets")).Get([]byte("no_such_key"))
- assert.Nil(t, value)
+ assert(t, value == nil, "")
return nil
})
}
@@ -118,15 +117,15 @@ func TestTx_CreateBucket(t *testing.T) {
// Create a bucket.
db.Update(func(tx *bolt.Tx) error {
b, err := tx.CreateBucket([]byte("widgets"))
- assert.NotNil(t, b)
- assert.NoError(t, err)
+ assert(t, b != nil, "")
+ ok(t, err)
return nil
})
// Read the bucket through a separate transaction.
db.View(func(tx *bolt.Tx) error {
b := tx.Bucket([]byte("widgets"))
- assert.NotNil(t, b)
+ assert(t, b != nil, "")
return nil
})
}
@@ -137,27 +136,27 @@ func TestTx_CreateBucketIfNotExists(t *testing.T) {
defer db.Close()
db.Update(func(tx *bolt.Tx) error {
b, err := tx.CreateBucketIfNotExists([]byte("widgets"))
- assert.NotNil(t, b)
- assert.NoError(t, err)
+ assert(t, b != nil, "")
+ ok(t, err)
b, err = tx.CreateBucketIfNotExists([]byte("widgets"))
- assert.NotNil(t, b)
- assert.NoError(t, err)
+ assert(t, b != nil, "")
+ ok(t, err)
b, err = tx.CreateBucketIfNotExists([]byte{})
- assert.Nil(t, b)
- assert.Equal(t, bolt.ErrBucketNameRequired, err)
+ assert(t, b == nil, "")
+ equals(t, bolt.ErrBucketNameRequired, err)
b, err = tx.CreateBucketIfNotExists(nil)
- assert.Nil(t, b)
- assert.Equal(t, bolt.ErrBucketNameRequired, err)
+ assert(t, b == nil, "")
+ equals(t, bolt.ErrBucketNameRequired, err)
return nil
})
// Read the bucket through a separate transaction.
db.View(func(tx *bolt.Tx) error {
b := tx.Bucket([]byte("widgets"))
- assert.NotNil(t, b)
+ assert(t, b != nil, "")
return nil
})
}
@@ -169,16 +168,16 @@ func TestTx_CreateBucket_Exists(t *testing.T) {
// Create a bucket.
db.Update(func(tx *bolt.Tx) error {
b, err := tx.CreateBucket([]byte("widgets"))
- assert.NotNil(t, b)
- assert.NoError(t, err)
+ assert(t, b != nil, "")
+ ok(t, err)
return nil
})
// Create the same bucket again.
db.Update(func(tx *bolt.Tx) error {
b, err := tx.CreateBucket([]byte("widgets"))
- assert.Nil(t, b)
- assert.Equal(t, bolt.ErrBucketExists, err)
+ assert(t, b == nil, "")
+ equals(t, bolt.ErrBucketExists, err)
return nil
})
}
@@ -189,8 +188,8 @@ func TestTx_CreateBucket_NameRequired(t *testing.T) {
defer db.Close()
db.Update(func(tx *bolt.Tx) error {
b, err := tx.CreateBucket(nil)
- assert.Nil(t, b)
- assert.Equal(t, bolt.ErrBucketNameRequired, err)
+ assert(t, b == nil, "")
+ equals(t, bolt.ErrBucketNameRequired, err)
return nil
})
}
@@ -209,17 +208,17 @@ func TestTx_DeleteBucket(t *testing.T) {
// Delete the bucket and make sure we can't get the value.
db.Update(func(tx *bolt.Tx) error {
- assert.NoError(t, tx.DeleteBucket([]byte("widgets")))
- assert.Nil(t, tx.Bucket([]byte("widgets")))
+ ok(t, tx.DeleteBucket([]byte("widgets")))
+ assert(t, tx.Bucket([]byte("widgets")) == nil, "")
return nil
})
db.Update(func(tx *bolt.Tx) error {
// Create the bucket again and make sure there's not a phantom value.
b, err := tx.CreateBucket([]byte("widgets"))
- assert.NotNil(t, b)
- assert.NoError(t, err)
- assert.Nil(t, tx.Bucket([]byte("widgets")).Get([]byte("foo")))
+ assert(t, b != nil, "")
+ ok(t, err)
+ assert(t, tx.Bucket([]byte("widgets")).Get([]byte("foo")) == nil, "")
return nil
})
}
@@ -230,7 +229,7 @@ func TestTx_DeleteBucket_Closed(t *testing.T) {
defer db.Close()
tx, _ := db.Begin(true)
tx.Commit()
- assert.Equal(t, tx.DeleteBucket([]byte("foo")), bolt.ErrTxClosed)
+ equals(t, tx.DeleteBucket([]byte("foo")), bolt.ErrTxClosed)
}
// Ensure that deleting a bucket with a read-only transaction returns an error.
@@ -238,7 +237,7 @@ func TestTx_DeleteBucket_ReadOnly(t *testing.T) {
db := NewTestDB()
defer db.Close()
db.View(func(tx *bolt.Tx) error {
- assert.Equal(t, tx.DeleteBucket([]byte("foo")), bolt.ErrTxNotWritable)
+ equals(t, tx.DeleteBucket([]byte("foo")), bolt.ErrTxNotWritable)
return nil
})
}
@@ -248,7 +247,7 @@ func TestTx_DeleteBucket_NotFound(t *testing.T) {
db := NewTestDB()
defer db.Close()
db.Update(func(tx *bolt.Tx) error {
- assert.Equal(t, bolt.ErrBucketNotFound, tx.DeleteBucket([]byte("widgets")))
+ equals(t, bolt.ErrBucketNotFound, tx.DeleteBucket([]byte("widgets")))
return nil
})
}
@@ -264,7 +263,7 @@ func TestTx_OnCommit(t *testing.T) {
_, err := tx.CreateBucket([]byte("widgets"))
return err
})
- assert.Equal(t, 3, x)
+ equals(t, 3, x)
}
// Ensure that Tx commit handlers are NOT called after a transaction rolls back.
@@ -278,7 +277,7 @@ func TestTx_OnCommit_Rollback(t *testing.T) {
tx.CreateBucket([]byte("widgets"))
return errors.New("rollback this commit")
})
- assert.Equal(t, 0, x)
+ equals(t, 0, x)
}
// Ensure that the database can be copied to a file path.
@@ -293,15 +292,15 @@ func TestTx_CopyFile(t *testing.T) {
return nil
})
- assert.NoError(t, db.View(func(tx *bolt.Tx) error { return tx.CopyFile(dest, 0600) }))
+ ok(t, db.View(func(tx *bolt.Tx) error { return tx.CopyFile(dest, 0600) }))
db2, err := bolt.Open(dest, 0600, nil)
- assert.NoError(t, err)
+ ok(t, err)
defer db2.Close()
db2.View(func(tx *bolt.Tx) error {
- assert.Equal(t, []byte("bar"), tx.Bucket([]byte("widgets")).Get([]byte("foo")))
- assert.Equal(t, []byte("bat"), tx.Bucket([]byte("widgets")).Get([]byte("baz")))
+ equals(t, []byte("bar"), tx.Bucket([]byte("widgets")).Get([]byte("foo")))
+ equals(t, []byte("bat"), tx.Bucket([]byte("widgets")).Get([]byte("baz")))
return nil
})
}
@@ -339,7 +338,7 @@ func TestTx_CopyFile_Error_Meta(t *testing.T) {
})
err := db.View(func(tx *bolt.Tx) error { return tx.Copy(&failWriter{}) })
- assert.EqualError(t, err, "meta copy: error injected for tests")
+ equals(t, err.Error(), "meta copy: error injected for tests")
}
// Ensure that Copy handles write errors right.
@@ -354,7 +353,7 @@ func TestTx_CopyFile_Error_Normal(t *testing.T) {
})
err := db.View(func(tx *bolt.Tx) error { return tx.Copy(&failWriter{3 * db.Info().PageSize}) })
- assert.EqualError(t, err, "error injected for tests")
+ equals(t, err.Error(), "error injected for tests")
}
func ExampleTx_Rollback() {
generated by cgit v1.2.3 (git 2.49.0) at 2025-07-13 21:13:46 +0000