From 9cd7c1361cbf69e2b4130b457b62996fd2924d37 Mon Sep 17 00:00:00 2001 From: Vincent Demeester Date: Tue, 7 Aug 2018 16:06:13 +0200 Subject: [PATCH] =?UTF-8?q?Migrate=20`TestExtractVariables`=20to=20subtest?= =?UTF-8?q?s=E2=80=A6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit … as suggested in previous PR comment. Signed-off-by: Vincent Demeester --- cli/compose/template/template_test.go | 16 ++++++++++++++-- 1 file changed, 14 insertions(+), 2 deletions(-) diff --git a/cli/compose/template/template_test.go b/cli/compose/template/template_test.go index abbc810c3c..672a7e75d9 100644 --- a/cli/compose/template/template_test.go +++ b/cli/compose/template/template_test.go @@ -175,20 +175,24 @@ func TestSubstituteWithCustomFunc(t *testing.T) { func TestExtractVariables(t *testing.T) { testCases := []struct { + name string dict map[string]interface{} expected map[string]string }{ { + name: "empty", dict: map[string]interface{}{}, expected: map[string]string{}, }, { + name: "no-variables", dict: map[string]interface{}{ "foo": "bar", }, expected: map[string]string{}, }, { + name: "variable-without-curly-braces", dict: map[string]interface{}{ "foo": "$bar", }, @@ -197,6 +201,7 @@ func TestExtractVariables(t *testing.T) { }, }, { + name: "variable", dict: map[string]interface{}{ "foo": "${bar}", }, @@ -205,6 +210,7 @@ func TestExtractVariables(t *testing.T) { }, }, { + name: "required-variable", dict: map[string]interface{}{ "foo": "${bar?:foo}", }, @@ -213,6 +219,7 @@ func TestExtractVariables(t *testing.T) { }, }, { + name: "required-variable2", dict: map[string]interface{}{ "foo": "${bar?foo}", }, @@ -221,6 +228,7 @@ func TestExtractVariables(t *testing.T) { }, }, { + name: "default-variable", dict: map[string]interface{}{ "foo": "${bar:-foo}", }, @@ -229,6 +237,7 @@ func TestExtractVariables(t *testing.T) { }, }, { + name: "default-variable2", dict: map[string]interface{}{ "foo": "${bar-foo}", }, @@ -237,6 +246,7 @@ func TestExtractVariables(t *testing.T) { }, }, { + name: "multiple-values", dict: map[string]interface{}{ "foo": "${bar:-foo}", "bar": map[string]interface{}{ @@ -259,7 +269,9 @@ func TestExtractVariables(t *testing.T) { }, } for _, tc := range testCases { - actual := ExtractVariables(tc.dict, defaultPattern) - assert.Check(t, is.DeepEqual(actual, tc.expected)) + t.Run(tc.name, func(t *testing.T) { + actual := ExtractVariables(tc.dict, defaultPattern) + assert.Check(t, is.DeepEqual(actual, tc.expected)) + }) } }