Cleaning up test file functions

Author: tro3

lock_test.go

@@ -18,14 +18,14 @@ func TestReadLock(t *testing.T) {
 	h := test.NewHelper(t)
 	defer h.Cleanup()
 
-	_, err := readLock(h.GetTestFileReader("lock/error.json"))
+	_, err := readLock(h.GetTestFile("lock/error.json"))
 	if err == nil {
 		t.Error("Reading lock with invalid props should have caused error, but did not")
 	} else if !strings.Contains(err.Error(), "both a branch") {
 		t.Errorf("Unexpected error %q; expected multiple version error", err)
 	}
 
-	l, err := readLock(h.GetTestFileReader("lock/golden.json"))
+	l, err := readLock(h.GetTestFile("lock/golden.json"))
 	if err != nil {
 		t.Fatalf("Should have read Lock correctly, but got err %q", err)
 	}

manifest_test.go

@@ -17,14 +17,14 @@ func TestReadManifest(t *testing.T) {
 	h := test.NewHelper(t)
 	defer h.Cleanup()
 
-	_, err := readManifest(h.GetTestFileReader("manifest/error.json"))
+	_, err := readManifest(h.GetTestFile("manifest/error.json"))
 	if err == nil {
 		t.Error("Reading manifest with invalid props should have caused error, but did not")
 	} else if !strings.Contains(err.Error(), "multiple constraints") {
 		t.Errorf("Unexpected error %q; expected multiple constraint error", err)
 	}
 
-	m2, err := readManifest(h.GetTestFileReader("manifest/golden.json"))
+	m2, err := readManifest(h.GetTestFile("manifest/golden.json"))
 	if err != nil {
 		t.Fatalf("Should have read Manifest correctly, but got err %q", err)
 	}

test/test.go

@@ -47,7 +47,10 @@ type Helper struct {
 
 // NewHelper initializes a new helper for testing.
 func NewHelper(t *testing.T) *Helper {
-	wd, _ := os.Getwd()
+	wd, err := os.Getwd()
+	if err != nil {
+		panic(err)
+	}
 	return &Helper{t: t, origWd: wd}
 }
 
@@ -417,45 +420,39 @@ func (h *Helper) TempFile(path, contents string) {
 	h.Must(ioutil.WriteFile(filepath.Join(h.tempdir, path), bytes, 0644))
 }
 
-// GetTestFileBytes reads a file form the testdata directory into memory.  src is
-// relative to ./testdata.  Assumes tests take place starting in the cmd/dep
-// directory.
-func (h *Helper) GetTestFileBytes(src string) []byte {
-	content, err := ioutil.ReadFile(filepath.Join(h.origWd, "_testdata", src))
+// GetTestFile reads a file from the testdata directory into memory.  src is
+// relative to ./_testdata.
+func (h *Helper) GetTestFile(src string) io.ReadCloser {
+	content, err := os.Open(filepath.Join(h.origWd, "_testdata", src))
 	if err != nil {
 		panic(err)
 	}
-	if strings.HasSuffix(src, ".go") {
-		formatted, err := format.Source(content)
-		if err == nil {
-			content = formatted
-		}
-	}
 	return content
 }
 
-// GetTestFileString reads a file form the testdata directory into memory.  src is
-// relative to ./testdata.  Assumes tests take place starting in the cmd/dep
-// directory.
+// GetTestFileString reads a file from the testdata directory into memory.  src is
+// relative to ./_testdata.
 func (h *Helper) GetTestFileString(src string) string {
-	return string(h.GetTestFileBytes(src))
-}
-
-// GetTestFileReader reads a file form the testdata directory into memory.  src is
-// relative to ./testdata.  Assumes tests take place starting in the cmd/dep
-// directory.
-func (h *Helper) GetTestFileReader(src string) io.Reader {
-	return strings.NewReader(h.GetTestFileString(src))
+	content, err := ioutil.ReadAll(h.GetTestFile(src))
+	if err != nil {
+		panic(err)
+	}
+	return string(content)
 }
 
 // TempCopy copies a temporary file from testdata into the temporary directory.
 // dest is relative to the temp directory location, and src is relative to
-// ./testdata.  Assumes tests take place starting in the cmd/dep directory.
+// ./_testdata.
 func (h *Helper) TempCopy(dest, src string) {
-	content := h.GetTestFileBytes(src)
-	h.makeTempdir()
-	h.Must(os.MkdirAll(filepath.Join(h.tempdir, filepath.Dir(dest)), 0755))
-	h.Must(ioutil.WriteFile(filepath.Join(h.tempdir, dest), content, 0644))
+	in := h.GetTestFile(src)
+	defer in.Close()
+	h.TempDir(filepath.Dir(dest))
+	out, err := os.Create(filepath.Join(h.tempdir, dest))
+	if err != nil {
+		panic(err)
+	}
+	defer out.Close()
+	io.Copy(out, in)
 }
 
 // TempDir adds a temporary directory for a run of testgo.

txn_writer_test.go

@@ -97,9 +97,9 @@ func TestTxnWriter(t *testing.T) {
 	expectedManifest := h.GetTestFileString("txn_writer/expected_manifest.json")
 	expectedLock := h.GetTestFileString("txn_writer/expected_lock.json")
 
-	m, err := readManifest(h.GetTestFileReader("txn_writer/expected_manifest.json"))
+	m, err := readManifest(h.GetTestFile("txn_writer/expected_manifest.json"))
 	h.Must(err)
-	l, err := readLock(h.GetTestFileReader("txn_writer/expected_lock.json"))
+	l, err := readLock(h.GetTestFile("txn_writer/expected_lock.json"))
 	h.Must(err)
 
 	// Just write manifest