qbit/go
1
0
Fork 0
mirror of https://github.com/golang/go synced 2024-11-26 03:07:57 -07:00
Code Releases Activity

go,internal,io,mime: use slices and maps to clean tests

Browse Source 
Replace reflect.DeepEqual with slices.Equal/maps.Equal, which is
much faster.
This commit is contained in:
apocelipes 2024-07-24 01:17:59 +08:00
parent c5430dc1d8
commit 7d64d78feb
11 changed files with 37 additions and 33 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
src/go/build/build_test.go
View File

@ -8,10 +8,12 @@ import (
"fmt"
"internal/testenv"
"io"
"maps"
"os"
"path/filepath"
"reflect"
"runtime"
"slices"
"strings"
"testing"
)
@ -30,7 +32,7 @@ func TestMatch(t *testing.T) {
if !ctxt.matchAuto(tag, m) {
t.Errorf("%s context should match %s, does not", what, tag)
}
if !reflect.DeepEqual(m, want) {
if !maps.Equal(m, want) {
t.Errorf("%s tags = %v, want %v", tag, m, want)
}
}
@ -40,7 +42,7 @@ func TestMatch(t *testing.T) {
if ctxt.matchAuto(tag, m) {
t.Errorf("%s context should NOT match %s, does", what, tag)
}
if !reflect.DeepEqual(m, want) {
if !maps.Equal(m, want) {
t.Errorf("%s tags = %v, want %v", tag, m, want)
}
}
@ -121,11 +123,11 @@ func TestMultiplePackageImport(t *testing.T) {
t.Errorf("pkg.Name = %q; want %q", pkg.Name, wantName)
}
if wantGoFiles := []string{"file.go", "file_appengine.go"}; !reflect.DeepEqual(pkg.GoFiles, wantGoFiles) {
if wantGoFiles := []string{"file.go", "file_appengine.go"}; !slices.Equal(pkg.GoFiles, wantGoFiles) {
t.Errorf("pkg.GoFiles = %q; want %q", pkg.GoFiles, wantGoFiles)
}
if wantInvalidFiles := []string{"file_appengine.go"}; !reflect.DeepEqual(pkg.InvalidGoFiles, wantInvalidFiles) {
if wantInvalidFiles := []string{"file_appengine.go"}; !slices.Equal(pkg.InvalidGoFiles, wantInvalidFiles) {
t.Errorf("pkg.InvalidGoFiles = %q; want %q", pkg.InvalidGoFiles, wantInvalidFiles)
}
}
@ -345,7 +347,7 @@ func TestShouldBuild(t *testing.T) {
ctx := &Context{BuildTags: []string{"yes"}}
tags := map[string]bool{}
shouldBuild, binaryOnly, err := ctx.shouldBuild([]byte(tt.content), tags)
if shouldBuild != tt.shouldBuild || binaryOnly != tt.binaryOnly || !reflect.DeepEqual(tags, tt.tags) || err != tt.err {
if shouldBuild != tt.shouldBuild || binaryOnly != tt.binaryOnly || !maps.Equal(tags, tt.tags) || err != tt.err {
t.Errorf("mismatch:\n"+
"have shouldBuild=%v, binaryOnly=%v, tags=%v, err=%v\n"+
"want shouldBuild=%v, binaryOnly=%v, tags=%v, err=%v",
@ -363,7 +365,7 @@ func TestGoodOSArchFile(t *testing.T) {
if !ctx.goodOSArchFile("hello_linux.go", m) {
t.Errorf("goodOSArchFile(hello_linux.go) = false, want true")
}
if !reflect.DeepEqual(m, want) {
if !maps.Equal(m, want) {
t.Errorf("goodOSArchFile(hello_linux.go) tags = %v, want %v", m, want)
}
}
@ -770,11 +772,11 @@ func TestAllTags(t *testing.T) {
t.Fatal(err)
}
want := []string{"arm", "netbsd"}
if !reflect.DeepEqual(p.AllTags, want) {
if !slices.Equal(p.AllTags, want) {
t.Errorf("AllTags = %v, want %v", p.AllTags, want)
}
wantFiles := []string{"alltags.go", "x_netbsd_arm.go"}
if !reflect.DeepEqual(p.GoFiles, wantFiles) {
if !slices.Equal(p.GoFiles, wantFiles) {
t.Errorf("GoFiles = %v, want %v", p.GoFiles, wantFiles)
}
@ -784,11 +786,11 @@ func TestAllTags(t *testing.T) {
if err != nil {
t.Fatal(err)
}
if !reflect.DeepEqual(p.AllTags, want) {
if !slices.Equal(p.AllTags, want) {
t.Errorf("AllTags = %v, want %v", p.AllTags, want)
}
wantFiles = []string{"alltags.go"}
if !reflect.DeepEqual(p.GoFiles, wantFiles) {
if !slices.Equal(p.GoFiles, wantFiles) {
t.Errorf("GoFiles = %v, want %v", p.GoFiles, wantFiles)
}
}

6
src/go/build/constraint/expr_test.go
View File

@ -6,7 +6,9 @@ package constraint
import (
"fmt"
"maps"
"reflect"
"slices"
"strings"
"testing"
)
@ -194,7 +196,7 @@ func TestExprEval(t *testing.T) {
return tag == "yes"
}
ok := x.Eval(hasTag)
if ok != tt.ok || !reflect.DeepEqual(tags, wantTags) {
if ok != tt.ok || !maps.Equal(tags, wantTags) {
t.Errorf("Eval(%#q):\nhave ok=%v, tags=%v\nwant ok=%v, tags=%v",
tt.in, ok, tags, tt.ok, wantTags)
}
@ -313,7 +315,7 @@ func TestPlusBuildLines(t *testing.T) {
for _, line := range tt.out {
want = append(want, "// +build "+line)
}
if !reflect.DeepEqual(lines, want) {
if !slices.Equal(lines, want) {
t.Errorf("PlusBuildLines(%q):\nhave %q\nwant %q", tt.in, lines, want)
}
})

6
src/go/token/position_test.go
View File

@ -7,7 +7,7 @@ package token
import (
"fmt"
"math/rand"
"reflect"
"slices"
"sync"
"testing"
)
@ -130,7 +130,7 @@ func TestPositions(t *testing.T) {
if f.LineCount() != len(test.lines) {
t.Errorf("%s, SetLines: got line count %d; want %d", f.Name(), f.LineCount(), len(test.lines))
}
if !reflect.DeepEqual(f.Lines(), test.lines) {
if !slices.Equal(f.Lines(), test.lines) {
t.Errorf("%s, Lines after SetLines(v): got %v; want %v", f.Name(), f.Lines(), test.lines)
}
verifyPositions(t, fset, f, test.lines)
@ -472,7 +472,7 @@ func TestFileAddLineColumnInfo(t *testing.T) {
for _, info := range test.infos {
f.AddLineColumnInfo(info.Offset, info.Filename, info.Line, info.Column)
}
if !reflect.DeepEqual(f.infos, test.want) {
if !slices.Equal(f.infos, test.want) {
t.Errorf("\ngot %+v, \nwant %+v", f.infos, test.want)
}
})

4
src/internal/dag/alg_test.go
View File

@ -5,7 +5,7 @@
package dag
import (
"reflect"
"slices"
"strings"
"testing"
)
@ -26,7 +26,7 @@ func TestTopo(t *testing.T) {
//
// "a" is a leaf.
wantNodes := strings.Fields("d c b a")
if !reflect.DeepEqual(wantNodes, got) {
if !slices.Equal(wantNodes, got) {
t.Fatalf("want topo sort %v, got %v", wantNodes, got)
}
}

4
src/internal/dag/parse_test.go
View File

@ -5,7 +5,7 @@
package dag
import (
"reflect"
"slices"
"strings"
"testing"
)
@ -52,7 +52,7 @@ func TestParse(t *testing.T) {
g := mustParse(t, diamond)
wantNodes := strings.Fields("a b c d")
if !reflect.DeepEqual(wantNodes, g.Nodes) {
if !slices.Equal(wantNodes, g.Nodes) {
t.Fatalf("want nodes %v, got %v", wantNodes, g.Nodes)
}

3
src/internal/godebug/godebug_test.go
View File

@ -11,7 +11,6 @@ import (
"internal/testenv"
"os"
"os/exec"
"reflect"
"runtime/metrics"
"slices"
"strings"
@ -125,7 +124,7 @@ func TestCmdBisect(t *testing.T) {
}
slices.Sort(have)
if !reflect.DeepEqual(have, want) {
if !slices.Equal(have, want) {
t.Errorf("bad bisect output:\nhave %v\nwant %v\ncomplete output:\n%s", have, want, string(out))
}
}

8
src/internal/profile/proto_test.go
View File

@ -5,7 +5,7 @@
package profile
import (
"reflect"
"slices"
"testing"
)
@ -34,7 +34,7 @@ func TestPackedEncoding(t *testing.T) {
},
} {
source := &packedInts{tc.uint64s, tc.int64s}
if got, want := marshal(source), tc.encoded; !reflect.DeepEqual(got, want) {
if got, want := marshal(source), tc.encoded; !slices.Equal(got, want) {
t.Errorf("failed encode %d, got %v, want %v", i, got, want)
}
@ -43,10 +43,10 @@ func TestPackedEncoding(t *testing.T) {
t.Errorf("failed decode %d: %v", i, err)
continue
}
if got, want := dest.uint64s, tc.uint64s; !reflect.DeepEqual(got, want) {
if got, want := dest.uint64s, tc.uint64s; !slices.Equal(got, want) {
t.Errorf("failed decode uint64s %d, got %v, want %v", i, got, want)
}
if got, want := dest.int64s, tc.int64s; !reflect.DeepEqual(got, want) {
if got, want := dest.int64s, tc.int64s; !slices.Equal(got, want) {
t.Errorf("failed decode int64s %d, got %v, want %v", i, got, want)
}
}

3
src/internal/xcoff/file_test.go
View File

@ -6,6 +6,7 @@ package xcoff
import (
"reflect"
"slices"
"testing"
)
@ -87,7 +88,7 @@ func TestOpen(t *testing.T) {
if err != nil {
t.Error(err)
}
if !reflect.DeepEqual(tl, fl) {
if !slices.Equal(tl, fl) {
t.Errorf("open %s: loader import = %v, want %v", tt.file, tl, fl)
}
}

4
src/io/fs/walk_test.go
View File

@ -9,7 +9,7 @@ import (
"os"
pathpkg "path"
"path/filepath"
"reflect"
"slices"
"testing"
"testing/fstest"
)
@ -145,7 +145,7 @@ func TestIssue51617(t *testing.T) {
t.Fatal(err)
}
want := []string{".", "a", "a/bad", "a/next"}
if !reflect.DeepEqual(saw, want) {
if !slices.Equal(saw, want) {
t.Errorf("got directories %v, want %v", saw, want)
}
}

4
src/mime/mediatype_test.go
View File

@ -5,7 +5,7 @@
package mime
import (
"reflect"
"maps"
"strings"
"testing"
)
@ -429,7 +429,7 @@ func TestParseMediaType(t *testing.T) {
if len(params) == 0 && len(test.p) == 0 {
continue
}
if !reflect.DeepEqual(params, test.p) {
if !maps.Equal(params, test.p) {
t.Errorf("for input %#q, wrong params.\n"+
"expected: %#v\n"+
" got: %#v",

6
src/mime/type_test.go
View File

@ -5,7 +5,7 @@
package mime
import (
"reflect"
"slices"
"strings"
"sync"
"testing"
@ -136,7 +136,7 @@ func TestExtensionsByType(t *testing.T) {
t.Errorf("ExtensionsByType(%q) = %q, %v; want error substring %q", tt.typ, got, err, tt.wantErr)
continue
}
if !reflect.DeepEqual(got, tt.want) {
if !slices.Equal(got, tt.want) {
t.Errorf("ExtensionsByType(%q) = %q; want %q", tt.typ, got, tt.want)
}
}
@ -213,7 +213,7 @@ func TestExtensionsByType2(t *testing.T) {
t.Errorf("ExtensionsByType(%q): %v", tt.typ, err)
continue
}
if !reflect.DeepEqual(got, tt.want) {
if !slices.Equal(got, tt.want) {
t.Errorf("ExtensionsByType(%q) = %q; want %q", tt.typ, got, tt.want)
}
}