add LoadProxies function

Author: icholy

internal/modproxy/modproxy_test.go

@@ -1,37 +1,12 @@
 package modproxy
 
 import (
-	"net/http"
-	"net/http/httptest"
-	"os"
 	"reflect"
 	"testing"
 
 	"github.com/icholy/gomajor/internal/modproxy/testmodproxy"
 )
 
-type testProxy struct {
-	name string
-	url  string
-}
-
-func loadTestProxies(t *testing.T) []testProxy {
-	proxyfs, err := testmodproxy.LoadFS("testdata/modules")
-	if err != nil {
-		t.Fatal(err)
-	}
-	server := httptest.NewServer(http.FileServer(http.FS(proxyfs)))
-	t.Cleanup(func() { server.Close() })
-	proxydir := t.TempDir()
-	if err := os.CopyFS(proxydir, proxyfs); err != nil {
-		t.Fatal(err)
-	}
-	return []testProxy{
-		{name: "http", url: server.URL},
-		{name: "file", url: "file://" + proxydir},
-	}
-}
-
 func TestModule(t *testing.T) {
 	tests := []struct {
 		mod      *Module
@@ -280,10 +255,10 @@ func TestQuery(t *testing.T) {
 			exist:   false,
 		},
 	}
-	proxies := loadTestProxies(t)
+	proxies := testmodproxy.LoadProxies(t, "testdata/modules")
 	for _, proxy := range proxies {
-		t.Run(proxy.name, func(t *testing.T) {
-			t.Setenv("GOPROXY", proxy.url)
+		t.Run(proxy.Name, func(t *testing.T) {
+			t.Setenv("GOPROXY", proxy.URL)
 			for _, tt := range tests {
 				t.Run(tt.name, func(t *testing.T) {
 					mod, ok, err := Query(tt.modpath, false)
@@ -337,10 +312,10 @@ func TestLatest(t *testing.T) {
 			},
 		},
 	}
-	proxies := loadTestProxies(t)
+	proxies := testmodproxy.LoadProxies(t, "testdata/modules")
 	for _, proxy := range proxies {
-		t.Run(proxy.name, func(t *testing.T) {
-			t.Setenv("GOPROXY", proxy.url)
+		t.Run(proxy.Name, func(t *testing.T) {
+			t.Setenv("GOPROXY", proxy.URL)
 			for _, tt := range tests {
 				t.Run(tt.name, func(t *testing.T) {
 					mod, err := Latest(tt.modpath, false, tt.pre)
@@ -379,10 +354,10 @@ func TestQueryPackage(t *testing.T) {
 			},
 		},
 	}
-	proxies := loadTestProxies(t)
+	proxies := testmodproxy.LoadProxies(t, "testdata/modules")
 	for _, proxy := range proxies {
-		t.Run(proxy.name, func(t *testing.T) {
-			t.Setenv("GOPROXY", proxy.url)
+		t.Run(proxy.Name, func(t *testing.T) {
+			t.Setenv("GOPROXY", proxy.URL)
 			for _, tt := range tests {
 				t.Run(tt.name, func(t *testing.T) {
 					mod, err := QueryPackage(tt.pkgpath, false)

internal/modproxy/testmodproxy/testmodproxy.go

@@ -7,16 +7,44 @@ import (
 	"io"
 	"io/fs"
 	"maps"
+	"net/http"
+	"net/http/httptest"
 	"os"
 	"path/filepath"
 	"slices"
 	"strings"
+	"testing"
 	"testing/fstest"
 
 	"golang.org/x/mod/module"
 	"golang.org/x/mod/semver"
 )
 
+// Proxy is a named test proxy url.
+type Proxy struct {
+	Name string
+	URL  string
+}
+
+// LoadProxies creates an http:// and file:// proxy for testing.
+// See LoadFS for input directory format.
+func LoadProxies(t *testing.T, rootDir string) []Proxy {
+	proxyfs, err := LoadFS(rootDir)
+	if err != nil {
+		t.Fatal(err)
+	}
+	server := httptest.NewServer(http.FileServer(http.FS(proxyfs)))
+	t.Cleanup(func() { server.Close() })
+	proxydir := t.TempDir()
+	if err := os.CopyFS(proxydir, proxyfs); err != nil {
+		t.Fatal(err)
+	}
+	return []Proxy{
+		{Name: "http", URL: server.URL},
+		{Name: "file", URL: "file://" + proxydir},
+	}
+}
+
 // LoadFS creates a virtual filesystem that implements the Go module proxy protocol.
 // It scans a directory of module source code and automatically generates all the
 // necessary proxy files: /@v/list, /@v/{version}.mod, /@v/{version}.zip, and /@v/{version}.info.