test: fix testpackage lint issues for test and ifelse (#1582)

.golangci.yml

@@ -16,6 +16,7 @@ linters:
     - musttag
     - nolintlint
     - revive
+    - testpackage
     - thelper
     - staticcheck
     - unparam
@@ -30,6 +31,18 @@ linters:
       - linters:
           - godoclint
         text: 'symbol should have a godoc \("Visit"\)'
+      - linters:
+          - testpackage
+        text: 'package should be `rule_test` instead of `rule`'
+      - linters:
+          - testpackage
+        text: 'package should be `lint_test` instead of `lint`'
+      - linters:
+          - testpackage
+        text: 'package should be `cli_test` instead of `cli`'
+      - linters:
+          - testpackage
+        text: 'package should be `formatter_test` instead of `formatter`'
 
   settings:
     gocritic:

internal/ifelse/branch_test.go

@@ -1,24 +1,26 @@
-package ifelse
+package ifelse_test
 
 import (
 	"go/ast"
 	"go/token"
 	"testing"
+
+	"github.com/mgechev/revive/internal/ifelse"
 )
 
 func TestBlockBranch(t *testing.T) {
 	t.Run("empty", func(t *testing.T) {
 		block := &ast.BlockStmt{List: []ast.Stmt{}}
-		b := BlockBranch(block)
+		b := ifelse.BlockBranch(block)
-		if b.BranchKind != Empty {
+		if b.BranchKind != ifelse.Empty {
 			t.Errorf("want Empty branch, got %v", b.BranchKind)
 		}
 	})
 	t.Run("non empty", func(t *testing.T) {
 		stmt := &ast.ReturnStmt{}
 		block := &ast.BlockStmt{List: []ast.Stmt{stmt}}
-		b := BlockBranch(block)
+		b := ifelse.BlockBranch(block)
-		if b.BranchKind != Return {
+		if b.BranchKind != ifelse.Return {
 			t.Errorf("want Return branch, got %v", b.BranchKind)
 		}
 	})
@@ -28,33 +30,33 @@ func TestStmtBranch(t *testing.T) {
 	cases := []struct {
 		name string
 		stmt ast.Stmt
-		kind BranchKind
+		kind ifelse.BranchKind
-		call *Call
+		call *ifelse.Call
 	}{
 		{
 			name: "ReturnStmt",
 			stmt: &ast.ReturnStmt{},
-			kind: Return,
+			kind: ifelse.Return,
 		},
 		{
 			name: "BreakStmt",
 			stmt: &ast.BranchStmt{Tok: token.BREAK},
-			kind: Break,
+			kind: ifelse.Break,
 		},
 		{
 			name: "ContinueStmt",
 			stmt: &ast.BranchStmt{Tok: token.CONTINUE},
-			kind: Continue,
+			kind: ifelse.Continue,
 		},
 		{
 			name: "GotoStmt",
 			stmt: &ast.BranchStmt{Tok: token.GOTO},
-			kind: Goto,
+			kind: ifelse.Goto,
 		},
 		{
 			name: "EmptyStmt",
 			stmt: &ast.EmptyStmt{},
-			kind: Empty,
+			kind: ifelse.Empty,
 		},
 		{
 			name: "ExprStmt with DeviatingFunc (panic)",
@@ -63,8 +65,8 @@ func TestStmtBranch(t *testing.T) {
 					Fun: &ast.Ident{Name: "panic"},
 				},
 			},
-			kind: Panic,
+			kind: ifelse.Panic,
-			call: &Call{Name: "panic"},
+			call: &ifelse.Call{Name: "panic"},
 		},
 		{
 			name: "ExprStmt with DeviatingFunc (os.Exit)",
@@ -76,8 +78,8 @@ func TestStmtBranch(t *testing.T) {
 					},
 				},
 			},
-			kind: Exit,
+			kind: ifelse.Exit,
-			call: &Call{Pkg: "os", Name: "Exit"},
+			call: &ifelse.Call{Pkg: "os", Name: "Exit"},
 		},
 		{
 			name: "ExprStmt with non-deviating func",
@@ -86,7 +88,7 @@ func TestStmtBranch(t *testing.T) {
 					Fun: &ast.Ident{Name: "foo"},
 				},
 			},
-			kind: Regular,
+			kind: ifelse.Regular,
 		},
 		{
 			name: "LabeledStmt wrapping ReturnStmt",
@@ -94,7 +96,7 @@ func TestStmtBranch(t *testing.T) {
 				Label: &ast.Ident{Name: "lbl"},
 				Stmt:  &ast.ReturnStmt{},
 			},
-			kind: Return,
+			kind: ifelse.Return,
 		},
 		{
 			name: "LabeledStmt wrapping ExprStmt",
@@ -102,21 +104,21 @@ func TestStmtBranch(t *testing.T) {
 				Label: &ast.Ident{Name: "lbl"},
 				Stmt:  &ast.ExprStmt{X: &ast.CallExpr{Fun: &ast.Ident{Name: "foo"}}},
 			},
-			kind: Regular,
+			kind: ifelse.Regular,
 		},
 		{
 			name: "BlockStmt with ReturnStmt",
 			stmt: &ast.BlockStmt{List: []ast.Stmt{&ast.ReturnStmt{}}},
-			kind: Return,
+			kind: ifelse.Return,
 		},
 		{
 			name: "BlockStmt with ExprStmt",
 			stmt: &ast.BlockStmt{List: []ast.Stmt{&ast.ExprStmt{X: &ast.CallExpr{Fun: &ast.Ident{Name: "foo"}}}}},
-			kind: Regular,
+			kind: ifelse.Regular,
 		},
 	}
 	for _, c := range cases {
-		b := StmtBranch(c.stmt)
+		b := ifelse.StmtBranch(c.stmt)
 		if b.BranchKind != c.kind {
 			t.Errorf("%s: want %v, got %v", c.name, c.kind, b.BranchKind)
 		}
@@ -131,37 +133,37 @@ func TestStmtBranch(t *testing.T) {
 func TestBranch_String_LongString(t *testing.T) {
 	tests := []struct {
 		name     string
-		branch   Branch
+		branch   ifelse.Branch
 		wantStr  string
 		wantLong string
 	}{
 		{
 			name:     "Return branch",
-			branch:   Branch{BranchKind: Return},
+			branch:   ifelse.Branch{BranchKind: ifelse.Return},
 			wantStr:  "{ ... return }",
 			wantLong: "a return statement",
 		},
 		{
 			name:     "Panic branch with Call",
-			branch:   Branch{BranchKind: Panic, Call: Call{Name: "panic"}},
+			branch:   ifelse.Branch{BranchKind: ifelse.Panic, Call: ifelse.Call{Name: "panic"}},
 			wantStr:  "{ ... panic() }",
 			wantLong: "call to panic function",
 		},
 		{
 			name:     "Exit branch with Call",
-			branch:   Branch{BranchKind: Exit, Call: Call{Pkg: "os", Name: "Exit"}},
+			branch:   ifelse.Branch{BranchKind: ifelse.Exit, Call: ifelse.Call{Pkg: "os", Name: "Exit"}},
 			wantStr:  "{ ... os.Exit() }",
 			wantLong: "call to os.Exit function",
 		},
 		{
 			name:     "Empty branch",
-			branch:   Branch{BranchKind: Empty},
+			branch:   ifelse.Branch{BranchKind: ifelse.Empty},
 			wantStr:  "{ }",
 			wantLong: "an empty block",
 		},
 		{
 			name:     "Regular branch",
-			branch:   Branch{BranchKind: Regular},
+			branch:   ifelse.Branch{BranchKind: ifelse.Regular},
 			wantStr:  "{ ... }",
 			wantLong: "a regular statement",
 		},
@@ -179,27 +181,27 @@ func TestBranch_String_LongString(t *testing.T) {
 func TestBranch_HasDecls(t *testing.T) {
 	tests := []struct {
 		name  string
-		block []ast.Stmt
+		block *ast.BlockStmt
 		want  bool
 	}{
 		{
 			name:  "DeclStmt",
-			block: []ast.Stmt{&ast.DeclStmt{}},
+			block: &ast.BlockStmt{List: []ast.Stmt{&ast.DeclStmt{}}},
 			want:  true,
 		},
 		{
 			name:  "AssignStmt with :=",
-			block: []ast.Stmt{&ast.AssignStmt{Tok: token.DEFINE}},
+			block: &ast.BlockStmt{List: []ast.Stmt{&ast.AssignStmt{Tok: token.DEFINE}}},
 			want:  true,
 		},
 		{
 			name:  "ExprStmt",
-			block: []ast.Stmt{&ast.ExprStmt{}},
+			block: &ast.BlockStmt{List: []ast.Stmt{&ast.ExprStmt{}}},
 			want:  false,
 		},
 	}
 	for _, tt := range tests {
-		b := Branch{block: tt.block}
+		b := ifelse.BlockBranch(tt.block)
 		if got := b.HasDecls(); got != tt.want {
 			t.Errorf("%s: want HasDecls to be %v, got %v", tt.name, tt.want, got)
 		}
@@ -209,42 +211,42 @@ func TestBranch_HasDecls(t *testing.T) {
 func TestBranch_IsShort(t *testing.T) {
 	tests := []struct {
 		name  string
-		block []ast.Stmt
+		block *ast.BlockStmt
 		want  bool
 	}{
 		{
 			name:  "nil block",
-			block: nil,
+			block: &ast.BlockStmt{},
 			want:  true,
 		},
 		{
 			name:  "single ExprStmt",
-			block: []ast.Stmt{&ast.ExprStmt{}},
+			block: &ast.BlockStmt{List: []ast.Stmt{&ast.ExprStmt{}}},
 			want:  true,
 		},
 		{
 			name:  "single BlockStmt",
-			block: []ast.Stmt{&ast.BlockStmt{}},
+			block: &ast.BlockStmt{List: []ast.Stmt{&ast.BlockStmt{}}},
 			want:  false,
 		},
 		{
 			name:  "two short statements",
-			block: []ast.Stmt{&ast.ExprStmt{}, &ast.ExprStmt{}},
+			block: &ast.BlockStmt{List: []ast.Stmt{&ast.ExprStmt{}, &ast.ExprStmt{}}},
 			want:  true,
 		},
 		{
 			name:  "second non-short statement",
-			block: []ast.Stmt{&ast.ExprStmt{}, &ast.BlockStmt{}},
+			block: &ast.BlockStmt{List: []ast.Stmt{&ast.ExprStmt{}, &ast.BlockStmt{}}},
 			want:  false,
 		},
 		{
 			name:  "three statements (should return false)",
-			block: []ast.Stmt{&ast.ExprStmt{}, &ast.ExprStmt{}, &ast.ExprStmt{}},
+			block: &ast.BlockStmt{List: []ast.Stmt{&ast.ExprStmt{}, &ast.ExprStmt{}, &ast.ExprStmt{}}},
 			want:  false,
 		},
 	}
 	for _, tt := range tests {
-		b := Branch{block: tt.block}
+		b := ifelse.BlockBranch(tt.block)
 		if got := b.IsShort(); got != tt.want {
 			t.Errorf("%s: want IsShort to be %v, got %v", tt.name, tt.want, got)
 		}

test/add_constant_test.go

@@ -1,4 +1,4 @@
-package test
+package test_test
 
 import (
 	"testing"

test/argument_limit_test.go

@@ -1,4 +1,4 @@
-package test
+package test_test
 
 import (
 	"testing"

test/atomic_test.go

@@ -1,4 +1,4 @@
-package test
+package test_test
 
 import (
 	"testing"

test/banned_characters_test.go

@@ -1,4 +1,4 @@
-package test
+package test_test
 
 import (
 	"testing"

test/bare_return_test.go

@@ -1,4 +1,4 @@
-package test
+package test_test
 
 import (
 	"testing"

test/bool_literal_in_expr_test.go

@@ -1,4 +1,4 @@
-package test
+package test_test
 
 import (
 	"testing"

test/call_to_gc_test.go

@@ -1,4 +1,4 @@
-package test
+package test_test
 
 import (
 	"testing"

test/cognitive_complexity_test.go

@@ -1,4 +1,4 @@
-package test
+package test_test
 
 import (
 	"testing"

test/comment_spacings_test.go

@@ -1,4 +1,4 @@
-package test
+package test_test
 
 import (
 	"testing"

test/comments_density_test.go

@@ -1,4 +1,4 @@
-package test
+package test_test
 
 import (
 	"testing"

test/confusing_naming_test.go

@@ -1,4 +1,4 @@
-package test
+package test_test
 
 import (
 	"testing"

test/confusing_results_test.go

@@ -1,4 +1,4 @@
-package test
+package test_test
 
 import (
 	"testing"

test/constant_logical_expr_test.go

@@ -1,4 +1,4 @@
-package test
+package test_test
 
 import (
 	"testing"

test/context_as_argument_test.go

@@ -1,4 +1,4 @@
-package test
+package test_test
 
 import (
 	"testing"

test/cyclomatic_test.go

@@ -1,4 +1,4 @@
-package test
+package test_test
 
 import (
 	"testing"

test/datarace_test.go

@@ -1,4 +1,4 @@
-package test
+package test_test
 
 import (
 	"testing"

test/deep_exit_test.go

@@ -1,4 +1,4 @@
-package test
+package test_test
 
 import (
 	"testing"

test/defer_test.go

@@ -1,4 +1,4 @@
-package test
+package test_test
 
 import (
 	"testing"

test/disable_annotations_test.go

@@ -1,4 +1,4 @@
-package test
+package test_test
 
 import (
 	"testing"

test/dot_imports_test.go

@@ -1,4 +1,4 @@
-package test
+package test_test
 
 import (
 	"testing"

test/duplicated_imports_test.go

@@ -1,4 +1,4 @@
-package test
+package test_test
 
 import (
 	"testing"

test/early_return_test.go

@@ -1,4 +1,4 @@
-package test
+package test_test
 
 import (
 	"testing"

test/empty_block_test.go

@@ -1,4 +1,4 @@
-package test
+package test_test
 
 import (
 	"testing"

test/empty_lines_test.go

@@ -1,4 +1,4 @@
-package test
+package test_test
 
 import (
 	"testing"

test/enforce_map_style_test.go

@@ -1,4 +1,4 @@
-package test
+package test_test
 
 import (
 	"testing"

test/enforce_repeated_arg_type_style_test.go

@@ -1,4 +1,4 @@
-package test
+package test_test
 
 import (
 	"testing"

test/enforce_slice_style_test.go

@@ -1,4 +1,4 @@
-package test
+package test_test
 
 import (
 	"testing"

test/enforce_switch_style_test.go

@@ -1,4 +1,4 @@
-package test
+package test_test
 
 import (
 	"testing"

test/error_strings_custom_functions_test.go

@@ -1,4 +1,4 @@
-package test
+package test_test
 
 import (
 	"testing"

test/exported_test.go

@@ -1,4 +1,4 @@
-package test
+package test_test
 
 import (
 	"testing"

test/file_filter_test.go

@@ -1,4 +1,4 @@
-package test
+package test_test
 
 import (
 	"testing"

test/file_header_test.go

@@ -1,4 +1,4 @@
-package test
+package test_test
 
 import (
 	"testing"

test/file_length_limit_test.go

@@ -1,4 +1,4 @@
-package test
+package test_test
 
 import (
 	"testing"

test/filename_format_test.go

@@ -1,4 +1,4 @@
-package test
+package test_test
 
 import (
 	"testing"

test/flag_param_test.go

@@ -1,4 +1,4 @@
-package test
+package test_test
 
 import (
 	"testing"

test/forbidden_call_in_wg_go_test.go

@@ -1,4 +1,4 @@
-package test
+package test_test
 
 import (
 	"testing"

test/function_length_test.go

@@ -1,4 +1,4 @@
-package test
+package test_test
 
 import (
 	"testing"

test/function_result_limit_test.go

@@ -1,4 +1,4 @@
-package test
+package test_test
 
 import (
 	"testing"

test/get_return_test.go

@@ -1,4 +1,4 @@
-package test
+package test_test
 
 import (
 	"testing"

test/golint_test.go

@@ -1,4 +1,4 @@
-package test
+package test_test
 
 import (
 	"flag"

test/identical_branches_test.go

@@ -1,4 +1,4 @@
-package test
+package test_test
 
 import (
 	"testing"

test/identical_ifelseif_branches_test.go

@@ -1,4 +1,4 @@
-package test
+package test_test
 
 import (
 	"testing"

test/identical_ifelseif_conditions_test.go

@@ -1,4 +1,4 @@
-package test
+package test_test
 
 import (
 	"testing"

test/identical_switch_branches_test.go

@@ -1,4 +1,4 @@
-package test
+package test_test
 
 import (
 	"testing"

test/identical_switch_conditions_test.go

@@ -1,4 +1,4 @@
-package test
+package test_test
 
 import (
 	"testing"

test/if_return_test.go

@@ -1,4 +1,4 @@
-package test
+package test_test
 
 import (
 	"testing"

test/import_alias_naming_test.go

@@ -1,4 +1,4 @@
-package test
+package test_test
 
 import (
 	"testing"

test/import_shadowing_test.go

@@ -1,4 +1,4 @@
-package test
+package test_test
 
 import (
 	"testing"

test/imports_blocklist_test.go

@@ -1,4 +1,4 @@
-package test
+package test_test
 
 import (
 	"testing"

test/indent_error_flow_test.go

@@ -1,4 +1,4 @@
-package test
+package test_test
 
 import (
 	"testing"

test/inefficient_map_lookup_test.go

@@ -1,4 +1,4 @@
-package test
+package test_test
 
 import (
 	"testing"

test/issue1100_test.go

@@ -1,4 +1,4 @@
-package test
+package test_test
 
 import (
 	"testing"

test/json_data_format_test.go

@@ -1,4 +1,4 @@
-package test
+package test_test
 
 import (
 	"testing"

test/line_length_limit_test.go

@@ -1,4 +1,4 @@
-package test
+package test_test
 
 import (
 	"testing"

test/max_control_nesting_test.go

@@ -1,4 +1,4 @@
-package test
+package test_test
 
 import (
 	"testing"

test/max_public_structs_test.go

@@ -1,4 +1,4 @@
-package test
+package test_test
 
 import (
 	"testing"

test/modifies_param_test.go

@@ -1,4 +1,4 @@
-package test
+package test_test
 
 import (
 	"testing"

test/modifies_value_receiver_test.go

@@ -1,4 +1,4 @@
-package test
+package test_test
 
 import (
 	"testing"

test/nested_structs_test.go

@@ -1,4 +1,4 @@
-package test
+package test_test
 
 import (
 	"testing"

test/optimize_operands_order_test.go

@@ -1,4 +1,4 @@
-package test
+package test_test
 
 import (
 	"testing"

test/package_directory_mismatch_test.go

@@ -1,4 +1,4 @@
-package test
+package test_test
 
 import (
 	"testing"

test/range_val_address_test.go

@@ -1,4 +1,4 @@
-package test
+package test_test
 
 import (
 	"testing"

test/range_val_in_closure_test.go

@@ -1,4 +1,4 @@
-package test
+package test_test
 
 import (
 	"testing"

test/receiver_naming_test.go

@@ -1,4 +1,4 @@
-package test
+package test_test
 
 import (
 	"testing"

test/redefines_builtin_id_test.go

@@ -1,4 +1,4 @@
-package test
+package test_test
 
 import (
 	"testing"

test/redundant_build_tag_test.go

@@ -1,4 +1,4 @@
-package test
+package test_test
 
 import (
 	"testing"

test/redundant_import_alias_test.go

@@ -1,4 +1,4 @@
-package test
+package test_test
 
 import (
 	"testing"

test/redundant_test_main_exit_test.go

@@ -1,4 +1,4 @@
-package test
+package test_test
 
 import (
 	"testing"

test/string_format_test.go

@@ -1,4 +1,4 @@
-package test
+package test_test
 
 import (
 	"testing"

test/string_of_int_test.go

@@ -1,4 +1,4 @@
-package test
+package test_test
 
 import (
 	"testing"

test/struct_tag_test.go

@@ -1,4 +1,4 @@
-package test
+package test_test
 
 import (
 	"testing"

test/superfluous_else_test.go

@@ -1,4 +1,4 @@
-package test
+package test_test
 
 import (
 	"testing"

test/time_date_test.go

@@ -1,4 +1,4 @@
-package test
+package test_test
 
 import (
 	"testing"

test/time_equal_test.go

@@ -1,4 +1,4 @@
-package test
+package test_test
 
 import (
 	"testing"

test/time_naming_test.go

@@ -1,4 +1,4 @@
-package test
+package test_test
 
 import (
 	"testing"

test/unchecked_type_assertion_test.go

@@ -1,4 +1,4 @@
-package test
+package test_test
 
 import (
 	"testing"

test/unconditional_recursion_test.go

@@ -1,4 +1,4 @@
-package test
+package test_test
 
 import (
 	"testing"

test/unexported_naming_test.go

@@ -1,4 +1,4 @@
-package test
+package test_test
 
 import (
 	"testing"

test/unexported_return_test.go

@@ -1,4 +1,4 @@
-package test
+package test_test
 
 import (
 	"testing"

test/unhandled_error_test.go

@@ -1,4 +1,4 @@
-package test
+package test_test
 
 import (
 	"testing"

test/unnecessary_format_test.go

@@ -1,4 +1,4 @@
-package test
+package test_test
 
 import (
 	"testing"

test/unnecessary_if_test.go

@@ -1,4 +1,4 @@
-package test
+package test_test
 
 import (
 	"testing"

test/unnecessary_stmt_test.go

@@ -1,4 +1,4 @@
-package test
+package test_test
 
 import (
 	"testing"

test/unreachable_code_test.go

@@ -1,4 +1,4 @@
-package test
+package test_test
 
 import (
 	"testing"

test/unsecure_url_scheme_test.go

@@ -1,4 +1,4 @@
-package test
+package test_test
 
 import (
 	"testing"

test/unused_param_test.go

@@ -1,4 +1,4 @@
-package test
+package test_test
 
 import (
 	"testing"

test/unused_receiver_test.go

@@ -1,4 +1,4 @@
-package test
+package test_test
 
 import (
 	"testing"

test/use_any_test.go

@@ -1,4 +1,4 @@
-package test
+package test_test
 
 import (
 	"testing"

test/use_errors_new_test.go

@@ -1,4 +1,4 @@
-package test
+package test_test
 
 import (
 	"testing"

test/use_fmt_print_test.go

@@ -1,4 +1,4 @@
-package test
+package test_test
 
 import (
 	"testing"

test/use_waitgroup_go_test.go

@@ -1,4 +1,4 @@
-package test
+package test_test
 
 import (
 	"testing"

test/useless_break_test.go

@@ -1,4 +1,4 @@
-package test
+package test_test
 
 import (
 	"testing"

test/useless_fallthrough_test.go

@@ -1,4 +1,4 @@
-package test
+package test_test
 
 import (
 	"testing"

test/utils_test.go

@@ -1,4 +1,4 @@
-package test
+package test_test
 
 import (
 	"encoding/json"

test/var_naming_test.go

@@ -1,4 +1,4 @@
-package test
+package test_test
 
 import (
 	"testing"

test/waitgroup_by_value_test.go

@@ -1,4 +1,4 @@
-package test
+package test_test
 
 import (
 	"testing"