Use testify and more forgiving numeric equality

PostgreSQL generate_series can return type int while CockroachDB always
returns bigint.
pull/955/head
Jack Christensen 2021-02-13 11:41:51 -06:00
parent ac2918b9a3
commit 37884a20e7
1 changed files with 7 additions and 24 deletions

View File

@ -157,30 +157,13 @@ func TestConnQueryValues(t *testing.T) {
rowCount++ rowCount++
values, err := rows.Values() values, err := rows.Values()
if err != nil { require.NoError(t, err)
t.Fatalf("rows.Values failed: %v", err) require.Len(t, values, 5)
} assert.Equal(t, "foo", values[0])
if len(values) != 5 { assert.Equal(t, "bar", values[1])
t.Errorf("Expected rows.Values to return 5 values, but it returned %d", len(values)) assert.EqualValues(t, rowCount, values[2])
} assert.Nil(t, values[3])
if values[0] != "foo" { assert.EqualValues(t, rowCount, values[4])
t.Errorf(`Expected values[0] to be "foo", but it was %v`, values[0])
}
if values[1] != "bar" {
t.Errorf(`Expected values[1] to be "bar", but it was %v`, values[1])
}
if values[2] != rowCount {
t.Errorf(`Expected values[2] to be %d, but it was %d`, rowCount, values[2])
}
if values[3] != nil {
t.Errorf(`Expected values[3] to be %v, but it was %d`, nil, values[3])
}
if values[4] != rowCount {
t.Errorf(`Expected values[4] to be %d, but it was %d`, rowCount, values[4])
}
} }
if rows.Err() != nil { if rows.Err() != nil {