Modify SignalInterface to use mockery-v2

Signed-off-by: Eduardo Apolinario <[email protected]>
flyteorg · May 23, 2024 · 8b12e0a · 8b12e0a
1 parent ac4cbae
commit 8b12e0a
Show file tree

Hide file tree

Showing 3 changed files with 119 additions and 43 deletions.
diff --git a/flyteadmin/pkg/manager/interfaces/signal.go b/flyteadmin/pkg/manager/interfaces/signal.go
@@ -6,7 +6,7 @@ import (
 	"github.com/flyteorg/flyte/flyteidl/gen/pb-go/flyteidl/admin"
 )
 
-//go:generate mockery -name=SignalInterface -output=../mocks -case=underscore
+//go:generate mockery-v2 --name=SignalInterface --output=../mocks --case=underscore --with-expecter
 
 // Interface for managing Flyte Signals
 type SignalInterface interface {

diff --git a/flyteadmin/pkg/manager/mocks/signal_interface.go b/flyteadmin/pkg/manager/mocks/signal_interface.go
diff --git a/flyteadmin/pkg/rpc/signal_service_test.go b/flyteadmin/pkg/rpc/signal_service_test.go
@@ -18,7 +18,7 @@ func TestGetOrCreateSignal(t *testing.T) {
 
 	t.Run("Happy", func(t *testing.T) {
 		signalManager := mocks.SignalInterface{}
-		signalManager.OnGetOrCreateSignalMatch(mock.Anything, mock.Anything).Return(&admin.Signal{}, nil)
+		signalManager.EXPECT().GetOrCreateSignal(mock.Anything, mock.Anything).Return(&admin.Signal{}, nil)
 
 		testScope := mockScope.NewTestScope()
 		mockServer := &SignalService{
@@ -44,7 +44,7 @@ func TestGetOrCreateSignal(t *testing.T) {
 
 	t.Run("ManagerError", func(t *testing.T) {
 		signalManager := mocks.SignalInterface{}
-		signalManager.OnGetOrCreateSignalMatch(mock.Anything, mock.Anything).Return(nil, errors.New("foo"))
+		signalManager.EXPECT().GetOrCreateSignal(mock.Anything, mock.Anything).Return(nil, errors.New("foo"))
 
 		testScope := mockScope.NewTestScope()
 		mockServer := &SignalService{
@@ -62,7 +62,7 @@ func TestListSignals(t *testing.T) {
 
 	t.Run("Happy", func(t *testing.T) {
 		signalManager := mocks.SignalInterface{}
-		signalManager.OnListSignalsMatch(mock.Anything, mock.Anything).Return(&admin.SignalList{}, nil)
+		signalManager.EXPECT().ListSignals(mock.Anything, mock.Anything).Return(&admin.SignalList{}, nil)
 
 		testScope := mockScope.NewTestScope()
 		mockServer := &SignalService{
@@ -88,7 +88,7 @@ func TestListSignals(t *testing.T) {
 
 	t.Run("ManagerError", func(t *testing.T) {
 		signalManager := mocks.SignalInterface{}
-		signalManager.OnListSignalsMatch(mock.Anything, mock.Anything).Return(nil, errors.New("foo"))
+		signalManager.EXPECT().ListSignals(mock.Anything, mock.Anything).Return(nil, errors.New("foo"))
 
 		testScope := mockScope.NewTestScope()
 		mockServer := &SignalService{
@@ -106,7 +106,7 @@ func TestSetSignal(t *testing.T) {
 
 	t.Run("Happy", func(t *testing.T) {
 		signalManager := mocks.SignalInterface{}
-		signalManager.OnSetSignalMatch(mock.Anything, mock.Anything).Return(&admin.SignalSetResponse{}, nil)
+		signalManager.EXPECT().SetSignal(mock.Anything, mock.Anything).Return(&admin.SignalSetResponse{}, nil)
 
 		testScope := mockScope.NewTestScope()
 		mockServer := &SignalService{
@@ -132,7 +132,7 @@ func TestSetSignal(t *testing.T) {
 
 	t.Run("ManagerError", func(t *testing.T) {
 		signalManager := mocks.SignalInterface{}
-		signalManager.OnSetSignalMatch(mock.Anything, mock.Anything).Return(nil, errors.New("foo"))
+		signalManager.EXPECT().SetSignal(mock.Anything, mock.Anything).Return(nil, errors.New("foo"))
 
 		testScope := mockScope.NewTestScope()
 		mockServer := &SignalService{