Correct test grouping

Author: fridgepoet

macros_test.go

@@ -80,10 +80,11 @@ func TestInterpolate(t *testing.T) {
 	}
 }
 
-func TestGetMacroRegex(t *testing.T) {
-	t.Run("returns composed regular expression", func(t *testing.T) {
-		assert.Equal(t, `\$__some_string\b(?:\((.*?)\))?`, getMacroRegex("some_string"))
-	})
+func TestGetMacroRegex_returns_composed_regular_expression(t *testing.T) {
+	assert.Equal(t, `\$__some_string\b(?:\((.*?)\))?`, getMacroRegex("some_string"))
+}
+
+func TestGetMatches(t *testing.T) {
 	t.Run("FindAllStringSubmatch returns DefaultMacros", func(t *testing.T) {
 		for macroName := range DefaultMacros {
 			matches, err := getMatches(macroName, fmt.Sprintf("$__%s", macroName))
@@ -92,15 +93,10 @@ func TestGetMacroRegex(t *testing.T) {
 			assert.Equal(t, [][]string{{fmt.Sprintf("$__%s", macroName), ""}}, matches)
 		}
 	})
-}
+	t.Run("does not return matches for macro name which is substring", func(t *testing.T) {
+		matches, err := getMatches("timeFilter", "$__timeFilterEpoch(time_column)")
 
-func TestGetMacroRegex_returns_composed_regular_expression(t *testing.T) {
-	assert.Equal(t, `\$__some_string\b(?:\((.*?)\))?`, getMacroRegex("some_string"))
-}
-
-func TestGetMatches_does_not_match_for_macro_name_which_is_substring(t *testing.T) {
-	matches, err := getMatches("timeFilter", "$__timeFilterEpoch(time_column)")
-
-	assert.NoError(t, err)
-	assert.Nil(t, matches)
+		assert.NoError(t, err)
+		assert.Nil(t, matches)
+	})
 }