fix vet

.drone.yml

@@ -3,7 +3,7 @@ kind: pipeline
 name: go1.10-build
 workspace:
   base: /go
-  path: src/xorm.io/xorm
+  path: src/gitea.com/xorm/xorm
 
 steps:
 - name: build
@@ -184,7 +184,7 @@ steps:
     GOPROXY: "https://goproxy.cn"
   commands:
     - go build -v
-    - go vet ./...
+    - go vet
   when:
     event:
     - push
@@ -297,8 +297,6 @@ steps:
   commands:
   - "go test -v -race -db=\"mysql\" -conn_str=\"root:@tcp(tidb:4000)/xorm_test\" -ignore_select_update=true -coverprofile=coverage7-1.txt -covermode=atomic"
   - "go test -v -race -db=\"mysql\" -conn_str=\"root:@tcp(tidb:4000)/xorm_test\" -ignore_select_update=true -cache=true -coverprofile=coverage7-2.txt -covermode=atomic"
-  - go get github.com/wadey/gocovmerge
-  - gocovmerge coverage1-1.txt coverage1-2.txt coverage2-1.txt coverage2-2.txt coverage2.1-1.txt coverage2.1-2.txt coverage3-1.txt coverage3-2.txt coverage4-1.txt coverage4-2.txt coverage5-1.txt coverage5-2.txt coverage6-1.txt coverage6-2.txt coverage7-1.txt coverage7-2.txt > coverage.txt
   when:
     event:
     - push

session_insert_test.go

@@ -531,9 +531,7 @@ func TestCreatedJsonTime(t *testing.T) {
 
 	var dis = make([]MyJsonTime, 0)
 	err = testEngine.Find(&dis)
-	if err != nil {
+	assert.NoError(t, err)
-		t.Fatal(err)
-	}
 }
 
 func TestInsertMulti2(t *testing.T) {
@@ -552,12 +550,7 @@ func TestInsertMulti2(t *testing.T) {
 		t.Error(err)
 		panic(err)
 	}
-	if cnt != int64(len(users)) {
+	assert.EqualValues(t, len(users), cnt)
-		err = errors.New("insert not returned 1")
-		t.Error(err)
-		panic(err)
-		return
-	}
 
 	users2 := []*Userinfo{
 		&Userinfo{Username: "1xlw", Departname: "dev", Alias: "lunny2", Created: time.Now()},
@@ -567,16 +560,8 @@ func TestInsertMulti2(t *testing.T) {
 	}
 
 	cnt, err = testEngine.Insert(&users2)
-	if err != nil {
+	assert.NoError(t, err)
-		t.Error(err)
+	assert.EqualValues(t, len(users2), cnt)
-		panic(err)
-	}
-
-	if cnt != int64(len(users2)) {
-		err = errors.New(fmt.Sprintf("insert not returned %v", len(users2)))
-		t.Error(err)
-		panic(err)
-	}
 }
 
 func TestInsertTwoTable(t *testing.T) {

session_schema_test.go

@@ -274,7 +274,7 @@ func TestCharst(t *testing.T) {
 
 func TestSync2_1(t *testing.T) {
 	type WxTest struct {
-		Id                 int   `xorm:"not null pk autoincr INT(64)`
+		Id                 int   `xorm:"not null pk autoincr INT(64)"`
 		Passport_user_type int16 `xorm:"null int"`
 		Id_delete          int8  `xorm:"null int default 1"`
 	}

session_update_test.go

@@ -299,47 +299,20 @@ func TestUpdate1(t *testing.T) {
 	// update by id
 	user := Userinfo{Username: "xxx", Height: 1.2}
 	cnt, err := testEngine.ID(ori.Uid).Update(&user)
-	if err != nil {
+	assert.NoError(t, err)
-		t.Error(err)
+	assert.EqualValues(t, 1, cnt)
-		panic(err)
-	}
-	if cnt != 1 {
-		err = errors.New("update not returned 1")
-		t.Error(err)
-		panic(err)
-		return
-	}
 
 	condi := Condi{"username": "zzz", "departname": ""}
 	cnt, err = testEngine.Table(&user).ID(ori.Uid).Update(&condi)
-	if err != nil {
+	assert.NoError(t, err)
-		t.Error(err)
+	assert.EqualValues(t, 1, cnt)
-		panic(err)
-	}
-	if cnt != 1 {
-		err = errors.New("update not returned 1")
-		t.Error(err)
-		panic(err)
-		return
-	}
 
 	cnt, err = testEngine.Update(&Userinfo{Username: "yyy"}, &user)
-	if err != nil {
+	assert.NoError(t, err)
-		t.Error(err)
-		panic(err)
-	}
-	total, err := testEngine.Count(&user)
-	if err != nil {
-		t.Error(err)
-		panic(err)
-	}
 
-	if cnt != total {
+	total, err := testEngine.Count(&user)
-		err = errors.New("insert not returned 1")
+	assert.NoError(t, err)
-		t.Error(err)
+	assert.EqualValues(t, cnt, total)
-		panic(err)
-		return
-	}
 
 	// nullable update
 	{
@@ -446,17 +419,8 @@ func TestUpdate1(t *testing.T) {
 	}
 
 	cnt, err = testEngine.ID(a.Id).Update(&Article{Name: "6"})
-	if err != nil {
+	assert.NoError(t, err)
-		t.Error(err)
+	assert.EqualValues(t, 1, cnt)
-		panic(err)
-	}
-
-	if cnt != 1 {
-		err = errors.New(fmt.Sprintf("insert not returned 1 but %d", cnt))
-		t.Error(err)
-		panic(err)
-		return
-	}
 
 	var s = "test"
 
@@ -474,20 +438,8 @@ func TestUpdate1(t *testing.T) {
 	col3 := &UpdateAllCols{}
 	has, err = testEngine.ID(col2.Id).Get(col3)
 	assert.NoError(t, err)
-
+	assert.True(t, has)
-	if !has {
+	assert.EqualValues(t, *col2, *col3)
-		err = errors.New(fmt.Sprintf("cannot get id %d", col2.Id))
-		t.Error(err)
-		panic(err)
-		return
-	}
-
-	if *col2 != *col3 {
-		err = errors.New(fmt.Sprintf("col2 should eq col3"))
-		t.Error(err)
-		panic(err)
-		return
-	}
 
 	{
 
@@ -515,24 +467,9 @@ func TestUpdate1(t *testing.T) {
 
 		col3 := &UpdateMustCols{}
 		has, err := testEngine.ID(col2.Id).Get(col3)
-		if err != nil {
+		assert.NoError(t, err)
-			t.Error(err)
+		assert.True(t, has)
-			panic(err)
+		assert.EqualValues(t, *col2, *col3)
-		}
-
-		if !has {
-			err = errors.New(fmt.Sprintf("cannot get id %d", col2.Id))
-			t.Error(err)
-			panic(err)
-			return
-		}
-
-		if *col2 != *col3 {
-			err = errors.New(fmt.Sprintf("col2 should eq col3"))
-			t.Error(err)
-			panic(err)
-			return
-		}
 	}
 }
 
@@ -821,13 +758,7 @@ func TestUpdateSameMapper(t *testing.T) {
 
 	cnt, err = testEngine.ID(a.Id).Update(&Article{Name: "6"})
 	assert.NoError(t, err)
-
+	assert.EqualValues(t, 1, cnt)
-	if cnt != 1 {
-		err = errors.New(fmt.Sprintf("insert not returned 1 but %d", cnt))
-		t.Error(err)
-		panic(err)
-		return
-	}
 
 	col1 := &UpdateAllCols{}
 	err = testEngine.Sync(col1)
@@ -843,20 +774,8 @@ func TestUpdateSameMapper(t *testing.T) {
 	col3 := &UpdateAllCols{}
 	has, err = testEngine.ID(col2.Id).Get(col3)
 	assert.NoError(t, err)
-
+	assert.True(t, has)
-	if !has {
+	assert.EqualValues(t, *col2, *col3)
-		err = errors.New(fmt.Sprintf("cannot get id %d", col2.Id))
-		t.Error(err)
-		panic(err)
-		return
-	}
-
-	if *col2 != *col3 {
-		err = errors.New(fmt.Sprintf("col2 should eq col3"))
-		t.Error(err)
-		panic(err)
-		return
-	}
 
 	{
 		col1 := &UpdateMustCols{}
@@ -875,20 +794,8 @@ func TestUpdateSameMapper(t *testing.T) {
 		col3 := &UpdateMustCols{}
 		has, err := testEngine.ID(col2.Id).Get(col3)
 		assert.NoError(t, err)
-
+		assert.True(t, has)
-		if !has {
+		assert.EqualValues(t, *col2, *col3)
-			err = errors.New(fmt.Sprintf("cannot get id %d", col2.Id))
-			t.Error(err)
-			panic(err)
-			return
-		}
-
-		if *col2 != *col3 {
-			err = errors.New(fmt.Sprintf("col2 should eq col3"))
-			t.Error(err)
-			panic(err)
-			return
-		}
 	}
 
 	{

types_null_test.go

@@ -97,10 +97,10 @@ func TestNullStructInsert(t *testing.T) {
 
 	if true {
 		item := NullType{
-			Name:   sql.NullString{"haolei", true},
+			Name:   sql.NullString{String: "haolei", Valid: true},
-			Age:    sql.NullInt64{34, true},
+			Age:    sql.NullInt64{Int64: 34, Valid: true},
-			Height: sql.NullFloat64{1.72, true},
+			Height: sql.NullFloat64{Float64: 1.72, Valid: true},
-			IsMan:  sql.NullBool{true, true},
+			IsMan:  sql.NullBool{Bool: true, Valid: true},
 		}
 		_, err := testEngine.Insert(&item)
 		if err != nil {
@@ -120,10 +120,10 @@ func TestNullStructInsert(t *testing.T) {
 
 		for i := 0; i < 5; i++ {
 			item := NullType{
-				Name:         sql.NullString{"haolei_" + fmt.Sprint(i+1), true},
+				Name:         sql.NullString{String: "haolei_" + fmt.Sprint(i+1), Valid: true},
-				Age:          sql.NullInt64{30 + int64(i), true},
+				Age:          sql.NullInt64{Int64: 30 + int64(i), Valid: true},
-				Height:       sql.NullFloat64{1.5 + 1.1*float64(i), true},
+				Height:       sql.NullFloat64{Float64: 1.5 + 1.1*float64(i), Valid: true},
-				IsMan:        sql.NullBool{true, true},
+				IsMan:        sql.NullBool{Bool: true, Valid: true},
 				CustomStruct: CustomStruct{i, i + 1, i + 2},
 			}
 
@@ -173,8 +173,8 @@ func TestNullStructUpdate(t *testing.T) {
 
 	if true { // 测试可插入NULL
 		item := new(NullType)
-		item.Age = sql.NullInt64{23, true}
+		item.Age = sql.NullInt64{Int64: 23, Valid: true}
-		item.Height = sql.NullFloat64{0, false} // update to NULL
+		item.Height = sql.NullFloat64{Float64: 0, Valid: false} // update to NULL
 
 		affected, err := testEngine.ID(2).Cols("age", "height", "is_man").Update(item)
 		if err != nil {
@@ -190,7 +190,7 @@ func TestNullStructUpdate(t *testing.T) {
 
 	if true { // 测试In update
 		item := new(NullType)
-		item.Age = sql.NullInt64{23, true}
+		item.Age = sql.NullInt64{Int64: 23, Valid: true}
 		affected, err := testEngine.In("id", 3, 4).Cols("age", "height", "is_man").Update(item)
 		if err != nil {
 			t.Error(err)
@@ -205,9 +205,9 @@ func TestNullStructUpdate(t *testing.T) {
 
 	if true { // 测试where
 		item := new(NullType)
-		item.Name = sql.NullString{"nullname", true}
+		item.Name = sql.NullString{String: "nullname", Valid: true}
-		item.IsMan = sql.NullBool{true, true}
+		item.IsMan = sql.NullBool{Bool: true, Valid: true}
-		item.Age = sql.NullInt64{34, true}
+		item.Age = sql.NullInt64{Int64: 34, Valid: true}
 
 		_, err := testEngine.Where("age > ?", 34).Update(item)
 		if err != nil {
@@ -218,9 +218,9 @@ func TestNullStructUpdate(t *testing.T) {
 
 	if true { // 修改全部时，插入空值
 		item := &NullType{
-			Name:   sql.NullString{"winxxp", true},
+			Name:   sql.NullString{String: "winxxp", Valid: true},
-			Age:    sql.NullInt64{30, true},
+			Age:    sql.NullInt64{Int64: 30, Valid: true},
-			Height: sql.NullFloat64{1.72, true},
+			Height: sql.NullFloat64{Float64: 1.72, Valid: true},
 			// IsMan:  sql.NullBool{true, true},
 		}