Stowage/go
2
0
Fork 0
mirror of https://github.com/golang/go.git synced 2025-10-19 11:03:18 +00:00
Code Issues Projects Releases Packages Wiki Activity

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

Browse source 
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>
This commit is contained in:
Tobias Klauser 2025-07-25 13:02:01 +02:00 • committed by Gopher Robot
parent a7f05b38f7
commit a2431776eb
5 changed files with 8 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

4
src/net/net_windows_test.go
View file

@ -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)
}
}

2
src/os/os_windows_test.go
View file

@ -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)
}
}

6
src/path/filepath/match_test.go
View file

@ -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)

2
src/syscall/dirent_test.go
View file

@ -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)
}
}

3
src/syscall/getdirentries_test.go
View file

@ -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)
}
}