Merge pull request #204 from vdemeester/update-gotestyourself

Update gotestyourself to gotest.tools

Author: Vincent Demeester

Gopkg.lock

@@ -13,10 +13,10 @@ import (
 	"strings"
 	"testing"
 
-	"github.com/gotestyourself/gotestyourself/assert"
-	"github.com/gotestyourself/gotestyourself/fs"
-	"github.com/gotestyourself/gotestyourself/golden"
-	"github.com/gotestyourself/gotestyourself/icmd"
+	"gotest.tools/assert"
+	"gotest.tools/fs"
+	"gotest.tools/golden"
+	"gotest.tools/icmd"
 
 	"github.com/docker/app/utils"
 )

e2e/binary_test.go

@@ -10,8 +10,8 @@ import (
 	"github.com/docker/app/internal"
 	"github.com/docker/app/renderer"
 
-	"github.com/gotestyourself/gotestyourself/assert"
 	"gopkg.in/yaml.v2"
+	"gotest.tools/assert"
 )
 
 func gather(t *testing.T, dir string) ([]string, []string, map[string]string) {

e2e/render_test.go

@@ -8,8 +8,8 @@ import (
 	"path/filepath"
 	"testing"
 
-	"github.com/gotestyourself/gotestyourself/assert"
-	"github.com/gotestyourself/gotestyourself/fs"
+	"gotest.tools/assert"
+	"gotest.tools/fs"
 
 	"github.com/docker/app/utils"
 )

packager/init_test.go

@@ -3,8 +3,8 @@ package utils
 import (
 	"testing"
 
-	"github.com/gotestyourself/gotestyourself/assert"
-	"github.com/gotestyourself/gotestyourself/fs"
+	"gotest.tools/assert"
+	"gotest.tools/fs"
 
 	"strings"
 )

utils/io_test.go

@@ -4,7 +4,7 @@ import (
 	"fmt"
 	"testing"
 
-	"github.com/gotestyourself/gotestyourself/assert"
+	"gotest.tools/assert"
 )
 
 func TestValidateAppName(t *testing.T) {

utils/names_test.go

@@ -16,8 +16,8 @@ The example below shows assert used with some common types.
 	import (
 	    "testing"
 
-	    "github.com/gotestyourself/gotestyourself/assert"
-	    is "github.com/gotestyourself/gotestyourself/assert/cmp"
+	    "gotest.tools/assert"
+	    is "gotest.tools/assert/cmp"
 	)
 
 	func TestEverything(t *testing.T) {
@@ -49,7 +49,7 @@ The example below shows assert used with some common types.
 
 Comparisons
 
-Package assert/cmp (http://bit.do/assert-cmp) provides
+Package https://godoc.org/gotest.tools/assert/cmp provides
 many common comparisons. Additional comparisons can be written to compare
 values in other ways. See the example Assert (CustomComparison).
 
@@ -62,17 +62,17 @@ See http://bit.do/cmd-gty-migrate-from-testify.
 
 
 */
-package assert
+package assert // import "gotest.tools/assert"
 
 import (
 	"fmt"
 	"go/ast"
 	"go/token"
 
 	gocmp "github.com/google/go-cmp/cmp"
-	"github.com/gotestyourself/gotestyourself/assert/cmp"
-	"github.com/gotestyourself/gotestyourself/internal/format"
-	"github.com/gotestyourself/gotestyourself/internal/source"
+	"gotest.tools/assert/cmp"
+	"gotest.tools/internal/format"
+	"gotest.tools/internal/source"
 )
 
 // BoolOrComparison can be a bool, or cmp.Comparison. See Assert() for usage.
@@ -242,7 +242,17 @@ func NilError(t TestingT, err error, msgAndArgs ...interface{}) {
 }
 
 // Equal uses the == operator to assert two values are equal and fails the test
-// if they are not equal. This is equivalent to Assert(t, cmp.Equal(x, y)).
+// if they are not equal.
+//
+// If the comparison fails Equal will use the variable names for x and y as part
+// of the failure message to identify the actual and expected values.
+//
+// If either x or y are a multi-line string the failure message will include a
+// unified diff of the two values. If the values only differ by whitespace
+// the unified diff will be augmented by replacing whitespace characters with
+// visible characters to identify the whitespace difference.
+//
+// This is equivalent to Assert(t, cmp.Equal(x, y)).
 func Equal(t TestingT, x, y interface{}, msgAndArgs ...interface{}) {
 	if ht, ok := t.(helperT); ok {
 		ht.Helper()
@@ -253,7 +263,7 @@ func Equal(t TestingT, x, y interface{}, msgAndArgs ...interface{}) {
 // DeepEqual uses google/go-cmp (http://bit.do/go-cmp) to assert two values are
 // equal and fails the test if they are not equal.
 //
-// Package assert/opt (http://bit.do/t-assert-opt) provides some additional
+// Package https://godoc.org/gotest.tools/assert/opt provides some additional
 // commonly used Options.
 //
 // This is equivalent to Assert(t, cmp.DeepEqual(x, y)).

…om/gotestyourself/gotestyourself/LICENSE vendor/gotest.tools/LICENSEvendor/github.com/gotestyourself/gotestyourself/LICENSE renamed to vendor/gotest.tools/LICENSE vendor/github.com/gotestyourself/gotestyourself/LICENSE renamed to vendor/gotest.tools/LICENSE

@@ -1,13 +1,13 @@
 /*Package cmp provides Comparisons for Assert and Check*/
-package cmp
+package cmp // import "gotest.tools/assert/cmp"
 
 import (
 	"fmt"
 	"reflect"
 	"strings"
 
 	"github.com/google/go-cmp/cmp"
-	"github.com/gotestyourself/gotestyourself/internal/format"
+	"gotest.tools/internal/format"
 )
 
 // Comparison is a function which compares values and returns ResultSuccess if
@@ -19,7 +19,7 @@ type Comparison func() Result
 // and succeeds if the values are equal.
 //
 // The comparison can be customized using comparison Options.
-// Package assert/opt (http://bit.do/t-assert-opt) provides some additional
+// Package https://godoc.org/gotest.tools/assert/opt provides some additional
 // commonly used Options.
 func DeepEqual(x, y interface{}, opts ...cmp.Option) Comparison {
 	return func() (result Result) {
@@ -58,7 +58,7 @@ func toResult(success bool, msg string) Result {
 	return ResultFailure(msg)
 }
 
-// Equal succeeds if x == y.
+// Equal succeeds if x == y. See assert.Equal for full documentation.
 func Equal(x, y interface{}) Comparison {
 	return func() Result {
 		switch {

…yourself/gotestyourself/assert/assert.go vendor/gotest.tools/assert/assert.govendor/github.com/gotestyourself/gotestyourself/assert/assert.go renamed to vendor/gotest.tools/assert/assert.go vendor/github.com/gotestyourself/gotestyourself/assert/assert.go renamed to vendor/gotest.tools/assert/assert.go

@@ -6,7 +6,7 @@ import (
 	"go/ast"
 	"text/template"
 
-	"github.com/gotestyourself/gotestyourself/internal/source"
+	"gotest.tools/internal/source"
 )
 
 // Result of a Comparison.