luciano/amazon-kinesis-client
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Refactor duplicate subscribe and wait code

Browse source
This commit is contained in:
furq-aws 2023-03-23 15:40:49 -07:00
parent c0895e5647
commit ee1f1c50c7
1 changed files with 15 additions and 32 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

47
amazon-kinesis-client/src/test/java/software/amazon/kinesis/lifecycle/ShardConsumerSubscriberTest.java
View file

@ -125,10 +125,7 @@ public class ShardConsumerSubscriberTest {
setupNotifierAnswer(1); setupNotifierAnswer(1);
synchronized (processedNotifier) { startSubscriptionsAndWait(subscriber, 5000);
subscriber.startSubscriptions();
processedNotifier.wait(5000);
}
verify(shardConsumer).handleInput(argThat(eqProcessRecordsInput(processRecordsInput)), any(Subscription.class)); verify(shardConsumer).handleInput(argThat(eqProcessRecordsInput(processRecordsInput)), any(Subscription.class));
} }
@ -139,10 +136,7 @@ public class ShardConsumerSubscriberTest {
setupNotifierAnswer(recordsPublisher.responses.size()); setupNotifierAnswer(recordsPublisher.responses.size());
synchronized (processedNotifier) { startSubscriptionsAndWait(subscriber, 5000);
subscriber.startSubscriptions();
processedNotifier.wait(5000);
}
verify(shardConsumer, times(100)).handleInput(argThat(eqProcessRecordsInput(processRecordsInput)), any(Subscription.class)); verify(shardConsumer, times(100)).handleInput(argThat(eqProcessRecordsInput(processRecordsInput)), any(Subscription.class));
} }
@ -171,10 +165,7 @@ public class ShardConsumerSubscriberTest {
} }
}).when(shardConsumer).handleInput(any(ProcessRecordsInput.class), any(Subscription.class)); }).when(shardConsumer).handleInput(any(ProcessRecordsInput.class), any(Subscription.class));
synchronized (processedNotifier) { startSubscriptionsAndWait(subscriber, 5000);
subscriber.startSubscriptions();
processedNotifier.wait(5000);
}
assertThat(subscriber.getAndResetDispatchFailure(), equalTo(testException)); assertThat(subscriber.getAndResetDispatchFailure(), equalTo(testException));
assertThat(subscriber.getAndResetDispatchFailure(), nullValue()); assertThat(subscriber.getAndResetDispatchFailure(), nullValue());
@ -192,10 +183,7 @@ public class ShardConsumerSubscriberTest {
setupNotifierAnswer(10); setupNotifierAnswer(10);
synchronized (processedNotifier) { startSubscriptionsAndWait(subscriber, 5000);
subscriber.startSubscriptions();
processedNotifier.wait(5000);
}
for (int attempts = 0; attempts < 10; attempts++) { for (int attempts = 0; attempts < 10; attempts++) {
if (subscriber.retrievalFailure() != null) { if (subscriber.retrievalFailure() != null) {
@ -220,10 +208,7 @@ public class ShardConsumerSubscriberTest {
setupNotifierAnswer(10); setupNotifierAnswer(10);
synchronized (processedNotifier) { startSubscriptionsAndWait(subscriber, 5000);
subscriber.startSubscriptions();
processedNotifier.wait(5000);
}
for (int attempts = 0; attempts < 10; attempts++) { for (int attempts = 0; attempts < 10; attempts++) {
if (subscriber.retrievalFailure() != null) { if (subscriber.retrievalFailure() != null) {
@ -267,10 +252,7 @@ public class ShardConsumerSubscriberTest {
return null; return null;
}).when(shardConsumer).handleInput(any(ProcessRecordsInput.class), any(Subscription.class)); }).when(shardConsumer).handleInput(any(ProcessRecordsInput.class), any(Subscription.class));
synchronized (processedNotifier) { startSubscriptionsAndWait(subscriber, 5000);
subscriber.startSubscriptions();
processedNotifier.wait(5000);
}
synchronized (processedNotifier) { synchronized (processedNotifier) {
executorService.execute(() -> { executorService.execute(() -> {
@ -337,10 +319,7 @@ public class ShardConsumerSubscriberTest {
}).when(shardConsumer).handleInput(any(ProcessRecordsInput.class), any(Subscription.class)); }).when(shardConsumer).handleInput(any(ProcessRecordsInput.class), any(Subscription.class));
// First try to start subscriptions. // First try to start subscriptions.
synchronized (processedNotifier) { startSubscriptionsAndWait(subscriber, 100);
subscriber.startSubscriptions();
processedNotifier.wait(100);
}
// Verifying that there are no interactions with shardConsumer mock indicating no records were sent back and // Verifying that there are no interactions with shardConsumer mock indicating no records were sent back and
// subscription has not started correctly. // subscription has not started correctly.
@ -398,10 +377,7 @@ public class ShardConsumerSubscriberTest {
}).when(shardConsumer).handleInput(any(ProcessRecordsInput.class), any(Subscription.class)); }).when(shardConsumer).handleInput(any(ProcessRecordsInput.class), any(Subscription.class));
// First try to start subscriptions. // First try to start subscriptions.
synchronized (processedNotifier) { startSubscriptionsAndWait(subscriber, 100);
subscriber.startSubscriptions();
processedNotifier.wait(100);
}
// Verifying that there are no interactions with shardConsumer mock indicating no records were sent back and // Verifying that there are no interactions with shardConsumer mock indicating no records were sent back and
// subscription has not started correctly. // subscription has not started correctly.
@ -480,6 +456,13 @@ public class ShardConsumerSubscriberTest {
}).when(shardConsumer).handleInput(any(ProcessRecordsInput.class), any(Subscription.class)); }).when(shardConsumer).handleInput(any(ProcessRecordsInput.class), any(Subscription.class));
} }
private void startSubscriptionsAndWait(ShardConsumerSubscriber subscriber, long timeout) throws InterruptedException {
synchronized (processedNotifier) {
subscriber.startSubscriptions();
processedNotifier.wait(timeout);
}
}
private class ResponseItem { private class ResponseItem {
private final RecordsRetrieved recordsRetrieved; private final RecordsRetrieved recordsRetrieved;
private final Throwable throwable; private final Throwable throwable;