From: Tobias Klauser <tklauser@distanz.ch>
Date: Fri, 25 Jul 2025 11:02:01 +0000 (+0200)
Subject: net, os, file/filepath, syscall: use slices.Equal in tests
X-Git-Url: http://www.git.cypherpunks.su/?a=commitdiff_plain;h=a2431776ebc57ebc385d3fd9d3cc6eb89acb9d9c;p=gostls13.git

net, os, file/filepath, syscall: use slices.Equal in tests

Use slices.Equal to compare slices instead of strings.Join and then
comparing strings.

Change-Id: Ib916002b7357bd7f4e66b853dd7af8d98eba5549
Reviewed-on: https://go-review.googlesource.com/c/go/+/690475
LUCI-TryBot-Result: Go LUCI <golang-scoped@luci-project-accounts.iam.gserviceaccount.com>
Auto-Submit: Tobias Klauser <tobias.klauser@gmail.com>
Reviewed-by: Dmitri Shuralyov <dmitshur@google.com>
Reviewed-by: Cherry Mui <cherryyz@google.com>
---

diff --git a/src/net/net_windows_test.go b/src/net/net_windows_test.go
index 671de76780..0a5c77f032 100644
--- a/src/net/net_windows_test.go
+++ b/src/net/net_windows_test.go
@@ -302,7 +302,7 @@ func TestInterfacesWithNetsh(t *testing.T) {
 	}
 	slices.Sort(want)
 
-	if strings.Join(want, "/") != strings.Join(have, "/") {
+	if !slices.Equal(want, have) {
 		t.Fatalf("unexpected interface list %q, want %q", have, want)
 	}
 }
@@ -487,7 +487,7 @@ func TestInterfaceAddrsWithNetsh(t *testing.T) {
 		want = append(want, wantIPv6...)
 		slices.Sort(want)
 
-		if strings.Join(want, "/") != strings.Join(have, "/") {
+		if !slices.Equal(want, have) {
 			t.Errorf("%s: unexpected addresses list %q, want %q", ifi.Name, have, want)
 		}
 	}
diff --git a/src/os/os_windows_test.go b/src/os/os_windows_test.go
index 515d1c1359..5a479051ee 100644
--- a/src/os/os_windows_test.go
+++ b/src/os/os_windows_test.go
@@ -663,7 +663,7 @@ func TestOpenVolumeName(t *testing.T) {
 	}
 	slices.Sort(have)
 
-	if strings.Join(want, "/") != strings.Join(have, "/") {
+	if !slices.Equal(want, have) {
 		t.Fatalf("unexpected file list %q, want %q", have, want)
 	}
 }
diff --git a/src/path/filepath/match_test.go b/src/path/filepath/match_test.go
index f415b04088..2ae79980c7 100644
--- a/src/path/filepath/match_test.go
+++ b/src/path/filepath/match_test.go
@@ -231,7 +231,7 @@ func (test *globTest) globAbs(root, rootPattern string) error {
 	}
 	slices.Sort(have)
 	want := test.buildWant(root + `\`)
-	if strings.Join(want, "_") == strings.Join(have, "_") {
+	if slices.Equal(want, have) {
 		return nil
 	}
 	return fmt.Errorf("Glob(%q) returns %q, but %q expected", p, have, want)
@@ -245,12 +245,12 @@ func (test *globTest) globRel(root string) error {
 	}
 	slices.Sort(have)
 	want := test.buildWant(root)
-	if strings.Join(want, "_") == strings.Join(have, "_") {
+	if slices.Equal(want, have) {
 		return nil
 	}
 	// try also matching version without root prefix
 	wantWithNoRoot := test.buildWant("")
-	if strings.Join(wantWithNoRoot, "_") == strings.Join(have, "_") {
+	if slices.Equal(wantWithNoRoot, have) {
 		return nil
 	}
 	return fmt.Errorf("Glob(%q) returns %q, but %q expected", p, have, want)
diff --git a/src/syscall/dirent_test.go b/src/syscall/dirent_test.go
index cfa5478feb..173ccc3ed2 100644
--- a/src/syscall/dirent_test.go
+++ b/src/syscall/dirent_test.go
@@ -140,7 +140,7 @@ func TestDirentRepeat(t *testing.T) {
 	// Check results
 	slices.Sort(files)
 	slices.Sort(files2)
-	if strings.Join(files, "|") != strings.Join(files2, "|") {
+	if !slices.Equal(files, files2) {
 		t.Errorf("bad file list: want\n%q\ngot\n%q", files, files2)
 	}
 }
diff --git a/src/syscall/getdirentries_test.go b/src/syscall/getdirentries_test.go
index 5d401d8dd6..b5361ddaef 100644
--- a/src/syscall/getdirentries_test.go
+++ b/src/syscall/getdirentries_test.go
@@ -11,7 +11,6 @@ import (
 	"os"
 	"path/filepath"
 	"slices"
-	"strings"
 	"syscall"
 	"testing"
 	"unsafe"
@@ -78,7 +77,7 @@ func testGetdirentries(t *testing.T, count int) {
 	names = append(names, ".", "..") // Getdirentries returns these also
 	slices.Sort(names)
 	slices.Sort(names2)
-	if strings.Join(names, ":") != strings.Join(names2, ":") {
+	if !slices.Equal(names, names2) {
 		t.Errorf("names don't match\n names: %q\nnames2: %q", names, names2)
 	}
 }