Merge pull request #39 from mtlynch/no-mockgen

0x2E · web-flow · commit 6f3ac27a7b18 · 2024-12-27T17:16:08.000+08:00
Delete mockgen mocks
diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
@@ -15,6 +15,4 @@ jobs:
         with:
           go-version: "1.23"
       - name: Test
-        run: |
-          go install go.uber.org/mock/mockgen@latest
-          ./scripts.sh test
+        run: ./scripts.sh test
diff --git a/go.mod b/go.mod
@@ -15,7 +15,6 @@ require (
 	github.com/labstack/echo/v4 v4.12.0
 	github.com/mmcdole/gofeed v1.3.0
 	github.com/stretchr/testify v1.9.0
-	go.uber.org/mock v0.4.0
 	go.uber.org/zap v1.27.0
 	gorm.io/gorm v1.25.12
 	gorm.io/plugin/soft_delete v1.2.1
diff --git a/go.sum b/go.sum
@@ -102,8 +102,6 @@ github.com/valyala/fasttemplate v1.2.2/go.mod h1:KHLXt3tVN2HBp8eijSv/kGJopbvo7S+
 github.com/yuin/goldmark v1.4.13/go.mod h1:6yULJ656Px+3vBD8DxQVa3kxgyrAnzto9xy5taEt/CY=
 go.uber.org/goleak v1.3.0 h1:2K3zAYmnTNqV73imy9J1T3WC+gmCePx2hEGkimedGto=
 go.uber.org/goleak v1.3.0/go.mod h1:CoHD4mav9JJNrW/WLlf7HGZPjdw8EucARQHekz1X6bE=
-go.uber.org/mock v0.4.0 h1:VcM4ZOtdbR4f6VXfiOpwpVJDL6lCReaZ6mw31wqh7KU=
-go.uber.org/mock v0.4.0/go.mod h1:a6FSlNadKUHUa9IP5Vyt1zh4fC7uAwxMutEAscFbkZc=
 go.uber.org/multierr v1.11.0 h1:blXXJkSxSSfBVBlC76pxqeO+LN3aDfLQo+309xJstO0=
 go.uber.org/multierr v1.11.0/go.mod h1:20+QtiLqy0Nd6FdQB9TLXag12DsQkrbs3htMFfDN80Y=
 go.uber.org/zap v1.27.0 h1:aJMhYGrd5QSmlpLMr2MftRKl7t8J8PTZPA732ud/XR8=
diff --git a/server/feed.go b/server/feed.go
@@ -13,8 +13,6 @@ import (
 	"github.com/0x2e/fusion/service/sniff"
 )
 
-//go:generate mockgen -destination=feed_mock.go -source=feed.go -package=server
-
 type FeedRepo interface {
 	List(filter *repo.FeedListFilter) ([]*model.Feed, error)
 	Get(id uint) (*model.Feed, error)
diff --git a/server/feed_mock.go b/server/feed_mock.go
diff --git a/server/group.go b/server/group.go
@@ -9,8 +9,6 @@ import (
 	"github.com/0x2e/fusion/repo"
 )
 
-//go:generate mockgen -destination=group_mock.go -source=group.go -package=server
-
 type GroupRepo interface {
 	All() ([]*model.Group, error)
 	Create(group *model.Group) error
diff --git a/server/group_mock.go b/server/group_mock.go
diff --git a/server/item.go b/server/item.go
@@ -7,8 +7,6 @@ import (
 	"github.com/0x2e/fusion/repo"
 )
 
-//go:generate mockgen -destination=item_mock.go -source=item.go -package=server
-
 type ItemRepo interface {
 	List(filter repo.ItemFilter, page, pageSize int) ([]*model.Item, int, error)
 	Get(id uint) (*model.Item, error)
diff --git a/server/item_mock.go b/server/item_mock.go

Original file line number	Diff line number	Diff line change
`@@ -13,8 +13,6 @@ import (`
`13`	`13`	`"github.com/0x2e/fusion/service/sniff"`
`14`	`14`	`)`
`15`	`15`
`16`		`-//go:generate mockgen -destination=feed_mock.go -source=feed.go -package=server`
`17`		`-`
`18`	`16`	`type FeedRepo interface {`
`19`	`17`	`List(filter repo.FeedListFilter) ([]model.Feed, error)`
`20`	`18`	`Get(id uint) (*model.Feed, error)`
Original file line number	Diff line number	Diff line change
`@@ -9,8 +9,6 @@ import (`
`9`	`9`	`"github.com/0x2e/fusion/repo"`
`10`	`10`	`)`
`11`	`11`
`12`		`-//go:generate mockgen -destination=group_mock.go -source=group.go -package=server`
`13`		`-`
`14`	`12`	`type GroupRepo interface {`
`15`	`13`	`All() ([]*model.Group, error)`
`16`	`14`	`Create(group *model.Group) error`
Original file line number	Diff line number	Diff line change
`@@ -7,8 +7,6 @@ import (`
`7`	`7`	`"github.com/0x2e/fusion/repo"`
`8`	`8`	`)`
`9`	`9`
`10`		`-//go:generate mockgen -destination=item_mock.go -source=item.go -package=server`
`11`		`-`
`12`	`10`	`type ItemRepo interface {`
`13`	`11`	`List(filter repo.ItemFilter, page, pageSize int) ([]*model.Item, int, error)`
`14`	`12`	`Get(id uint) (*model.Item, error)`