From a2a3ae7154697dcfa4b620ade95e6dfe440bdaa1 Mon Sep 17 00:00:00 2001
From: Shreyas Goenka <shreyas.goenka@databricks.com>
Date: Thu, 9 Jan 2025 16:34:06 +0530
Subject: [PATCH] address comments

---
 libs/template/reader_test.go   | 40 +++++++++++++++++++---------------
 libs/template/resolver_test.go | 36 ++++++++++++++++--------------
 2 files changed, 42 insertions(+), 34 deletions(-)

diff --git a/libs/template/reader_test.go b/libs/template/reader_test.go
index 3dd96647b..58a65f0da 100644
--- a/libs/template/reader_test.go
+++ b/libs/template/reader_test.go
@@ -23,27 +23,31 @@ func TestBuiltInReader(t *testing.T) {
 	}
 
 	for _, name := range exists {
-		r := &builtinReader{name: name}
-		fs, err := r.FS(context.Background())
-		assert.NoError(t, err)
-		assert.NotNil(t, fs)
+		t.Run(name, func(t *testing.T) {
+			r := &builtinReader{name: name}
+			fs, err := r.FS(context.Background())
+			assert.NoError(t, err)
+			assert.NotNil(t, fs)
 
-		// Assert file content returned is accurate and every template has a welcome
-		// message defined.
-		fd, err := fs.Open("databricks_template_schema.json")
-		require.NoError(t, err)
-		b, err := io.ReadAll(fd)
-		require.NoError(t, err)
-		assert.Contains(t, string(b), "welcome_message")
-		assert.NoError(t, fd.Close())
+			// Assert file content returned is accurate and every template has a welcome
+			// message defined.
+			fd, err := fs.Open("databricks_template_schema.json")
+			require.NoError(t, err)
+			b, err := io.ReadAll(fd)
+			require.NoError(t, err)
+			assert.Contains(t, string(b), "welcome_message")
+			assert.NoError(t, fd.Close())
+		})
 	}
 
-	r := &builtinReader{name: "doesnotexist"}
-	_, err := r.FS(context.Background())
-	assert.EqualError(t, err, "builtin template doesnotexist not found")
+	t.Run("doesnotexist", func(t *testing.T) {
+		r := &builtinReader{name: "doesnotexist"}
+		_, err := r.FS(context.Background())
+		assert.EqualError(t, err, "builtin template doesnotexist not found")
 
-	// Close should not error.
-	assert.NoError(t, r.Close())
+		// Close should not error.
+		assert.NoError(t, r.Close())
+	})
 }
 
 func TestGitUrlReader(t *testing.T) {
@@ -56,7 +60,7 @@ func TestGitUrlReader(t *testing.T) {
 	cloneFunc := func(ctx context.Context, url, reference, targetPath string) error {
 		numCalls++
 		args = []string{url, reference, targetPath}
-		err := os.MkdirAll(filepath.Join(targetPath, "a/b/c"), 0o755)
+		err := os.MkdirAll(filepath.Join(targetPath, "a", "b", "c"), 0o755)
 		require.NoError(t, err)
 		testutil.WriteFile(t, filepath.Join(targetPath, "a", "b", "c", "somefile"), "somecontent")
 		return nil
diff --git a/libs/template/resolver_test.go b/libs/template/resolver_test.go
index 460912aa3..96a232a60 100644
--- a/libs/template/resolver_test.go
+++ b/libs/template/resolver_test.go
@@ -42,28 +42,32 @@ func TestTemplateResolverForDefaultTemplates(t *testing.T) {
 		"default-sql",
 		"dbt-sql",
 	} {
+		t.Run(name, func(t *testing.T) {
+			r := Resolver{
+				TemplatePathOrUrl: name,
+			}
+
+			tmpl, err := r.Resolve(context.Background())
+			require.NoError(t, err)
+
+			assert.Equal(t, &builtinReader{name: name}, tmpl.Reader)
+			assert.IsType(t, &writerWithFullTelemetry{}, tmpl.Writer)
+		})
+	}
+
+	t.Run("mlops-stacks", func(t *testing.T) {
 		r := Resolver{
-			TemplatePathOrUrl: name,
+			TemplatePathOrUrl: "mlops-stacks",
+			ConfigFile:        "/config/file",
 		}
 
 		tmpl, err := r.Resolve(context.Background())
 		require.NoError(t, err)
 
-		assert.Equal(t, &builtinReader{name: name}, tmpl.Reader)
-		assert.IsType(t, &writerWithFullTelemetry{}, tmpl.Writer)
-	}
-
-	r := Resolver{
-		TemplatePathOrUrl: "mlops-stacks",
-		ConfigFile:        "/config/file",
-	}
-
-	tmpl, err := r.Resolve(context.Background())
-	require.NoError(t, err)
-
-	// Assert reader and writer configuration
-	assert.Equal(t, "https://github.com/databricks/mlops-stacks", tmpl.Reader.(*gitReader).gitUrl)
-	assert.Equal(t, "/config/file", tmpl.Writer.(*writerWithFullTelemetry).configPath)
+		// Assert reader and writer configuration
+		assert.Equal(t, "https://github.com/databricks/mlops-stacks", tmpl.Reader.(*gitReader).gitUrl)
+		assert.Equal(t, "/config/file", tmpl.Writer.(*writerWithFullTelemetry).configPath)
+	})
 }
 
 func TestTemplateResolverForCustomUrl(t *testing.T) {