Switch all import paths to pegomock/v3

petergtz · May 3, 2023 · f56fc82 · f56fc82
1 parent 8ea8c53
commit f56fc82
Show file tree

Hide file tree

Showing 42 changed files with 75 additions and 74 deletions.
diff --git a/dsl.go b/dsl.go
@@ -24,7 +24,7 @@ import (
 	"time"
 
 	"github.com/onsi/gomega/format"
-	"github.com/petergtz/pegomock/internal/verify"
+	"github.com/petergtz/pegomock/v3/internal/verify"
 )
 
 var GlobalFailHandler FailHandler

diff --git a/dsl_test.go b/dsl_test.go
@@ -23,13 +23,13 @@ import (
 	"testing"
 	"time"
 
-	. "github.com/petergtz/pegomock"
-	. "github.com/petergtz/pegomock/matchers"
+	. "github.com/petergtz/pegomock/v3"
+	. "github.com/petergtz/pegomock/v3/matchers"
 
 	"github.com/onsi/ginkgo/v2"
 	"github.com/onsi/gomega"
-	"github.com/petergtz/pegomock"
-	"github.com/petergtz/pegomock/test_interface"
+	"github.com/petergtz/pegomock/v3"
+	"github.com/petergtz/pegomock/v3/test_interface"
 )
 
 var (
@@ -211,7 +211,7 @@ var _ = Describe("MockDisplay", func() {
 		})
 	})
 
-	Describe("https://github.com/petergtz/pegomock/issues/24", func() {
+	Describe("https://github.com/petergtz/pegomock/v3/issues/24", func() {
 		Context("Stubbing with nil value", func() {
 			It("does not panic when return type is interface{}", func() {
 				When(display.InterfaceReturnValue()).ThenReturn(nil)
@@ -359,7 +359,7 @@ var _ = Describe("MockDisplay", func() {
 
 		Context("Never calling Flash", func() {
 			It("succeeds during verification when using Never() and argument matchers", func() {
-				// https://github.com/petergtz/pegomock/issues/34
+				// https://github.com/petergtz/pegomock/v3/issues/34
 				Expect(func() { display.VerifyWasCalled(Never()).Flash(AnyString(), AnyInt()) }).NotTo(Panic())
 			})
 		})

diff --git a/generate_test_mocks/gomock_reflect/generate_test.go b/generate_test_mocks/gomock_reflect/generate_test.go
@@ -19,14 +19,14 @@ import (
 	"testing"
 
 	. "github.com/onsi/ginkgo/v2"
-	"github.com/petergtz/pegomock/pegomock/filehandling"
+	"github.com/petergtz/pegomock/v3/pegomock/filehandling"
 )
 
 func TestMockGeneration(t *testing.T) { RunSpecs(t, "Generating mocks with GoMock-reflect") }
 
 var _ = It("Generate mocks", func() {
 	filehandling.GenerateMockFile(
-		[]string{"github.com/petergtz/pegomock/test_interface", "Display"},
+		[]string{"github.com/petergtz/pegomock/v3/test_interface", "Display"},
 		"../../mock_display_test.go", "MockDisplay", "pegomock_test",
 		"", false, os.Stdout, false, true, "")
 })
diff --git a/generate_test_mocks/gomock_source/generate_test.go b/generate_test_mocks/gomock_source/generate_test.go
@@ -19,7 +19,7 @@ import (
 	"testing"
 
 	. "github.com/onsi/ginkgo/v2"
-	"github.com/petergtz/pegomock/pegomock/filehandling"
+	"github.com/petergtz/pegomock/v3/pegomock/filehandling"
 )
 
 func TestMockGeneration(t *testing.T) { RunSpecs(t, "Generating mocks with GoMock-source") }

diff --git a/generate_test_mocks/xtools_go_loader/generate_test.go b/generate_test_mocks/xtools_go_loader/generate_test.go
@@ -19,7 +19,7 @@ import (
 	"testing"
 
 	. "github.com/onsi/ginkgo/v2"
-	"github.com/petergtz/pegomock/pegomock/filehandling"
+	"github.com/petergtz/pegomock/v3/pegomock/filehandling"
 )
 
 func TestMockGeneration(t *testing.T) {
@@ -28,7 +28,7 @@ func TestMockGeneration(t *testing.T) {
 
 var _ = It("Generate mocks", func() {
 	filehandling.GenerateMockFile(
-		[]string{"github.com/petergtz/pegomock/test_interface", "Display"},
+		[]string{"github.com/petergtz/pegomock/v3/test_interface", "Display"},
 		"../../mock_display_test.go", "MockDisplay", "pegomock_test",
 		"", false, os.Stdout, true, true, "")
 })
diff --git a/ginkgo_compatible/in_order_context.go b/ginkgo_compatible/in_order_context.go
@@ -1,5 +1,5 @@
 package mock
 
-import "github.com/petergtz/pegomock"
+import "github.com/petergtz/pegomock/v3"
 
 type InOrderContext = pegomock.InOrderContext
diff --git a/ginkgo_compatible/matchers.go b/ginkgo_compatible/matchers.go
@@ -1,7 +1,7 @@
 package mock
 
 import (
-	"github.com/petergtz/pegomock"
+	"github.com/petergtz/pegomock/v3"
 )
 
 var (

diff --git a/ginkgo_compatible/option.go b/ginkgo_compatible/option.go
@@ -1,7 +1,7 @@
 package mock
 
 import (
-	"github.com/petergtz/pegomock"
+	"github.com/petergtz/pegomock/v3"
 )
 
 var OptionWithT = pegomock.WithT
diff --git a/ginkgo_compatible/whenever.go b/ginkgo_compatible/whenever.go
@@ -1,7 +1,7 @@
 package mock
 
 import (
-	"github.com/petergtz/pegomock"
+	"github.com/petergtz/pegomock/v3"
 )
 
 var Whenever = pegomock.When
diff --git a/go.mod b/go.mod
@@ -1,4 +1,4 @@
-module github.com/petergtz/pegomock
+module github.com/petergtz/pegomock/v3
 
 go 1.18
 

diff --git a/internal/generate_matchers/matcher_generation.go b/internal/generate_matchers/matcher_generation.go
@@ -9,7 +9,7 @@ import (
 
 // Generate matchers:
 //
-//     go generate github.com/petergtz/pegomock/internal/generate_matchers
+//     go generate github.com/petergtz/pegomock/v3/internal/generate_matchers
 
 //go:generate go run matcher_generation.go
 //go:generate go fmt ../../matcher_factories.go
@@ -127,7 +127,7 @@ func GenerateGinkgoMatchersFile() string {
 	contents := `package mock
 
 import (
-	"github.com/petergtz/pegomock"
+	"github.com/petergtz/pegomock/v3"
 )
 
 var (`

diff --git a/matcher.go b/matcher.go
@@ -4,8 +4,9 @@ import (
 	"fmt"
 	"reflect"
 
-	"github.com/petergtz/pegomock/internal/verify"
 	"sync"
+
+	"github.com/petergtz/pegomock/v3/internal/verify"
 )
 
 type EqMatcher struct {

diff --git a/matchers/http_request.go b/matchers/http_request.go
diff --git a/matchers/io_readcloser.go b/matchers/io_readcloser.go
diff --git a/matchers/map_of_http_file_to_http_file.go b/matchers/map_of_http_file_to_http_file.go
diff --git a/matchers/map_of_int_to_int.go b/matchers/map_of_int_to_int.go
diff --git a/matchers/map_of_string_to_empty_unnamed_struct.go b/matchers/map_of_string_to_empty_unnamed_struct.go
diff --git a/matchers/map_of_string_to_http_request.go b/matchers/map_of_string_to_http_request.go
diff --git a/matchers/map_of_string_to_interface.go b/matchers/map_of_string_to_interface.go
diff --git a/matchers/ptr_to_http_request.go b/matchers/ptr_to_http_request.go
diff --git a/matchers/recv_chan_of_string.go b/matchers/recv_chan_of_string.go
diff --git a/matchers/send_chan_of_error.go b/matchers/send_chan_of_error.go
diff --git a/matchers/slice_of_string.go b/matchers/slice_of_string.go
diff --git a/matchers/time_time.go b/matchers/time_time.go
diff --git a/mockgen/mockgen.go b/mockgen/mockgen.go
@@ -31,12 +31,12 @@ import (
 	"strings"
 	"unicode"
 
-	"github.com/petergtz/pegomock/mockgen/util"
+	"github.com/petergtz/pegomock/v3/mockgen/util"
 
-	"github.com/petergtz/pegomock/model"
+	"github.com/petergtz/pegomock/v3/model"
 )
 
-const mockFrameworkImportPath = "github.com/petergtz/pegomock"
+const mockFrameworkImportPath = "github.com/petergtz/pegomock/v3"
 
 func GenerateOutput(ast *model.Package, source, nameOut, packageOut, selfPackage string) ([]byte, map[string]string) {
 	g := generator{typesSet: make(map[string]string)}
@@ -436,7 +436,7 @@ func generateMatcherSourceCode(t model.Type, packageMap map[string]string) strin
 package matchers
 
 import (
-	"github.com/petergtz/pegomock"
+	"github.com/petergtz/pegomock/v3"
 	"reflect"%v
 )
 

diff --git a/mockgen/mockgen_test.go b/mockgen/mockgen_test.go
@@ -1,8 +1,8 @@
 package mockgen_test
 
 import (
-	"github.com/petergtz/pegomock/mockgen"
-	"github.com/petergtz/pegomock/modelgen/loader"
+	"github.com/petergtz/pegomock/v3/mockgen"
+	"github.com/petergtz/pegomock/v3/modelgen/loader"
 
 	. "github.com/onsi/ginkgo/v2"
 	. "github.com/onsi/gomega"
@@ -11,7 +11,7 @@ import (
 var _ = Describe("Mockgen", func() {
 	Context("matcherSourceCodes", func() {
 		It("uses correct naming pattern with underscores for keys, and correct types etc. in source code", func() {
-			ast, e := loader.GenerateModel("github.com/petergtz/pegomock/test_interface", "Display")
+			ast, e := loader.GenerateModel("github.com/petergtz/pegomock/v3/test_interface", "Display")
 			Expect(e).NotTo(HaveOccurred())
 			_, matcherSourceCodes := mockgen.GenerateOutput(ast, "irrelevant", "MockDisplay", "test_package", "")
 

diff --git a/mockgen/util/util_test.go b/mockgen/util/util_test.go
@@ -7,7 +7,7 @@ import (
 	. "github.com/onsi/ginkgo/v2"
 	"github.com/onsi/gomega"
 	. "github.com/onsi/gomega"
-	"github.com/petergtz/pegomock/mockgen/util"
+	"github.com/petergtz/pegomock/v3/mockgen/util"
 )
 
 func TestUtil(t *testing.T) {

diff --git a/modelgen/gomock/parse.go b/modelgen/gomock/parse.go
@@ -27,7 +27,7 @@ import (
 	"strconv"
 	"strings"
 
-	"github.com/petergtz/pegomock/model"
+	"github.com/petergtz/pegomock/v3/model"
 )
 
 var (

diff --git a/modelgen/gomock/reflect.go b/modelgen/gomock/reflect.go
@@ -29,7 +29,7 @@ import (
 	"runtime"
 	"text/template"
 
-	"github.com/petergtz/pegomock/model"
+	"github.com/petergtz/pegomock/v3/model"
 )
 
 var (
@@ -120,8 +120,8 @@ import (
 	"path"
 	"reflect"
 
-	"github.com/petergtz/pegomock/model"
-	"github.com/petergtz/pegomock/modelgen/gomock"
+	"github.com/petergtz/pegomock/v3/model"
+	"github.com/petergtz/pegomock/v3/modelgen/gomock"
 
 	pkg_ {{printf "%q" .ImportPath}}
 )

diff --git a/modelgen/gomock/reflect_helpers.go b/modelgen/gomock/reflect_helpers.go
@@ -5,7 +5,7 @@ import (
 	"fmt"
 	"reflect"
 
-	"github.com/petergtz/pegomock/model"
+	"github.com/petergtz/pegomock/v3/model"
 )
 
 func init() {

diff --git a/modelgen/gomock/reflect_test.go b/modelgen/gomock/reflect_test.go
@@ -9,7 +9,7 @@ import (
 	. "github.com/onsi/ginkgo/v2"
 	"github.com/onsi/gomega"
 	. "github.com/onsi/gomega"
-	"github.com/petergtz/pegomock/modelgen/gomock"
+	"github.com/petergtz/pegomock/v3/modelgen/gomock"
 )
 
 func TestGomock(t *testing.T) {

diff --git a/modelgen/loader/loader.go b/modelgen/loader/loader.go
@@ -6,7 +6,7 @@ import (
 	"go/ast"
 	"go/types"
 
-	"github.com/petergtz/pegomock/model"
+	"github.com/petergtz/pegomock/v3/model"
 	"golang.org/x/tools/go/loader"
 )
 

diff --git a/modelgen/loader/loader_test.go b/modelgen/loader/loader_test.go
@@ -4,7 +4,7 @@ import (
 	. "github.com/onsi/ginkgo/v2"
 	. "github.com/onsi/gomega"
 
-	. "github.com/petergtz/pegomock/modelgen/loader"
+	. "github.com/petergtz/pegomock/v3/modelgen/loader"
 )
 
 var _ = Describe("Loader", func() {