compares: add Zero and Empty

Fixes: #110

Author: ccoVeille

README.md

@@ -190,6 +190,10 @@ assert.True(t, a >= b)
 assert.True(t, a < b)
 assert.True(t, a <= b)
 assert.False(t, a == b)
+assert.NotEmpty(t, a == b)
+assert.NotZero(t, a == b)
+assert.Zero(t, a == b)
+assert.Empty(t, a == b)
 // And so on...
 
 ✅

analyzer/testdata/src/checkers-default/compares/compares_test.go

@@ -15,6 +15,54 @@ func TestComparesChecker(t *testing.T) {
 
 	// Invalid.
 	{
+		assert.Equal(t, a, b)                                            // want "compares: use assert\\.Equal"
+		assert.Equalf(t, a, b, "msg with args %d %s", 42, "42")          // want "compares: use assert\\.Equalf"
+		assert.NotEqual(t, a, b)                                         // want "compares: use assert\\.NotEqual"
+		assert.NotEqualf(t, a, b, "msg with args %d %s", 42, "42")       // want "compares: use assert\\.NotEqualf"
+		assert.Greater(t, a, b)                                          // want "compares: use assert\\.Greater"
+		assert.Greaterf(t, a, b, "msg with args %d %s", 42, "42")        // want "compares: use assert\\.Greaterf"
+		assert.GreaterOrEqual(t, a, b)                                   // want "compares: use assert\\.GreaterOrEqual"
+		assert.GreaterOrEqualf(t, a, b, "msg with args %d %s", 42, "42") // want "compares: use assert\\.GreaterOrEqualf"
+		assert.Less(t, a, b)                                             // want "compares: use assert\\.Less"
+		assert.Lessf(t, a, b, "msg with args %d %s", 42, "42")           // want "compares: use assert\\.Lessf"
+		assert.LessOrEqual(t, a, b)                                      // want "compares: use assert\\.LessOrEqual"
+		assert.LessOrEqualf(t, a, b, "msg with args %d %s", 42, "42")    // want "compares: use assert\\.LessOrEqualf"
+		assert.NotEqual(t, a, b)                                         // want "compares: use assert\\.NotEqual"
+		assert.NotEqualf(t, a, b, "msg with args %d %s", 42, "42")       // want "compares: use assert\\.NotEqualf"
+		assert.Equal(t, a, b)                                            // want "compares: use assert\\.Equal"
+		assert.Equalf(t, a, b, "msg with args %d %s", 42, "42")          // want "compares: use assert\\.Equalf"
+		assert.LessOrEqual(t, a, b)                                      // want "compares: use assert\\.LessOrEqual"
+		assert.LessOrEqualf(t, a, b, "msg with args %d %s", 42, "42")    // want "compares: use assert\\.LessOrEqualf"
+		assert.Less(t, a, b)                                             // want "compares: use assert\\.Less"
+		assert.Lessf(t, a, b, "msg with args %d %s", 42, "42")           // want "compares: use assert\\.Lessf"
+		assert.GreaterOrEqual(t, a, b)                                   // want "compares: use assert\\.GreaterOrEqual"
+		assert.GreaterOrEqualf(t, a, b, "msg with args %d %s", 42, "42") // want "compares: use assert\\.GreaterOrEqualf"
+		assert.Greater(t, a, b)                                          // want "compares: use assert\\.Greater"
+		assert.Greaterf(t, a, b, "msg with args %d %s", 42, "42")        // want "compares: use assert\\.Greaterf"
+		assert.Equal(t, a, b)                                            // want "compares: use assert\\.Equal"
+		assert.Equalf(t, a, b, "msg with args %d %s", 42, "42")          // want "compares: use assert\\.Equalf"
+		assert.NotEqual(t, a, b)                                         // want "compares: use assert\\.NotEqual"
+		assert.NotEqualf(t, a, b, "msg with args %d %s", 42, "42")       // want "compares: use assert\\.NotEqualf"
+		assert.Greater(t, a, b)                                          // want "compares: use assert\\.Greater"
+		assert.Greaterf(t, a, b, "msg with args %d %s", 42, "42")        // want "compares: use assert\\.Greaterf"
+		assert.GreaterOrEqual(t, a, b)                                   // want "compares: use assert\\.GreaterOrEqual"
+		assert.GreaterOrEqualf(t, a, b, "msg with args %d %s", 42, "42") // want "compares: use assert\\.GreaterOrEqualf"
+		assert.Less(t, a, b)                                             // want "compares: use assert\\.Less"
+		assert.Lessf(t, a, b, "msg with args %d %s", 42, "42")           // want "compares: use assert\\.Lessf"
+		assert.LessOrEqual(t, a, b)                                      // want "compares: use assert\\.LessOrEqual"
+		assert.LessOrEqualf(t, a, b, "msg with args %d %s", 42, "42")    // want "compares: use assert\\.LessOrEqualf"
+		assert.NotEqual(t, a, b)                                         // want "compares: use assert\\.NotEqual"
+		assert.NotEqualf(t, a, b, "msg with args %d %s", 42, "42")       // want "compares: use assert\\.NotEqualf"
+		assert.Equal(t, a, b)                                            // want "compares: use assert\\.Equal"
+		assert.Equalf(t, a, b, "msg with args %d %s", 42, "42")          // want "compares: use assert\\.Equalf"
+		assert.LessOrEqual(t, a, b)                                      // want "compares: use assert\\.LessOrEqual"
+		assert.LessOrEqualf(t, a, b, "msg with args %d %s", 42, "42")    // want "compares: use assert\\.LessOrEqualf"
+		assert.Less(t, a, b)                                             // want "compares: use assert\\.Less"
+		assert.Lessf(t, a, b, "msg with args %d %s", 42, "42")           // want "compares: use assert\\.Lessf"
+		assert.GreaterOrEqual(t, a, b)                                   // want "compares: use assert\\.GreaterOrEqual"
+		assert.GreaterOrEqualf(t, a, b, "msg with args %d %s", 42, "42") // want "compares: use assert\\.GreaterOrEqualf"
+		assert.Greater(t, a, b)                                          // want "compares: use assert\\.Greater"
+		assert.Greaterf(t, a, b, "msg with args %d %s", 42, "42")        // want "compares: use assert\\.Greaterf"
 		assert.Equal(t, a, b)                                            // want "compares: use assert\\.Equal"
 		assert.Equalf(t, a, b, "msg with args %d %s", 42, "42")          // want "compares: use assert\\.Equalf"
 		assert.NotEqual(t, a, b)                                         // want "compares: use assert\\.NotEqual"

analyzer/testdata/src/checkers-default/compares/compares_test.go.golden

@@ -16,6 +16,10 @@ import (
 //	assert.True(t, a < b)
 //	assert.True(t, a <= b)
 //	assert.False(t, a == b)
+//	assert.NotEmpty(t, a == b)
+//	assert.NotZero(t, a == b)
+//	assert.Zero(t, a == b)
+//	assert.Empty(t, a == b)
 //	...
 //
 // and requires
@@ -48,9 +52,9 @@ func (checker Compares) Check(pass *analysis.Pass, call *CallMeta) *analysis.Dia
 	var tokenToProposedFn map[token.Token]string
 
 	switch call.Fn.NameFTrimmed {
-	case "True":
+	case "True", "NotZero", "NotEmpty":
 		tokenToProposedFn = tokenToProposedFnInsteadOfTrue
-	case "False":
+	case "False", "Zero", "Empty":
 		tokenToProposedFn = tokenToProposedFnInsteadOfFalse
 	default:
 		return nil

internal/checkers/compares.go

@@ -32,7 +32,9 @@ func (g ComparesTestsGenerator) TemplateData() any {
 
 	var invalidAssertions []Assertion //nolint:prealloc
 	for checker, oppositeChecker := range map[string]string{
-		"True": "False",
+		"True":     "False",
+		"NotEmpty": "Empty",
+		"NotZero":  "Zero",
 	} {
 		invalidAssertions = append(invalidAssertions,
 			Assertion{Fn: checker, Argsf: "a == b", ReportMsgf: report, ProposedFn: "Equal", ProposedArgsf: "a, b"},