Browse code

pkg/jsonmessage: Wrap test failure messages so control characters align

When logging the failure of a case which involves control characters add line
feeds and spacing such that the expected and actual strings are aligned in the
same columns making comparisons easier.

Turns:
jsonmessage_test.go:156: Expected "\x1b[2K\rstatus 1 B\r", got "\x1b[1K\x1b[K\rstatus 1 B\r"
Into:
jsonmessage_test.go:156:
Expected "\x1b[2K\rstatus 1 B\r"
got "\x1b[1K\x1b[K\rstatus 1 B\r"

Signed-off-by: Ian Campbell <ian.campbell@docker.com>

Ian Campbell authored on 2016/11/11 20:13:36
Showing 1 changed files
... ...
@@ -144,7 +144,7 @@ func TestJSONMessageDisplay(t *testing.T) {
144 144
 			t.Fatal(err)
145 145
 		}
146 146
 		if data.String() != expectedMessages[0] {
147
-			t.Fatalf("Expected %q, got %q", expectedMessages[0], data.String())
147
+			t.Fatalf("Expected %q,got %q", expectedMessages[0], data.String())
148 148
 		}
149 149
 		// With terminal
150 150
 		data = bytes.NewBuffer([]byte{})
... ...
@@ -152,7 +152,7 @@ func TestJSONMessageDisplay(t *testing.T) {
152 152
 			t.Fatal(err)
153 153
 		}
154 154
 		if data.String() != expectedMessages[1] {
155
-			t.Fatalf("Expected %q, got %q", expectedMessages[1], data.String())
155
+			t.Fatalf("\nExpected %q\n     got %q", expectedMessages[1], data.String())
156 156
 		}
157 157
 	}
158 158
 }
... ...
@@ -238,7 +238,7 @@ func TestDisplayJSONMessagesStream(t *testing.T) {
238 238
 			t.Fatal(err)
239 239
 		}
240 240
 		if data.String() != expectedMessages[1] {
241
-			t.Fatalf("Expected an %q, got %q", expectedMessages[1], data.String())
241
+			t.Fatalf("\nExpected %q\n     got %q", expectedMessages[1], data.String())
242 242
 		}
243 243
 	}
244 244