Changing assert package used in tests

Replacing obsolete project with the newer version.
Package github.com/stretchrcom/testify/assert is not developed any
more, it is replaced with github.com/stretchr/testify/assert.

camelize_test.go

@@ -1,7 +1,7 @@
 package freetds
 
 import (
-	"github.com/stretchrcom/testify/assert"
+	"github.com/stretchr/testify/assert"
 	"testing"
 )
 

conn_pool_test.go

@@ -2,7 +2,7 @@ package freetds
 
 import (
 	"fmt"
-	"github.com/stretchrcom/testify/assert"
+	"github.com/stretchr/testify/assert"
 	"testing"
 	"time"
 )

conn_sp_test.go

@@ -5,7 +5,7 @@ import (
 	"testing"
 	"time"
 
-	"github.com/stretchrcom/testify/assert"
+	"github.com/stretchr/testify/assert"
 )
 
 func TestExecSp(t *testing.T) {
@@ -118,11 +118,11 @@ func TestExecSpOutputParams(t *testing.T) {
 	assert.True(t, rst.HasOutputParams())
 	assert.Equal(t, len(rst.outputParams), 1)
 	assert.Equal(t, rst.outputParams[0].Name, "@p1")
-	assert.Equal(t, rst.outputParams[0].Value, 124)
+	assert.EqualValues(t, rst.outputParams[0].Value, 124)
 	var p1 int32
 	err = rst.ParamScan(&p1)
 	assert.Nil(t, err)
-	assert.Equal(t, p1, 124)
+	assert.EqualValues(t, p1, 124)
 }
 
 func TestGetSpParams(t *testing.T) {
@@ -131,10 +131,10 @@ func TestGetSpParams(t *testing.T) {
 	assert.Nil(t, err)
 	p := params[0]
 	assert.Equal(t, p.Name, "@p1")
-	assert.Equal(t, p.ParameterId, 1)
-	assert.Equal(t, p.UserTypeId, SYBINT4)
+	assert.EqualValues(t, p.ParameterId, 1)
+	assert.EqualValues(t, p.UserTypeId, SYBINT4)
 	assert.Equal(t, p.IsOutput, false)
-	assert.Equal(t, p.MaxLength, 4)
+	assert.EqualValues(t, p.MaxLength, 4)
 	assert.Equal(t, int(p.Precision), 0xa)
 	assert.Equal(t, int(p.Scale), 0x0)
 }

conn_test.go

@@ -7,7 +7,7 @@ import (
 	"testing"
 	"time"
 
-	"github.com/stretchrcom/testify/assert"
+	"github.com/stretchr/testify/assert"
 )
 
 var CREATE_DB_SCRIPTS = [...]string{`
@@ -206,7 +206,7 @@ func TestSelectValue(t *testing.T) {
 
 	val, err := conn.SelectValue("select 1")
 	assert.Nil(t, err)
-	assert.Equal(t, 1, val)
+	assert.EqualValues(t, 1, val)
 
 	val, err = conn.SelectValue("select 1 where 1=2")
 	assert.NotNil(t, err)
@@ -313,7 +313,7 @@ func TestTransactionCommitRollback(t *testing.T) {
 	assert.Nil(t, err)
 	rows, err := conn.SelectValue("select count(*)  from test_transaction")
 	assert.Nil(t, err)
-	assert.Equal(t, rows, 2)
+	assert.EqualValues(t, rows, 2)
 
 	//roollback
 	err = conn.Begin()
@@ -323,7 +323,7 @@ func TestTransactionCommitRollback(t *testing.T) {
 	assert.Nil(t, err)
 	rows, err = conn.SelectValue("select count(*)  from test_transaction")
 	assert.Nil(t, err)
-	assert.Equal(t, rows, 2)
+	assert.EqualValues(t, rows, 2)
 }
 
 func createTestTable2(t *testing.T, conn *Conn, name string, columDef string) {

convert_sql_buf_test.go

@@ -4,7 +4,7 @@ import (
 	"testing"
 	"time"
 
-	"github.com/stretchrcom/testify/assert"
+	"github.com/stretchr/testify/assert"
 )
 
 func TestInt(t *testing.T) {
@@ -27,7 +27,7 @@ func TestInt16(t *testing.T) {
 	data, _, err := typeToSqlBuf(SYBINT2, 32768, false)
 	assert.Nil(t, err)
 	i16 := sqlBufToType(SYBINT2, data)
-	assert.Equal(t, i16, -32768)
+	assert.EqualValues(t, i16, -32768)
 	//error
 	_, _, err = typeToSqlBuf(SYBINT2, "pero", false)
 	assert.NotNil(t, err)
@@ -110,5 +110,5 @@ func testToSqlToType(t *testing.T, typ int, value interface{}) {
 	data, _, err := typeToSqlBuf(typ, value, false)
 	assert.Nil(t, err)
 	value2 := sqlBufToType(typ, data)
-	assert.Equal(t, value, value2)
+	assert.EqualValues(t, value, value2)
 }

credentials_test.go

@@ -3,7 +3,7 @@ package freetds
 import (
 	"testing"
 
-	"github.com/stretchrcom/testify/assert"
+	"github.com/stretchr/testify/assert"
 )
 
 func TestParseConnectionString(t *testing.T) {

executesql_test.go

@@ -4,7 +4,7 @@ import (
 	"testing"
 	"time"
 
-	"github.com/stretchrcom/testify/assert"
+	"github.com/stretchr/testify/assert"
 )
 
 func TestGoTo2SqlDataType2(t *testing.T) {

mssql_test.go

@@ -3,9 +3,10 @@ package freetds
 import (
 	"database/sql"
 	"fmt"
-	"github.com/stretchrcom/testify/assert"
 	"strings"
 	"testing"
+
+	"github.com/stretchr/testify/assert"
 )
 
 func open() (*sql.DB, error) {
@@ -78,20 +79,20 @@ func TestLastInsertIdRowsAffected(t *testing.T) {
 	assert.NotNil(t, r)
 	id, err := r.LastInsertId()
 	assert.Nil(t, err)
-	assert.Equal(t, id, 1)
+	assert.EqualValues(t, id, 1)
 	ra, err := r.RowsAffected()
 	assert.Nil(t, err)
-	assert.Equal(t, ra, 1)
+	assert.EqualValues(t, ra, 1)
 
 	r, err = db.Exec("insert into test_last_insert_id values(?)", "pero")
 	assert.Nil(t, err)
 	assert.NotNil(t, r)
 	id, err = r.LastInsertId()
 	assert.Nil(t, err)
-	assert.Equal(t, id, 2)
+	assert.EqualValues(t, id, 2)
 	ra, err = r.RowsAffected()
 	assert.Nil(t, err)
-	assert.Equal(t, ra, 1)
+	assert.EqualValues(t, ra, 1)
 
 	r, err = db.Exec("update test_last_insert_id set name = ?", "jozo")
 	assert.Nil(t, err)
@@ -100,13 +101,13 @@ func TestLastInsertIdRowsAffected(t *testing.T) {
 	assert.NotNil(t, err)
 	ra, err = r.RowsAffected()
 	assert.Nil(t, err)
-	assert.Equal(t, ra, 2)
+	assert.EqualValues(t, ra, 2)
 
 	r, err = db.Exec("delete from test_last_insert_id")
 	assert.Nil(t, err)
 	ra, err = r.RowsAffected()
 	assert.Nil(t, err)
-	assert.Equal(t, ra, 2)
+	assert.EqualValues(t, ra, 2)
 }
 
 func createTestTable(t *testing.T, db *sql.DB, name string, columDef string) {

result_test.go

@@ -1,9 +1,10 @@
 package freetds
 
 import (
-	"github.com/stretchrcom/testify/assert"
 	"testing"
 	"time"
+
+	"github.com/stretchr/testify/assert"
 )
 
 var now = time.Now()
@@ -130,5 +131,5 @@ func TestScanTypesInStructDoesNotMatchThoseInResult(t *testing.T) {
 	assert.Equal(t, s.Int64, 5)
 
 	assert.Equal(t, s.Float32, 5.5)
-	assert.Equal(t, s.Float64, 6.5)
+	assert.EqualValues(t, s.Float64, 6.5)
 }

sp_result_test.go

@@ -1,7 +1,7 @@
 package freetds
 
 import (
-	"github.com/stretchrcom/testify/assert"
+	"github.com/stretchr/testify/assert"
 	"testing"
 )