Skip to content

Commit 1cc8a02

Browse files
c-julinc-julin
committed
fix: resolve test compilation errors after hasMore removal
- Fix mock expectations in integration tests to use 3 parameters - Remove HasMore field from stream completion message struct - Fix page token test to handle unordered partition iteration
1 parent b6f3ed4 commit 1cc8a02

File tree

3 files changed

+20
-16
lines changed

3 files changed

+20
-16
lines changed

‎backend/pkg/api/connect/service/console/stream_progress_reporter.go‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -226,7 +226,6 @@ func (p *streamProgressReporter) OnComplete(elapsedMs int64, isCancelled bool, n
226226
MessagesConsumed: p.messagesConsumed.Load(),
227227
BytesConsumed: p.bytesConsumed.Load(),
228228
NextPageToken: nextPageToken,
229-
HasMore: nextPageToken != "",
230229
}
231230

232231
if err := p.stream.Send(

‎backend/pkg/console/list_messages_integration_test.go‎

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -88,7 +88,7 @@ func (s *ConsoleIntegrationTestSuite) TestListMessages() {
8888

8989
mockProgress.EXPECT().OnPhase("Get Partitions")
9090
mockProgress.EXPECT().OnPhase("Get Watermarks and calculate consuming requests")
91-
mockProgress.EXPECT().OnComplete(gomock.Any(), false, "", false)
91+
mockProgress.EXPECT().OnComplete(gomock.Any(), false, "")
9292

9393
svc := createNewTestService(t, log, t.Name(), s.testSeedBroker, s.registryAddr)
9494

@@ -120,7 +120,7 @@ func (s *ConsoleIntegrationTestSuite) TestListMessages() {
120120
mockProgress.EXPECT().OnPhase("Consuming messages")
121121
mockProgress.EXPECT().OnMessage(gomock.AssignableToTypeOf(msg)).Times(20)
122122
mockProgress.EXPECT().OnMessageConsumed(gomock.AssignableToTypeOf(int64Type)).Times(20)
123-
mockProgress.EXPECT().OnComplete(gomock.AssignableToTypeOf(int64Type), false, "", false)
123+
mockProgress.EXPECT().OnComplete(gomock.AssignableToTypeOf(int64Type), false, "")
124124

125125
svc := createNewTestService(t, log, t.Name(), s.testSeedBroker, s.registryAddr)
126126

@@ -151,7 +151,7 @@ func (s *ConsoleIntegrationTestSuite) TestListMessages() {
151151
mockProgress.EXPECT().OnPhase("Consuming messages")
152152
mockProgress.EXPECT().OnMessage(MatchesOrder("10")).Times(1)
153153
mockProgress.EXPECT().OnMessageConsumed(gomock.AssignableToTypeOf(int64Type)).Times(1)
154-
mockProgress.EXPECT().OnComplete(gomock.AssignableToTypeOf(int64Type), false, "", false)
154+
mockProgress.EXPECT().OnComplete(gomock.AssignableToTypeOf(int64Type), false, "")
155155

156156
svc := createNewTestService(t, log, t.Name(), s.testSeedBroker, s.registryAddr)
157157

@@ -186,7 +186,7 @@ func (s *ConsoleIntegrationTestSuite) TestListMessages() {
186186
mockProgress.EXPECT().OnMessage(MatchesOrder("13")).Times(1)
187187
mockProgress.EXPECT().OnMessage(MatchesOrder("14")).Times(1)
188188
mockProgress.EXPECT().OnMessageConsumed(gomock.AssignableToTypeOf(int64Type)).Times(5)
189-
mockProgress.EXPECT().OnComplete(gomock.AssignableToTypeOf(int64Type), false, "", false)
189+
mockProgress.EXPECT().OnComplete(gomock.AssignableToTypeOf(int64Type), false, "")
190190

191191
svc := createNewTestService(t, log, t.Name(), s.testSeedBroker, s.registryAddr)
192192

@@ -217,7 +217,7 @@ func (s *ConsoleIntegrationTestSuite) TestListMessages() {
217217
mockProgress.EXPECT().OnPhase("Consuming messages")
218218
mockProgress.EXPECT().OnMessage(MatchesOrder("19")).Times(1)
219219
mockProgress.EXPECT().OnMessageConsumed(gomock.AssignableToTypeOf(int64Type)).Times(1)
220-
mockProgress.EXPECT().OnComplete(gomock.AssignableToTypeOf(int64Type), false, "", false)
220+
mockProgress.EXPECT().OnComplete(gomock.AssignableToTypeOf(int64Type), false, "")
221221

222222
svc := createNewTestService(t, log, t.Name(), s.testSeedBroker, s.registryAddr)
223223

@@ -253,7 +253,7 @@ func (s *ConsoleIntegrationTestSuite) TestListMessages() {
253253
mockProgress.EXPECT().OnMessage(MatchesOrder("14")).Times(1)
254254
mockProgress.EXPECT().OnMessage(MatchesOrder("15")).Times(1)
255255
mockProgress.EXPECT().OnMessageConsumed(gomock.AssignableToTypeOf(int64Type)).Times(5)
256-
mockProgress.EXPECT().OnComplete(gomock.AssignableToTypeOf(int64Type), false, "", false)
256+
mockProgress.EXPECT().OnComplete(gomock.AssignableToTypeOf(int64Type), false, "")
257257

258258
svc := createNewTestService(t, log, t.Name(), s.testSeedBroker, s.registryAddr)
259259

@@ -326,7 +326,7 @@ func (s *ConsoleIntegrationTestSuite) TestListMessages() {
326326
mockProgress.EXPECT().OnPhase("Consuming messages")
327327
mockProgress.EXPECT().OnMessage(MatchesOrder("10")).Times(1)
328328
mockProgress.EXPECT().OnMessageConsumed(gomock.AssignableToTypeOf(int64Type)).Times(1)
329-
mockProgress.EXPECT().OnComplete(gomock.AssignableToTypeOf(int64Type), false, "", false)
329+
mockProgress.EXPECT().OnComplete(gomock.AssignableToTypeOf(int64Type), false, "")
330330

331331
var fetchCalls int32
332332
mdCalls := atomic.Int32{}
@@ -570,7 +570,7 @@ func (s *ConsoleIntegrationTestSuite) TestListMessages() {
570570
mockProgress.EXPECT().OnPhase("Consuming messages")
571571
mockProgress.EXPECT().OnMessage(orderMatcher).Times(11)
572572
mockProgress.EXPECT().OnMessageConsumed(gomock.AssignableToTypeOf(int64Type)).AnyTimes()
573-
mockProgress.EXPECT().OnComplete(gomock.AssignableToTypeOf(int64Type), false, "", false)
573+
mockProgress.EXPECT().OnComplete(gomock.AssignableToTypeOf(int64Type), false, "")
574574

575575
svc := createNewTestService(t, log, t.Name(), s.testSeedBroker, s.registryAddr)
576576

@@ -610,7 +610,7 @@ func (s *ConsoleIntegrationTestSuite) TestListMessages() {
610610
mockProgress.EXPECT().OnPhase("Consuming messages")
611611
mockProgress.EXPECT().OnMessage(orderMatcher).Times(4)
612612
mockProgress.EXPECT().OnMessageConsumed(gomock.AssignableToTypeOf(int64Type)).AnyTimes()
613-
mockProgress.EXPECT().OnComplete(gomock.AssignableToTypeOf(int64Type), false, "", false)
613+
mockProgress.EXPECT().OnComplete(gomock.AssignableToTypeOf(int64Type), false, "")
614614

615615
svc := createNewTestService(t, log, t.Name(), s.testSeedBroker, s.registryAddr)
616616

@@ -656,7 +656,7 @@ func (s *ConsoleIntegrationTestSuite) TestListMessages() {
656656
mockProgress.EXPECT().OnPhase("Consuming messages")
657657
mockProgress.EXPECT().OnMessage(orderMatcher).Times(10)
658658
mockProgress.EXPECT().OnMessageConsumed(gomock.AssignableToTypeOf(int64Type)).AnyTimes()
659-
mockProgress.EXPECT().OnComplete(gomock.AssignableToTypeOf(int64Type), false, "", false)
659+
mockProgress.EXPECT().OnComplete(gomock.AssignableToTypeOf(int64Type), false, "")
660660

661661
svc := createNewTestService(t, log, t.Name(), s.testSeedBroker, s.registryAddr)
662662

@@ -703,7 +703,7 @@ func (s *ConsoleIntegrationTestSuite) TestListMessages() {
703703
mockProgress.EXPECT().OnPhase("Consuming messages")
704704
mockProgress.EXPECT().OnMessageConsumed(gomock.AssignableToTypeOf(int64Type)).AnyTimes()
705705
mockProgress.EXPECT().OnMessage(orderMatcher).Times(10)
706-
mockProgress.EXPECT().OnComplete(gomock.AssignableToTypeOf(int64Type), false, "", false)
706+
mockProgress.EXPECT().OnComplete(gomock.AssignableToTypeOf(int64Type), false, "")
707707

708708
svc := createNewTestService(t, log, t.Name(), s.testSeedBroker, s.registryAddr)
709709

@@ -749,7 +749,7 @@ func (s *ConsoleIntegrationTestSuite) TestListMessages() {
749749
mockProgress.EXPECT().OnPhase("Consuming messages")
750750
mockProgress.EXPECT().OnMessage(orderMatcher).Times(10)
751751
mockProgress.EXPECT().OnMessageConsumed(gomock.AssignableToTypeOf(int64Type)).AnyTimes()
752-
mockProgress.EXPECT().OnComplete(gomock.AssignableToTypeOf(int64Type), false, "", false)
752+
mockProgress.EXPECT().OnComplete(gomock.AssignableToTypeOf(int64Type), false, "")
753753

754754
svc := createNewTestService(t, log, t.Name(), s.testSeedBroker, s.registryAddr)
755755

‎backend/pkg/console/page_token_test.go‎

Lines changed: 8 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -199,9 +199,14 @@ func TestCreateInitialPageToken(t *testing.T) {
199199
assert.Len(t, token.Partitions, 3)
200200

201201
// Check that NextOffset is set to HWM - 1 for descending
202-
assert.Equal(t, int64(999), token.Partitions[0].NextOffset)
203-
assert.Equal(t, int64(1999), token.Partitions[1].NextOffset)
204-
assert.Equal(t, int64(1499), token.Partitions[2].NextOffset)
202+
// Build map by partition ID since order is not guaranteed
203+
partByID := make(map[int32]PartitionCursor)
204+
for _, p := range token.Partitions {
205+
partByID[p.ID] = p
206+
}
207+
assert.Equal(t, int64(999), partByID[0].NextOffset)
208+
assert.Equal(t, int64(1999), partByID[1].NextOffset)
209+
assert.Equal(t, int64(1499), partByID[2].NextOffset)
205210
}
206211

207212
func TestCreateInitialPageToken_EmptyTopic(t *testing.T) {

0 commit comments

Comments
 (0)