Replace bmizerany/assert with internal/assert

lufia · lufia · commit 95f8bb72beb7 · 2020-04-03T16:54:01.000+09:00
diff --git a/cmd/cmd_test.go b/cmd/cmd_test.go
@@ -3,7 +3,7 @@ package cmd
 import (
 	"testing"
 
-	"github.com/bmizerany/assert"
+	"github.com/github/hub/internal/assert"
 )
 
 func TestNew(t *testing.T) {
diff --git a/commands/args_test.go b/commands/args_test.go
@@ -3,7 +3,7 @@ package commands
 import (
 	"testing"
 
-	"github.com/bmizerany/assert"
+	"github.com/github/hub/internal/assert"
 )
 
 func TestNewArgs(t *testing.T) {
diff --git a/commands/commands_test.go b/commands/commands_test.go
@@ -6,7 +6,7 @@ import (
 	"regexp"
 	"testing"
 
-	"github.com/bmizerany/assert"
+	"github.com/github/hub/internal/assert"
 	"github.com/github/hub/ui"
 )
 
diff --git a/commands/compare_test.go b/commands/compare_test.go
@@ -1,7 +1,7 @@
 package commands
 
 import (
-	"github.com/bmizerany/assert"
+	"github.com/github/hub/internal/assert"
 	"testing"
 )
 
diff --git a/commands/fetch_test.go b/commands/fetch_test.go
@@ -1,7 +1,7 @@
 package commands
 
 import (
-	"github.com/bmizerany/assert"
+	"github.com/github/hub/internal/assert"
 	"testing"
 )
 
diff --git a/commands/init_test.go b/commands/init_test.go
@@ -6,8 +6,8 @@ import (
 	"path/filepath"
 	"testing"
 
-	"github.com/bmizerany/assert"
 	"github.com/github/hub/github"
+	"github.com/github/hub/internal/assert"
 )
 
 func setupInitContext() {
diff --git a/commands/issue_test.go b/commands/issue_test.go
@@ -16,6 +16,7 @@ type formatIssueTest struct {
 }
 
 func testFormatIssue(t *testing.T, tests []formatIssueTest) {
+	t.Helper()
 	for _, test := range tests {
 		if got := formatIssue(test.issue, test.format, test.colorize); got != test.expect {
 			t.Errorf("%s: formatIssue(..., %q, %t) = %q, want %q", test.name, test.format, test.colorize, got, test.expect)
diff --git a/commands/pull_request_test.go b/commands/pull_request_test.go
@@ -3,8 +3,8 @@ package commands
 import (
 	"testing"
 
-	"github.com/bmizerany/assert"
 	"github.com/github/hub/github"
+	"github.com/github/hub/internal/assert"
 )
 
 func TestPullRequest_ParsePullRequestProject(t *testing.T) {
diff --git a/commands/push_test.go b/commands/push_test.go
@@ -1,7 +1,7 @@
 package commands
 
 import (
-	"github.com/bmizerany/assert"
+	"github.com/github/hub/internal/assert"
 	"testing"
 )
 
diff --git a/commands/remote_test.go b/commands/remote_test.go
@@ -5,9 +5,9 @@ import (
 	"regexp"
 	"testing"
 
-	"github.com/bmizerany/assert"
 	"github.com/github/hub/fixtures"
 	"github.com/github/hub/github"
+	"github.com/github/hub/internal/assert"
 )
 
 func TestTransformRemoteArgs(t *testing.T) {
diff --git a/commands/runner_test.go b/commands/runner_test.go
@@ -3,7 +3,7 @@ package commands
 import (
 	"testing"
 
-	"github.com/bmizerany/assert"
+	"github.com/github/hub/internal/assert"
 )
 
 func TestRunner_splitAliasCmd(t *testing.T) {
diff --git a/commands/utils_test.go b/commands/utils_test.go
@@ -5,7 +5,7 @@ import (
 	"os"
 	"testing"
 
-	"github.com/bmizerany/assert"
+	"github.com/github/hub/internal/assert"
 )
 
 func TestDirIsNotEmpty(t *testing.T) {
diff --git a/git/git_test.go b/git/git_test.go
@@ -6,8 +6,8 @@ import (
 	"strings"
 	"testing"
 
-	"github.com/bmizerany/assert"
 	"github.com/github/hub/fixtures"
+	"github.com/github/hub/internal/assert"
 )
 
 func TestGitDir(t *testing.T) {
diff --git a/git/ssh_config_test.go b/git/ssh_config_test.go
@@ -5,7 +5,7 @@ import (
 	"os"
 	"testing"
 
-	"github.com/bmizerany/assert"
+	"github.com/github/hub/internal/assert"
 )
 
 func TestSSHConfigReader_Read(t *testing.T) {
diff --git a/git/url_test.go b/git/url_test.go
@@ -3,7 +3,7 @@ package git
 import (
 	"testing"
 
-	"github.com/bmizerany/assert"
+	"github.com/github/hub/internal/assert"
 )
 
 func createURLParser() *URLParser {
diff --git a/github/branch_test.go b/github/branch_test.go
@@ -3,7 +3,7 @@ package github
 import (
 	"testing"
 
-	"github.com/bmizerany/assert"
+	"github.com/github/hub/internal/assert"
 )
 
 func TestBranch_ShortName(t *testing.T) {
diff --git a/github/client_test.go b/github/client_test.go
@@ -6,7 +6,7 @@ import (
 	"regexp"
 	"testing"
 
-	"github.com/bmizerany/assert"
+	"github.com/github/hub/internal/assert"
 )
 
 func TestClient_FormatError(t *testing.T) {
diff --git a/github/config_service_test.go b/github/config_service_test.go
@@ -6,8 +6,8 @@ import (
 	"strings"
 	"testing"
 
-	"github.com/bmizerany/assert"
 	"github.com/github/hub/fixtures"
+	"github.com/github/hub/internal/assert"
 )
 
 func TestConfigService_TomlLoad(t *testing.T) {
diff --git a/github/crash_report_test.go b/github/crash_report_test.go
@@ -3,7 +3,7 @@ package github
 import (
 	"testing"
 
-	"github.com/bmizerany/assert"
+	"github.com/github/hub/internal/assert"
 )
 
 func TestStackRemoveSelfAndPanic(t *testing.T) {
diff --git a/github/editor_test.go b/github/editor_test.go
@@ -6,7 +6,7 @@ import (
 	"os"
 	"testing"
 
-	"github.com/bmizerany/assert"
+	"github.com/github/hub/internal/assert"
 )
 
 func TestEditor_openAndEdit_deleteFileWhenOpeningEditorFails(t *testing.T) {
diff --git a/github/http_test.go b/github/http_test.go
@@ -12,7 +12,7 @@ import (
 	"os"
 	"testing"
 
-	"github.com/bmizerany/assert"
+	"github.com/github/hub/internal/assert"
 )
 
 func setupTestServer(unixSocket string) *testServer {
diff --git a/github/localrepo_test.go b/github/localrepo_test.go
@@ -4,7 +4,7 @@ import (
 	"net/url"
 	"testing"
 
-	"github.com/bmizerany/assert"
+	"github.com/github/hub/internal/assert"
 )
 
 func TestGitHubRepo_remotesForPublish(t *testing.T) {
diff --git a/github/message_builder_test.go b/github/message_builder_test.go
@@ -3,7 +3,7 @@ package github
 import (
 	"testing"
 
-	"github.com/bmizerany/assert"
+	"github.com/github/hub/internal/assert"
 )
 
 func TestMessageBuilder_multiline_title(t *testing.T) {
diff --git a/github/project_test.go b/github/project_test.go
@@ -5,8 +5,8 @@ import (
 	"os"
 	"testing"
 
-	"github.com/bmizerany/assert"
 	"github.com/github/hub/fixtures"
+	"github.com/github/hub/internal/assert"
 )
 
 func TestSameAs(t *testing.T) {
diff --git a/github/remote_test.go b/github/remote_test.go
@@ -3,8 +3,8 @@ package github
 import (
 	"testing"
 
-	"github.com/bmizerany/assert"
 	"github.com/github/hub/fixtures"
+	"github.com/github/hub/internal/assert"
 )
 
 func TestGithubRemote_NoPush(t *testing.T) {
diff --git a/github/template_test.go b/github/template_test.go
@@ -5,8 +5,8 @@ import (
 	"path/filepath"
 	"testing"
 
-	"github.com/bmizerany/assert"
 	"github.com/github/hub/fixtures"
+	"github.com/github/hub/internal/assert"
 )
 
 var prContent = `Description
diff --git a/github/url_test.go b/github/url_test.go
@@ -3,8 +3,8 @@ package github
 import (
 	"testing"
 
-	"github.com/bmizerany/assert"
 	"github.com/github/hub/fixtures"
+	"github.com/github/hub/internal/assert"
 )
 
 func TestParseURL(t *testing.T) {
diff --git a/go.mod b/go.mod
@@ -5,10 +5,8 @@ go 1.11
 require (
 	github.com/BurntSushi/toml v0.3.0
 	github.com/atotto/clipboard v0.0.0-20171229224153-bc5958e1c833
-	github.com/bmizerany/assert v0.0.0-20160611221934-b7ed37b82869
+	github.com/google/go-cmp v0.4.0
 	github.com/kballard/go-shellquote v0.0.0-20170619183022-cd60e84ee657
-	github.com/kr/pretty v0.0.0-20160823170715-cfb55aafdaf3 // indirect
-	github.com/kr/text v0.0.0-20160504234017-7cafcd837844 // indirect
 	github.com/mattn/go-colorable v0.0.9
 	github.com/mattn/go-isatty v0.0.3
 	github.com/mitchellh/go-homedir v0.0.0-20161203194507-b8bc1bf76747
diff --git a/go.sum b/go.sum
@@ -2,15 +2,10 @@ github.com/BurntSushi/toml v0.3.0 h1:e1/Ivsx3Z0FVTV0NSOv/aVgbUWyQuzj7DDnFblkRvsY
 github.com/BurntSushi/toml v0.3.0/go.mod h1:xHWCNGjB5oqiDr8zfno3MHue2Ht5sIBksp03qcyfWMU=
 github.com/atotto/clipboard v0.0.0-20171229224153-bc5958e1c833 h1:h/E5ryZTJAtOY6T3K6u/JA1OURt0nk1C4fITywxOp4E=
 github.com/atotto/clipboard v0.0.0-20171229224153-bc5958e1c833/go.mod h1:ZY9tmq7sm5xIbd9bOK4onWV4S6X0u6GY7Vn0Yu86PYI=
-github.com/bmizerany/assert v0.0.0-20160611221934-b7ed37b82869 h1:DDGfHa7BWjL4YnC6+E63dPcxHo2sUxDIu8g3QgEJdRY=
-github.com/bmizerany/assert v0.0.0-20160611221934-b7ed37b82869/go.mod h1:Ekp36dRnpXw/yCqJaO+ZrUyxD+3VXMFFr56k5XYrpB4=
 github.com/google/go-cmp v0.4.0 h1:xsAVV57WRhGj6kEIi8ReJzQlHHqcBYCElAvkovg3B/4=
+github.com/google/go-cmp v0.4.0/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE=
 github.com/kballard/go-shellquote v0.0.0-20170619183022-cd60e84ee657 h1:vE7J1m7cCpiRVEIr1B5ccDxRpbPsWT5JU3if2Di5nE4=
 github.com/kballard/go-shellquote v0.0.0-20170619183022-cd60e84ee657/go.mod h1:CzGEWj7cYgsdH8dAjBGEr58BoE7ScuLd+fwFZ44+/x8=
-github.com/kr/pretty v0.0.0-20160823170715-cfb55aafdaf3 h1:dhwb1Ev84SKKVBfLuhR4bw/29yYHzwtTyTLUWWnvYxI=
-github.com/kr/pretty v0.0.0-20160823170715-cfb55aafdaf3/go.mod h1:Bvhd+E3laJ0AVkG0c9rmtZcnhV0HQ3+c3YxxqTvc/gA=
-github.com/kr/text v0.0.0-20160504234017-7cafcd837844 h1:kpzneEBeC0dMewP3gr/fADv1OlblH9r1goWVwpOt3TU=
-github.com/kr/text v0.0.0-20160504234017-7cafcd837844/go.mod h1:sjUstKUATFIcff4qlB53Kml0wQPtJVc/3fWrmuUmcfA=
 github.com/mattn/go-colorable v0.0.9 h1:UVL0vNpWh04HeJXV0KLcaT7r06gOH2l4OW6ddYRUIY4=
 github.com/mattn/go-colorable v0.0.9/go.mod h1:9vuHe8Xs5qXnSaW/c/ABM9alt+Vo+STaOChaDxuIBZU=
 github.com/mattn/go-isatty v0.0.3 h1:ns/ykhmWi7G9O+8a448SecJU3nSMBXJfqQkl0upE1jI=
@@ -21,8 +16,6 @@ github.com/russross/blackfriday v0.0.0-20180526075726-670777b536d3 h1:vZXiDtLzqE
 github.com/russross/blackfriday v0.0.0-20180526075726-670777b536d3/go.mod h1:JO/DiYxRf+HjHt06OyowR9PTA263kcR/rfWxYHBV53g=
 github.com/shurcooL/sanitized_anchor_name v0.0.0-20170918181015-86672fcb3f95 h1:/vdW8Cb7EXrkqWGufVMES1OH2sU9gKVb2n9/1y5NMBY=
 github.com/shurcooL/sanitized_anchor_name v0.0.0-20170918181015-86672fcb3f95/go.mod h1:1NzhyTcUVG4SuEtjjoZeVRXNmyL/1OwPU0+IJeTBvfc=
-golang.org/x/crypto v0.0.0-20180127211104-1875d0a70c90 h1:DNyuYmiOz3AH2rGH1n4YsZUvxVhkeMvSs8s31jiWpm0=
-golang.org/x/crypto v0.0.0-20180127211104-1875d0a70c90/go.mod h1:6SG95UA2DQfeDnfUPMdvaQW0Q7yPrPDi9nlGo2tz2b4=
 golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2 h1:VklqNMn3ovrHsnt90PveolxSbWFaJdECFbxSq0Mqo2M=
 golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w=
 golang.org/x/net v0.0.0-20191002035440-2ec189313ef0 h1:2mqDk8w/o6UmeUCu5Qiq2y7iMf6anbx+YA8d1JFoFrs=
@@ -32,6 +25,8 @@ golang.org/x/sys v0.0.0-20190531175056-4c3a928424d2 h1:T5DasATyLQfmbTpfEXx/IOL9v
 golang.org/x/sys v0.0.0-20190531175056-4c3a928424d2/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/text v0.3.0 h1:g61tztE5qeGQ89tm6NTjjM9VPIm088od1l6aSorWRWg=
 golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
+golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543 h1:E7g+9GITq07hpfrRu66IVDexMakfv52eLZ2CXBWiKr4=
+golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
 gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405 h1:yhCVgyC4o1eVCa2tZl7eS0r+SDo693bJlVdllGtEeKM=
 gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
 gopkg.in/yaml.v2 v2.0.0-20190319135612-7b8349ac747c h1:nsJYChHWxeFA6+48RmvBXEvQNanNyh933kZYWiu2HBE=
diff --git a/utils/utils_test.go b/utils/utils_test.go
@@ -1,7 +1,7 @@
 package utils
 
 import (
-	"github.com/bmizerany/assert"
+	"github.com/github/hub/internal/assert"
 	"testing"
 	"time"
 )

Original file line number	Diff line number	Diff line change
`@@ -3,7 +3,7 @@ package cmd`
`3`	`3`	`import (`
`4`	`4`	`"testing"`
`5`	`5`
`6`		`- "github.com/bmizerany/assert"`
	`6`	`+ "github.com/github/hub/internal/assert"`
`7`	`7`	`)`
`8`	`8`
`9`	`9`	`func TestNew(t *testing.T) {`
Original file line number	Diff line number	Diff line change
`@@ -3,7 +3,7 @@ package commands`
`3`	`3`	`import (`
`4`	`4`	`"testing"`
`5`	`5`
`6`		`- "github.com/bmizerany/assert"`
	`6`	`+ "github.com/github/hub/internal/assert"`
`7`	`7`	`)`
`8`	`8`
`9`	`9`	`func TestNewArgs(t *testing.T) {`
Original file line number	Diff line number	Diff line change
`@@ -6,7 +6,7 @@ import (`
`6`	`6`	`"regexp"`
`7`	`7`	`"testing"`
`8`	`8`
`9`		`- "github.com/bmizerany/assert"`
	`9`	`+ "github.com/github/hub/internal/assert"`
`10`	`10`	`"github.com/github/hub/ui"`
`11`	`11`	`)`
`12`	`12`
Original file line number	Diff line number	Diff line change
`@@ -1,7 +1,7 @@`
`1`	`1`	`package commands`
`2`	`2`
`3`	`3`	`import (`
`4`		`- "github.com/bmizerany/assert"`
	`4`	`+ "github.com/github/hub/internal/assert"`
`5`	`5`	`"testing"`
`6`	`6`	`)`
`7`	`7`
Original file line number	Diff line number	Diff line change
`@@ -6,8 +6,8 @@ import (`
`6`	`6`	`"path/filepath"`
`7`	`7`	`"testing"`
`8`	`8`
`9`		`- "github.com/bmizerany/assert"`
`10`	`9`	`"github.com/github/hub/github"`
	`10`	`+ "github.com/github/hub/internal/assert"`
`11`	`11`	`)`
`12`	`12`
`13`	`13`	`func setupInitContext() {`
Original file line number	Diff line number	Diff line change
`@@ -16,6 +16,7 @@ type formatIssueTest struct {`
`16`	`16`	`}`
`17`	`17`
`18`	`18`	`func testFormatIssue(t *testing.T, tests []formatIssueTest) {`
	`19`	`+ t.Helper()`
`19`	`20`	`for _, test := range tests {`
`20`	`21`	`if got := formatIssue(test.issue, test.format, test.colorize); got != test.expect {`
`21`	`22`	`t.Errorf("%s: formatIssue(..., %q, %t) = %q, want %q", test.name, test.format, test.colorize, got, test.expect)`
Original file line number	Diff line number	Diff line change
`@@ -3,8 +3,8 @@ package commands`
`3`	`3`	`import (`
`4`	`4`	`"testing"`
`5`	`5`
`6`		`- "github.com/bmizerany/assert"`
`7`	`6`	`"github.com/github/hub/github"`
	`7`	`+ "github.com/github/hub/internal/assert"`
`8`	`8`	`)`
`9`	`9`
`10`	`10`	`func TestPullRequest_ParsePullRequestProject(t *testing.T) {`
Original file line number	Diff line number	Diff line change
`@@ -5,9 +5,9 @@ import (`
`5`	`5`	`"regexp"`
`6`	`6`	`"testing"`
`7`	`7`
`8`		`- "github.com/bmizerany/assert"`
`9`	`8`	`"github.com/github/hub/fixtures"`
`10`	`9`	`"github.com/github/hub/github"`
	`10`	`+ "github.com/github/hub/internal/assert"`
`11`	`11`	`)`
`12`	`12`
`13`	`13`	`func TestTransformRemoteArgs(t *testing.T) {`