Fix the formatting tests of byte slices to their new format
Change the expected format of byte slices from strings to slices and
avoid the line wrapping when necessary by reducing the length of the slice.
diff --git a/format/format_test.go b/format/format_test.go
index 59517fe..1fdf29a 100644
--- a/format/format_test.go
+++ b/format/format_test.go
@@ -162,11 +162,9 @@
})
Describe("formatting []byte slices", func() {
- It("should present them as strings", func() {
+ It("should present them as slices", func() {
b := []byte("a\nb\nc")
- Ω(Object(b, 1)).Should(matchRegexp(`\[\]uint8 \| len:5, cap:\d+`, `a
- b
- c`))
+ Ω(Object(b, 1)).Should(matchRegexp(`\[\]uint8 \| len:5, cap:\d+`, `\[97, 10, 98, 10, 99\]`))
})
})
@@ -255,10 +253,11 @@
m["Toby Ziegler"] = []byte("Richard Schiff")
m["CJ Cregg"] = []byte("Allison Janney")
expected := `{
- ("Josiah Edward Bartlet": "Martin Sheen"|"Toby Ziegler": "Richard Schiff"|"CJ Cregg": "Allison Janney"),
- ("Josiah Edward Bartlet": "Martin Sheen"|"Toby Ziegler": "Richard Schiff"|"CJ Cregg": "Allison Janney"),
- ("Josiah Edward Bartlet": "Martin Sheen"|"Toby Ziegler": "Richard Schiff"|"CJ Cregg": "Allison Janney"),
- }`
+( "Josiah Edward Bartlet": \[77, 97, 114, 116, 105, 110, 32, 83, 104, 101, 101, 110\],
+| "Toby Ziegler": \[82, 105, 99, 104, 97, 114, 100, 32, 83, 99, 104, 105, 102, 102\],
+| "CJ Cregg": \[65, 108, 108, 105, 115, 111, 110, 32, 74, 97, 110, 110, 101, 121\],
+){3} }`
+
Ω(Object(m, 1)).Should(matchRegexp(`map\[string\]\[\]uint8 \| len:3`, expected))
})
})
@@ -270,11 +269,11 @@
Name: "Oswald",
Enumeration: 17,
Veritas: true,
- Data: []byte("datum"),
+ Data: []byte(""),
secret: 1983,
}
- Ω(Object(s, 1)).Should(match("format_test.SimpleStruct", `{Name: "Oswald", Enumeration: 17, Veritas: true, Data: "datum", secret: 1983}`))
+ Ω(Object(s, 1)).Should(match("format_test.SimpleStruct", `{Name: "Oswald", Enumeration: 17, Veritas: true, Data: [], secret: 1983}`))
})
Context("when the struct contains long entries", func() {
@@ -291,7 +290,7 @@
Name: "Mithrandir Gandalf Greyhame",
Enumeration: 2021,
Veritas: true,
- Data: "wizard",
+ Data: [119, 105, 122, 97, 114, 100],
secret: 3,
}`))
})
@@ -315,7 +314,7 @@
Describe("formatting aliased types", func() {
It("should print out the correct alias type", func() {
Ω(Object(StringAlias("alias"), 1)).Should(match("format_test.StringAlias", `alias`))
- Ω(Object(ByteAlias("alias"), 1)).Should(matchRegexp(`format_test\.ByteAlias \| len:5, cap:\d+`, `alias`))
+ Ω(Object(ByteAlias("alias"), 1)).Should(matchRegexp(`format_test\.ByteAlias \| len:5, cap:\d+`, `\[97, 108, 105, 97, 115\]`))
Ω(Object(IntAlias(3), 1)).Should(match("format_test.IntAlias", "3"))
})
})
@@ -325,7 +324,7 @@
s := ComplexStruct{
Strings: []string{"lots", "of", "short", "strings"},
SimpleThings: []*SimpleStruct{
- {"short", 7, true, []byte("succinct"), 17},
+ {"short", 7, true, []byte("sm"), 17},
{"something longer", 427, true, []byte("designed to wrap around nicely"), 30},
},
DataMaps: map[int]ByteAlias{
@@ -336,19 +335,19 @@
expected := `{
Strings: \["lots", "of", "short", "strings"\],
SimpleThings: \[
- {Name: "short", Enumeration: 7, Veritas: true, Data: "succinct", secret: 17},
+ {Name: "short", Enumeration: 7, Veritas: true, Data: \[115, 109\], secret: 17},
{
Name: "something longer",
Enumeration: 427,
Veritas: true,
- Data: "designed to wrap around nicely",
+ Data: \[100, 101, 115, 105, 103, 110, 101, 100, 32, 116, 111, 32, 119, 114, 97, 112, 32, 97, 114, 111, 117, 110, 100, 32, 110, 105, 99, 101, 108, 121\],
secret: 30,
},
\],
DataMaps: {
- (17: "some substantially longer chunks of data"|1138: "that should make things wrap"),
- (17: "some substantially longer chunks of data"|1138: "that should make things wrap"),
- },
+( 17: \[115, 111, 109, 101, 32, 115, 117, 98, 115, 116, 97, 110, 116, 105, 97, 108, 108, 121, 32, 108, 111, 110, 103, 101, 114, 32, 99, 104, 117, 110, 107, 115, 32, 111, 102, 32, 100, 97, 116, 97\],
+| 1138: \[116, 104, 97, 116, 32, 115, 104, 111, 117, 108, 100, 32, 109, 97, 107, 101, 32, 116, 104, 105, 110, 103, 115, 32, 119, 114, 97, 112\],
+){2} },
}`
Ω(Object(s, 1)).Should(matchRegexp(`format_test\.ComplexStruct`, expected))
})
@@ -389,7 +388,7 @@
funcValue: %p,
pointerValue: 5,
sliceValue: \["string", "slice"\],
- byteSliceValue: "bytes",
+ byteSliceValue: \[98, 121, 116, 101, 115\],
stringValue: "a string",
arrValue: \[11, 12, 13\],
byteArrValue: \[17, 20, 32\],
