Skip to content
This repository was archived by the owner on Sep 9, 2020. It is now read-only.

Golden file pattern for integration tests, reduced commits #246

Merged
merged 1 commit into from
Feb 21, 2017
Merged

Golden file pattern for integration tests, reduced commits #246

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
101 changes: 28 additions & 73 deletions cmd/dep/init_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@
package main

import (
"strings"
"testing"

"github.com/golang/dep/test"
Expand Down Expand Up @@ -61,86 +62,40 @@ func TestInit(t *testing.T) {
}

// Build a fake consumer of these packages.
const root = "github.com/golang/notexist"
m := `package main
root := "src/github.com/golang/notexist"
h.TempCopy(root+"/foo/thing.go", "init/thing.input.go")
h.TempCopy(root+"/foo/bar/bar.go", "init/bar.input.go")

import (
"github.com/Sirupsen/logrus"
"github.com/pkg/errors"

"` + root + `/foo/bar"
)

func main() {
err := nil
if err != nil {
errors.Wrap(err, "thing")
}
logrus.Info(bar.Qux)
}`

h.TempFile("src/"+root+"/foo/thing.go", m)

m = `package bar

const Qux = "yo yo!"
`
h.TempFile("src/"+root+"/foo/bar/bar.go", m)

h.Cd(h.Path("src/" + root))
h.Cd(h.Path(root))
h.Run("init")

expectedManifest := `{
"dependencies": {
"github.com/Sirupsen/logrus": {
"revision": "42b84f9ec624953ecbf81a94feccb3f5935c5edf"
},
"github.com/pkg/errors": {
"version": ">=0.8.0, <1.0.0"
}
}
}
`
manifest := h.ReadManifest()
if manifest != expectedManifest {
t.Fatalf("expected %s, got %s", expectedManifest, manifest)
goldenManifest := "init/manifest.golden.json"
wantManifest := h.GetTestFileString(goldenManifest)
gotManifest := h.ReadManifest()
if wantManifest != gotManifest {
if *test.UpdateGolden {
if err := h.WriteTestFile(goldenManifest, gotManifest); err != nil {
t.Fatal(err)
}
} else {
t.Errorf("expected %s, got %s", wantManifest, gotManifest)
}
}

sysCommit := h.GetCommit("go.googlesource.com/sys")
expectedLock := `{
"memo": "668fe45796bc4e85a5a6c0a0f1eb6fab9e23588d1eb33f3a12b2ad5599a3575e",
"projects": [
{
"name": "github.com/Sirupsen/logrus",
"revision": "42b84f9ec624953ecbf81a94feccb3f5935c5edf",
"packages": [
"."
]
},
{
"name": "github.com/pkg/errors",
"version": "v0.8.0",
"revision": "645ef00459ed84a119197bfb8d8205042c6df63d",
"packages": [
"."
]
},
{
"name": "golang.org/x/sys",
"branch": "master",
"revision": "` + sysCommit + `",
"packages": [
"unix"
]
}
]
}
`
lock := h.ReadLock()
if lock != expectedLock {
t.Fatalf("expected %s, got %s", expectedLock, lock)
goldenLock := "init/lock.golden.json"
wantLock := strings.Replace(h.GetTestFileString(goldenLock), "` + sysCommit + `", sysCommit, 1)
gotLock := h.ReadLock()
if wantLock != gotLock {
if *test.UpdateGolden {
if err := h.WriteTestFile(goldenLock, gotLock); err != nil {
t.Fatal(err)
}
} else {
t.Errorf("expected %s, got %s", wantLock, gotLock)
}
}

// vendor should have been created & populated
h.MustExist(h.Path("src/" + root + "/vendor/github.com/Sirupsen/logrus"))
h.MustExist(h.Path(root + "/vendor/github.com/Sirupsen/logrus"))
}
144 changes: 49 additions & 95 deletions cmd/dep/remove_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@
package main

import (
"strings"
"testing"

"github.com/golang/dep/test"
Expand Down Expand Up @@ -33,65 +34,38 @@ func TestRemove(t *testing.T) {
}

// Build a fake consumer of these packages.
const root = "github.com/golang/notexist"
m := `package main
const root = "src/github.com/golang/notexist"
h.TempCopy(root+"/thing.go", "remove/main.input.go")
h.TempCopy(root+"/manifest.json", "remove/manifest.input.json")

import (
"github.com/Sirupsen/logrus"
"github.com/pkg/errors"
)

func main() {
err := nil
if err != nil {
errors.Wrap(err, "thing")
}
logrus.Info("whatev")
}`

h.TempFile("src/"+root+"/thing.go", m)
origm := `{
"dependencies": {
"github.com/not/used": {
"version": "2.0.0"
},
"github.com/Sirupsen/logrus": {
"revision": "42b84f9ec624953ecbf81a94feccb3f5935c5edf"
},
"github.com/pkg/errors": {
"version": ">=0.8.0, <1.0.0"
}
}
}
`
expectedManifest := `{
"dependencies": {
"github.com/Sirupsen/logrus": {
"revision": "42b84f9ec624953ecbf81a94feccb3f5935c5edf"
},
"github.com/pkg/errors": {
"version": ">=0.8.0, <1.0.0"
}
}
}
`

h.TempFile("src/"+root+"/manifest.json", origm)

h.Cd(h.Path("src/" + root))
h.Cd(h.Path(root))
h.Run("remove", "-unused")

manifest := h.ReadManifest()
if manifest != expectedManifest {
t.Fatalf("expected %s, got %s", expectedManifest, manifest)
goldenManifest := "remove/manifest0.golden.json"
wantManifest := h.GetTestFileString(goldenManifest)
gotManifest := h.ReadManifest()
if wantManifest != gotManifest {
if *test.UpdateGolden {
if err := h.WriteTestFile(goldenManifest, gotManifest); err != nil {
t.Fatal(err)
}
} else {
t.Errorf("expected %s, got %s", wantManifest, gotManifest)
}
}

h.TempFile("src/"+root+"/manifest.json", origm)
h.TempCopy(root+"/manifest.json", "remove/manifest.input.json")
h.Run("remove", "github.com/not/used")

manifest = h.ReadManifest()
if manifest != expectedManifest {
t.Fatalf("expected %s, got %s", expectedManifest, manifest)
gotManifest = h.ReadManifest()
if wantManifest != gotManifest {
if *test.UpdateGolden {
if err := h.WriteTestFile(goldenManifest, gotManifest); err != nil {
t.Fatal(err)
}
} else {
t.Errorf("expected %s, got %s", wantManifest, gotManifest)
}
}

if err := h.DoRun([]string{"remove", "-unused", "github.com/not/used"}); err == nil {
Expand All @@ -110,53 +84,33 @@ func main() {
t.Fatal("rm of arg in manifest and imports should have failed without -force")
}

h.TempFile("src/"+root+"/manifest.json", origm)
h.TempCopy(root+"/manifest.json", "remove/manifest.input.json")
h.Run("remove", "-force", "github.com/pkg/errors", "github.com/not/used")

manifest = h.ReadManifest()
if manifest != `{
"dependencies": {
"github.com/Sirupsen/logrus": {
"revision": "42b84f9ec624953ecbf81a94feccb3f5935c5edf"
}
}
}
` {
t.Fatalf("expected %s, got %s", expectedManifest, manifest)
goldenManifest = "remove/manifest1.golden.json"
wantManifest = h.GetTestFileString(goldenManifest)
gotManifest = h.ReadManifest()
if wantManifest != gotManifest {
if *test.UpdateGolden {
if err := h.WriteTestFile(goldenManifest, gotManifest); err != nil {
t.Fatal(err)
}
} else {
t.Errorf("expected %s, got %s", wantManifest, gotManifest)
}
}

sysCommit := h.GetCommit("go.googlesource.com/sys")
expectedLock := `{
"memo": "7769242a737ed497aa39831eecfdc4a1bf59517df898907accc6bdc0f789a69b",
"projects": [
{
"name": "github.com/Sirupsen/logrus",
"revision": "42b84f9ec624953ecbf81a94feccb3f5935c5edf",
"packages": [
"."
]
},
{
"name": "github.com/pkg/errors",
"version": "v0.8.0",
"revision": "645ef00459ed84a119197bfb8d8205042c6df63d",
"packages": [
"."
]
},
{
"name": "golang.org/x/sys",
"branch": "master",
"revision": "` + sysCommit + `",
"packages": [
"unix"
]
}
]
}
`
lock := h.ReadLock()
if lock != expectedLock {
t.Fatalf("expected %s, got %s", expectedLock, lock)
goldenLock := "remove/lock1.golden.json"
wantLock := strings.Replace(h.GetTestFileString(goldenLock), "` + sysCommit + `", sysCommit, 1)
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

It's not great that we're still having to do this. I've opened #255 to get rid of it.

gotLock := h.ReadLock()
if wantLock != gotLock {
if *test.UpdateGolden {
if err := h.WriteTestFile(goldenLock, gotLock); err != nil {
t.Fatal(err)
}
} else {
t.Errorf("expected %s, got %s", wantLock, gotLock)
}
}
}
7 changes: 7 additions & 0 deletions cmd/dep/testdata/init/bar.input.go
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
// Copyright 2016 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 bar

const Qux = "yo yo!"
28 changes: 28 additions & 0 deletions cmd/dep/testdata/init/lock.golden.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,28 @@
{
"memo": "668fe45796bc4e85a5a6c0a0f1eb6fab9e23588d1eb33f3a12b2ad5599a3575e",
"projects": [
{
"name": "github.com/Sirupsen/logrus",
"revision": "42b84f9ec624953ecbf81a94feccb3f5935c5edf",
"packages": [
"."
]
},
{
"name": "github.com/pkg/errors",
"version": "v0.8.0",
"revision": "645ef00459ed84a119197bfb8d8205042c6df63d",
"packages": [
"."
]
},
{
"name": "golang.org/x/sys",
"branch": "master",
"revision": "` + sysCommit + `",
"packages": [
"unix"
]
}
]
}
10 changes: 10 additions & 0 deletions cmd/dep/testdata/init/manifest.golden.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
{
"dependencies": {
"github.com/Sirupsen/logrus": {
"revision": "42b84f9ec624953ecbf81a94feccb3f5935c5edf"
},
"github.com/pkg/errors": {
"version": ">=0.8.0, <1.0.0"
}
}
}
20 changes: 20 additions & 0 deletions cmd/dep/testdata/init/thing.input.go
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,20 @@
// Copyright 2016 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 main

import (
"github.com/Sirupsen/logrus"
"github.com/pkg/errors"

"github.com/golang/notexist/foo/bar"
)

func main() {
err := nil
if err != nil {
errors.Wrap(err, "thing")
}
logrus.Info(bar.Qux)
}
28 changes: 28 additions & 0 deletions cmd/dep/testdata/remove/lock1.golden.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,28 @@
{
"memo": "7769242a737ed497aa39831eecfdc4a1bf59517df898907accc6bdc0f789a69b",
"projects": [
{
"name": "github.com/Sirupsen/logrus",
"revision": "42b84f9ec624953ecbf81a94feccb3f5935c5edf",
"packages": [
"."
]
},
{
"name": "github.com/pkg/errors",
"version": "v0.8.0",
"revision": "645ef00459ed84a119197bfb8d8205042c6df63d",
"packages": [
"."
]
},
{
"name": "golang.org/x/sys",
"branch": "master",
"revision": "e24f485414aeafb646f6fca458b0bf869c0880a1",
"packages": [
"unix"
]
}
]
}
Loading