sync

Author: rekby

internal/topic/topiclistenerinternal/event_handler.go

@@ -8,7 +8,7 @@ import (
 	"github.com/ydb-platform/ydb-go-sdk/v3/topic/topicreader"
 )
 
-//go:generate mockgen -source event_handler.go -destination event_handler_mock_test.go -package topiclistenerinternal -write_package_comment=false --typed
+//go:generate mockgen -source event_handler.go -destination event_handler_mock_test.go --typed -package topiclistenerinternal -write_package_comment=false
 
 type EventHandler interface {
 	// OnStartPartitionSessionRequest called when server send start partition session request method.

internal/topic/topiclistenerinternal/event_handler_mock_test.go

@@ -11,7 +11,7 @@ import (
 
 // Pool is interface for sync.Pool and may be extended by follow to original type
 //
-//go:generate mockgen -destination=pool_interface_mock_test.go -write_package_comment=false -package=topicreadercommon github.com/ydb-platform/ydb-go-sdk/v3/internal/topic/topicreadercommon Pool
+//go:generate mockgen -destination=pool_interface_mock_test.go --typed -write_package_comment=false -package=topicreadercommon github.com/ydb-platform/ydb-go-sdk/v3/internal/topic/topicreadercommon Pool
 type Pool interface {
 	Get() interface{}
 	Put(x interface{})

internal/topic/topicreadercommon/message_content_pool.go

@@ -38,7 +38,8 @@ func TestCallbackOnReaderContent(t *testing.T) {
 		mc := gomock.NewController(t)
 		p := NewMockPool(mc)
 		p.EXPECT().Get().Return(nil)
-		p.EXPECT().Put(gomock.Any()).Do(func(buf *bytes.Buffer) {
+		p.EXPECT().Put(gomock.Any()).Do(func(val any) {
+			buf := val.(*bytes.Buffer)
 			require.NotNil(t, buf)
 			require.Equal(t, 0, buf.Len())
 			require.Equal(t, minInitializeBufferSize, buf.Cap())
@@ -62,11 +63,13 @@ func TestCallbackOnReaderContent(t *testing.T) {
 		p.EXPECT().Get().Return(nil).Times(2)
 
 		var targetCapacity int
-		p.EXPECT().Put(gomock.Any()).Do(func(buf *bytes.Buffer) {
+		p.EXPECT().Put(gomock.Any()).DoAndReturn(func(val any) {
+			buf := val.(*bytes.Buffer)
 			targetCapacity = buf.Cap()
 		})
 
-		p.EXPECT().Put(gomock.Any()).Do(func(buf *bytes.Buffer) {
+		p.EXPECT().Put(gomock.Any()).DoAndReturn(func(val any) {
+			buf := val.(*bytes.Buffer)
 			require.NotNil(t, buf)
 			require.Equal(t, 0, buf.Len())
 
@@ -96,7 +99,8 @@ func TestCallbackOnReaderContent(t *testing.T) {
 		mc := gomock.NewController(t)
 		p := NewMockPool(mc)
 		p.EXPECT().Get().Return(nil)
-		p.EXPECT().Put(gomock.Any()).Do(func(buf *bytes.Buffer) {
+		p.EXPECT().Put(gomock.Any()).DoAndReturn(func(val any) {
+			buf := val.(*bytes.Buffer)
 			require.NotNil(t, buf)
 			require.Equal(t, 0, buf.Len())
 			require.Equal(t, maxInitialBufferSize, buf.Cap())
@@ -117,7 +121,7 @@ func TestCallbackOnReaderContent(t *testing.T) {
 		mc := gomock.NewController(t)
 		p := NewMockPool(mc)
 		p.EXPECT().Get().Return(poolBuf)
-		p.EXPECT().Put(gomock.Any()).Do(func(buf *bytes.Buffer) {
+		p.EXPECT().Put(gomock.Any()).DoAndReturn(func(buf any) {
 			require.Same(t, poolBuf, buf)
 		})
 

internal/topic/topicreadercommon/message_content_pool_test.go

@@ -6,7 +6,7 @@ import (
 	"github.com/ydb-platform/ydb-go-sdk/v3/internal/topic/topicreadercommon"
 )
 
-//go:generate mockgen -source batched_stream_reader_interface.go -destination batched_stream_reader_mock_test.go -package topicreaderinternal -write_package_comment=false
+//go:generate mockgen -source batched_stream_reader_interface.go --typed -destination batched_stream_reader_mock_test.go -package topicreaderinternal -write_package_comment=false
 
 type batchedStreamReader interface {
 	WaitInit(ctx context.Context) error