Signal/Signal-Server
1
0
Fork 0
mirror of https://github.com/signalapp/Signal-Server synced 2026-04-22 03:58:03 +01:00
Code Issues Packages Projects Releases Wiki Activity

Add JUnit 5 RedisClusterExtension

Browse Source
This commit is contained in:
Chris Eager
2021-08-13 12:07:04 -05:00
committed by GitHub
parent 779051ef9f
commit 27844fe692
7 changed files with 368 additions and 140 deletions
Download Patch File Download Diff File Expand all files Collapse all files

29
service/src/test/java/org/whispersystems/textsecuregcm/limits/CardinalityRateLimiterTest.java
View File

@@ -5,33 +5,26 @@
package org.whispersystems.textsecuregcm.limits;
import static org.junit.Assert.assertTrue;
import static org.junit.Assert.fail;
import static org.junit.jupiter.api.Assertions.assertTrue;
import static org.junit.jupiter.api.Assertions.fail;
import java.time.Duration;
import org.junit.After;
import org.junit.Before;
import org.junit.Test;
import org.junit.jupiter.api.Test;
import org.junit.jupiter.api.extension.RegisterExtension;
import org.whispersystems.textsecuregcm.controllers.RateLimitExceededException;
import org.whispersystems.textsecuregcm.redis.AbstractRedisClusterTest;
import org.whispersystems.textsecuregcm.redis.RedisClusterExtension;
public class CardinalityRateLimiterTest extends AbstractRedisClusterTest {
class CardinalityRateLimiterTest {
@Before
public void setUp() throws Exception {
super.setUp();
}
@After
public void tearDown() throws Exception {
super.tearDown();
}
@RegisterExtension
static final RedisClusterExtension REDIS_CLUSTER_EXTENSION = RedisClusterExtension.builder().build();
@Test
public void testValidate() {
void testValidate() {
final int maxCardinality = 10;
final CardinalityRateLimiter rateLimiter =
new CardinalityRateLimiter(getRedisCluster(), "test", Duration.ofDays(1), maxCardinality);
new CardinalityRateLimiter(REDIS_CLUSTER_EXTENSION.getRedisCluster(), "test", Duration.ofDays(1),
maxCardinality);
final String source = "+18005551234";
int validatedAttempts = 0;

33
service/src/test/java/org/whispersystems/textsecuregcm/limits/RateLimitResetMetricsManagerTest.java
View File

@@ -1,6 +1,6 @@
package org.whispersystems.textsecuregcm.limits;
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.when;
@@ -8,27 +8,28 @@ import io.dropwizard.util.Duration;
import io.micrometer.core.instrument.Counter;
import io.micrometer.core.instrument.simple.SimpleMeterRegistry;
import java.util.UUID;
import org.junit.Before;
import org.junit.Test;
import org.whispersystems.textsecuregcm.redis.AbstractRedisClusterTest;
import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Test;
import org.junit.jupiter.api.extension.RegisterExtension;
import org.whispersystems.textsecuregcm.redis.RedisClusterExtension;
import org.whispersystems.textsecuregcm.storage.Account;
public class RateLimitResetMetricsManagerTest extends AbstractRedisClusterTest {
class RateLimitResetMetricsManagerTest {
@RegisterExtension
static final RedisClusterExtension REDIS_CLUSTER_EXTENSION = RedisClusterExtension.builder().build();
private RateLimitResetMetricsManager metricsManager;
private SimpleMeterRegistry meterRegistry;
@Before
@Override
public void setUp() throws Exception {
super.setUp();
@BeforeEach
void setUp() {
meterRegistry = new SimpleMeterRegistry();
metricsManager = new RateLimitResetMetricsManager(getRedisCluster(), meterRegistry);
metricsManager = new RateLimitResetMetricsManager(REDIS_CLUSTER_EXTENSION.getRedisCluster(), meterRegistry);
}
@Test
public void testRecordMetrics() {
void testRecordMetrics() {
final Account firstAccount = mock(Account.class);
when(firstAccount.getUuid()).thenReturn(UUID.randomUUID());
@@ -45,13 +46,15 @@ public class RateLimitResetMetricsManagerTest extends AbstractRedisClusterTest {
.orElseThrow();
assertEquals(3, counterTotal, 0.0);
final long enforcedCount = getRedisCluster().withCluster(conn -> conn.sync().pfcount("enforced"));
final long enforcedCount = REDIS_CLUSTER_EXTENSION.getRedisCluster()
.withCluster(conn -> conn.sync().pfcount("enforced"));
assertEquals(1L, enforcedCount);
final long unenforcedCount = getRedisCluster().withCluster(conn -> conn.sync().pfcount("unenforced"));
final long unenforcedCount = REDIS_CLUSTER_EXTENSION.getRedisCluster()
.withCluster(conn -> conn.sync().pfcount("unenforced"));
assertEquals(1L, unenforcedCount);
final long total = getRedisCluster().withCluster(conn -> conn.sync().pfcount("total"));
final long total = REDIS_CLUSTER_EXTENSION.getRedisCluster().withCluster(conn -> conn.sync().pfcount("total"));
assertEquals(2L, total);
}

32
service/src/test/java/org/whispersystems/textsecuregcm/limits/UnsealedSenderRateLimiterTest.java
View File

@@ -5,24 +5,27 @@
package org.whispersystems.textsecuregcm.limits;
import static org.junit.Assert.assertThrows;
import static org.junit.jupiter.api.Assertions.assertThrows;
import static org.mockito.Mockito.mock;
import static org.mockito.Mockito.when;
import java.time.Duration;
import java.util.UUID;
import org.junit.Before;
import org.junit.Test;
import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Test;
import org.junit.jupiter.api.extension.RegisterExtension;
import org.whispersystems.textsecuregcm.configuration.dynamic.DynamicConfiguration;
import org.whispersystems.textsecuregcm.configuration.dynamic.DynamicMessageRateConfiguration;
import org.whispersystems.textsecuregcm.configuration.dynamic.DynamicRateLimitChallengeConfiguration;
import org.whispersystems.textsecuregcm.configuration.dynamic.DynamicRateLimitsConfiguration;
import org.whispersystems.textsecuregcm.controllers.RateLimitExceededException;
import org.whispersystems.textsecuregcm.redis.AbstractRedisClusterTest;
import org.whispersystems.textsecuregcm.redis.RedisClusterExtension;
import org.whispersystems.textsecuregcm.storage.Account;
import org.whispersystems.textsecuregcm.storage.DynamicConfigurationManager;
public class UnsealedSenderRateLimiterTest extends AbstractRedisClusterTest {
class UnsealedSenderRateLimiterTest {
@RegisterExtension
static final RedisClusterExtension REDIS_CLUSTER_EXTENSION = RedisClusterExtension.builder().build();
private Account sender;
private Account firstDestination;
@@ -32,14 +35,12 @@ public class UnsealedSenderRateLimiterTest extends AbstractRedisClusterTest {
private DynamicRateLimitChallengeConfiguration rateLimitChallengeConfiguration;
@Before
@Override
public void setUp() throws Exception {
super.setUp();
@BeforeEach
void setUp() throws Exception {
final RateLimiters rateLimiters = mock(RateLimiters.class);
final CardinalityRateLimiter cardinalityRateLimiter =
new CardinalityRateLimiter(getRedisCluster(), "test", Duration.ofDays(1), 1);
new CardinalityRateLimiter(REDIS_CLUSTER_EXTENSION.getRedisCluster(), "test", Duration.ofDays(1), 1);
when(rateLimiters.getUnsealedSenderCardinalityLimiter()).thenReturn(cardinalityRateLimiter);
when(rateLimiters.getRateLimitResetLimiter()).thenReturn(mock(RateLimiter.class));
@@ -56,7 +57,8 @@ public class UnsealedSenderRateLimiterTest extends AbstractRedisClusterTest {
when(dynamicConfiguration.getRateLimitChallengeConfiguration()).thenReturn(rateLimitChallengeConfiguration);
when(rateLimitChallengeConfiguration.isUnsealedSenderLimitEnforced()).thenReturn(true);
unsealedSenderRateLimiter = new UnsealedSenderRateLimiter(rateLimiters, getRedisCluster(), dynamicConfigurationManager,
unsealedSenderRateLimiter = new UnsealedSenderRateLimiter(rateLimiters, REDIS_CLUSTER_EXTENSION.getRedisCluster(),
dynamicConfigurationManager,
mock(RateLimitResetMetricsManager.class));
sender = mock(Account.class);
@@ -73,7 +75,7 @@ public class UnsealedSenderRateLimiterTest extends AbstractRedisClusterTest {
}
@Test
public void validate() throws RateLimitExceededException {
void validate() throws RateLimitExceededException {
unsealedSenderRateLimiter.validate(sender, firstDestination);
assertThrows(RateLimitExceededException.class, () -> unsealedSenderRateLimiter.validate(sender, secondDestination));
@@ -82,7 +84,7 @@ public class UnsealedSenderRateLimiterTest extends AbstractRedisClusterTest {
}
@Test
public void handleRateLimitReset() throws RateLimitExceededException {
void handleRateLimitReset() throws RateLimitExceededException {
unsealedSenderRateLimiter.validate(sender, firstDestination);
assertThrows(RateLimitExceededException.class, () -> unsealedSenderRateLimiter.validate(sender, secondDestination));
@@ -93,7 +95,7 @@ public class UnsealedSenderRateLimiterTest extends AbstractRedisClusterTest {
}
@Test
public void enforcementConfiguration() throws RateLimitExceededException {
void enforcementConfiguration() throws RateLimitExceededException {
when(rateLimitChallengeConfiguration.isUnsealedSenderLimitEnforced()).thenReturn(false);