From 172219a9d5ee3d999469401935c4714c72c85420 Mon Sep 17 00:00:00 2001 From: Daniel Nephin Date: Tue, 12 Feb 2019 19:50:56 -0500 Subject: [PATCH] Release v3 To properly support go modules we need a new import path. Following https://github.com/golang/go/wiki/Modules#releasing-modules-v2-or-higher the correct way to do that seems to be to release a new major version. --- assert/assert.go | 6 +++--- assert/assert_test.go | 2 +- assert/cmd/gty-migrate-from-testify/call_test.go | 2 +- assert/cmd/gty-migrate-from-testify/main_test.go | 8 ++++---- assert/cmd/gty-migrate-from-testify/migrate_test.go | 4 ++-- assert/cmp/compare.go | 2 +- assert/cmp/compare_test.go | 2 +- assert/cmp/result.go | 2 +- assert/example_test.go | 4 ++-- assert/opt/opt_test.go | 4 ++-- assert/result.go | 6 +++--- env/env.go | 4 ++-- env/env_test.go | 6 +++--- fs/example_test.go | 8 ++++---- fs/file.go | 4 ++-- fs/file_test.go | 4 ++-- fs/manifest.go | 2 +- fs/manifest_test.go | 2 +- fs/ops.go | 2 +- fs/ops_test.go | 4 ++-- fs/path.go | 2 +- fs/report.go | 4 ++-- fs/report_test.go | 6 +++--- go.mod | 2 +- golden/example_test.go | 4 ++-- golden/golden.go | 6 +++--- golden/golden_test.go | 6 +++--- icmd/command.go | 4 ++-- icmd/command_test.go | 8 ++++---- icmd/example_test.go | 2 +- internal/format/diff.go | 2 +- internal/format/diff_test.go | 6 +++--- internal/format/format_test.go | 4 ++-- internal/source/source_test.go | 6 +++--- poll/check_test.go | 2 +- poll/example_test.go | 2 +- poll/poll_test.go | 4 ++-- skip/example_test.go | 2 +- skip/skip.go | 4 ++-- skip/skip_test.go | 4 ++-- x/subtest/context_test.go | 2 +- x/subtest/example_test.go | 4 ++-- 42 files changed, 82 insertions(+), 82 deletions(-) diff --git a/assert/assert.go b/assert/assert.go index 9a57fb80..e5784a83 100644 --- a/assert/assert.go +++ b/assert/assert.go @@ -70,9 +70,9 @@ import ( "go/token" gocmp "github.com/google/go-cmp/cmp" - "gotest.tools/assert/cmp" - "gotest.tools/internal/format" - "gotest.tools/internal/source" + "gotest.tools/v3/assert/cmp" + "gotest.tools/v3/internal/format" + "gotest.tools/v3/internal/source" ) // BoolOrComparison can be a bool, or cmp.Comparison. See Assert() for usage. diff --git a/assert/assert_test.go b/assert/assert_test.go index d53d940d..890b206b 100644 --- a/assert/assert_test.go +++ b/assert/assert_test.go @@ -6,7 +6,7 @@ import ( "testing" gocmp "github.com/google/go-cmp/cmp" - "gotest.tools/assert/cmp" + "gotest.tools/v3/assert/cmp" ) type fakeTestingT struct { diff --git a/assert/cmd/gty-migrate-from-testify/call_test.go b/assert/cmd/gty-migrate-from-testify/call_test.go index 61746f51..aaf7cc9e 100644 --- a/assert/cmd/gty-migrate-from-testify/call_test.go +++ b/assert/cmd/gty-migrate-from-testify/call_test.go @@ -5,7 +5,7 @@ import ( "go/token" "testing" - "gotest.tools/assert" + "gotest.tools/v3/assert" ) func TestCall_String(t *testing.T) { diff --git a/assert/cmd/gty-migrate-from-testify/main_test.go b/assert/cmd/gty-migrate-from-testify/main_test.go index 73cdfc53..e5accbba 100644 --- a/assert/cmd/gty-migrate-from-testify/main_test.go +++ b/assert/cmd/gty-migrate-from-testify/main_test.go @@ -5,10 +5,10 @@ import ( "testing" "github.com/google/go-cmp/cmp" - "gotest.tools/assert" - "gotest.tools/env" - "gotest.tools/fs" - "gotest.tools/golden" + "gotest.tools/v3/assert" + "gotest.tools/v3/env" + "gotest.tools/v3/fs" + "gotest.tools/v3/golden" ) func TestRun(t *testing.T) { diff --git a/assert/cmd/gty-migrate-from-testify/migrate_test.go b/assert/cmd/gty-migrate-from-testify/migrate_test.go index 6dd8089e..4fbbb846 100644 --- a/assert/cmd/gty-migrate-from-testify/migrate_test.go +++ b/assert/cmd/gty-migrate-from-testify/migrate_test.go @@ -6,8 +6,8 @@ import ( "testing" "golang.org/x/tools/go/loader" - "gotest.tools/assert" - "gotest.tools/assert/cmp" + "gotest.tools/v3/assert" + "gotest.tools/v3/assert/cmp" ) func TestMigrateFileReplacesTestingT(t *testing.T) { diff --git a/assert/cmp/compare.go b/assert/cmp/compare.go index 24234e25..c6971e4f 100644 --- a/assert/cmp/compare.go +++ b/assert/cmp/compare.go @@ -8,7 +8,7 @@ import ( "strings" "github.com/google/go-cmp/cmp" - "gotest.tools/internal/format" + "gotest.tools/v3/internal/format" ) // Comparison is a function which compares values and returns ResultSuccess if diff --git a/assert/cmp/compare_test.go b/assert/cmp/compare_test.go index 7878b0bb..b3b3f8c7 100644 --- a/assert/cmp/compare_test.go +++ b/assert/cmp/compare_test.go @@ -313,7 +313,7 @@ func TestError(t *testing.T) { assertFailureHasPrefix(t, result, `expected error "the error message", got "wrapped: other" other -gotest.tools/assert/cmp.TestError`) +gotest.tools`) msg := "the message" result = Error(errors.New(msg), msg)() diff --git a/assert/cmp/result.go b/assert/cmp/result.go index 204edda4..385e1a08 100644 --- a/assert/cmp/result.go +++ b/assert/cmp/result.go @@ -6,7 +6,7 @@ import ( "go/ast" "text/template" - "gotest.tools/internal/source" + "gotest.tools/v3/internal/source" ) // A Result of a Comparison. diff --git a/assert/example_test.go b/assert/example_test.go index 0235c370..2abfe12e 100644 --- a/assert/example_test.go +++ b/assert/example_test.go @@ -5,8 +5,8 @@ import ( "regexp" "testing" - "gotest.tools/assert" - "gotest.tools/assert/cmp" + "gotest.tools/v3/assert" + "gotest.tools/v3/assert/cmp" ) var t = &testing.T{} diff --git a/assert/opt/opt_test.go b/assert/opt/opt_test.go index 878efbc9..c4a910c6 100644 --- a/assert/opt/opt_test.go +++ b/assert/opt/opt_test.go @@ -5,8 +5,8 @@ import ( "time" gocmp "github.com/google/go-cmp/cmp" - "gotest.tools/assert" - "gotest.tools/internal/source" + "gotest.tools/v3/assert" + "gotest.tools/v3/internal/source" ) func TestDurationWithThreshold(t *testing.T) { diff --git a/assert/result.go b/assert/result.go index 949d9396..d77860b5 100644 --- a/assert/result.go +++ b/assert/result.go @@ -4,9 +4,9 @@ import ( "fmt" "go/ast" - "gotest.tools/assert/cmp" - "gotest.tools/internal/format" - "gotest.tools/internal/source" + "gotest.tools/v3/assert/cmp" + "gotest.tools/v3/internal/format" + "gotest.tools/v3/internal/source" ) func runComparison( diff --git a/env/env.go b/env/env.go index 609d90e9..1e2a8fc2 100644 --- a/env/env.go +++ b/env/env.go @@ -7,8 +7,8 @@ import ( "os" "strings" - "gotest.tools/assert" - "gotest.tools/x/subtest" + "gotest.tools/v3/assert" + "gotest.tools/v3/x/subtest" ) type helperT interface { diff --git a/env/env_test.go b/env/env_test.go index 2c6073d3..5fef178b 100644 --- a/env/env_test.go +++ b/env/env_test.go @@ -6,9 +6,9 @@ import ( "sort" "testing" - "gotest.tools/assert" - "gotest.tools/fs" - "gotest.tools/skip" + "gotest.tools/v3/assert" + "gotest.tools/v3/fs" + "gotest.tools/v3/skip" ) func TestPatchFromUnset(t *testing.T) { diff --git a/fs/example_test.go b/fs/example_test.go index 98e7b487..09ea38df 100644 --- a/fs/example_test.go +++ b/fs/example_test.go @@ -5,10 +5,10 @@ import ( "os" "testing" - "gotest.tools/assert" - "gotest.tools/assert/cmp" - "gotest.tools/fs" - "gotest.tools/golden" + "gotest.tools/v3/assert" + "gotest.tools/v3/assert/cmp" + "gotest.tools/v3/fs" + "gotest.tools/v3/golden" ) var t = &testing.T{} diff --git a/fs/file.go b/fs/file.go index 7d0cab36..cc1cee30 100644 --- a/fs/file.go +++ b/fs/file.go @@ -10,8 +10,8 @@ import ( "runtime" "strings" - "gotest.tools/assert" - "gotest.tools/x/subtest" + "gotest.tools/v3/assert" + "gotest.tools/v3/x/subtest" ) // Path objects return their filesystem path. Path may be implemented by a diff --git a/fs/file_test.go b/fs/file_test.go index f3c891c4..f0235a40 100644 --- a/fs/file_test.go +++ b/fs/file_test.go @@ -4,8 +4,8 @@ import ( "os" "testing" - "gotest.tools/assert" - "gotest.tools/fs" + "gotest.tools/v3/assert" + "gotest.tools/v3/fs" ) func TestNewDirWithOpsAndManifestEqual(t *testing.T) { diff --git a/fs/manifest.go b/fs/manifest.go index e5e693e6..d3967563 100644 --- a/fs/manifest.go +++ b/fs/manifest.go @@ -7,7 +7,7 @@ import ( "path/filepath" "github.com/pkg/errors" - "gotest.tools/assert" + "gotest.tools/v3/assert" ) // Manifest stores the expected structure and properties of files and directories diff --git a/fs/manifest_test.go b/fs/manifest_test.go index 31086bbf..0b31c7f7 100644 --- a/fs/manifest_test.go +++ b/fs/manifest_test.go @@ -10,7 +10,7 @@ import ( "testing" "github.com/google/go-cmp/cmp" - "gotest.tools/assert" + "gotest.tools/v3/assert" ) func TestManifestFromDir(t *testing.T) { diff --git a/fs/ops.go b/fs/ops.go index c3c33587..476647af 100644 --- a/fs/ops.go +++ b/fs/ops.go @@ -10,7 +10,7 @@ import ( "time" "github.com/pkg/errors" - "gotest.tools/assert" + "gotest.tools/v3/assert" ) const defaultFileMode = 0644 diff --git a/fs/ops_test.go b/fs/ops_test.go index 5c7f0fea..90c01eeb 100644 --- a/fs/ops_test.go +++ b/fs/ops_test.go @@ -8,8 +8,8 @@ import ( "testing" "time" - "gotest.tools/assert" - "gotest.tools/fs" + "gotest.tools/v3/assert" + "gotest.tools/v3/fs" ) func TestFromDir(t *testing.T) { diff --git a/fs/path.go b/fs/path.go index d53306ec..c301b904 100644 --- a/fs/path.go +++ b/fs/path.go @@ -6,7 +6,7 @@ import ( "io/ioutil" "os" - "gotest.tools/assert" + "gotest.tools/v3/assert" ) // resourcePath is an adaptor for resources so they can be used as a Path diff --git a/fs/report.go b/fs/report.go index 7a1aa8ef..0b2d73d9 100644 --- a/fs/report.go +++ b/fs/report.go @@ -10,8 +10,8 @@ import ( "sort" "strings" - "gotest.tools/assert/cmp" - "gotest.tools/internal/format" + "gotest.tools/v3/assert/cmp" + "gotest.tools/v3/internal/format" ) // Equal compares a directory to the expected structured described by a manifest diff --git a/fs/report_test.go b/fs/report_test.go index 26cf4936..81c47dae 100644 --- a/fs/report_test.go +++ b/fs/report_test.go @@ -6,9 +6,9 @@ import ( "runtime" "testing" - "gotest.tools/assert" - is "gotest.tools/assert/cmp" - "gotest.tools/skip" + "gotest.tools/v3/assert" + is "gotest.tools/v3/assert/cmp" + "gotest.tools/v3/skip" ) func TestEqualMissingRoot(t *testing.T) { diff --git a/go.mod b/go.mod index b07c3b76..2fbdf945 100644 --- a/go.mod +++ b/go.mod @@ -1,4 +1,4 @@ -module gotest.tools +module gotest.tools/v3 require ( github.com/google/go-cmp v0.3.0 diff --git a/golden/example_test.go b/golden/example_test.go index f4806d28..7f9847e0 100644 --- a/golden/example_test.go +++ b/golden/example_test.go @@ -3,8 +3,8 @@ package golden_test import ( "testing" - "gotest.tools/assert" - "gotest.tools/golden" + "gotest.tools/v3/assert" + "gotest.tools/v3/golden" ) var t = &testing.T{} diff --git a/golden/golden.go b/golden/golden.go index 61d96f53..fd24119e 100644 --- a/golden/golden.go +++ b/golden/golden.go @@ -12,9 +12,9 @@ import ( "os" "path/filepath" - "gotest.tools/assert" - "gotest.tools/assert/cmp" - "gotest.tools/internal/format" + "gotest.tools/v3/assert" + "gotest.tools/v3/assert/cmp" + "gotest.tools/v3/internal/format" ) var flagUpdate = flag.Bool("test.update-golden", false, "update golden file") diff --git a/golden/golden_test.go b/golden/golden_test.go index 2eceb64e..28520845 100644 --- a/golden/golden_test.go +++ b/golden/golden_test.go @@ -6,9 +6,9 @@ import ( "path/filepath" "testing" - "gotest.tools/assert" - "gotest.tools/assert/cmp" - "gotest.tools/fs" + "gotest.tools/v3/assert" + "gotest.tools/v3/assert/cmp" + "gotest.tools/v3/fs" ) type fakeT struct { diff --git a/icmd/command.go b/icmd/command.go index 00d118c8..f41eb9d8 100644 --- a/icmd/command.go +++ b/icmd/command.go @@ -12,8 +12,8 @@ import ( "sync" "time" - "gotest.tools/assert" - "gotest.tools/assert/cmp" + "gotest.tools/v3/assert" + "gotest.tools/v3/assert/cmp" ) type helperT interface { diff --git a/icmd/command_test.go b/icmd/command_test.go index fbcafc89..485b2d60 100644 --- a/icmd/command_test.go +++ b/icmd/command_test.go @@ -10,10 +10,10 @@ import ( "testing" "time" - "gotest.tools/assert" - "gotest.tools/fs" - "gotest.tools/golden" - "gotest.tools/internal/maint" + "gotest.tools/v3/assert" + "gotest.tools/v3/fs" + "gotest.tools/v3/golden" + "gotest.tools/v3/internal/maint" ) var ( diff --git a/icmd/example_test.go b/icmd/example_test.go index 130ae203..216b82d5 100644 --- a/icmd/example_test.go +++ b/icmd/example_test.go @@ -3,7 +3,7 @@ package icmd_test import ( "testing" - "gotest.tools/icmd" + "gotest.tools/v3/icmd" ) var t = &testing.T{} diff --git a/internal/format/diff.go b/internal/format/diff.go index c938c97b..9897d4b9 100644 --- a/internal/format/diff.go +++ b/internal/format/diff.go @@ -6,7 +6,7 @@ import ( "strings" "unicode" - "gotest.tools/internal/difflib" + "gotest.tools/v3/internal/difflib" ) const ( diff --git a/internal/format/diff_test.go b/internal/format/diff_test.go index 5e0e541b..4986635b 100644 --- a/internal/format/diff_test.go +++ b/internal/format/diff_test.go @@ -3,9 +3,9 @@ package format_test import ( "testing" - "gotest.tools/assert" - "gotest.tools/golden" - "gotest.tools/internal/format" + "gotest.tools/v3/assert" + "gotest.tools/v3/golden" + "gotest.tools/v3/internal/format" ) func TestUnifiedDiff(t *testing.T) { diff --git a/internal/format/format_test.go b/internal/format/format_test.go index f0cb2b46..6404ad35 100644 --- a/internal/format/format_test.go +++ b/internal/format/format_test.go @@ -3,8 +3,8 @@ package format_test import ( "testing" - "gotest.tools/assert" - "gotest.tools/internal/format" + "gotest.tools/v3/assert" + "gotest.tools/v3/internal/format" ) func TestMessage(t *testing.T) { diff --git a/internal/source/source_test.go b/internal/source/source_test.go index 5b378d63..3c218194 100644 --- a/internal/source/source_test.go +++ b/internal/source/source_test.go @@ -9,9 +9,9 @@ import ( "strings" "testing" - "gotest.tools/assert" - "gotest.tools/internal/source" - "gotest.tools/skip" + "gotest.tools/v3/assert" + "gotest.tools/v3/internal/source" + "gotest.tools/v3/skip" ) func TestFormattedCallExprArg_SingleLine(t *testing.T) { diff --git a/poll/check_test.go b/poll/check_test.go index a9277d45..c8538380 100644 --- a/poll/check_test.go +++ b/poll/check_test.go @@ -5,7 +5,7 @@ import ( "os" "testing" - "gotest.tools/assert" + "gotest.tools/v3/assert" ) func TestWaitOnFile(t *testing.T) { diff --git a/poll/example_test.go b/poll/example_test.go index a80886dc..fd3ead6b 100644 --- a/poll/example_test.go +++ b/poll/example_test.go @@ -4,7 +4,7 @@ import ( "time" "github.com/pkg/errors" - "gotest.tools/poll" + "gotest.tools/v3/poll" ) var t poll.TestingT diff --git a/poll/poll_test.go b/poll/poll_test.go index 14d07312..286cf213 100644 --- a/poll/poll_test.go +++ b/poll/poll_test.go @@ -6,8 +6,8 @@ import ( "time" "github.com/pkg/errors" - "gotest.tools/assert" - "gotest.tools/assert/cmp" + "gotest.tools/v3/assert" + "gotest.tools/v3/assert/cmp" ) type fakeT struct { diff --git a/skip/example_test.go b/skip/example_test.go index 489ac972..31c2148e 100644 --- a/skip/example_test.go +++ b/skip/example_test.go @@ -3,7 +3,7 @@ package skip_test import ( "testing" - "gotest.tools/skip" + "gotest.tools/v3/skip" ) var apiVersion = "" diff --git a/skip/skip.go b/skip/skip.go index d27ca53c..53d1948f 100644 --- a/skip/skip.go +++ b/skip/skip.go @@ -10,8 +10,8 @@ import ( "runtime" "strings" - "gotest.tools/internal/format" - "gotest.tools/internal/source" + "gotest.tools/v3/internal/format" + "gotest.tools/v3/internal/source" ) type skipT interface { diff --git a/skip/skip_test.go b/skip/skip_test.go index 3fbd573e..49b4ddad 100644 --- a/skip/skip_test.go +++ b/skip/skip_test.go @@ -5,8 +5,8 @@ import ( "fmt" "testing" - "gotest.tools/assert" - "gotest.tools/assert/cmp" + "gotest.tools/v3/assert" + "gotest.tools/v3/assert/cmp" ) type fakeSkipT struct { diff --git a/x/subtest/context_test.go b/x/subtest/context_test.go index f452231a..56b316ee 100644 --- a/x/subtest/context_test.go +++ b/x/subtest/context_test.go @@ -4,7 +4,7 @@ import ( "context" "testing" - "gotest.tools/assert" + "gotest.tools/v3/assert" ) func TestTestcase_Run_CallsCleanup(t *testing.T) { diff --git a/x/subtest/example_test.go b/x/subtest/example_test.go index 2c7d40c3..b4365e04 100644 --- a/x/subtest/example_test.go +++ b/x/subtest/example_test.go @@ -6,8 +6,8 @@ import ( "strings" "testing" - "gotest.tools/assert" - "gotest.tools/x/subtest" + "gotest.tools/v3/assert" + "gotest.tools/v3/x/subtest" ) var t = &testing.T{}