From 7ccaa2744e48c1c0da2c13fbf4edcae5af7a35c0 Mon Sep 17 00:00:00 2001 From: Thomas Pelletier Date: Tue, 19 Oct 2021 15:29:49 -0400 Subject: [PATCH] tomltest: unmarshal JSONs for tests (#633) Comparing the output and the expected results byte-wise means we get false negative when order doesn't matter (for example the ValidTableKeyword test). --- toml_testgen_support_test.go | 11 ++++++++++- toml_testgen_test.go | 1 - 2 files changed, 10 insertions(+), 2 deletions(-) diff --git a/toml_testgen_support_test.go b/toml_testgen_support_test.go index ea97418..bbfbe05 100644 --- a/toml_testgen_support_test.go +++ b/toml_testgen_support_test.go @@ -41,5 +41,14 @@ func testgenValid(t *testing.T, input string, jsonRef string) { } j, err := testsuite.ValueToTaggedJSON(doc) require.NoError(t, err) - require.Equal(t, jsonRef, string(j)+"\n") + + var ref interface{} + err = json.Unmarshal([]byte(jsonRef), &ref) + require.NoError(t, err) + + var actual interface{} + err = json.Unmarshal([]byte(j), &actual) + require.NoError(t, err) + + require.Equal(t, ref, actual) } diff --git a/toml_testgen_test.go b/toml_testgen_test.go index d4bf4da..ea5335a 100644 --- a/toml_testgen_test.go +++ b/toml_testgen_test.go @@ -1492,7 +1492,6 @@ func TestTOMLTest_Valid_Table_Empty(t *testing.T) { } func TestTOMLTest_Valid_Table_Keyword(t *testing.T) { - t.Skip("FIXME") input := "[true]\n\n[false]\n\n[inf]\n\n[nan]\n\n\n" jsonRef := "{\n \"true\": {},\n \"false\": {},\n \"inf\": {},\n \"nan\": {}\n}\n" testgenValid(t, input, jsonRef)