jcarr
/
go-spew
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

HighlightValues: add other test, more other types, fix sorting issue, shorten names

This commit is contained in:
Geraint Edwards 2019-01-17 15:07:12 +00:00
parent cf75182434
commit 802250caa5
No known key found for this signature in database
GPG Key ID: 662262F0980FAEAC
2 changed files with 27 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
spew/dump.go
View File

@ -323,7 +323,7 @@ func (d *dumpState) dump(v reflect.Value) {
case reflect.Bool: case reflect.Bool:
highlightIsOn = true highlightIsOn = true
d.w.Write(highlight3StartBytes) d.w.Write(highlight3StartBytes)
case reflect.Uintptr: case reflect.Uintptr, reflect.UnsafePointer, reflect.Chan, reflect.Func:
highlightIsOn = true highlightIsOn = true
d.w.Write(highlight4StartBytes) d.w.Write(highlight4StartBytes)
} }

36
spew/dump_test.go
View File

@ -64,6 +64,7 @@ package spew_test
import ( import (
"bytes" "bytes"
"fmt" "fmt"
"regexp"
"testing" "testing"
"unsafe" "unsafe"
@ -1042,8 +1043,8 @@ func TestDumpSortedKeys(t *testing.T) {
} }
func TestDumpHighlightValues(t *testing.T) { func TestDumpHighlightValues(t *testing.T) {
cfg := spew.ConfigState{HighlightValues: true} cfg := spew.ConfigState{SortKeys: true, HighlightValues: true}
colBytes := map[string]string{ col := map[string]string{
"reset": "\x1b[0m", "reset": "\x1b[0m",
"str": "\x1b[32m", "str": "\x1b[32m",
"num": "\x1b[33m", "num": "\x1b[33m",
@ -1052,9 +1053,9 @@ func TestDumpHighlightValues(t *testing.T) {
} }
s := cfg.Sdump(map[int]string{1: "1", 3: "3", 2: "2"}) s := cfg.Sdump(map[int]string{1: "1", 3: "3", 2: "2"})
expected := "(map[int]string) (len=3) {\n" + expected := "(map[int]string) (len=3) {\n" +
"(int) " + colBytes["num"] + "1" + colBytes["reset"] + ": (string) (len=1) " + colBytes["str"] + "\"1\"" + colBytes["reset"] + ",\n" + "(int) " + col["num"] + "1" + col["reset"] + ": (string) (len=1) " + col["str"] + "\"1\"" + col["reset"] + ",\n" +
"(int) " + colBytes["num"] + "3" + colBytes["reset"] + ": (string) (len=1) " + colBytes["str"] + "\"3\"" + colBytes["reset"] + ",\n" + "(int) " + col["num"] + "2" + col["reset"] + ": (string) (len=1) " + col["str"] + "\"2\"" + col["reset"] + ",\n" +
"(int) " + colBytes["num"] + "2" + colBytes["reset"] + ": (string) (len=1) " + colBytes["str"] + "\"2\"" + colBytes["reset"] + "\n" + "(int) " + col["num"] + "3" + col["reset"] + ": (string) (len=1) " + col["str"] + "\"3\"" + col["reset"] + "\n" +
"}\n" "}\n"
if s != expected { if s != expected {
t.Errorf("Highlighted string mismatch:\n %v %v", s, expected) t.Errorf("Highlighted string mismatch:\n %v %v", s, expected)
@ -1062,9 +1063,9 @@ func TestDumpHighlightValues(t *testing.T) {
s = cfg.Sdump(map[stringer]int{"1": 1, "3": 3, "2": 2}) s = cfg.Sdump(map[stringer]int{"1": 1, "3": 3, "2": 2})
expected = "(map[spew_test.stringer]int) (len=3) {\n" + expected = "(map[spew_test.stringer]int) (len=3) {\n" +
"(spew_test.stringer) (len=1) stringer 1: (int) " + colBytes["num"] + "1" + colBytes["reset"] + ",\n" + "(spew_test.stringer) (len=1) stringer 1: (int) " + col["num"] + "1" + col["reset"] + ",\n" +
"(spew_test.stringer) (len=1) stringer 3: (int) " + colBytes["num"] + "3" + colBytes["reset"] + ",\n" + "(spew_test.stringer) (len=1) stringer 2: (int) " + col["num"] + "2" + col["reset"] + ",\n" +
"(spew_test.stringer) (len=1) stringer 2: (int) " + colBytes["num"] + "2" + colBytes["reset"] + "\n" + "(spew_test.stringer) (len=1) stringer 3: (int) " + col["num"] + "3" + col["reset"] + "\n" +
"}\n" "}\n"
if s != expected { if s != expected {
t.Errorf("Highlighted ints mismatch:\n %v %v", s, expected) t.Errorf("Highlighted ints mismatch:\n %v %v", s, expected)
@ -1072,11 +1073,26 @@ func TestDumpHighlightValues(t *testing.T) {
s = cfg.Sdump(map[string]bool{"custom1": true, "custom2": false}) s = cfg.Sdump(map[string]bool{"custom1": true, "custom2": false})
expected = "(map[string]bool) (len=2) {\n" + expected = "(map[string]bool) (len=2) {\n" +
"(string) (len=7) " + colBytes["str"] + `"custom1"` + colBytes["reset"] + ": (bool) " + colBytes["bool"] + "true" + colBytes["reset"] + ",\n" + "(string) (len=7) " + col["str"] + `"custom1"` + col["reset"] + ": (bool) " + col["bool"] + "true" + col["reset"] + ",\n" +
"(string) (len=7) " + colBytes["str"] + `"custom2"` + colBytes["reset"] + ": (bool) " + colBytes["bool"] + "false" + colBytes["reset"] + "\n" + "(string) (len=7) " + col["str"] + `"custom2"` + col["reset"] + ": (bool) " + col["bool"] + "false" + col["reset"] + "\n" +
"}\n" "}\n"
if s != expected { if s != expected {
t.Errorf("Highlighted keys mismatch:\n %v %v", s, expected) t.Errorf("Highlighted keys mismatch:\n %v %v", s, expected)
} }
s = cfg.Sdump(map[string]chan int{"chanInt1": make(chan int), "chanInt2": make(chan int)})
dummyPtr := "0x123456789a"
expected = "(map[string]chan int) (len=2) {\n" +
"(string) (len=8) " + col["str"] + `"chanInt1"` + col["reset"] + ": (chan int) " + col["other"] + dummyPtr + col["reset"] + ",\n" +
"(string) (len=8) " + col["str"] + `"chanInt2"` + col["reset"] + ": (chan int) " + col["other"] + dummyPtr + col["reset"] + "\n" +
"}\n"
// replace all pointers with dummyPtr (they will be prefixed by 'm' - from col[], so cannot \b at start) to match expected
re := regexp.MustCompile(`0x[0-9a-f]{10}\b`)
s = re.ReplaceAllString(s, dummyPtr)
if s != expected {
t.Errorf("Highlighted other mismatch:\n %v %v", s, expected)
}
} }