From 0520232e01a3592829ca79cbc7031e26e37197fe Mon Sep 17 00:00:00 2001
From: Oleksandr Redko <Oleksandr_Redko@epam.com>
Date: Wed, 31 May 2023 23:34:18 +0300
Subject: [PATCH] dev: simplify issues and enabled set tests (#3832)

---
 pkg/config/issues_test.go              | 23 ++++-------------------
 pkg/lint/lintersdb/enabled_set_test.go |  6 +-----
 2 files changed, 5 insertions(+), 24 deletions(-)

diff --git a/pkg/config/issues_test.go b/pkg/config/issues_test.go
index 208188bc810a..f870bfb9b982 100644
--- a/pkg/config/issues_test.go
+++ b/pkg/config/issues_test.go
@@ -1,7 +1,6 @@
 package config
 
 import (
-	"fmt"
 	"testing"
 
 	"github.com/stretchr/testify/assert"
@@ -10,27 +9,13 @@ import (
 func TestGetExcludePatterns(t *testing.T) {
 	assert.Equal(t, GetExcludePatterns(nil), DefaultExcludePatterns)
 
-	include := make([]string, 2)
-	include[0], include[1] = DefaultExcludePatterns[0].ID, DefaultExcludePatterns[1].ID
+	include := []string{DefaultExcludePatterns[0].ID, DefaultExcludePatterns[1].ID}
 
 	exclude := GetExcludePatterns(include)
-	assert.Equal(t, len(exclude), len(DefaultExcludePatterns)-len(include))
+	assert.Len(t, exclude, len(DefaultExcludePatterns)-len(include))
 
 	for _, p := range exclude {
-		// Not in include.
-		for _, i := range include {
-			if i == p.ID {
-				t.Fatalf("%s can't appear inside include.", p.ID)
-			}
-		}
-		// Must in DefaultExcludePatterns.
-		var inDefaultExc bool
-		for _, i := range DefaultExcludePatterns {
-			if i == p {
-				inDefaultExc = true
-				break
-			}
-		}
-		assert.True(t, inDefaultExc, fmt.Sprintf("%s must appear inside DefaultExcludePatterns.", p.ID))
+		assert.NotContains(t, include, p.ID)
+		assert.Contains(t, DefaultExcludePatterns, p)
 	}
 }
diff --git a/pkg/lint/lintersdb/enabled_set_test.go b/pkg/lint/lintersdb/enabled_set_test.go
index a5586b586cb5..3a6baa18a185 100644
--- a/pkg/lint/lintersdb/enabled_set_test.go
+++ b/pkg/lint/lintersdb/enabled_set_test.go
@@ -1,7 +1,6 @@
 package lintersdb
 
 import (
-	"sort"
 	"testing"
 
 	"github.com/stretchr/testify/assert"
@@ -109,10 +108,7 @@ func TestGetEnabledLintersSet(t *testing.T) {
 				enabledLinters = append(enabledLinters, ln)
 			}
 
-			sort.Strings(enabledLinters)
-			sort.Strings(c.exp)
-
-			assert.Equal(t, c.exp, enabledLinters)
+			assert.ElementsMatch(t, c.exp, enabledLinters)
 		})
 	}
 }