Support multiple storage implementations in tests

Author: code-asher

cli/remove_test.go

@@ -3,6 +3,8 @@ package cli_test
 import (
 	"bytes"
 	"fmt"
+	"os"
+	"path/filepath"
 	"testing"
 
 	"github.com/stretchr/testify/require"
@@ -45,7 +47,7 @@ func TestRemove(t *testing.T) {
 		{
 			name:      "RemoveOne",
 			extension: testutil.Extensions[0],
-			version:   "a",
+			version:   testutil.Extensions[0].LatestVersion,
 		},
 		{
 			name:      "All",
@@ -67,19 +69,19 @@ func TestRemove(t *testing.T) {
 			error:     "cannot specify both",
 			extension: testutil.Extensions[0],
 			all:       true,
-			version:   "a",
+			version:   testutil.Extensions[0].LatestVersion,
 		},
 		{
 			name:      "NoVersion",
 			error:     "does not exist",
 			extension: testutil.Extensions[0],
-			version:   "d",
+			version:   "does-not-exist",
 		},
 		{
 			name:      "NoVersions",
 			error:     "does not exist",
 			extension: testutil.Extensions[1],
-			version:   "a",
+			version:   testutil.Extensions[1].LatestVersion,
 		},
 		{
 			name:      "AllNoVersions",
@@ -96,9 +98,13 @@ func TestRemove(t *testing.T) {
 
 			extdir := t.TempDir()
 			ext := testutil.Extensions[0]
-			testutil.AddExtension(t, ext, extdir, "a")
-			testutil.AddExtension(t, ext, extdir, "b")
-			testutil.AddExtension(t, ext, extdir, "c")
+			for _, version := range ext.Versions {
+				manifestPath := filepath.Join(extdir, ext.Publisher, ext.Name, version, "extension.vsixmanifest")
+				err := os.MkdirAll(filepath.Dir(manifestPath), 0o755)
+				require.NoError(t, err)
+				err = os.WriteFile(manifestPath, testutil.ConvertExtensionToManifestBytes(t, ext, version), 0o644)
+				require.NoError(t, err)
+			}
 
 			id := fmt.Sprintf("%s.%s", test.extension.Publisher, test.extension.Name)
 			if test.version != "" {
@@ -123,10 +129,10 @@ func TestRemove(t *testing.T) {
 			} else {
 				require.NoError(t, err)
 				if test.all {
-					require.Contains(t, output, "Removed 3 versions")
-					require.Contains(t, output, "  - a")
-					require.Contains(t, output, "  - b")
-					require.Contains(t, output, "  - c")
+					require.Contains(t, output, fmt.Sprintf("Removed %d versions", len(test.extension.Versions)))
+					for _, version := range test.extension.Versions {
+						require.Contains(t, output, fmt.Sprintf("  - %s", version))
+					}
 				} else {
 					require.Contains(t, output, fmt.Sprintf("Removed %s", test.version))
 				}

storage/local_test.go

@@ -0,0 +1,34 @@
+package storage_test
+
+import (
+	"os"
+	"path/filepath"
+	"testing"
+
+	"github.com/stretchr/testify/require"
+
+	"cdr.dev/slog"
+	"cdr.dev/slog/sloggers/slogtest"
+	"github.com/coder/code-marketplace/storage"
+)
+
+func localFactory(t *testing.T) testStorage {
+	extdir := t.TempDir()
+	logger := slogtest.Make(t, &slogtest.Options{IgnoreErrors: true}).Leveled(slog.LevelDebug)
+	s, err := storage.NewLocalStorage(extdir, logger)
+	require.NoError(t, err)
+	return testStorage{
+		storage: s,
+		write: func(content []byte, elem ...string) {
+			dest := filepath.Join(extdir, filepath.Join(elem...))
+			err := os.MkdirAll(filepath.Dir(dest), 0o755)
+			require.NoError(t, err)
+			err = os.WriteFile(dest, content, 0o644)
+			require.NoError(t, err)
+		},
+		exists: func(elem ...string) bool {
+			_, err := os.Stat(filepath.Join(extdir, filepath.Join(elem...)))
+			return err == nil
+		},
+	}
+}

storage/storage_test.go

@@ -5,9 +5,6 @@ import (
 	"bytes"
 	"encoding/json"
 	"encoding/xml"
-	"fmt"
-	"os"
-	"path/filepath"
 	"testing"
 
 	"github.com/stretchr/testify/require"
@@ -124,28 +121,10 @@ func ConvertExtensionToManifest(ext Extension, version string) *storage.VSIXMani
 	}
 }
 
-// AddExtension adds the provided test extension to the provided directory.
-func AddExtension(t *testing.T, ext Extension, extdir, version string) *storage.VSIXManifest {
-	dir := filepath.Join(extdir, ext.Publisher, ext.Name, version)
-	err := os.MkdirAll(dir, 0o755)
+func ConvertExtensionToManifestBytes(t *testing.T, ext Extension, version string) []byte {
+	manifestBytes, err := xml.Marshal(ConvertExtensionToManifest(ext, version))
 	require.NoError(t, err)
-
-	manifest := ConvertExtensionToManifest(ext, version)
-	rawManifest, err := xml.Marshal(manifest)
-	require.NoError(t, err)
-
-	err = os.WriteFile(filepath.Join(dir, "extension.vsixmanifest"), rawManifest, 0o644)
-	require.NoError(t, err)
-
-	// The storage interface should add the extension asset when it reads the
-	// manifest since it is not on the actual manifest on disk.
-	manifest.Assets.Asset = append(manifest.Assets.Asset, storage.VSIXAsset{
-		Type:        storage.VSIXAssetType,
-		Path:        fmt.Sprintf("%s.%s-%s.vsix", ext.Publisher, ext.Name, version),
-		Addressable: "true",
-	})
-
-	return manifest
+	return manifestBytes
 }
 
 type file struct {