pkg,service: simplify tests with slices.Contains (#4040)

Author: alexandear

pkg/dwarf/line/line_parser_test.go

@@ -11,6 +11,7 @@ import (
 	"os/exec"
 	"path/filepath"
 	"runtime"
+	"slices"
 	"strings"
 	"testing"
 	"time"
@@ -331,14 +332,7 @@ func TestDebugLineC(t *testing.T) {
 			t.Fatal("Parser could not parse Filenames")
 		}
 		for _, fn := range ln.FileNames {
-			found := false
-			for _, cmp := range file {
-				if filepath.ToSlash(fn.Path) == cmp {
-					found = true
-					break
-				}
-			}
-			if !found {
+			if !slices.Contains(file, filepath.ToSlash(fn.Path)) {
 				t.Fatalf("Found %s does not appear in the filelist\n", fn.Path)
 			}
 		}

pkg/proc/proc_test.go

@@ -19,6 +19,7 @@ import (
 	"path/filepath"
 	"reflect"
 	"runtime"
+	"slices"
 	"sort"
 	"strings"
 	"sync"
@@ -63,14 +64,7 @@ func TestMain(m *testing.M) {
 
 func matchSkipConditions(conditions ...string) bool {
 	for _, cond := range conditions {
-		condfound := false
-		for _, s := range []string{runtime.GOOS, runtime.GOARCH, testBackend, buildMode} {
-			if s == cond {
-				condfound = true
-				break
-			}
-		}
-		if !condfound {
+		if !slices.Contains([]string{runtime.GOOS, runtime.GOARCH, testBackend, buildMode}, cond) {
 			return false
 		}
 	}
@@ -183,14 +177,7 @@ func assertLineNumber(p *proc.Target, t *testing.T, lineno int, descr string) (s
 
 func assertLineNumberIn(p *proc.Target, t *testing.T, linenos []int, descr string) (string, int) {
 	f, l := currentLineNumber(p, t)
-	found := false
-	for _, lineno := range linenos {
-		if l == lineno {
-			found = true
-			break
-		}
-	}
-	if !found {
+	if !slices.Contains(linenos, l) {
 		_, callerFile, callerLine, _ := runtime.Caller(1)
 		t.Fatalf("%s expected lines :%#v got %s:%d\n\tat %s:%d", descr, linenos, f, l, callerFile, callerLine)
 	}
@@ -4012,21 +3999,12 @@ func TestDeadlockBreakpoint(t *testing.T) {
 	})
 }
 
-func findSource(source string, sources []string) bool {
-	for _, s := range sources {
-		if s == source {
-			return true
-		}
-	}
-	return false
-}
-
 func TestListImages(t *testing.T) {
 	protest.MustHaveCgo(t)
 	pluginFixtures := protest.WithPlugins(t, protest.AllNonOptimized, "plugin1/", "plugin2/")
 
 	withTestProcessArgs("plugintest", t, ".", []string{pluginFixtures[0].Path, pluginFixtures[1].Path}, protest.AllNonOptimized, func(p *proc.Target, grp *proc.TargetGroup, fixture protest.Fixture) {
-		if !findSource(fixture.Source, p.BinInfo().Sources) {
+		if !slices.Contains(p.BinInfo().Sources, fixture.Source) {
 			t.Fatalf("could not find %s in sources: %q\n", fixture.Source, p.BinInfo().Sources)
 		}
 
@@ -4043,7 +4021,7 @@ func TestListImages(t *testing.T) {
 		if !plugin1Found {
 			t.Fatalf("Could not find plugin1")
 		}
-		if !findSource(fixture.Source, p.BinInfo().Sources) {
+		if !slices.Contains(p.BinInfo().Sources, fixture.Source) {
 			// Source files for the base program must be available even after a plugin is loaded. Issue #2074.
 			t.Fatalf("could not find %s in sources (after loading plugin): %q\n", fixture.Source, p.BinInfo().Sources)
 		}

pkg/proc/variables_test.go

@@ -1003,14 +1003,7 @@ func TestEvalExpression(t *testing.T) {
 					}
 					switch e := tc.err.(type) {
 					case *altError:
-						ok := false
-						for _, tgtErr := range e.errs {
-							if tgtErr == err.Error() {
-								ok = true
-								break
-							}
-						}
-						if !ok {
+						if !slices.Contains(e.errs, err.Error()) {
 							t.Fatalf("Unexpected error. Expected %s got %s", tc.err.Error(), err.Error())
 						}
 					default:
@@ -1511,14 +1504,7 @@ func testCallFunctionIntl(t *testing.T, grp *proc.TargetGroup, p *proc.Target, t
 		}
 		switch e := tc.err.(type) {
 		case *altError:
-			ok := false
-			for _, tgtErr := range e.errs {
-				if tgtErr == err.Error() {
-					ok = true
-					break
-				}
-			}
-			if !ok {
+			if !slices.Contains(e.errs, err.Error()) {
 				t.Fatalf("Unexpected error. Expected %s got %s", tc.err.Error(), err.Error())
 			}
 		default:
@@ -1598,14 +1584,7 @@ func TestIssue1531(t *testing.T) {
 			for i := 0; i < len(mv.Children); i += 2 {
 				cv := &mv.Children[i]
 				s := constant.StringVal(cv.Value)
-				found := false
-				for j := range keys {
-					if keys[j] == s {
-						found = true
-						break
-					}
-				}
-				if !found {
+				if !slices.Contains(keys, s) {
 					t.Errorf("key %q not allowed", s)
 					return
 				}
@@ -1962,14 +1941,7 @@ func TestClassicMap(t *testing.T) {
 					}
 					switch e := tc.err.(type) {
 					case *altError:
-						ok := false
-						for _, tgtErr := range e.errs {
-							if tgtErr == err.Error() {
-								ok = true
-								break
-							}
-						}
-						if !ok {
+						if !slices.Contains(e.errs, err.Error()) {
 							t.Fatalf("Unexpected error. Expected %s got %s", tc.err.Error(), err.Error())
 						}
 					default:

service/dap/server_test.go

@@ -16,6 +16,7 @@ import (
 	"reflect"
 	"regexp"
 	"runtime"
+	"slices"
 	"strconv"
 	"strings"
 	"testing"
@@ -982,13 +983,7 @@ func checkStackFramesNamed(testName string, t *testing.T, got *dap.StackTraceRes
 				startLineOk = got.Body.StackFrames[0].Line == wantStartLine
 			}
 		case []int:
-			startLineOk = false
-			for _, ln := range wantStartLine {
-				if got.Body.StackFrames[0].Line == ln {
-					startLineOk = true
-					break
-				}
-			}
+			startLineOk = slices.Contains(wantStartLine, got.Body.StackFrames[0].Line)
 		}
 
 		if wantFrames > 0 && !startLineOk {
@@ -2720,24 +2715,15 @@ func TestRegistersScopeAndVariables(t *testing.T) {
 }
 
 func findPcReg(regs []dap.Variable) int {
+	pcRegNames := []string{"rip", "pc", "eip", "era"}
 	for i, reg := range regs {
-		if isPcReg(reg) {
+		if slices.Contains(pcRegNames, strings.TrimSpace(reg.Name)) {
 			return i
 		}
 	}
 	return -1
 }
 
-func isPcReg(reg dap.Variable) bool {
-	pcRegNames := []string{"rip", "pc", "eip", "era"}
-	for _, name := range pcRegNames {
-		if name == strings.TrimSpace(reg.Name) {
-			return true
-		}
-	}
-	return false
-}
-
 // TestShadowedVariables executes to a breakpoint and checks the shadowed
 // variable is named correctly.
 func TestShadowedVariables(t *testing.T) {

service/test/integration2_test.go

@@ -12,6 +12,7 @@ import (
 	"path/filepath"
 	"reflect"
 	"runtime"
+	"slices"
 	"strconv"
 	"strings"
 	"testing"
@@ -1635,14 +1636,7 @@ func TestTypesCommand(t *testing.T) {
 		types, err := c.ListTypes("")
 		assertNoError(err, t, "ListTypes()")
 
-		found := false
-		for i := range types {
-			if types[i] == "main.astruct" {
-				found = true
-				break
-			}
-		}
-		if !found {
+		if !slices.Contains(types, "main.astruct") {
 			t.Fatal("Type astruct not found in ListTypes output")
 		}