Commit 5336cdc1 authored by gwenn's avatar gwenn

Improve tests.

parent 288d5a3f
...@@ -34,9 +34,11 @@ func init() { ...@@ -34,9 +34,11 @@ func init() {
func TestEnableFKey(t *testing.T) { func TestEnableFKey(t *testing.T) {
db := open(t) db := open(t)
defer checkClose(db, t) defer checkClose(db, t)
b := Must(db.IsFKeyEnabled()) b, err := db.IsFKeyEnabled()
checkNoError(t, err, "%s")
if !b { if !b {
b = Must(db.EnableFKey(true)) b, err = db.EnableFKey(true)
checkNoError(t, err, "%s")
assert.T(t, b, "cannot enable FK") assert.T(t, b, "cannot enable FK")
} }
} }
...@@ -44,9 +46,11 @@ func TestEnableFKey(t *testing.T) { ...@@ -44,9 +46,11 @@ func TestEnableFKey(t *testing.T) {
func TestEnableTriggers(t *testing.T) { func TestEnableTriggers(t *testing.T) {
db := open(t) db := open(t)
defer checkClose(db, t) defer checkClose(db, t)
b := Must(db.AreTriggersEnabled()) b, err := db.AreTriggersEnabled()
checkNoError(t, err, "%s")
if !b { if !b {
b = Must(db.EnableTriggers(true)) b, err = db.EnableTriggers(true)
checkNoError(t, err, "%s")
assert.T(t, b, "cannot enable triggers") assert.T(t, b, "cannot enable triggers")
} }
} }
......
...@@ -107,12 +107,14 @@ func TestSavepoint(t *testing.T) { ...@@ -107,12 +107,14 @@ func TestSavepoint(t *testing.T) {
func TestExists(t *testing.T) { func TestExists(t *testing.T) {
db := open(t) db := open(t)
defer checkClose(db, t) defer checkClose(db, t)
b := Must(db.Exists("SELECT 1 WHERE 1 = 0")) b, err := db.Exists("SELECT 1 WHERE 1 = 0")
checkNoError(t, err, "%s")
assert.T(t, !b, "no row expected") assert.T(t, !b, "no row expected")
b = Must(db.Exists("SELECT 1 WHERE 1 = 1")) b, err = db.Exists("SELECT 1 WHERE 1 = 1")
checkNoError(t, err, "%s")
assert.T(t, b, "one row expected") assert.T(t, b, "one row expected")
_, err := db.Exists("SELECT 1", 1) _, err = db.Exists("SELECT 1", 1)
assert.T(t, err != nil) assert.T(t, err != nil)
//println(err.Error()) //println(err.Error())
......
...@@ -113,13 +113,16 @@ func TestScanColumn(t *testing.T) { ...@@ -113,13 +113,16 @@ func TestScanColumn(t *testing.T) {
defer checkFinalize(s, t) defer checkFinalize(s, t)
assert.T(t, checkStep(t, s)) assert.T(t, checkStep(t, s))
var i1, i2, i3 int var i1, i2, i3 int
null := Must(s.ScanByIndex(0, &i1)) null, err := s.ScanByIndex(0, &i1)
checkNoError(t, err, "%s")
assert.T(t, !null, "expected not null value") assert.T(t, !null, "expected not null value")
assert.Equal(t, 1, i1) assert.Equal(t, 1, i1)
null = Must(s.ScanByIndex(1, &i2)) null, err = s.ScanByIndex(1, &i2)
checkNoError(t, err, "%s")
assert.T(t, null, "expected null value") assert.T(t, null, "expected null value")
assert.Equal(t, 0, i2) assert.Equal(t, 0, i2)
null = Must(s.ScanByIndex(2, &i3)) null, err = s.ScanByIndex(2, &i3)
checkNoError(t, err, "%s")
assert.T(t, !null, "expected not null value") assert.T(t, !null, "expected not null value")
assert.Equal(t, 0, i3) assert.Equal(t, 0, i3)
...@@ -137,13 +140,16 @@ func TestNamedScanColumn(t *testing.T) { ...@@ -137,13 +140,16 @@ func TestNamedScanColumn(t *testing.T) {
defer checkFinalize(s, t) defer checkFinalize(s, t)
assert.T(t, checkStep(t, s)) assert.T(t, checkStep(t, s))
var i1, i2, i3 int var i1, i2, i3 int
null := Must(s.ScanByName("i1", &i1)) null, err := s.ScanByName("i1", &i1)
checkNoError(t, err, "%s")
assert.T(t, !null, "expected not null value") assert.T(t, !null, "expected not null value")
assert.Equal(t, 1, i1) assert.Equal(t, 1, i1)
null = Must(s.ScanByName("i2", &i2)) null, err = s.ScanByName("i2", &i2)
checkNoError(t, err, "%s")
assert.T(t, null, "expected null value") assert.T(t, null, "expected null value")
assert.Equal(t, 0, i2) assert.Equal(t, 0, i2)
null = Must(s.ScanByName("i3", &i3)) null, err = s.ScanByName("i3", &i3)
checkNoError(t, err, "%s")
assert.T(t, !null, "expected not null value") assert.T(t, !null, "expected not null value")
assert.Equal(t, 0, i3) assert.Equal(t, 0, i3)
...@@ -188,11 +194,13 @@ func TestScanNull(t *testing.T) { ...@@ -188,11 +194,13 @@ func TestScanNull(t *testing.T) {
defer checkFinalize(s, t) defer checkFinalize(s, t)
assert.T(t, checkStep(t, s)) assert.T(t, checkStep(t, s))
var pi = new(int) var pi = new(int)
null := Must(s.ScanByIndex(0, &pi)) null, err := s.ScanByIndex(0, &pi)
checkNoError(t, err, "%s")
assert.T(t, null, "expected null value") assert.T(t, null, "expected null value")
assert.Equal(t, (*int)(nil), pi, "expected nil") assert.Equal(t, (*int)(nil), pi, "expected nil")
var ps = new(string) var ps = new(string)
null = Must(s.ScanByIndex(0, &ps)) null, err = s.ScanByIndex(0, &ps)
checkNoError(t, err, "%s")
assert.T(t, null, "expected null value") assert.T(t, null, "expected null value")
assert.Equal(t, (*string)(nil), ps, "expected nil") assert.Equal(t, (*string)(nil), ps, "expected nil")
...@@ -236,11 +244,13 @@ func TestScanNotNull(t *testing.T) { ...@@ -236,11 +244,13 @@ func TestScanNotNull(t *testing.T) {
defer checkFinalize(s, t) defer checkFinalize(s, t)
assert.T(t, checkStep(t, s)) assert.T(t, checkStep(t, s))
var pi = new(int) var pi = new(int)
null := Must(s.ScanByIndex(0, &pi)) null, err := s.ScanByIndex(0, &pi)
checkNoError(t, err, "%s")
assert.T(t, !null, "expected not null value") assert.T(t, !null, "expected not null value")
assert.Equal(t, 1, *pi) assert.Equal(t, 1, *pi)
var ps = new(string) var ps = new(string)
null = Must(s.ScanByIndex(0, &ps)) null, err = s.ScanByIndex(0, &ps)
checkNoError(t, err, "%s")
assert.T(t, !null, "expected not null value") assert.T(t, !null, "expected not null value")
assert.Equal(t, "1", *ps) assert.Equal(t, "1", *ps)
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment