[
https://issues.apache.org/jira/browse/BEAM-13510?focusedWorklogId=714313&page=com.atlassian.jira.plugin.system.issuetabpanels:worklog-tabpanel#worklog-714313
]
ASF GitHub Bot logged work on BEAM-13510:
-----------------------------------------
Author: ASF GitHub Bot
Created on: 25/Jan/22 09:22
Start Date: 25/Jan/22 09:22
Worklog Time Spent: 10m
Work Description: mosche commented on a change in pull request #16478:
URL: https://github.com/apache/beam/pull/16478#discussion_r791511507
##########
File path:
sdks/java/io/amazon-web-services2/src/test/java/org/apache/beam/sdk/io/aws2/sqs/SqsUnboundedReaderTest.java
##########
@@ -17,113 +17,155 @@
*/
package org.apache.beam.sdk.io.aws2.sqs;
+import static java.lang.System.currentTimeMillis;
+import static java.util.stream.IntStream.range;
import static junit.framework.TestCase.assertFalse;
+import static org.assertj.core.api.Assertions.assertThat;
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertTrue;
+import static org.mockito.Answers.RETURNS_DEEP_STUBS;
+import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.when;
import java.io.IOException;
+import java.time.Clock;
import java.util.ArrayList;
-import java.util.HashSet;
import java.util.List;
+import org.apache.beam.sdk.coders.SerializableCoder;
import org.apache.beam.sdk.io.UnboundedSource;
-import org.apache.beam.sdk.testing.TestPipeline;
+import org.apache.beam.sdk.io.aws2.sqs.EmbeddedSqsServer.TestCaseEnv;
import org.apache.beam.sdk.util.CoderUtils;
+import org.junit.ClassRule;
+import org.junit.Ignore;
import org.junit.Rule;
import org.junit.Test;
import org.junit.runner.RunWith;
-import org.junit.runners.JUnit4;
+import org.mockito.Mock;
+import org.mockito.junit.MockitoJUnitRunner;
import software.amazon.awssdk.services.sqs.SqsClient;
-import
software.amazon.awssdk.services.sqs.model.ChangeMessageVisibilityRequest;
-import software.amazon.awssdk.services.sqs.model.SendMessageRequest;
/** Tests on {@link SqsUnboundedReader}. */
-@RunWith(JUnit4.class)
+@RunWith(MockitoJUnitRunner.class)
public class SqsUnboundedReaderTest {
private static final String DATA = "testData";
- @Rule public TestPipeline pipeline = TestPipeline.create();
+ @ClassRule public static EmbeddedSqsServer sqsServer = new
EmbeddedSqsServer();
- @Rule public EmbeddedSqsServer embeddedSqsRestServer = new
EmbeddedSqsServer();
+ @Rule public TestCaseEnv testCase = new TestCaseEnv(sqsServer);
- private SqsUnboundedSource source;
+ @Mock(answer = RETURNS_DEEP_STUBS)
+ public SqsUnboundedSource mockSource;
- private void setupOneMessage() {
- final SqsClient client = embeddedSqsRestServer.getClient();
- final String queueUrl = embeddedSqsRestServer.getQueueUrl();
-
client.sendMessage(SendMessageRequest.builder().queueUrl(queueUrl).messageBody(DATA).build());
- source =
- new SqsUnboundedSource(
- SqsIO.read()
- .withQueueUrl(queueUrl)
- .withSqsClientProvider(SqsClientProviderMock.of(client))
- .withMaxNumRecords(1));
- }
-
- private void setupMessages(List<String> messages) {
- final SqsClient client = embeddedSqsRestServer.getClient();
- final String queueUrl = embeddedSqsRestServer.getQueueUrl();
+ private void setupMessages(String... messages) {
+ final SqsClient client = testCase.getClient();
+ final String queueUrl = testCase.getQueueUrl();
for (String message : messages) {
- client.sendMessage(
-
SendMessageRequest.builder().queueUrl(queueUrl).messageBody(message).build());
+ client.sendMessage(b -> b.queueUrl(queueUrl).messageBody(message));
}
- source =
- new SqsUnboundedSource(
- SqsIO.read()
- .withQueueUrl(queueUrl)
- .withSqsClientProvider(SqsClientProviderMock.of(client))
- .withMaxNumRecords(messages.size()));
+
+
when(mockSource.getRead().sqsClientProvider()).thenReturn(SqsClientProviderMock.of(client));
+ when(mockSource.getRead().queueUrl()).thenReturn(queueUrl);
}
@Test
public void testReadOneMessage() throws IOException {
- setupOneMessage();
- UnboundedSource.UnboundedReader<SqsMessage> reader =
- source.createReader(pipeline.getOptions(), null);
+ setupMessages(DATA);
+ SqsUnboundedReader reader = new SqsUnboundedReader(mockSource, null);
+
// Read one message.
assertTrue(reader.start());
assertEquals(DATA, reader.getCurrent().getBody());
assertFalse(reader.advance());
+
// ACK the message.
UnboundedSource.CheckpointMark checkpoint = reader.getCheckpointMark();
checkpoint.finalizeCheckpoint();
reader.close();
}
@Test
- public void testTimeoutAckAndRereadOneMessage() throws IOException {
- setupOneMessage();
- UnboundedSource.UnboundedReader<SqsMessage> reader =
- source.createReader(pipeline.getOptions(), null);
- SqsClient sqsClient = embeddedSqsRestServer.getClient();
+ public void testAckDeletedMessage() throws IOException {
Review comment:
Done 👍
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: [email protected]
For queries about this service, please contact Infrastructure at:
[email protected]
Issue Time Tracking
-------------------
Worklog Id: (was: 714313)
Time Spent: 4h 50m (was: 4h 40m)
> SQS reader retries on invalid (expired) receipt handles (AWS SDK v2)
> --------------------------------------------------------------------
>
> Key: BEAM-13510
> URL: https://issues.apache.org/jira/browse/BEAM-13510
> Project: Beam
> Issue Type: Bug
> Components: io-java-aws
> Reporter: Moritz Mack
> Assignee: Moritz Mack
> Priority: P2
> Labels: SQS, aws-sdk-v2
> Time Spent: 4h 50m
> Remaining Estimate: 0h
>
> The extension of visibility timeouts as well as deletes with invalid
> (expired) receipt handles will never succeed and therefore cannot be retried.
> Investigate if this is also an issue in SDK v1.
--
This message was sent by Atlassian Jira
(v8.20.1#820001)
