Suggest NotEmpty for Positive len (#124)

* Suggest NotEmpty for Positive len * fix doc & make doc, readme and tests consistent --------- Co-authored-by: Anton Telyshev <[email protected]>
Antonboom · Jun 15, 2024 · 858de46 · 858de46
1 parent c1346cf
commit 858de46
Show file tree

Hide file tree

Showing 5 changed files with 11 additions and 4 deletions.
diff --git a/README.md b/README.md
@@ -234,6 +234,7 @@ assert.NotEqual(t, 0, len(arr))
 assert.NotEqualValues(t, 0, len(arr))
 assert.Less(t, 0, len(arr))
 assert.Greater(t, len(arr), 0)
+assert.Positive(t, len(arr))
 assert.NotZero(t, len(arr))
 assert.NotEmpty(t, len(arr))
 

diff --git a/analyzer/testdata/src/checkers-default/empty/empty_test.go b/analyzer/testdata/src/checkers-default/empty/empty_test.go
diff --git a/analyzer/testdata/src/checkers-default/empty/empty_test.go.golden b/analyzer/testdata/src/checkers-default/empty/empty_test.go.golden
@@ -73,6 +73,8 @@ func TestEmptyChecker(t *testing.T) {
 		assert.NotEmptyf(t, elems, "msg with args %d %s", 42, "42") // want "empty: use assert\\.NotEmptyf"
 		assert.NotEmpty(t, elems)                                   // want "empty: use assert\\.NotEmpty"
 		assert.NotEmptyf(t, elems, "msg with args %d %s", 42, "42") // want "empty: use assert\\.NotEmptyf"
+		assert.NotEmpty(t, elems)                                   // want "empty: use assert\\.NotEmpty"
+		assert.NotEmptyf(t, elems, "msg with args %d %s", 42, "42") // want "empty: use assert\\.NotEmptyf"
 
 		// Valid.
 		assert.NotEmpty(t, elems)

diff --git a/internal/checkers/empty.go b/internal/checkers/empty.go
@@ -28,6 +28,7 @@ import (
 //	assert.NotEqualValues(t, 0, len(arr))
 //	assert.Less(t, 0, len(arr))
 //	assert.Greater(t, len(arr), 0)
+//	assert.Positive(t, len(arr))
 //	assert.NotZero(t, len(arr))
 //	assert.NotEmpty(t, len(arr))
 //
@@ -133,7 +134,7 @@ func (checker Empty) checkNotEmpty(pass *analysis.Pass, call *CallMeta) *analysi
 
 	a := call.Args[0]
 	switch call.Fn.NameFTrimmed {
-	case "NotZero", "NotEmpty":
+	case "NotZero", "NotEmpty", "Positive":
 		lenArg, ok := isBuiltinLenCall(pass, a)
 		if ok {
 			return newUseNotEmptyDiagnostic(a.Pos(), a.End(), lenArg)

diff --git a/internal/testgen/gen_empty.go b/internal/testgen/gen_empty.go
@@ -84,8 +84,9 @@ func (g EmptyTestsGenerator) TemplateData() any {
 					{Fn: "NotEqual", Argsf: "0, len(elems)", ReportMsgf: report, ProposedFn: "NotEmpty", ProposedArgsf: "elems"},
 					{Fn: "NotEqualValues", Argsf: "len(elems), 0", ReportMsgf: report, ProposedFn: "NotEmpty", ProposedArgsf: "elems"},
 					{Fn: "NotEqualValues", Argsf: "0, len(elems)", ReportMsgf: report, ProposedFn: "NotEmpty", ProposedArgsf: "elems"},
-					{Fn: "Greater", Argsf: "len(elems), 0", ReportMsgf: report, ProposedFn: "NotEmpty", ProposedArgsf: "elems"},
 					{Fn: "Less", Argsf: "0, len(elems)", ReportMsgf: report, ProposedFn: "NotEmpty", ProposedArgsf: "elems"},
+					{Fn: "Greater", Argsf: "len(elems), 0", ReportMsgf: report, ProposedFn: "NotEmpty", ProposedArgsf: "elems"},
+					{Fn: "Positive", Argsf: "len(elems)", ReportMsgf: report, ProposedFn: "NotEmpty", ProposedArgsf: "elems"},
 					{Fn: "NotZero", Argsf: "len(elems)", ReportMsgf: report, ProposedFn: "NotEmpty", ProposedArgsf: "elems"},
 					{Fn: "NotEmpty", Argsf: "len(elems)", ReportMsgf: report, ProposedFn: "NotEmpty", ProposedArgsf: "elems"},
 				},