diff options
| author | apocelipes <seve3r@outlook.com> | 2024-07-24 10:24:16 +0000 |
|---|---|---|
| committer | Gopher Robot <gobot@golang.org> | 2024-07-25 00:25:45 +0000 |
| commit | bd6f911f852f4a608e2cf11c1ce5b55ff0347866 (patch) | |
| tree | e3cec16727da931a4b232af74e26ccee42761b7e /src/archive/tar/reader_test.go | |
| parent | b5b9d24dc38c63cca6319f2b139cb9b35b3cb058 (diff) | |
| download | go-bd6f911f852f4a608e2cf11c1ce5b55ff0347866.tar.xz | |
archive: use slices and maps to clean up tests
Replace reflect.DeepEqual with slices.Equal/maps.Equal, which is
much faster.
Clean up some unnecessary helper functions.
Change-Id: I9b94bd43886302b9b327539ab065a435ce0d75d9
GitHub-Last-Rev: b9ca21f165bcc5e45733e6a511a2344b1aa4a281
GitHub-Pull-Request: golang/go#67607
Reviewed-on: https://go-review.googlesource.com/c/go/+/587936
LUCI-TryBot-Result: Go LUCI <golang-scoped@luci-project-accounts.iam.gserviceaccount.com>
Reviewed-by: Ian Lance Taylor <iant@google.com>
Reviewed-by: Dmitri Shuralyov <dmitshur@google.com>
Auto-Submit: Ian Lance Taylor <iant@google.com>
Reviewed-by: Joseph Tsai <joetsai@digital-static.net>
Diffstat (limited to 'src/archive/tar/reader_test.go')
| -rw-r--r-- | src/archive/tar/reader_test.go | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/src/archive/tar/reader_test.go b/src/archive/tar/reader_test.go index 7e0462c3f8..cc49fe3641 100644 --- a/src/archive/tar/reader_test.go +++ b/src/archive/tar/reader_test.go @@ -11,10 +11,12 @@ import ( "errors" "fmt" "io" + "maps" "math" "os" "path" "reflect" + "slices" "strconv" "strings" "testing" @@ -1017,7 +1019,7 @@ func TestParsePAX(t *testing.T) { for i, v := range vectors { r := strings.NewReader(v.in) got, err := parsePAX(r) - if !reflect.DeepEqual(got, v.want) && !(len(got) == 0 && len(v.want) == 0) { + if !maps.Equal(got, v.want) && !(len(got) == 0 && len(v.want) == 0) { t.Errorf("test %d, parsePAX():\ngot %v\nwant %v", i, got, v.want) } if ok := err == nil; ok != v.ok { @@ -1134,7 +1136,7 @@ func TestReadOldGNUSparseMap(t *testing.T) { v.input = v.input[copy(blk[:], v.input):] tr := Reader{r: bytes.NewReader(v.input)} got, err := tr.readOldGNUSparseMap(&hdr, &blk) - if !equalSparseEntries(got, v.wantMap) { + if !slices.Equal(got, v.wantMap) { t.Errorf("test %d, readOldGNUSparseMap(): got %v, want %v", i, got, v.wantMap) } if err != v.wantErr { @@ -1325,7 +1327,7 @@ func TestReadGNUSparsePAXHeaders(t *testing.T) { r := strings.NewReader(v.inputData + "#") // Add canary byte tr := Reader{curr: ®FileReader{r, int64(r.Len())}} got, err := tr.readGNUSparsePAXHeaders(&hdr) - if !equalSparseEntries(got, v.wantMap) { + if !slices.Equal(got, v.wantMap) { t.Errorf("test %d, readGNUSparsePAXHeaders(): got %v, want %v", i, got, v.wantMap) } if err != v.wantErr { |