Skip to content

Commit c4562ca

Browse files
committed
fix test after rebase
1 parent ebbe1b4 commit c4562ca

File tree

1 file changed

+10
-6
lines changed

1 file changed

+10
-6
lines changed

pulsar-broker/src/test/java/org/apache/pulsar/broker/loadbalance/extensions/channel/ServiceUnitStateChannelTest.java

+10-6
Original file line numberDiff line numberDiff line change
@@ -514,7 +514,8 @@ public void transferTestWhenDestBrokerFails()
514514
assertEquals(0, getOwnerRequests2.size());
515515

516516
// recovered, check the monitor update state : Assigned -> Owned
517-
doReturn(CompletableFuture.completedFuture(Optional.of(lookupServiceAddress1))).when(loadManager).selectAsync(any());
517+
doReturn(CompletableFuture.completedFuture(Optional.of(lookupServiceAddress1)))
518+
.when(loadManager).selectAsync(any());
518519
FieldUtils.writeDeclaredField(channel2, "producer", producer, true);
519520
FieldUtils.writeDeclaredField(channel1,
520521
"inFlightStateWaitingTimeInMillis", 1 , true);
@@ -733,8 +734,8 @@ public void handleBrokerDeletionEventTest()
733734

734735
var owner1 = channel1.getOwnerAsync(bundle1);
735736
var owner2 = channel2.getOwnerAsync(bundle2);
736-
doReturn(CompletableFuture.completedFuture(Optional.of(lookupServiceAddress2))).when(loadManager).selectAsync(any());
737-
737+
doReturn(CompletableFuture.completedFuture(Optional.of(lookupServiceAddress2)))
738+
.when(loadManager).selectAsync(any());
738739
assertTrue(owner1.get().isEmpty());
739740
assertTrue(owner2.get().isEmpty());
740741

@@ -1099,7 +1100,8 @@ public void assignTestWhenDestBrokerProducerFails()
10991100
"inFlightStateWaitingTimeInMillis", 3 * 1000, true);
11001101
FieldUtils.writeDeclaredField(channel2,
11011102
"inFlightStateWaitingTimeInMillis", 3 * 1000, true);
1102-
doReturn(CompletableFuture.completedFuture(Optional.of(lookupServiceAddress2))).when(loadManager).selectAsync(any());
1103+
doReturn(CompletableFuture.completedFuture(Optional.of(lookupServiceAddress2)))
1104+
.when(loadManager).selectAsync(any());
11031105
channel1.publishAssignEventAsync(bundle, lookupServiceAddress2);
11041106
// channel1 is broken. the assign won't be complete.
11051107
waitUntilState(channel1, bundle);
@@ -1437,7 +1439,8 @@ public void testOverrideInactiveBrokerStateData()
14371439
new ServiceUnitStateData(Owned, broker, null, 1));
14381440

14391441
// test stable metadata state
1440-
doReturn(Optional.of(lookupServiceAddress2)).when(brokerSelector).select(any(), any(), any());
1442+
doReturn(CompletableFuture.completedFuture(Optional.of(lookupServiceAddress2)))
1443+
.when(loadManager).selectAsync(any());
14411444
leaderChannel.handleMetadataSessionEvent(SessionReestablished);
14421445
followerChannel.handleMetadataSessionEvent(SessionReestablished);
14431446
FieldUtils.writeDeclaredField(leaderChannel, "lastMetadataSessionEventTimestamp",
@@ -1501,7 +1504,8 @@ public void testOverrideOrphanStateData()
15011504
new ServiceUnitStateData(Owned, broker, null, 1));
15021505

15031506
// test stable metadata state
1504-
doReturn(Optional.of(lookupServiceAddress2)).when(brokerSelector).select(any(), any(), any());
1507+
doReturn(CompletableFuture.completedFuture(Optional.of(lookupServiceAddress2)))
1508+
.when(loadManager).selectAsync(any());
15051509
FieldUtils.writeDeclaredField(leaderChannel, "inFlightStateWaitingTimeInMillis",
15061510
-1, true);
15071511
FieldUtils.writeDeclaredField(followerChannel, "inFlightStateWaitingTimeInMillis",

0 commit comments

Comments
 (0)