From 3290797d2b2b1f41355b6a06d5e9efccf2509a7c Mon Sep 17 00:00:00 2001 From: Roger Peppe Date: Thu, 1 Sep 2022 14:19:38 +0100 Subject: [PATCH] internal/filetypes: fix TestParseFile tests MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit These tests were disabled. Fix the error messages and reenable. Signed-off-by: Roger Peppe Change-Id: Ibb399f3b9474cd5dd4f7043fa5638529aaf50c4e Reviewed-on: https://review.gerrithub.io/c/cue-lang/cue/+/542989 Reviewed-by: Daniel Martí Unity-Result: CUEcueckoo TryBot-Result: CUEcueckoo --- internal/filetypes/filetypes_test.go | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/internal/filetypes/filetypes_test.go b/internal/filetypes/filetypes_test.go index 0d13428c5d4..114bb4f8431 100644 --- a/internal/filetypes/filetypes_test.go +++ b/internal/filetypes/filetypes_test.go @@ -29,8 +29,8 @@ func check(t *testing.T, want, x interface{}, err error) { if err != nil { x = errors.String(err.(errors.Error)) } - if diff := cmp.Diff(x, want, cmpopts.EquateEmpty()); diff != "" { - t.Error(diff) + if diff := cmp.Diff(want, x, cmpopts.EquateEmpty()); diff != "" { + t.Errorf("unexpected result; -want +got\n%s", diff) } } @@ -252,9 +252,7 @@ func TestFromFile(t *testing.T) { } func TestParseFile(t *testing.T) { - t.Skip("fix error messages") // TODO(errors): wrong path? - testCases := []struct { in string mode Mode @@ -311,10 +309,10 @@ func TestParseFile(t *testing.T) { }, }, { in: "foo:file.bar", - out: `cue: marshal error: tags: value "foo" not found`, + out: `unknown filetype foo`, }, { in: "file.bar", - out: `cue: marshal error: extensions: value ".bar" not found`, + out: `unknown file extension .bar`, }} for _, tc := range testCases { t.Run(tc.in, func(t *testing.T) {