Skip to content

Commit 97145c6

Browse files
committed
fixed tests
1 parent 38f0281 commit 97145c6

File tree

3 files changed

+19
-14
lines changed

3 files changed

+19
-14
lines changed

internal/grpcwrapper/rawtopic/rawtopicwriter/messages.go

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -184,6 +184,12 @@ func (r *WriteRequest) Size() int {
184184
return 0
185185
}
186186

187+
func (r *WriteRequest) FillCache() *WriteRequest {
188+
r.Size()
189+
190+
return r
191+
}
192+
187193
func (r *WriteRequest) Cut(count int) (head *WriteRequest, rest *WriteRequest) {
188194
if count >= len(r.Messages) {
189195
return r, nil

internal/topic/topicwriterinternal/writer_reconnector_test.go

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -127,7 +127,7 @@ func TestWriterImpl_Write(t *testing.T) {
127127
const seqNo = 31
128128

129129
writeMessageReceived := make(empty.Chan)
130-
e.stream.EXPECT().Send(&rawtopicwriter.WriteRequest{
130+
e.stream.EXPECT().Send((&rawtopicwriter.WriteRequest{
131131
Messages: []rawtopicwriter.MessageData{
132132
{
133133
SeqNo: seqNo,
@@ -138,7 +138,7 @@ func TestWriterImpl_Write(t *testing.T) {
138138
},
139139
},
140140
Codec: rawtopiccommon.CodecRaw,
141-
}).DoAndReturn(func(_ rawtopicwriter.ClientMessage) error {
141+
}).FillCache()).DoAndReturn(func(_ rawtopicwriter.ClientMessage) error {
142142
close(writeMessageReceived)
143143

144144
return nil
@@ -523,24 +523,24 @@ func TestWriterImpl_Reconnect(t *testing.T) {
523523
}
524524

525525
strm2 := newStream("strm2")
526-
strm2.EXPECT().Send(&rawtopicwriter.WriteRequest{
526+
strm2.EXPECT().Send((&rawtopicwriter.WriteRequest{
527527
Messages: []rawtopicwriter.MessageData{
528528
{SeqNo: 1},
529529
},
530530
Codec: rawtopiccommon.CodecRaw,
531-
}).DoAndReturn(func(_ rawtopicwriter.ClientMessage) error {
531+
}).FillCache()).DoAndReturn(func(_ rawtopicwriter.ClientMessage) error {
532532
t.Logf("strm2 sent message and return retriable error")
533533

534534
return xerrors.Retryable(errors.New("retriable on strm2"))
535535
})
536536

537537
strm3 := newStream("strm3")
538-
strm3.EXPECT().Send(&rawtopicwriter.WriteRequest{
538+
strm3.EXPECT().Send((&rawtopicwriter.WriteRequest{
539539
Messages: []rawtopicwriter.MessageData{
540540
{SeqNo: 1},
541541
},
542542
Codec: rawtopiccommon.CodecRaw,
543-
}).DoAndReturn(func(_ rawtopicwriter.ClientMessage) error {
543+
}).FillCache()).DoAndReturn(func(_ rawtopicwriter.ClientMessage) error {
544544
t.Logf("strm3 sent message and return unretriable error")
545545

546546
return errors.New("strm3")
@@ -599,7 +599,7 @@ func TestWriterImpl_CloseWithFlush(t *testing.T) {
599599
const seqNo = 36
600600

601601
writeCompleted := make(empty.Chan)
602-
e.stream.EXPECT().Send(&rawtopicwriter.WriteRequest{
602+
e.stream.EXPECT().Send((&rawtopicwriter.WriteRequest{
603603
Messages: []rawtopicwriter.MessageData{
604604
{
605605
SeqNo: seqNo,
@@ -610,7 +610,7 @@ func TestWriterImpl_CloseWithFlush(t *testing.T) {
610610
},
611611
},
612612
Codec: rawtopiccommon.CodecRaw,
613-
}).DoAndReturn(func(_ rawtopicwriter.ClientMessage) error {
613+
}).FillCache()).DoAndReturn(func(_ rawtopicwriter.ClientMessage) error {
614614
close(writeCompleted)
615615

616616
return nil
@@ -720,7 +720,7 @@ func TestCreateRawMessageData(t *testing.T) {
720720
req, err := createWriteRequest(newTestMessagesWithContent(), rawtopiccommon.CodecRaw)
721721
require.NoError(t, err)
722722
require.Equal(t,
723-
rawtopicwriter.WriteRequest{
723+
&rawtopicwriter.WriteRequest{
724724
Messages: []rawtopicwriter.MessageData{},
725725
Codec: rawtopiccommon.CodecRaw,
726726
},
@@ -740,7 +740,7 @@ func TestCreateRawMessageData(t *testing.T) {
740740
})
741741

742742
require.NoError(t, err)
743-
require.Equal(t, rawtopicwriter.WriteRequest{
743+
require.Equal(t, &rawtopicwriter.WriteRequest{
744744
Messages: []rawtopicwriter.MessageData{
745745
{
746746
SeqNo: 1,
@@ -763,7 +763,7 @@ func TestCreateRawMessageData(t *testing.T) {
763763
req, err := createWriteRequest(newTestMessagesWithContent(1, 2, 3), rawtopiccommon.CodecRaw)
764764
require.NoError(t, err)
765765
require.Equal(t,
766-
rawtopicwriter.WriteRequest{
766+
&rawtopicwriter.WriteRequest{
767767
Messages: []rawtopicwriter.MessageData{
768768
{
769769
SeqNo: 1,

tests/integration/topic_read_writer_test.go

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -18,9 +18,6 @@ import (
1818
"testing"
1919
"time"
2020

21-
"github.com/ydb-platform/ydb-go-sdk/v3/query"
22-
"github.com/ydb-platform/ydb-go-sdk/v3/topic/topicreader"
23-
2421
"github.com/stretchr/testify/require"
2522
"google.golang.org/grpc"
2623

@@ -30,7 +27,9 @@ import (
3027
"github.com/ydb-platform/ydb-go-sdk/v3/internal/version"
3128
"github.com/ydb-platform/ydb-go-sdk/v3/internal/xtest"
3229
"github.com/ydb-platform/ydb-go-sdk/v3/log"
30+
"github.com/ydb-platform/ydb-go-sdk/v3/query"
3331
"github.com/ydb-platform/ydb-go-sdk/v3/topic/topicoptions"
32+
"github.com/ydb-platform/ydb-go-sdk/v3/topic/topicreader"
3433
"github.com/ydb-platform/ydb-go-sdk/v3/topic/topicsugar"
3534
"github.com/ydb-platform/ydb-go-sdk/v3/topic/topictypes"
3635
"github.com/ydb-platform/ydb-go-sdk/v3/topic/topicwriter"

0 commit comments

Comments
 (0)