1
1
package com .amazonaws .services .sqs ;
2
2
3
- import java .util .Collections ;
4
- import java .util .HashMap ;
5
- import java .util .concurrent .Executors ;
6
- import java .util .concurrent .ScheduledExecutorService ;
7
- import java .util .concurrent .TimeUnit ;
8
-
9
3
import com .amazonaws .services .sqs .util .Constants ;
10
- import com .amazonaws .services .sqs .util .SQSMessageConsumerBuilder ;
11
- import org .junit .After ;
12
- import org .junit .Assert ;
13
- import org .junit .Before ;
14
- import org .junit .Test ;
15
-
16
4
import com .amazonaws .services .sqs .util .IntegrationTest ;
17
5
import com .amazonaws .services .sqs .util .SQSMessageConsumer ;
6
+ import com .amazonaws .services .sqs .util .SQSMessageConsumerBuilder ;
18
7
import com .amazonaws .services .sqs .util .SQSQueueUtils ;
8
+ import org .junit .jupiter .api .AfterEach ;
9
+ import org .junit .jupiter .api .BeforeEach ;
10
+ import org .junit .jupiter .api .Test ;
19
11
import software .amazon .awssdk .services .sqs .model .CreateQueueRequest ;
20
12
import software .amazon .awssdk .services .sqs .model .DeleteQueueRequest ;
21
13
import software .amazon .awssdk .services .sqs .model .GetQueueUrlRequest ;
24
16
import software .amazon .awssdk .services .sqs .model .QueueDoesNotExistException ;
25
17
import software .amazon .awssdk .services .sqs .model .SendMessageRequest ;
26
18
19
+ import java .util .Collections ;
20
+ import java .util .HashMap ;
21
+ import java .util .concurrent .Executors ;
22
+ import java .util .concurrent .ScheduledExecutorService ;
23
+ import java .util .concurrent .TimeUnit ;
24
+
25
+ import static org .junit .jupiter .api .Assertions .assertEquals ;
26
+ import static org .junit .jupiter .api .Assertions .assertNotEquals ;
27
+ import static org .junit .jupiter .api .Assertions .assertTrue ;
27
28
28
29
public class AmazonSQSIdleQueueDeletingIT extends IntegrationTest {
29
30
@@ -32,15 +33,15 @@ public class AmazonSQSIdleQueueDeletingIT extends IntegrationTest {
32
33
private static AmazonSQSRequester requester ;
33
34
private static AmazonSQSResponder responder ;
34
35
35
- @ Before
36
+ @ BeforeEach
36
37
public void setup () {
37
38
client = new AmazonSQSIdleQueueDeletingClient (sqs , queueNamePrefix );
38
39
requester = new AmazonSQSRequesterClient (sqs , queueNamePrefix ,
39
40
Collections .emptyMap (), exceptionHandler );
40
41
responder = new AmazonSQSResponderClient (sqs );
41
42
}
42
43
43
- @ After
44
+ @ AfterEach
44
45
public void teardown () {
45
46
if (client != null && queueUrl != null ) {
46
47
try {
@@ -71,8 +72,8 @@ public void idleQueueIsDeleted() throws InterruptedException {
71
72
queueUrl = client .createQueue (createQueueRequest ).queueUrl ();
72
73
73
74
// May have to wait for up to a minute for the new queue to show up in ListQueues
74
- Assert . assertTrue ("Expected queue to be deleted: " + queueUrl ,
75
- SQSQueueUtils . awaitQueueDeleted ( sqs , queueUrl , 70 , TimeUnit . SECONDS ) );
75
+ assertTrue (SQSQueueUtils . awaitQueueDeleted ( sqs , queueUrl , 70 , TimeUnit . SECONDS ) ,
76
+ "Expected queue to be deleted: " + queueUrl );
76
77
}
77
78
78
79
@ Test
@@ -99,7 +100,7 @@ public void updatedHeartBeatTag() throws InterruptedException {
99
100
100
101
String updatedHeartbeat = getLastHeartbeatTimestamp ();
101
102
102
- Assert . assertNotEquals (initialHeartBeat , updatedHeartbeat );
103
+ assertNotEquals (initialHeartBeat , updatedHeartbeat );
103
104
}
104
105
105
106
private String getLastHeartbeatTimestamp () {
@@ -131,7 +132,7 @@ public void notUpdatedHeartBeatTag() throws InterruptedException {
131
132
132
133
String notUpdatedHeartbeat = getLastHeartbeatTimestamp ();
133
134
134
- Assert . assertEquals (initialHeartBeat , notUpdatedHeartbeat );
135
+ assertEquals (initialHeartBeat , notUpdatedHeartbeat );
135
136
}
136
137
137
138
@ Test
@@ -153,14 +154,14 @@ public void recreatingQueues() throws InterruptedException {
153
154
sqs .deleteQueue (DeleteQueueRequest .builder ().queueUrl (queueUrl ).build ());
154
155
155
156
// Sleeping is unfortunate here, but it's necessary to ensure the eventual consistency
156
- // of the delete is resolved first. Otherwise it's easy to get a false positive below.
157
+ // of the delete is resolved first. Otherwise, it's easy to get a false positive below.
157
158
TimeUnit .MINUTES .sleep (1 );
158
159
159
160
// Ensure the original queue is eventually recreated. This becoming true at least once
160
161
// indicates that CreateQueue was successfully called, even if it may flip back to false
161
162
// on subsequent calls.
162
- Assert . assertTrue ("Expected original queue to be recreated: " + queueUrl ,
163
- SQSQueueUtils . awaitQueueCreated ( sqs , queueUrl , 70 , TimeUnit . SECONDS ) );
163
+ assertTrue (SQSQueueUtils . awaitQueueCreated ( sqs , queueUrl , 70 , TimeUnit . SECONDS ),
164
+ "Expected original queue to be recreated: " + queueUrl );
164
165
165
166
// Ensure the user doesn't experience any send or receive failures
166
167
user .finish ();
@@ -180,10 +181,10 @@ public void recreatingQueues() throws InterruptedException {
180
181
}
181
182
});
182
183
183
- Assert . assertTrue ("Expected original queue to be deleted: " + failoverQueueUrl ,
184
- SQSQueueUtils . awaitQueueDeleted ( sqs , queueUrl , 70 , TimeUnit . SECONDS ) );
185
- Assert . assertTrue ("Expected failover queue to be deleted with the original: " + failoverQueueUrl ,
186
- SQSQueueUtils . awaitQueueDeleted ( sqs , failoverQueueUrl , 70 , TimeUnit . SECONDS ) );
184
+ assertTrue (SQSQueueUtils . awaitQueueDeleted ( sqs , queueUrl , 70 , TimeUnit . SECONDS ),
185
+ "Expected original queue to be deleted: " + failoverQueueUrl );
186
+ assertTrue (SQSQueueUtils . awaitQueueDeleted ( sqs , failoverQueueUrl , 70 , TimeUnit . SECONDS ),
187
+ "Expected failover queue to be deleted with the original: " + failoverQueueUrl );
187
188
}
188
189
189
190
private class QueueUser {
0 commit comments