remove fakeAcker in favour of generated Acker mock

Author: pchila

internal/pkg/agent/application/upgrade/upgrade_test.go

@@ -29,15 +29,15 @@ import (
 	"github.com/elastic/elastic-agent/internal/pkg/agent/errors"
 	"github.com/elastic/elastic-agent/internal/pkg/config"
 	"github.com/elastic/elastic-agent/internal/pkg/fleetapi"
-	"github.com/elastic/elastic-agent/internal/pkg/fleetapi/acker"
 	"github.com/elastic/elastic-agent/internal/pkg/release"
 	v1 "github.com/elastic/elastic-agent/pkg/api/v1"
 	"github.com/elastic/elastic-agent/pkg/control/v2/client"
 	"github.com/elastic/elastic-agent/pkg/control/v2/cproto"
 	"github.com/elastic/elastic-agent/pkg/core/logger"
 	"github.com/elastic/elastic-agent/pkg/core/logger/loggertest"
 	agtversion "github.com/elastic/elastic-agent/pkg/version"
-	mocks "github.com/elastic/elastic-agent/testing/mocks/pkg/control/v2/client"
+	ackermocks "github.com/elastic/elastic-agent/testing/mocks/internal_/pkg/fleetapi/acker"
+	clientmocks "github.com/elastic/elastic-agent/testing/mocks/pkg/control/v2/client"
 )
 
 func Test_CopyFile(t *testing.T) {
@@ -239,7 +239,7 @@ func TestIsInProgress(t *testing.T) {
 		t.Run(name, func(t *testing.T) {
 			// Expect client.State() call to be made only if no Upgrade Watcher PIDs
 			// are returned (i.e. no Upgrade Watcher is found to be running).
-			mc := mocks.NewClient(t)
+			mc := clientmocks.NewClient(t)
 			if test.watcherPIDsFetcher != nil {
 				pids, _ := test.watcherPIDsFetcher()
 				if len(pids) == 0 {
@@ -293,37 +293,31 @@ func TestUpgraderAckAction(t *testing.T) {
 		require.Nil(t, u.AckAction(t.Context(), nil, action))
 	})
 	t.Run("AckAction with acker", func(t *testing.T) {
-		acker := &fakeAcker{}
-		acker.On("Ack", mock.Anything, action).Return(nil)
-		acker.On("Commit", mock.Anything).Return(nil)
+		mockAcker := ackermocks.NewAcker(t)
+		mockAcker.EXPECT().Ack(mock.Anything, action).Return(nil)
+		mockAcker.EXPECT().Commit(mock.Anything).Return(nil)
 
-		require.Nil(t, u.AckAction(t.Context(), acker, action))
-		acker.AssertCalled(t, "Ack", mock.Anything, action)
-		acker.AssertCalled(t, "Commit", mock.Anything)
+		require.Nil(t, u.AckAction(t.Context(), mockAcker, action))
 	})
 
 	t.Run("AckAction with acker - failing commit", func(t *testing.T) {
-		acker := &fakeAcker{}
+		mockAcker := ackermocks.NewAcker(t)
 
 		errCommit := errors.New("failed commit")
-		acker.On("Ack", mock.Anything, action).Return(nil)
-		acker.On("Commit", mock.Anything).Return(errCommit)
+		mockAcker.EXPECT().Ack(mock.Anything, action).Return(nil)
+		mockAcker.EXPECT().Commit(mock.Anything).Return(errCommit)
 
-		require.ErrorIs(t, u.AckAction(t.Context(), acker, action), errCommit)
-		acker.AssertCalled(t, "Ack", mock.Anything, action)
-		acker.AssertCalled(t, "Commit", mock.Anything)
+		require.ErrorIs(t, u.AckAction(t.Context(), mockAcker, action), errCommit)
 	})
 
 	t.Run("AckAction with acker - failed ack", func(t *testing.T) {
-		acker := &fakeAcker{}
+		mockAcker := ackermocks.NewAcker(t)
 
 		errAck := errors.New("ack error")
-		acker.On("Ack", mock.Anything, action).Return(errAck)
-		acker.On("Commit", mock.Anything).Return(nil)
-
-		require.ErrorIs(t, u.AckAction(t.Context(), acker, action), errAck)
-		acker.AssertCalled(t, "Ack", mock.Anything, action)
-		acker.AssertNotCalled(t, "Commit", mock.Anything)
+		mockAcker.EXPECT().Ack(mock.Anything, action).Return(errAck)
+		// no expectation on Commit() since it shouldn't be called after an error during Ack()
+		
+		require.ErrorIs(t, u.AckAction(t.Context(), mockAcker, action), errAck)
 	})
 }
 
@@ -1276,19 +1270,3 @@ func TestIsSameReleaseVersion(t *testing.T) {
 		})
 	}
 }
-
-var _ acker.Acker = &fakeAcker{}
-
-type fakeAcker struct {
-	mock.Mock
-}
-
-func (f *fakeAcker) Ack(ctx context.Context, action fleetapi.Action) error {
-	args := f.Called(ctx, action)
-	return args.Error(0)
-}
-
-func (f *fakeAcker) Commit(ctx context.Context) error {
-	args := f.Called(ctx)
-	return args.Error(0)
-}