Removed dummy testing package

dave · Dec 3, 2018 · 5a24b9a · 5a24b9a
1 parent ab0d940
commit 5a24b9a
Show file tree

Hide file tree

Showing 12 changed files with 151 additions and 19 deletions.
diff --git a/README.md b/README.md
@@ -288,7 +288,7 @@ The [Load](https://godoc.org/github.com/dave/dst/decorator#Load) convenience fun
 
 ```go
 // Create a simple module in a temporary directory
-dir, err := dummy.TempDir(map[string]string{
+dir, err := tempDir(map[string]string{
 	"go.mod":	"module root",
 	"main.go":	"package main \n\n func main() {}",
 })

diff --git a/decorations_test.go b/decorations_test.go
@@ -13,7 +13,6 @@ import (
 
 	"github.com/dave/dst"
 	"github.com/dave/dst/decorator"
-	"github.com/dave/dst/decorator/dummy"
 	"github.com/dave/dst/decorator/resolver/goast"
 	"github.com/dave/dst/decorator/resolver/gopackages"
 	"github.com/dave/dst/decorator/resolver/gotypes"
@@ -168,7 +167,7 @@ func ExampleManualImports() {
 func ExampleImports() {
 
 	// Create a simple module in a temporary directory
-	dir, err := dummy.TempDir(map[string]string{
+	dir, err := tempDir(map[string]string{
 		"go.mod":  "module root",
 		"main.go": "package main \n\n func main() {}",
 	})
@@ -219,7 +218,7 @@ func ExampleImports() {
 func ExampleGoTypesImport() {
 
 	// Create a simple module in a temporary directory
-	dir, err := dummy.TempDir(map[string]string{
+	dir, err := tempDir(map[string]string{
 		"go.mod": "module root",
 		"main.go": `package main
 

diff --git a/decorator/decorator_resolver_test.go b/decorator/decorator_resolver_test.go
@@ -6,7 +6,6 @@ import (
 	"testing"
 
 	"github.com/dave/dst"
-	"github.com/dave/dst/decorator/dummy"
 	"golang.org/x/tools/go/packages"
 )
 
@@ -80,7 +79,7 @@ func TestDecoratorResolver(t *testing.T) {
 				t.Skip()
 			}
 
-			root, err := dummy.TempDir(test.src)
+			root, err := tempDir(test.src)
 			if err != nil {
 				t.Fatal(err)
 			}

diff --git a/decorator/resolver/gobuild/resolver_test.go b/decorator/resolver/gobuild/resolver_test.go
@@ -4,7 +4,6 @@ import (
 	"path/filepath"
 	"testing"
 
-	"github.com/dave/dst/decorator/dummy"
 	"github.com/dave/dst/decorator/resolver"
 	"github.com/dave/dst/decorator/resolver/gobuild"
 )
@@ -26,7 +25,7 @@ func TestRestorerResolver(t *testing.T) {
 					"main2/main2.go":      "package main \n\n func main(){}",
 					"a/a.go":              "package a2 \n\n func A(){}",
 				}
-				bc, err := dummy.BuildContext(src)
+				bc, err := buildContext(src)
 				if err != nil {
 					t.Fatal(err)
 				}

diff --git a/decorator/dummy/buildcontext.go → decorator/resolver/gobuild/util_test.go b/decorator/dummy/buildcontext.go → decorator/resolver/gobuild/util_test.go
@@ -1,4 +1,4 @@
-package dummy
+package gobuild_test
 
 import (
 	"bytes"
@@ -13,7 +13,7 @@ import (
 	"gopkg.in/src-d/go-billy.v4/memfs"
 )
 
-func BuildContext(m map[string]string) (*build.Context, error) {
+func buildContext(m map[string]string) (*build.Context, error) {
 
 	goroot := "/goroot/"
 	gopath := "/gopath/"

diff --git a/decorator/resolver/gopackages/resolver_test.go b/decorator/resolver/gopackages/resolver_test.go
@@ -5,7 +5,6 @@ import (
 	"path/filepath"
 	"testing"
 
-	"github.com/dave/dst/decorator/dummy"
 	"github.com/dave/dst/decorator/resolver"
 	"github.com/dave/dst/decorator/resolver/gopackages"
 )
@@ -27,7 +26,7 @@ func TestRestorerResolver(t *testing.T) {
 					"go.mod":       "module root",
 				}
 				var err error
-				root, err = dummy.TempDir(src)
+				root, err = tempDir(src)
 				if err != nil {
 					t.Fatal(err)
 				}

diff --git a/decorator/resolver/gopackages/util_test.go b/decorator/resolver/gopackages/util_test.go
@@ -0,0 +1,46 @@
+package gopackages_test
+
+import (
+	"fmt"
+	"go/format"
+	"io/ioutil"
+	"os"
+	"path/filepath"
+	"strings"
+)
+
+func tempDir(m map[string]string) (dir string, err error) {
+	if dir, err = ioutil.TempDir("", ""); err != nil {
+		return
+	}
+	for fpathrel, src := range m {
+		if strings.HasSuffix(fpathrel, "/") {
+			// just a dir
+			if err = os.MkdirAll(filepath.Join(dir, fpathrel), 0777); err != nil {
+				return
+			}
+		} else {
+			fpath := filepath.Join(dir, fpathrel)
+			fdir, _ := filepath.Split(fpath)
+			if err = os.MkdirAll(fdir, 0777); err != nil {
+				return
+			}
+
+			var formatted []byte
+			if strings.HasSuffix(fpath, ".go") {
+				formatted, err = format.Source([]byte(src))
+				if err != nil {
+					err = fmt.Errorf("formatting %s: %v", fpathrel, err)
+					return
+				}
+			} else {
+				formatted = []byte(src)
+			}
+
+			if err = ioutil.WriteFile(fpath, formatted, 0666); err != nil {
+				return
+			}
+		}
+	}
+	return
+}
diff --git a/decorator/resolver/gotypes/resolver_test.go b/decorator/resolver/gotypes/resolver_test.go
@@ -6,7 +6,6 @@ import (
 	"path/filepath"
 	"testing"
 
-	"github.com/dave/dst/decorator/dummy"
 	"github.com/dave/dst/decorator/resolver/gotypes"
 	"golang.org/x/tools/go/packages"
 )
@@ -123,7 +122,7 @@ func TestDecoratorResolver(t *testing.T) {
 				t.Skip()
 			}
 
-			root, err := dummy.TempDir(test.src)
+			root, err := tempDir(test.src)
 			if err != nil {
 				t.Fatal(err)
 			}

diff --git a/decorator/resolver/gotypes/util_test.go b/decorator/resolver/gotypes/util_test.go
@@ -0,0 +1,46 @@
+package gotypes_test
+
+import (
+	"fmt"
+	"go/format"
+	"io/ioutil"
+	"os"
+	"path/filepath"
+	"strings"
+)
+
+func tempDir(m map[string]string) (dir string, err error) {
+	if dir, err = ioutil.TempDir("", ""); err != nil {
+		return
+	}
+	for fpathrel, src := range m {
+		if strings.HasSuffix(fpathrel, "/") {
+			// just a dir
+			if err = os.MkdirAll(filepath.Join(dir, fpathrel), 0777); err != nil {
+				return
+			}
+		} else {
+			fpath := filepath.Join(dir, fpathrel)
+			fdir, _ := filepath.Split(fpath)
+			if err = os.MkdirAll(fdir, 0777); err != nil {
+				return
+			}
+
+			var formatted []byte
+			if strings.HasSuffix(fpath, ".go") {
+				formatted, err = format.Source([]byte(src))
+				if err != nil {
+					err = fmt.Errorf("formatting %s: %v", fpathrel, err)
+					return
+				}
+			} else {
+				formatted = []byte(src)
+			}
+
+			if err = ioutil.WriteFile(fpath, formatted, 0666); err != nil {
+				return
+			}
+		}
+	}
+	return
+}
diff --git a/decorator/restorer_resolver_test.go b/decorator/restorer_resolver_test.go
@@ -12,7 +12,6 @@ import (
 	"testing"
 
 	"github.com/dave/dst"
-	"github.com/dave/dst/decorator/dummy"
 	"github.com/dave/dst/decorator/resolver/gopackages"
 	"golang.org/x/tools/go/packages"
 )
@@ -1090,7 +1089,7 @@ func TestRestorerResolver(t *testing.T) {
 					t.Skip()
 				}
 
-				rootDir, err := dummy.TempDir(test.src)
+				rootDir, err := tempDir(test.src)
 				if err != nil {
 					t.Fatal(err)
 				}
@@ -1471,7 +1470,7 @@ func TestRestorerDecorationResolver(t *testing.T) {
 				t.Fatalf("code changed after gofmt. before: \n%s\nafter:\n%s", test.src["main/main.go"], string(expected))
 			}
 
-			rootDir, err := dummy.TempDir(test.src)
+			rootDir, err := tempDir(test.src)
 			if err != nil {
 				t.Fatal(err)
 			}

diff --git a/decorator/util_test.go b/decorator/util_test.go
@@ -0,0 +1,46 @@
+package decorator
+
+import (
+	"fmt"
+	"go/format"
+	"io/ioutil"
+	"os"
+	"path/filepath"
+	"strings"
+)
+
+func tempDir(m map[string]string) (dir string, err error) {
+	if dir, err = ioutil.TempDir("", ""); err != nil {
+		return
+	}
+	for fpathrel, src := range m {
+		if strings.HasSuffix(fpathrel, "/") {
+			// just a dir
+			if err = os.MkdirAll(filepath.Join(dir, fpathrel), 0777); err != nil {
+				return
+			}
+		} else {
+			fpath := filepath.Join(dir, fpathrel)
+			fdir, _ := filepath.Split(fpath)
+			if err = os.MkdirAll(fdir, 0777); err != nil {
+				return
+			}
+
+			var formatted []byte
+			if strings.HasSuffix(fpath, ".go") {
+				formatted, err = format.Source([]byte(src))
+				if err != nil {
+					err = fmt.Errorf("formatting %s: %v", fpathrel, err)
+					return
+				}
+			} else {
+				formatted = []byte(src)
+			}
+
+			if err = ioutil.WriteFile(fpath, formatted, 0666); err != nil {
+				return
+			}
+		}
+	}
+	return
+}
diff --git a/decorator/dummy/tempdir.go → util_test.go b/decorator/dummy/tempdir.go → util_test.go
@@ -1,4 +1,4 @@
-package dummy
+package dst_test
 
 import (
 	"fmt"
@@ -9,7 +9,7 @@ import (
 	"strings"
 )
 
-func TempDir(m map[string]string) (dir string, err error) {
+func tempDir(m map[string]string) (dir string, err error) {
 	if dir, err = ioutil.TempDir("", ""); err != nil {
 		return
 	}