MirrorMirror
/
Signal-Server
mirror of https://github.com/signalapp/Signal-Server.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Migrate DirectoryQueueTest to JUnit 5.

This commit is contained in:
Jon Chambers 2021-07-26 11:28:44 -04:00 committed by Jon Chambers
parent 8579190cdf
commit a6066bfc2f
1 changed files with 90 additions and 91 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

41
service/src/test/java/org/whispersystems/textsecuregcm/sqs/DirectoryQueueTest.java
View File

@ -5,10 +5,10 @@
package org.whispersystems.textsecuregcm.sqs; package org.whispersystems.textsecuregcm.sqs;
import junitparams.JUnitParamsRunner; import org.junit.jupiter.api.Test;
import junitparams.Parameters; import org.junit.jupiter.params.ParameterizedTest;
import org.junit.Test; import org.junit.jupiter.params.provider.Arguments;
import org.junit.runner.RunWith; import org.junit.jupiter.params.provider.MethodSource;
import org.mockito.ArgumentCaptor; import org.mockito.ArgumentCaptor;
import org.whispersystems.textsecuregcm.storage.Account; import org.whispersystems.textsecuregcm.storage.Account;
import software.amazon.awssdk.services.sqs.SqsClient; import software.amazon.awssdk.services.sqs.SqsClient;
@ -18,19 +18,19 @@ import software.amazon.awssdk.services.sqs.model.SendMessageBatchRequest;
import java.util.List; import java.util.List;
import java.util.Map; import java.util.Map;
import java.util.UUID; import java.util.UUID;
import java.util.stream.Stream;
import static org.junit.Assert.assertEquals; import static org.junit.jupiter.api.Assertions.assertEquals;
import static org.mockito.Mockito.mock; import static org.mockito.Mockito.mock;
import static org.mockito.Mockito.times; import static org.mockito.Mockito.times;
import static org.mockito.Mockito.verify; import static org.mockito.Mockito.verify;
import static org.mockito.Mockito.when; import static org.mockito.Mockito.when;
@RunWith(JUnitParamsRunner.class)
public class DirectoryQueueTest { public class DirectoryQueueTest {
@Test @ParameterizedTest
@Parameters(method = "argumentsForTestRefreshRegisteredUser") @MethodSource("argumentsForTestRefreshRegisteredUser")
public void testRefreshRegisteredUser(final boolean accountEnabled, final boolean accountDiscoverableByPhoneNumber, final String expectedAction) { void testRefreshRegisteredUser(final boolean accountEnabled, final boolean accountDiscoverableByPhoneNumber, final String expectedAction) {
final SqsClient sqs = mock(SqsClient.class); final SqsClient sqs = mock(SqsClient.class);
final DirectoryQueue directoryQueue = new DirectoryQueue(List.of("sqs://test"), sqs); final DirectoryQueue directoryQueue = new DirectoryQueue(List.of("sqs://test"), sqs);
@ -51,8 +51,17 @@ public class DirectoryQueueTest {
assertEquals(MessageAttributeValue.builder().dataType("String").stringValue(expectedAction).build(), messageAttributes.get("action")); assertEquals(MessageAttributeValue.builder().dataType("String").stringValue(expectedAction).build(), messageAttributes.get("action"));
} }
@SuppressWarnings("unused")
private static Stream<Arguments> argumentsForTestRefreshRegisteredUser() {
return Stream.of(
Arguments.of(true, true, "add"),
Arguments.of(true, false, "delete"),
Arguments.of(false, true, "delete"),
Arguments.of(false, false, "delete"));
}
@Test @Test
public void testRefreshBatch() { void testRefreshBatch() {
final SqsClient sqs = mock(SqsClient.class); final SqsClient sqs = mock(SqsClient.class);
final DirectoryQueue directoryQueue = new DirectoryQueue(List.of("sqs://test"), sqs); final DirectoryQueue directoryQueue = new DirectoryQueue(List.of("sqs://test"), sqs);
@ -87,7 +96,7 @@ public class DirectoryQueueTest {
} }
@Test @Test
public void testSendMessageMultipleQueues() { void testSendMessageMultipleQueues() {
final SqsClient sqs = mock(SqsClient.class); final SqsClient sqs = mock(SqsClient.class);
final DirectoryQueue directoryQueue = new DirectoryQueue(List.of("sqs://first", "sqs://second"), sqs); final DirectoryQueue directoryQueue = new DirectoryQueue(List.of("sqs://first", "sqs://second"), sqs);
@ -109,14 +118,4 @@ public class DirectoryQueueTest {
assertEquals(MessageAttributeValue.builder().dataType("String").stringValue("add").build(), messageAttributes.get("action")); assertEquals(MessageAttributeValue.builder().dataType("String").stringValue("add").build(), messageAttributes.get("action"));
} }
} }
@SuppressWarnings("unused")
private Object argumentsForTestRefreshRegisteredUser() {
return new Object[] {
new Object[] { true, true, "add" },
new Object[] { true, false, "delete" },
new Object[] { false, true, "delete" },
new Object[] { false, false, "delete" }
};
}
} }