internal/fetch: move fs_test.go into getters_test.go
Pure code motion.
For golang/go#47834
Change-Id: I6ccf5ea9574b2d7c9495956ea080cca269c99470
Reviewed-on: https://go-review.googlesource.com/c/pkgsite/+/343962
Trust: Jonathan Amsterdam <jba@google.com>
Run-TryBot: Jonathan Amsterdam <jba@google.com>
TryBot-Result: kokoro <noreply+kokoro@google.com>
Reviewed-by: Jamal Carvalho <jamal@golang.org>
diff --git a/internal/fetch/fs_test.go b/internal/fetch/fs_test.go
deleted file mode 100644
index 3290015..0000000
--- a/internal/fetch/fs_test.go
+++ /dev/null
@@ -1,94 +0,0 @@
-// Copyright 2021 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-package fetch
-
-import (
- "context"
- "io/ioutil"
- "testing"
- "time"
-
- "github.com/google/go-cmp/cmp"
- "golang.org/x/pkgsite/internal/proxy"
-)
-
-func TestEscapedPath(t *testing.T) {
- for _, test := range []struct {
- path, version, suffix string
- want string
- }{
- {
- "m.com", "v1", "info",
- "dir/m.com/@v/v1.info",
- },
- {
- "github.com/aBc", "v2.3.4", "zip",
- "dir/github.com/a!bc/@v/v2.3.4.zip",
- },
- } {
- g := NewFSModuleGetter("dir").(*fsModuleGetter)
- got, err := g.escapedPath(test.path, test.version, test.suffix)
- if err != nil {
- t.Fatal(err)
- }
- if got != test.want {
- t.Errorf("%s, %s, %s: got %q, want %q", test.path, test.version, test.suffix, got, test.want)
- }
- }
-}
-
-func TestFSGetter(t *testing.T) {
- ctx := context.Background()
- const (
- modulePath = "github.com/jackc/pgio"
- version = "v1.0.0"
- goMod = "module github.com/jackc/pgio\n\ngo 1.12\n"
- )
- ts, err := time.Parse(time.RFC3339, "2019-03-30T17:04:38Z")
- if err != nil {
- t.Fatal(err)
- }
- g := NewFSModuleGetter("testdata/modcache")
- t.Run("info", func(t *testing.T) {
- got, err := g.Info(ctx, modulePath, version)
- if err != nil {
- t.Fatal(err)
- }
- want := &proxy.VersionInfo{Version: version, Time: ts}
- if !cmp.Equal(got, want) {
- t.Errorf("got %+v, want %+v", got, want)
- }
- })
- t.Run("mod", func(t *testing.T) {
- got, err := g.Mod(ctx, modulePath, version)
- if err != nil {
- t.Fatal(err)
- }
- want := []byte(goMod)
- if !cmp.Equal(got, want) {
- t.Errorf("got %q, want %q", got, want)
- }
- })
- t.Run("fs", func(t *testing.T) {
- fsys, err := g.FS(ctx, modulePath, version)
- if err != nil {
- t.Fatal(err)
- }
- // Just check that the go.mod file is there and has the right contents.
- f, err := fsys.Open("go.mod")
- if err != nil {
- t.Fatal(err)
- }
- defer f.Close()
- got, err := ioutil.ReadAll(f)
- if err != nil {
- t.Fatal(err)
- }
- want := []byte(goMod)
- if !cmp.Equal(got, want) {
- t.Errorf("got %q, want %q", got, want)
- }
- })
-}
diff --git a/internal/fetch/getters_test.go b/internal/fetch/getters_test.go
index 6cd4f77..62dcf99 100644
--- a/internal/fetch/getters_test.go
+++ b/internal/fetch/getters_test.go
@@ -5,10 +5,15 @@
package fetch
import (
+ "context"
"errors"
+ "io/ioutil"
"testing"
+ "time"
+ "github.com/google/go-cmp/cmp"
"golang.org/x/pkgsite/internal/derrors"
+ "golang.org/x/pkgsite/internal/proxy"
)
func TestDirectoryModuleGetterEmpty(t *testing.T) {
@@ -25,3 +30,82 @@
t.Errorf("got %v, want BadModule", err)
}
}
+
+func TestEscapedPath(t *testing.T) {
+ for _, test := range []struct {
+ path, version, suffix string
+ want string
+ }{
+ {
+ "m.com", "v1", "info",
+ "dir/m.com/@v/v1.info",
+ },
+ {
+ "github.com/aBc", "v2.3.4", "zip",
+ "dir/github.com/a!bc/@v/v2.3.4.zip",
+ },
+ } {
+ g := NewFSModuleGetter("dir").(*fsModuleGetter)
+ got, err := g.escapedPath(test.path, test.version, test.suffix)
+ if err != nil {
+ t.Fatal(err)
+ }
+ if got != test.want {
+ t.Errorf("%s, %s, %s: got %q, want %q", test.path, test.version, test.suffix, got, test.want)
+ }
+ }
+}
+
+func TestFSGetter(t *testing.T) {
+ ctx := context.Background()
+ const (
+ modulePath = "github.com/jackc/pgio"
+ version = "v1.0.0"
+ goMod = "module github.com/jackc/pgio\n\ngo 1.12\n"
+ )
+ ts, err := time.Parse(time.RFC3339, "2019-03-30T17:04:38Z")
+ if err != nil {
+ t.Fatal(err)
+ }
+ g := NewFSModuleGetter("testdata/modcache")
+ t.Run("info", func(t *testing.T) {
+ got, err := g.Info(ctx, modulePath, version)
+ if err != nil {
+ t.Fatal(err)
+ }
+ want := &proxy.VersionInfo{Version: version, Time: ts}
+ if !cmp.Equal(got, want) {
+ t.Errorf("got %+v, want %+v", got, want)
+ }
+ })
+ t.Run("mod", func(t *testing.T) {
+ got, err := g.Mod(ctx, modulePath, version)
+ if err != nil {
+ t.Fatal(err)
+ }
+ want := []byte(goMod)
+ if !cmp.Equal(got, want) {
+ t.Errorf("got %q, want %q", got, want)
+ }
+ })
+ t.Run("fs", func(t *testing.T) {
+ fsys, err := g.FS(ctx, modulePath, version)
+ if err != nil {
+ t.Fatal(err)
+ }
+ // Just check that the go.mod file is there and has the right contents.
+ f, err := fsys.Open("go.mod")
+ if err != nil {
+ t.Fatal(err)
+ }
+ defer f.Close()
+ got, err := ioutil.ReadAll(f)
+ if err != nil {
+ t.Fatal(err)
+ }
+ want := []byte(goMod)
+ if !cmp.Equal(got, want) {
+ t.Errorf("got %q, want %q", got, want)
+ }
+ })
+}
