fix linting errors in /assert package

mvrahden · boyan-soubachov · commit ab6dc3262822 · 2021-08-24T21:55:23.000+10:00
diff --git a/assert/assertion_compare_test.go b/assert/assertion_compare_test.go
@@ -150,7 +150,7 @@ func TestGreater(t *testing.T) {
 	} {
 		out := &outputT{buf: bytes.NewBuffer(nil)}
 		False(t, Greater(out, currCase.less, currCase.greater))
-		Contains(t, string(out.buf.Bytes()), currCase.msg)
+		Contains(t, out.buf.String(), currCase.msg)
 		Contains(t, out.helpers, "github.com/stretchr/testify/assert.Greater")
 	}
 }
@@ -191,7 +191,7 @@ func TestGreaterOrEqual(t *testing.T) {
 	} {
 		out := &outputT{buf: bytes.NewBuffer(nil)}
 		False(t, GreaterOrEqual(out, currCase.less, currCase.greater))
-		Contains(t, string(out.buf.Bytes()), currCase.msg)
+		Contains(t, out.buf.String(), currCase.msg)
 		Contains(t, out.helpers, "github.com/stretchr/testify/assert.GreaterOrEqual")
 	}
 }
@@ -232,7 +232,7 @@ func TestLess(t *testing.T) {
 	} {
 		out := &outputT{buf: bytes.NewBuffer(nil)}
 		False(t, Less(out, currCase.greater, currCase.less))
-		Contains(t, string(out.buf.Bytes()), currCase.msg)
+		Contains(t, out.buf.String(), currCase.msg)
 		Contains(t, out.helpers, "github.com/stretchr/testify/assert.Less")
 	}
 }
@@ -273,7 +273,7 @@ func TestLessOrEqual(t *testing.T) {
 	} {
 		out := &outputT{buf: bytes.NewBuffer(nil)}
 		False(t, LessOrEqual(out, currCase.greater, currCase.less))
-		Contains(t, string(out.buf.Bytes()), currCase.msg)
+		Contains(t, out.buf.String(), currCase.msg)
 		Contains(t, out.helpers, "github.com/stretchr/testify/assert.LessOrEqual")
 	}
 }
@@ -312,7 +312,7 @@ func TestPositive(t *testing.T) {
 	} {
 		out := &outputT{buf: bytes.NewBuffer(nil)}
 		False(t, Positive(out, currCase.e))
-		Contains(t, string(out.buf.Bytes()), currCase.msg)
+		Contains(t, out.buf.String(), currCase.msg)
 		Contains(t, out.helpers, "github.com/stretchr/testify/assert.Positive")
 	}
 }
@@ -351,7 +351,7 @@ func TestNegative(t *testing.T) {
 	} {
 		out := &outputT{buf: bytes.NewBuffer(nil)}
 		False(t, Negative(out, currCase.e))
-		Contains(t, string(out.buf.Bytes()), currCase.msg)
+		Contains(t, out.buf.String(), currCase.msg)
 		Contains(t, out.helpers, "github.com/stretchr/testify/assert.Negative")
 	}
 }
@@ -386,7 +386,7 @@ func Test_compareTwoValuesNotComparableValues(t *testing.T) {
 	}{
 		{v1: CompareStruct{}, v2: CompareStruct{}},
 		{v1: map[string]int{}, v2: map[string]int{}},
-		{v1: make([]int, 5, 5), v2: make([]int, 5, 5)},
+		{v1: make([]int, 5), v2: make([]int, 5)},
 	} {
 		compareResult := compareTwoValues(mockT, currCase.v1, currCase.v2, []CompareType{compareLess, compareEqual, compareGreater}, "testFailMessage")
 		False(t, compareResult)
diff --git a/assert/assertion_order_test.go b/assert/assertion_order_test.go
@@ -46,7 +46,7 @@ func TestIsIncreasing(t *testing.T) {
 	} {
 		out := &outputT{buf: bytes.NewBuffer(nil)}
 		False(t, IsIncreasing(out, currCase.collection))
-		Contains(t, string(out.buf.Bytes()), currCase.msg)
+		Contains(t, out.buf.String(), currCase.msg)
 	}
 }
 
@@ -91,7 +91,7 @@ func TestIsNonIncreasing(t *testing.T) {
 	} {
 		out := &outputT{buf: bytes.NewBuffer(nil)}
 		False(t, IsNonIncreasing(out, currCase.collection))
-		Contains(t, string(out.buf.Bytes()), currCase.msg)
+		Contains(t, out.buf.String(), currCase.msg)
 	}
 }
 
@@ -136,7 +136,7 @@ func TestIsDecreasing(t *testing.T) {
 	} {
 		out := &outputT{buf: bytes.NewBuffer(nil)}
 		False(t, IsDecreasing(out, currCase.collection))
-		Contains(t, string(out.buf.Bytes()), currCase.msg)
+		Contains(t, out.buf.String(), currCase.msg)
 	}
 }
 
@@ -181,6 +181,6 @@ func TestIsNonDecreasing(t *testing.T) {
 	} {
 		out := &outputT{buf: bytes.NewBuffer(nil)}
 		False(t, IsNonDecreasing(out, currCase.collection))
-		Contains(t, string(out.buf.Bytes()), currCase.msg)
+		Contains(t, out.buf.String(), currCase.msg)
 	}
 }
diff --git a/assert/assertions.go b/assert/assertions.go
@@ -856,7 +856,7 @@ func NotSubset(t TestingT, list, subset interface{}, msgAndArgs ...interface{})
 		h.Helper()
 	}
 	if subset == nil {
-		return Fail(t, fmt.Sprintf("nil is the empty set which is a subset of every set"), msgAndArgs...)
+		return Fail(t, "nil is the empty set which is a subset of every set", msgAndArgs...)
 	}
 
 	subsetValue := reflect.ValueOf(subset)
@@ -1165,15 +1165,15 @@ func InDelta(t TestingT, expected, actual interface{}, delta float64, msgAndArgs
 	bf, bok := toFloat(actual)
 
 	if !aok || !bok {
-		return Fail(t, fmt.Sprintf("Parameters must be numerical"), msgAndArgs...)
+		return Fail(t, "Parameters must be numerical", msgAndArgs...)
 	}
 
 	if math.IsNaN(af) && math.IsNaN(bf) {
 		return true
 	}
 
 	if math.IsNaN(af) {
-		return Fail(t, fmt.Sprintf("Expected must not be NaN"), msgAndArgs...)
+		return Fail(t, "Expected must not be NaN", msgAndArgs...)
 	}
 
 	if math.IsNaN(bf) {
@@ -1196,7 +1196,7 @@ func InDeltaSlice(t TestingT, expected, actual interface{}, delta float64, msgAn
 	if expected == nil || actual == nil ||
 		reflect.TypeOf(actual).Kind() != reflect.Slice ||
 		reflect.TypeOf(expected).Kind() != reflect.Slice {
-		return Fail(t, fmt.Sprintf("Parameters must be slice"), msgAndArgs...)
+		return Fail(t, "Parameters must be slice", msgAndArgs...)
 	}
 
 	actualSlice := reflect.ValueOf(actual)
@@ -1306,7 +1306,7 @@ func InEpsilonSlice(t TestingT, expected, actual interface{}, epsilon float64, m
 	if expected == nil || actual == nil ||
 		reflect.TypeOf(actual).Kind() != reflect.Slice ||
 		reflect.TypeOf(expected).Kind() != reflect.Slice {
-		return Fail(t, fmt.Sprintf("Parameters must be slice"), msgAndArgs...)
+		return Fail(t, "Parameters must be slice", msgAndArgs...)
 	}
 
 	actualSlice := reflect.ValueOf(actual)
diff --git a/assert/assertions_test.go b/assert/assertions_test.go
@@ -1575,8 +1575,7 @@ func testAutogeneratedFunction() {
 	t := struct {
 		io.Closer
 	}{}
-	var c io.Closer
-	c = t
+	c := t
 	c.Close()
 }
 
@@ -2224,7 +2223,7 @@ func ExampleValueAssertionFunc() {
 
 	dumbParse := func(input string) interface{} {
 		var x interface{}
-		json.Unmarshal([]byte(input), &x)
+		_ = json.Unmarshal([]byte(input), &x)
 		return x
 	}
 
diff --git a/assert/http_assertions_test.go b/assert/http_assertions_test.go
@@ -122,7 +122,7 @@ func TestHTTPStatusesWrapper(t *testing.T) {
 
 func httpHelloName(w http.ResponseWriter, r *http.Request) {
 	name := r.FormValue("name")
-	w.Write([]byte(fmt.Sprintf("Hello, %s!", name)))
+	_, _ = w.Write([]byte(fmt.Sprintf("Hello, %s!", name)))
 }
 
 func TestHTTPRequestWithNoParams(t *testing.T) {

Original file line number	Diff line number	Diff line change
`@@ -150,7 +150,7 @@ func TestGreater(t *testing.T) {`
`150`	`150`	`} {`
`151`	`151`	`out := &outputT{buf: bytes.NewBuffer(nil)}`
`152`	`152`	`False(t, Greater(out, currCase.less, currCase.greater))`
`153`		`- Contains(t, string(out.buf.Bytes()), currCase.msg)`
	`153`	`+ Contains(t, out.buf.String(), currCase.msg)`
`154`	`154`	`Contains(t, out.helpers, "github.com/stretchr/testify/assert.Greater")`
`155`	`155`	`}`
`156`	`156`	`}`
`@@ -191,7 +191,7 @@ func TestGreaterOrEqual(t *testing.T) {`
`191`	`191`	`} {`
`192`	`192`	`out := &outputT{buf: bytes.NewBuffer(nil)}`
`193`	`193`	`False(t, GreaterOrEqual(out, currCase.less, currCase.greater))`
`194`		`- Contains(t, string(out.buf.Bytes()), currCase.msg)`
	`194`	`+ Contains(t, out.buf.String(), currCase.msg)`
`195`	`195`	`Contains(t, out.helpers, "github.com/stretchr/testify/assert.GreaterOrEqual")`
`196`	`196`	`}`
`197`	`197`	`}`
`@@ -232,7 +232,7 @@ func TestLess(t *testing.T) {`
`232`	`232`	`} {`
`233`	`233`	`out := &outputT{buf: bytes.NewBuffer(nil)}`
`234`	`234`	`False(t, Less(out, currCase.greater, currCase.less))`
`235`		`- Contains(t, string(out.buf.Bytes()), currCase.msg)`
	`235`	`+ Contains(t, out.buf.String(), currCase.msg)`
`236`	`236`	`Contains(t, out.helpers, "github.com/stretchr/testify/assert.Less")`
`237`	`237`	`}`
`238`	`238`	`}`
`@@ -273,7 +273,7 @@ func TestLessOrEqual(t *testing.T) {`
`273`	`273`	`} {`
`274`	`274`	`out := &outputT{buf: bytes.NewBuffer(nil)}`
`275`	`275`	`False(t, LessOrEqual(out, currCase.greater, currCase.less))`
`276`		`- Contains(t, string(out.buf.Bytes()), currCase.msg)`
	`276`	`+ Contains(t, out.buf.String(), currCase.msg)`
`277`	`277`	`Contains(t, out.helpers, "github.com/stretchr/testify/assert.LessOrEqual")`
`278`	`278`	`}`
`279`	`279`	`}`
`@@ -312,7 +312,7 @@ func TestPositive(t *testing.T) {`
`312`	`312`	`} {`
`313`	`313`	`out := &outputT{buf: bytes.NewBuffer(nil)}`
`314`	`314`	`False(t, Positive(out, currCase.e))`
`315`		`- Contains(t, string(out.buf.Bytes()), currCase.msg)`
	`315`	`+ Contains(t, out.buf.String(), currCase.msg)`
`316`	`316`	`Contains(t, out.helpers, "github.com/stretchr/testify/assert.Positive")`
`317`	`317`	`}`
`318`	`318`	`}`
`@@ -351,7 +351,7 @@ func TestNegative(t *testing.T) {`
`351`	`351`	`} {`
`352`	`352`	`out := &outputT{buf: bytes.NewBuffer(nil)}`
`353`	`353`	`False(t, Negative(out, currCase.e))`
`354`		`- Contains(t, string(out.buf.Bytes()), currCase.msg)`
	`354`	`+ Contains(t, out.buf.String(), currCase.msg)`
`355`	`355`	`Contains(t, out.helpers, "github.com/stretchr/testify/assert.Negative")`
`356`	`356`	`}`
`357`	`357`	`}`
`@@ -386,7 +386,7 @@ func Test_compareTwoValuesNotComparableValues(t *testing.T) {`
`386`	`386`	`}{`
`387`	`387`	`{v1: CompareStruct{}, v2: CompareStruct{}},`
`388`	`388`	`{v1: map[string]int{}, v2: map[string]int{}},`
`389`		`- {v1: make([]int, 5, 5), v2: make([]int, 5, 5)},`
	`389`	`+ {v1: make([]int, 5), v2: make([]int, 5)},`
`390`	`390`	`} {`
`391`	`391`	`compareResult := compareTwoValues(mockT, currCase.v1, currCase.v2, []CompareType{compareLess, compareEqual, compareGreater}, "testFailMessage")`
`392`	`392`	`False(t, compareResult)`
Original file line number	Diff line number	Diff line change
`@@ -46,7 +46,7 @@ func TestIsIncreasing(t *testing.T) {`
`46`	`46`	`} {`
`47`	`47`	`out := &outputT{buf: bytes.NewBuffer(nil)}`
`48`	`48`	`False(t, IsIncreasing(out, currCase.collection))`
`49`		`- Contains(t, string(out.buf.Bytes()), currCase.msg)`
	`49`	`+ Contains(t, out.buf.String(), currCase.msg)`
`50`	`50`	`}`
`51`	`51`	`}`
`52`	`52`
`@@ -91,7 +91,7 @@ func TestIsNonIncreasing(t *testing.T) {`
`91`	`91`	`} {`
`92`	`92`	`out := &outputT{buf: bytes.NewBuffer(nil)}`
`93`	`93`	`False(t, IsNonIncreasing(out, currCase.collection))`
`94`		`- Contains(t, string(out.buf.Bytes()), currCase.msg)`
	`94`	`+ Contains(t, out.buf.String(), currCase.msg)`
`95`	`95`	`}`
`96`	`96`	`}`
`97`	`97`
`@@ -136,7 +136,7 @@ func TestIsDecreasing(t *testing.T) {`
`136`	`136`	`} {`
`137`	`137`	`out := &outputT{buf: bytes.NewBuffer(nil)}`
`138`	`138`	`False(t, IsDecreasing(out, currCase.collection))`
`139`		`- Contains(t, string(out.buf.Bytes()), currCase.msg)`
	`139`	`+ Contains(t, out.buf.String(), currCase.msg)`
`140`	`140`	`}`
`141`	`141`	`}`
`142`	`142`
`@@ -181,6 +181,6 @@ func TestIsNonDecreasing(t *testing.T) {`
`181`	`181`	`} {`
`182`	`182`	`out := &outputT{buf: bytes.NewBuffer(nil)}`
`183`	`183`	`False(t, IsNonDecreasing(out, currCase.collection))`
`184`		`- Contains(t, string(out.buf.Bytes()), currCase.msg)`
	`184`	`+ Contains(t, out.buf.String(), currCase.msg)`
`185`	`185`	`}`
`186`	`186`	`}`
Original file line number	Diff line number	Diff line change
`@@ -856,7 +856,7 @@ func NotSubset(t TestingT, list, subset interface{}, msgAndArgs ...interface{})`
`856`	`856`	`h.Helper()`
`857`	`857`	`}`
`858`	`858`	`if subset == nil {`
`859`		`- return Fail(t, fmt.Sprintf("nil is the empty set which is a subset of every set"), msgAndArgs...)`
	`859`	`+ return Fail(t, "nil is the empty set which is a subset of every set", msgAndArgs...)`
`860`	`860`	`}`
`861`	`861`
`862`	`862`	`subsetValue := reflect.ValueOf(subset)`
`@@ -1165,15 +1165,15 @@ func InDelta(t TestingT, expected, actual interface{}, delta float64, msgAndArgs`
`1165`	`1165`	`bf, bok := toFloat(actual)`
`1166`	`1166`
`1167`	`1167`	`if !aok \|\| !bok {`
`1168`		`- return Fail(t, fmt.Sprintf("Parameters must be numerical"), msgAndArgs...)`
	`1168`	`+ return Fail(t, "Parameters must be numerical", msgAndArgs...)`
`1169`	`1169`	`}`
`1170`	`1170`
`1171`	`1171`	`if math.IsNaN(af) && math.IsNaN(bf) {`
`1172`	`1172`	`return true`
`1173`	`1173`	`}`
`1174`	`1174`
`1175`	`1175`	`if math.IsNaN(af) {`
`1176`		`- return Fail(t, fmt.Sprintf("Expected must not be NaN"), msgAndArgs...)`
	`1176`	`+ return Fail(t, "Expected must not be NaN", msgAndArgs...)`
`1177`	`1177`	`}`
`1178`	`1178`
`1179`	`1179`	`if math.IsNaN(bf) {`
`@@ -1196,7 +1196,7 @@ func InDeltaSlice(t TestingT, expected, actual interface{}, delta float64, msgAn`
`1196`	`1196`	`if expected == nil \|\| actual == nil \|\|`
`1197`	`1197`	`reflect.TypeOf(actual).Kind() != reflect.Slice \|\|`
`1198`	`1198`	`reflect.TypeOf(expected).Kind() != reflect.Slice {`
`1199`		`- return Fail(t, fmt.Sprintf("Parameters must be slice"), msgAndArgs...)`
	`1199`	`+ return Fail(t, "Parameters must be slice", msgAndArgs...)`
`1200`	`1200`	`}`
`1201`	`1201`
`1202`	`1202`	`actualSlice := reflect.ValueOf(actual)`
`@@ -1306,7 +1306,7 @@ func InEpsilonSlice(t TestingT, expected, actual interface{}, epsilon float64, m`
`1306`	`1306`	`if expected == nil \|\| actual == nil \|\|`
`1307`	`1307`	`reflect.TypeOf(actual).Kind() != reflect.Slice \|\|`
`1308`	`1308`	`reflect.TypeOf(expected).Kind() != reflect.Slice {`
`1309`		`- return Fail(t, fmt.Sprintf("Parameters must be slice"), msgAndArgs...)`
	`1309`	`+ return Fail(t, "Parameters must be slice", msgAndArgs...)`
`1310`	`1310`	`}`
`1311`	`1311`
`1312`	`1312`	`actualSlice := reflect.ValueOf(actual)`
Original file line number	Diff line number	Diff line change
`@@ -122,7 +122,7 @@ func TestHTTPStatusesWrapper(t *testing.T) {`
`122`	`122`
`123`	`123`	`func httpHelloName(w http.ResponseWriter, r *http.Request) {`
`124`	`124`	`name := r.FormValue("name")`
`125`		`- w.Write([]byte(fmt.Sprintf("Hello, %s!", name)))`
	`125`	`+ _, _ = w.Write([]byte(fmt.Sprintf("Hello, %s!", name)))`
`126`	`126`	`}`
`127`	`127`
`128`	`128`	`func TestHTTPRequestWithNoParams(t *testing.T) {`