1
1
package com .amazonaws .services .sqs ;
2
2
3
- import java .util .Collections ;
4
- import java .util .concurrent .Executors ;
5
- import java .util .concurrent .ScheduledExecutorService ;
6
- import java .util .concurrent .TimeUnit ;
7
-
8
- import com .amazonaws .services .sqs .model .SendMessageRequest ;
9
- 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
3
import com .amazonaws .services .sqs .model .CreateQueueRequest ;
17
4
import com .amazonaws .services .sqs .model .Message ;
18
5
import com .amazonaws .services .sqs .model .QueueDoesNotExistException ;
6
+ import com .amazonaws .services .sqs .model .SendMessageRequest ;
7
+ import com .amazonaws .services .sqs .util .Constants ;
19
8
import com .amazonaws .services .sqs .util .IntegrationTest ;
20
9
import com .amazonaws .services .sqs .util .SQSMessageConsumer ;
10
+ import com .amazonaws .services .sqs .util .SQSMessageConsumerBuilder ;
21
11
import com .amazonaws .services .sqs .util .SQSQueueUtils ;
12
+ import org .junit .jupiter .api .AfterEach ;
13
+ import org .junit .jupiter .api .BeforeEach ;
14
+ import org .junit .jupiter .api .Test ;
15
+
16
+ import java .util .Collections ;
17
+ import java .util .concurrent .Executors ;
18
+ import java .util .concurrent .ScheduledExecutorService ;
19
+ import java .util .concurrent .TimeUnit ;
20
+
21
+ import static org .junit .jupiter .api .Assertions .assertEquals ;
22
+ import static org .junit .jupiter .api .Assertions .assertNotEquals ;
23
+ import static org .junit .jupiter .api .Assertions .assertTrue ;
22
24
23
25
24
26
public class AmazonSQSIdleQueueDeletingIT extends IntegrationTest {
@@ -28,15 +30,15 @@ public class AmazonSQSIdleQueueDeletingIT extends IntegrationTest {
28
30
private static AmazonSQSRequester requester ;
29
31
private static AmazonSQSResponder responder ;
30
32
31
- @ Before
33
+ @ BeforeEach
32
34
public void setup () {
33
35
client = new AmazonSQSIdleQueueDeletingClient (sqs , queueNamePrefix );
34
36
requester = new AmazonSQSRequesterClient (sqs , queueNamePrefix ,
35
37
Collections .emptyMap (), exceptionHandler );
36
38
responder = new AmazonSQSResponderClient (sqs );
37
39
}
38
40
39
- @ After
41
+ @ AfterEach
40
42
public void teardown () {
41
43
if (client != null && queueUrl != null ) {
42
44
try {
@@ -65,8 +67,8 @@ public void idleQueueIsDeleted() throws InterruptedException {
65
67
queueUrl = client .createQueue (createQueueRequest ).getQueueUrl ();
66
68
67
69
// May have to wait for up to a minute for the new queue to show up in ListQueues
68
- Assert . assertTrue ("Expected queue to be deleted: " + queueUrl ,
69
- SQSQueueUtils . awaitQueueDeleted ( sqs , queueUrl , 70 , TimeUnit . SECONDS ) );
70
+ assertTrue (SQSQueueUtils . awaitQueueDeleted ( sqs , queueUrl , 70 , TimeUnit . SECONDS ) ,
71
+ "Expected queue to be deleted: " + queueUrl );
70
72
}
71
73
72
74
@ Test
@@ -91,7 +93,7 @@ public void updatedHeartBeatTag() throws InterruptedException {
91
93
92
94
String updatedHeartbeat = getLastHeartbeatTimestamp ();
93
95
94
- Assert . assertNotEquals (initialHeartBeat , updatedHeartbeat );
96
+ assertNotEquals (initialHeartBeat , updatedHeartbeat );
95
97
}
96
98
97
99
private String getLastHeartbeatTimestamp () {
@@ -121,7 +123,7 @@ public void notUpdatedHeartBeatTag() throws InterruptedException {
121
123
122
124
String notUpdatedHeartbeat = getLastHeartbeatTimestamp ();
123
125
124
- Assert . assertEquals (initialHeartBeat , notUpdatedHeartbeat );
126
+ assertEquals (initialHeartBeat , notUpdatedHeartbeat );
125
127
}
126
128
127
129
@ Test
@@ -147,8 +149,8 @@ public void recreatingQueues() throws InterruptedException {
147
149
// Ensure the original queue is eventually recreated. This becoming true at least once
148
150
// indicates that CreateQueue was successfully called, even if it may flip back to false
149
151
// on subsequent calls.
150
- Assert . assertTrue ("Expected original queue to be recreated: " + queueUrl ,
151
- SQSQueueUtils . awaitQueueCreated ( sqs , queueUrl , 70 , TimeUnit . SECONDS ) );
152
+ assertTrue (SQSQueueUtils . awaitQueueCreated ( sqs , queueUrl , 70 , TimeUnit . SECONDS ),
153
+ "Expected original queue to be recreated: " + queueUrl );
152
154
153
155
// Ensure the user doesn't experience any send or receive failures
154
156
user .finish ();
@@ -168,10 +170,10 @@ public void recreatingQueues() throws InterruptedException {
168
170
}
169
171
});
170
172
171
- Assert . assertTrue ("Expected original queue to be deleted: " + failoverQueueUrl ,
172
- SQSQueueUtils . awaitQueueDeleted ( sqs , queueUrl , 70 , TimeUnit . SECONDS ) );
173
- Assert . assertTrue ("Expected failover queue to be deleted with the original: " + failoverQueueUrl ,
174
- SQSQueueUtils . awaitQueueDeleted ( sqs , failoverQueueUrl , 70 , TimeUnit . SECONDS ) );
173
+ assertTrue (SQSQueueUtils . awaitQueueDeleted ( sqs , queueUrl , 70 , TimeUnit . SECONDS ),
174
+ "Expected original queue to be deleted: " + failoverQueueUrl );
175
+ assertTrue (SQSQueueUtils . awaitQueueDeleted ( sqs , failoverQueueUrl , 70 , TimeUnit . SECONDS ),
176
+ "Expected failover queue to be deleted with the original: " + failoverQueueUrl );
175
177
}
176
178
177
179
private class QueueUser {
0 commit comments