From 352e1b22492e51aeef37349020e736fb3b0581fa Mon Sep 17 00:00:00 2001 From: Sergey Skrobotov Date: Mon, 17 Jul 2023 12:58:10 -0700 Subject: [PATCH] test classes moved to same packages with components they test --- ...ternalServiceCredentialsGeneratorTest.java | 4 +-- ...xternalServiceCredentialsSelectorTest.java | 5 +--- .../{tests => }/auth/OptionalAccessTest.java | 6 ++--- .../{tests => }/auth/SaltedTokenHashTest.java | 3 +-- .../controllers/ArtControllerTest.java | 3 +-- .../controllers/AttachmentControllerTest.java | 4 +-- .../controllers/CallLinkControllerTest.java | 25 ++++++++++--------- .../CertificateControllerTest.java | 3 +-- .../controllers/DeviceControllerTest.java | 3 +-- .../DirectoryControllerV2Test.java | 3 +-- .../controllers/DonationControllerTest.java | 3 +-- .../controllers/KeysControllerTest.java | 4 +-- .../controllers/PaymentsControllerTest.java | 3 +-- .../RemoteConfigControllerTest.java | 5 ++-- .../SecureStorageControllerTest.java | 3 +-- .../controllers/StickerControllerTest.java | 4 +-- .../currency/FixerClientTest.java | 5 ++++ .../{tests => }/entities/PreKeyTest.java | 8 +++--- .../http/FaultTolerantHttpClientTest.java | 5 ++-- .../textsecuregcm/push/APNSenderTest.java | 2 +- .../textsecuregcm/push/FcmSenderTest.java | 2 +- .../redis/ClusterLuaScriptTest.java | 2 +- .../redis/ReplicatedJedisPoolTest.java | 5 ++-- .../{tests => }/s3/PolicySignerTest.java | 5 ++-- .../storage/AccountDatabaseCrawlerTest.java | 10 ++------ .../{tests => }/storage/AccountTest.java | 7 ++---- .../storage/ChangeNumberManagerTest.java | 2 +- .../storage/KeysManagerTest.java | 2 +- .../storage/MessagesCacheTest.java | 2 +- .../storage/MessagesDynamoDbTest.java | 2 +- .../storage/ProfilesManagerTest.java | 7 ++---- .../storage/PushFeedbackProcessorTest.java | 8 ++---- .../storage/RedeemedReceiptsManagerTest.java | 6 +---- .../storage/RemoteConfigsTest.java | 12 ++++----- .../RepeatedUseECSignedPreKeyStoreTest.java | 12 ++++----- .../tests/util/DevicesHelper.java | 1 - .../tests/util/MockRedisFuture.java | 9 ------- .../tests/util/RedisClusterHelper.java | 2 +- .../util/SynchronousExecutorService.java | 3 +-- .../{tests => }/util/LocaleTest.java | 8 ++++-- .../{tests => }/util/NumberPrefixTest.java | 5 ++-- .../{tests => }/util/ValidNumberTest.java | 7 ++---- 42 files changed, 84 insertions(+), 136 deletions(-) rename service/src/test/java/org/whispersystems/textsecuregcm/{tests => }/auth/ExternalServiceCredentialsGeneratorTest.java (97%) rename service/src/test/java/org/whispersystems/textsecuregcm/{tests => }/auth/ExternalServiceCredentialsSelectorTest.java (94%) rename service/src/test/java/org/whispersystems/textsecuregcm/{tests => }/auth/OptionalAccessTest.java (95%) rename service/src/test/java/org/whispersystems/textsecuregcm/{tests => }/auth/SaltedTokenHashTest.java (89%) rename service/src/test/java/org/whispersystems/textsecuregcm/{tests => }/controllers/ArtControllerTest.java (95%) rename service/src/test/java/org/whispersystems/textsecuregcm/{tests => }/controllers/AttachmentControllerTest.java (97%) rename service/src/test/java/org/whispersystems/textsecuregcm/{tests => }/controllers/CallLinkControllerTest.java (96%) rename service/src/test/java/org/whispersystems/textsecuregcm/{tests => }/controllers/CertificateControllerTest.java (99%) rename service/src/test/java/org/whispersystems/textsecuregcm/{tests => }/controllers/DeviceControllerTest.java (99%) rename service/src/test/java/org/whispersystems/textsecuregcm/{tests => }/controllers/DirectoryControllerV2Test.java (93%) rename service/src/test/java/org/whispersystems/textsecuregcm/{tests => }/controllers/DonationControllerTest.java (98%) rename service/src/test/java/org/whispersystems/textsecuregcm/{tests => }/controllers/KeysControllerTest.java (99%) rename service/src/test/java/org/whispersystems/textsecuregcm/{tests => }/controllers/PaymentsControllerTest.java (97%) rename service/src/test/java/org/whispersystems/textsecuregcm/{tests => }/controllers/RemoteConfigControllerTest.java (99%) rename service/src/test/java/org/whispersystems/textsecuregcm/{tests => }/controllers/SecureStorageControllerTest.java (96%) rename service/src/test/java/org/whispersystems/textsecuregcm/{tests => }/controllers/StickerControllerTest.java (95%) rename service/src/test/java/org/whispersystems/textsecuregcm/{tests => }/entities/PreKeyTest.java (84%) rename service/src/test/java/org/whispersystems/textsecuregcm/{tests => }/http/FaultTolerantHttpClientTest.java (97%) rename service/src/test/java/org/whispersystems/textsecuregcm/{tests => }/redis/ReplicatedJedisPoolTest.java (97%) rename service/src/test/java/org/whispersystems/textsecuregcm/{tests => }/s3/PolicySignerTest.java (91%) rename service/src/test/java/org/whispersystems/textsecuregcm/{tests => }/storage/AccountDatabaseCrawlerTest.java (85%) rename service/src/test/java/org/whispersystems/textsecuregcm/{tests => }/storage/AccountTest.java (98%) rename service/src/test/java/org/whispersystems/textsecuregcm/{tests => }/storage/ProfilesManagerTest.java (93%) rename service/src/test/java/org/whispersystems/textsecuregcm/{tests => }/storage/PushFeedbackProcessorTest.java (95%) rename service/src/test/java/org/whispersystems/textsecuregcm/{tests => }/storage/RedeemedReceiptsManagerTest.java (91%) rename service/src/test/java/org/whispersystems/textsecuregcm/{tests => }/util/LocaleTest.java (91%) rename service/src/test/java/org/whispersystems/textsecuregcm/{tests => }/util/NumberPrefixTest.java (77%) rename service/src/test/java/org/whispersystems/textsecuregcm/{tests => }/util/ValidNumberTest.java (85%) diff --git a/service/src/test/java/org/whispersystems/textsecuregcm/tests/auth/ExternalServiceCredentialsGeneratorTest.java b/service/src/test/java/org/whispersystems/textsecuregcm/auth/ExternalServiceCredentialsGeneratorTest.java similarity index 97% rename from service/src/test/java/org/whispersystems/textsecuregcm/tests/auth/ExternalServiceCredentialsGeneratorTest.java rename to service/src/test/java/org/whispersystems/textsecuregcm/auth/ExternalServiceCredentialsGeneratorTest.java index cb76e0469..3e951f641 100644 --- a/service/src/test/java/org/whispersystems/textsecuregcm/tests/auth/ExternalServiceCredentialsGeneratorTest.java +++ b/service/src/test/java/org/whispersystems/textsecuregcm/auth/ExternalServiceCredentialsGeneratorTest.java @@ -3,7 +3,7 @@ * SPDX-License-Identifier: AGPL-3.0-only */ -package org.whispersystems.textsecuregcm.tests.auth; +package org.whispersystems.textsecuregcm.auth; import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertFalse; @@ -17,8 +17,6 @@ import java.time.temporal.ChronoUnit; import java.util.concurrent.TimeUnit; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; -import org.whispersystems.textsecuregcm.auth.ExternalServiceCredentials; -import org.whispersystems.textsecuregcm.auth.ExternalServiceCredentialsGenerator; import org.whispersystems.textsecuregcm.util.MockUtils; import org.whispersystems.textsecuregcm.util.MutableClock; diff --git a/service/src/test/java/org/whispersystems/textsecuregcm/tests/auth/ExternalServiceCredentialsSelectorTest.java b/service/src/test/java/org/whispersystems/textsecuregcm/auth/ExternalServiceCredentialsSelectorTest.java similarity index 94% rename from service/src/test/java/org/whispersystems/textsecuregcm/tests/auth/ExternalServiceCredentialsSelectorTest.java rename to service/src/test/java/org/whispersystems/textsecuregcm/auth/ExternalServiceCredentialsSelectorTest.java index 368a52d56..89848eb9b 100644 --- a/service/src/test/java/org/whispersystems/textsecuregcm/tests/auth/ExternalServiceCredentialsSelectorTest.java +++ b/service/src/test/java/org/whispersystems/textsecuregcm/auth/ExternalServiceCredentialsSelectorTest.java @@ -3,7 +3,7 @@ * SPDX-License-Identifier: AGPL-3.0-only */ -package org.whispersystems.textsecuregcm.tests.auth; +package org.whispersystems.textsecuregcm.auth; import static org.assertj.core.api.Assertions.assertThat; @@ -16,9 +16,6 @@ import org.apache.commons.lang3.RandomUtils; import org.junit.jupiter.api.Test; import org.junit.jupiter.params.ParameterizedTest; import org.junit.jupiter.params.provider.MethodSource; -import org.whispersystems.textsecuregcm.auth.ExternalServiceCredentials; -import org.whispersystems.textsecuregcm.auth.ExternalServiceCredentialsGenerator; -import org.whispersystems.textsecuregcm.auth.ExternalServiceCredentialsSelector; import org.whispersystems.textsecuregcm.auth.ExternalServiceCredentialsSelector.CredentialInfo; import org.whispersystems.textsecuregcm.util.MockUtils; import org.whispersystems.textsecuregcm.util.MutableClock; diff --git a/service/src/test/java/org/whispersystems/textsecuregcm/tests/auth/OptionalAccessTest.java b/service/src/test/java/org/whispersystems/textsecuregcm/auth/OptionalAccessTest.java similarity index 95% rename from service/src/test/java/org/whispersystems/textsecuregcm/tests/auth/OptionalAccessTest.java rename to service/src/test/java/org/whispersystems/textsecuregcm/auth/OptionalAccessTest.java index b907bd2a9..cc0afbcca 100644 --- a/service/src/test/java/org/whispersystems/textsecuregcm/tests/auth/OptionalAccessTest.java +++ b/service/src/test/java/org/whispersystems/textsecuregcm/auth/OptionalAccessTest.java @@ -1,9 +1,9 @@ /* - * Copyright 2013-2020 Signal Messenger, LLC + * Copyright 2013 Signal Messenger, LLC * SPDX-License-Identifier: AGPL-3.0-only */ -package org.whispersystems.textsecuregcm.tests.auth; +package org.whispersystems.textsecuregcm.auth; import static org.junit.jupiter.api.Assertions.assertEquals; import static org.mockito.ArgumentMatchers.eq; @@ -14,8 +14,6 @@ import java.util.Base64; import java.util.Optional; import javax.ws.rs.WebApplicationException; import org.junit.jupiter.api.Test; -import org.whispersystems.textsecuregcm.auth.Anonymous; -import org.whispersystems.textsecuregcm.auth.OptionalAccess; import org.whispersystems.textsecuregcm.storage.Account; class OptionalAccessTest { diff --git a/service/src/test/java/org/whispersystems/textsecuregcm/tests/auth/SaltedTokenHashTest.java b/service/src/test/java/org/whispersystems/textsecuregcm/auth/SaltedTokenHashTest.java similarity index 89% rename from service/src/test/java/org/whispersystems/textsecuregcm/tests/auth/SaltedTokenHashTest.java rename to service/src/test/java/org/whispersystems/textsecuregcm/auth/SaltedTokenHashTest.java index 55f83e5d0..be2a57631 100644 --- a/service/src/test/java/org/whispersystems/textsecuregcm/tests/auth/SaltedTokenHashTest.java +++ b/service/src/test/java/org/whispersystems/textsecuregcm/auth/SaltedTokenHashTest.java @@ -3,12 +3,11 @@ * SPDX-License-Identifier: AGPL-3.0-only */ -package org.whispersystems.textsecuregcm.tests.auth; +package org.whispersystems.textsecuregcm.auth; import static org.assertj.core.api.AssertionsForClassTypes.assertThat; import org.junit.jupiter.api.Test; -import org.whispersystems.textsecuregcm.auth.SaltedTokenHash; class SaltedTokenHashTest { diff --git a/service/src/test/java/org/whispersystems/textsecuregcm/tests/controllers/ArtControllerTest.java b/service/src/test/java/org/whispersystems/textsecuregcm/controllers/ArtControllerTest.java similarity index 95% rename from service/src/test/java/org/whispersystems/textsecuregcm/tests/controllers/ArtControllerTest.java rename to service/src/test/java/org/whispersystems/textsecuregcm/controllers/ArtControllerTest.java index cf5b5385a..c87a7fad5 100644 --- a/service/src/test/java/org/whispersystems/textsecuregcm/tests/controllers/ArtControllerTest.java +++ b/service/src/test/java/org/whispersystems/textsecuregcm/controllers/ArtControllerTest.java @@ -3,7 +3,7 @@ * SPDX-License-Identifier: AGPL-3.0-only */ -package org.whispersystems.textsecuregcm.tests.controllers; +package org.whispersystems.textsecuregcm.controllers; import static org.assertj.core.api.Assertions.assertThat; import static org.mockito.Mockito.mock; @@ -23,7 +23,6 @@ import org.whispersystems.textsecuregcm.auth.DisabledPermittedAuthenticatedAccou import org.whispersystems.textsecuregcm.auth.ExternalServiceCredentials; import org.whispersystems.textsecuregcm.auth.ExternalServiceCredentialsGenerator; import org.whispersystems.textsecuregcm.configuration.ArtServiceConfiguration; -import org.whispersystems.textsecuregcm.controllers.ArtController; import org.whispersystems.textsecuregcm.limits.RateLimiter; import org.whispersystems.textsecuregcm.limits.RateLimiters; import org.whispersystems.textsecuregcm.tests.util.AuthHelper; diff --git a/service/src/test/java/org/whispersystems/textsecuregcm/tests/controllers/AttachmentControllerTest.java b/service/src/test/java/org/whispersystems/textsecuregcm/controllers/AttachmentControllerTest.java similarity index 97% rename from service/src/test/java/org/whispersystems/textsecuregcm/tests/controllers/AttachmentControllerTest.java rename to service/src/test/java/org/whispersystems/textsecuregcm/controllers/AttachmentControllerTest.java index 9fc7bcf4d..68f980215 100644 --- a/service/src/test/java/org/whispersystems/textsecuregcm/tests/controllers/AttachmentControllerTest.java +++ b/service/src/test/java/org/whispersystems/textsecuregcm/controllers/AttachmentControllerTest.java @@ -3,7 +3,7 @@ * SPDX-License-Identifier: AGPL-3.0-only */ -package org.whispersystems.textsecuregcm.tests.controllers; +package org.whispersystems.textsecuregcm.controllers; import static org.assertj.core.api.Assertions.assertThat; import static org.mockito.Mockito.mock; @@ -35,8 +35,6 @@ import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.ExtendWith; import org.whispersystems.textsecuregcm.auth.AuthenticatedAccount; import org.whispersystems.textsecuregcm.auth.DisabledPermittedAuthenticatedAccount; -import org.whispersystems.textsecuregcm.controllers.AttachmentControllerV2; -import org.whispersystems.textsecuregcm.controllers.AttachmentControllerV3; import org.whispersystems.textsecuregcm.entities.AttachmentDescriptorV2; import org.whispersystems.textsecuregcm.entities.AttachmentDescriptorV3; import org.whispersystems.textsecuregcm.limits.RateLimiter; diff --git a/service/src/test/java/org/whispersystems/textsecuregcm/tests/controllers/CallLinkControllerTest.java b/service/src/test/java/org/whispersystems/textsecuregcm/controllers/CallLinkControllerTest.java similarity index 96% rename from service/src/test/java/org/whispersystems/textsecuregcm/tests/controllers/CallLinkControllerTest.java rename to service/src/test/java/org/whispersystems/textsecuregcm/controllers/CallLinkControllerTest.java index 4cec6a1ed..acf6cee60 100644 --- a/service/src/test/java/org/whispersystems/textsecuregcm/tests/controllers/CallLinkControllerTest.java +++ b/service/src/test/java/org/whispersystems/textsecuregcm/controllers/CallLinkControllerTest.java @@ -1,21 +1,30 @@ -package org.whispersystems.textsecuregcm.tests.controllers; +/* + * Copyright 2023 Signal Messenger, LLC + * SPDX-License-Identifier: AGPL-3.0-only + */ + +package org.whispersystems.textsecuregcm.controllers; + +import static org.assertj.core.api.AssertionsForClassTypes.assertThat; +import static org.mockito.Mockito.doThrow; +import static org.mockito.Mockito.mock; +import static org.mockito.Mockito.when; import com.google.common.collect.ImmutableSet; import io.dropwizard.auth.PolymorphicAuthValueFactoryProvider; import io.dropwizard.testing.junit5.DropwizardExtensionsSupport; import io.dropwizard.testing.junit5.ResourceExtension; +import javax.ws.rs.client.Entity; +import javax.ws.rs.core.Response; import org.glassfish.jersey.test.grizzly.GrizzlyWebTestContainerFactory; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.ExtendWith; - import org.signal.libsignal.protocol.util.Hex; import org.signal.libsignal.zkgroup.GenericServerSecretParams; import org.signal.libsignal.zkgroup.calllinks.CreateCallLinkCredentialRequestContext; import org.whispersystems.textsecuregcm.auth.AuthenticatedAccount; import org.whispersystems.textsecuregcm.auth.DisabledPermittedAuthenticatedAccount; -import org.whispersystems.textsecuregcm.controllers.CallLinkController; -import org.whispersystems.textsecuregcm.controllers.RateLimitExceededException; import org.whispersystems.textsecuregcm.entities.GetCreateCallLinkCredentialsRequest; import org.whispersystems.textsecuregcm.limits.RateLimiter; import org.whispersystems.textsecuregcm.limits.RateLimiters; @@ -23,14 +32,6 @@ import org.whispersystems.textsecuregcm.mappers.RateLimitExceededExceptionMapper import org.whispersystems.textsecuregcm.tests.util.AuthHelper; import org.whispersystems.textsecuregcm.util.SystemMapper; -import javax.ws.rs.client.Entity; -import javax.ws.rs.core.Response; - -import static org.assertj.core.api.AssertionsForClassTypes.assertThat; -import static org.mockito.Mockito.doThrow; -import static org.mockito.Mockito.mock; -import static org.mockito.Mockito.when; - @ExtendWith(DropwizardExtensionsSupport.class) public class CallLinkControllerTest { private static final GenericServerSecretParams genericServerSecretParams = GenericServerSecretParams.generate(); diff --git a/service/src/test/java/org/whispersystems/textsecuregcm/tests/controllers/CertificateControllerTest.java b/service/src/test/java/org/whispersystems/textsecuregcm/controllers/CertificateControllerTest.java similarity index 99% rename from service/src/test/java/org/whispersystems/textsecuregcm/tests/controllers/CertificateControllerTest.java rename to service/src/test/java/org/whispersystems/textsecuregcm/controllers/CertificateControllerTest.java index 9807a2e66..d67245501 100644 --- a/service/src/test/java/org/whispersystems/textsecuregcm/tests/controllers/CertificateControllerTest.java +++ b/service/src/test/java/org/whispersystems/textsecuregcm/controllers/CertificateControllerTest.java @@ -3,7 +3,7 @@ * SPDX-License-Identifier: AGPL-3.0-only */ -package org.whispersystems.textsecuregcm.tests.controllers; +package org.whispersystems.textsecuregcm.controllers; import static org.junit.jupiter.api.Assertions.assertArrayEquals; import static org.junit.jupiter.api.Assertions.assertDoesNotThrow; @@ -42,7 +42,6 @@ import org.whispersystems.textsecuregcm.auth.AuthenticatedAccount; import org.whispersystems.textsecuregcm.auth.CertificateGenerator; import org.whispersystems.textsecuregcm.auth.DisabledPermittedAuthenticatedAccount; import org.whispersystems.textsecuregcm.auth.OptionalAccess; -import org.whispersystems.textsecuregcm.controllers.CertificateController; import org.whispersystems.textsecuregcm.entities.DeliveryCertificate; import org.whispersystems.textsecuregcm.entities.GroupCredentials; import org.whispersystems.textsecuregcm.entities.MessageProtos.SenderCertificate; diff --git a/service/src/test/java/org/whispersystems/textsecuregcm/tests/controllers/DeviceControllerTest.java b/service/src/test/java/org/whispersystems/textsecuregcm/controllers/DeviceControllerTest.java similarity index 99% rename from service/src/test/java/org/whispersystems/textsecuregcm/tests/controllers/DeviceControllerTest.java rename to service/src/test/java/org/whispersystems/textsecuregcm/controllers/DeviceControllerTest.java index 483ef55bb..741833e65 100644 --- a/service/src/test/java/org/whispersystems/textsecuregcm/tests/controllers/DeviceControllerTest.java +++ b/service/src/test/java/org/whispersystems/textsecuregcm/controllers/DeviceControllerTest.java @@ -2,7 +2,7 @@ * Copyright 2013 Signal Messenger, LLC * SPDX-License-Identifier: AGPL-3.0-only */ -package org.whispersystems.textsecuregcm.tests.controllers; +package org.whispersystems.textsecuregcm.controllers; import static org.assertj.core.api.Assertions.assertThat; import static org.junit.jupiter.api.Assertions.assertEquals; @@ -51,7 +51,6 @@ import org.whispersystems.textsecuregcm.auth.AuthenticatedAccount; import org.whispersystems.textsecuregcm.auth.DisabledPermittedAuthenticatedAccount; import org.whispersystems.textsecuregcm.auth.StoredVerificationCode; import org.whispersystems.textsecuregcm.auth.WebsocketRefreshApplicationEventListener; -import org.whispersystems.textsecuregcm.controllers.DeviceController; import org.whispersystems.textsecuregcm.entities.AccountAttributes; import org.whispersystems.textsecuregcm.entities.ApnRegistrationId; import org.whispersystems.textsecuregcm.entities.DeviceActivationRequest; diff --git a/service/src/test/java/org/whispersystems/textsecuregcm/tests/controllers/DirectoryControllerV2Test.java b/service/src/test/java/org/whispersystems/textsecuregcm/controllers/DirectoryControllerV2Test.java similarity index 93% rename from service/src/test/java/org/whispersystems/textsecuregcm/tests/controllers/DirectoryControllerV2Test.java rename to service/src/test/java/org/whispersystems/textsecuregcm/controllers/DirectoryControllerV2Test.java index ad87358ae..296bd0920 100644 --- a/service/src/test/java/org/whispersystems/textsecuregcm/tests/controllers/DirectoryControllerV2Test.java +++ b/service/src/test/java/org/whispersystems/textsecuregcm/controllers/DirectoryControllerV2Test.java @@ -3,7 +3,7 @@ * SPDX-License-Identifier: AGPL-3.0-only */ -package org.whispersystems.textsecuregcm.tests.controllers; +package org.whispersystems.textsecuregcm.controllers; import static org.junit.jupiter.api.Assertions.assertEquals; import static org.mockito.Mockito.mock; @@ -19,7 +19,6 @@ import org.whispersystems.textsecuregcm.auth.AuthenticatedAccount; import org.whispersystems.textsecuregcm.auth.ExternalServiceCredentials; import org.whispersystems.textsecuregcm.auth.ExternalServiceCredentialsGenerator; import org.whispersystems.textsecuregcm.configuration.DirectoryV2ClientConfiguration; -import org.whispersystems.textsecuregcm.controllers.DirectoryV2Controller; import org.whispersystems.textsecuregcm.storage.Account; import org.whispersystems.textsecuregcm.storage.Device; import org.whispersystems.textsecuregcm.util.Pair; diff --git a/service/src/test/java/org/whispersystems/textsecuregcm/tests/controllers/DonationControllerTest.java b/service/src/test/java/org/whispersystems/textsecuregcm/controllers/DonationControllerTest.java similarity index 98% rename from service/src/test/java/org/whispersystems/textsecuregcm/tests/controllers/DonationControllerTest.java rename to service/src/test/java/org/whispersystems/textsecuregcm/controllers/DonationControllerTest.java index 3935568ed..45abc1223 100644 --- a/service/src/test/java/org/whispersystems/textsecuregcm/tests/controllers/DonationControllerTest.java +++ b/service/src/test/java/org/whispersystems/textsecuregcm/controllers/DonationControllerTest.java @@ -3,7 +3,7 @@ * SPDX-License-Identifier: AGPL-3.0-only */ -package org.whispersystems.textsecuregcm.tests.controllers; +package org.whispersystems.textsecuregcm.controllers; import static org.assertj.core.api.Assertions.assertThat; import static org.mockito.ArgumentMatchers.any; @@ -38,7 +38,6 @@ import org.whispersystems.textsecuregcm.auth.AuthenticatedAccount; import org.whispersystems.textsecuregcm.auth.DisabledPermittedAuthenticatedAccount; import org.whispersystems.textsecuregcm.configuration.BadgeConfiguration; import org.whispersystems.textsecuregcm.configuration.BadgesConfiguration; -import org.whispersystems.textsecuregcm.controllers.DonationController; import org.whispersystems.textsecuregcm.entities.BadgeSvg; import org.whispersystems.textsecuregcm.entities.RedeemReceiptRequest; import org.whispersystems.textsecuregcm.storage.AccountBadge; diff --git a/service/src/test/java/org/whispersystems/textsecuregcm/tests/controllers/KeysControllerTest.java b/service/src/test/java/org/whispersystems/textsecuregcm/controllers/KeysControllerTest.java similarity index 99% rename from service/src/test/java/org/whispersystems/textsecuregcm/tests/controllers/KeysControllerTest.java rename to service/src/test/java/org/whispersystems/textsecuregcm/controllers/KeysControllerTest.java index 6095fa0d9..fa1c9db76 100644 --- a/service/src/test/java/org/whispersystems/textsecuregcm/tests/controllers/KeysControllerTest.java +++ b/service/src/test/java/org/whispersystems/textsecuregcm/controllers/KeysControllerTest.java @@ -3,7 +3,7 @@ * SPDX-License-Identifier: AGPL-3.0-only */ -package org.whispersystems.textsecuregcm.tests.controllers; +package org.whispersystems.textsecuregcm.controllers; import static org.assertj.core.api.Assertions.assertThat; import static org.junit.jupiter.api.Assertions.assertEquals; @@ -50,8 +50,6 @@ import org.signal.libsignal.protocol.ecc.ECKeyPair; import org.whispersystems.textsecuregcm.auth.AuthenticatedAccount; import org.whispersystems.textsecuregcm.auth.DisabledPermittedAuthenticatedAccount; import org.whispersystems.textsecuregcm.auth.OptionalAccess; -import org.whispersystems.textsecuregcm.controllers.KeysController; -import org.whispersystems.textsecuregcm.controllers.RateLimitExceededException; import org.whispersystems.textsecuregcm.entities.ECPreKey; import org.whispersystems.textsecuregcm.entities.ECSignedPreKey; import org.whispersystems.textsecuregcm.entities.KEMSignedPreKey; diff --git a/service/src/test/java/org/whispersystems/textsecuregcm/tests/controllers/PaymentsControllerTest.java b/service/src/test/java/org/whispersystems/textsecuregcm/controllers/PaymentsControllerTest.java similarity index 97% rename from service/src/test/java/org/whispersystems/textsecuregcm/tests/controllers/PaymentsControllerTest.java rename to service/src/test/java/org/whispersystems/textsecuregcm/controllers/PaymentsControllerTest.java index 45a6a3cf0..e7a4d1ca1 100644 --- a/service/src/test/java/org/whispersystems/textsecuregcm/tests/controllers/PaymentsControllerTest.java +++ b/service/src/test/java/org/whispersystems/textsecuregcm/controllers/PaymentsControllerTest.java @@ -3,7 +3,7 @@ * SPDX-License-Identifier: AGPL-3.0-only */ -package org.whispersystems.textsecuregcm.tests.controllers; +package org.whispersystems.textsecuregcm.controllers; import static org.assertj.core.api.AssertionsForClassTypes.assertThat; import static org.mockito.ArgumentMatchers.eq; @@ -27,7 +27,6 @@ import org.whispersystems.textsecuregcm.auth.AuthenticatedAccount; import org.whispersystems.textsecuregcm.auth.DisabledPermittedAuthenticatedAccount; import org.whispersystems.textsecuregcm.auth.ExternalServiceCredentials; import org.whispersystems.textsecuregcm.auth.ExternalServiceCredentialsGenerator; -import org.whispersystems.textsecuregcm.controllers.PaymentsController; import org.whispersystems.textsecuregcm.currency.CurrencyConversionManager; import org.whispersystems.textsecuregcm.entities.CurrencyConversionEntity; import org.whispersystems.textsecuregcm.entities.CurrencyConversionEntityList; diff --git a/service/src/test/java/org/whispersystems/textsecuregcm/tests/controllers/RemoteConfigControllerTest.java b/service/src/test/java/org/whispersystems/textsecuregcm/controllers/RemoteConfigControllerTest.java similarity index 99% rename from service/src/test/java/org/whispersystems/textsecuregcm/tests/controllers/RemoteConfigControllerTest.java rename to service/src/test/java/org/whispersystems/textsecuregcm/controllers/RemoteConfigControllerTest.java index af3c9d57d..48ea3db70 100644 --- a/service/src/test/java/org/whispersystems/textsecuregcm/tests/controllers/RemoteConfigControllerTest.java +++ b/service/src/test/java/org/whispersystems/textsecuregcm/controllers/RemoteConfigControllerTest.java @@ -1,9 +1,9 @@ /* - * Copyright 2013-2021 Signal Messenger, LLC + * Copyright 2013 Signal Messenger, LLC * SPDX-License-Identifier: AGPL-3.0-only */ -package org.whispersystems.textsecuregcm.tests.controllers; +package org.whispersystems.textsecuregcm.controllers; import static org.assertj.core.api.Assertions.assertThat; import static org.mockito.ArgumentMatchers.any; @@ -43,7 +43,6 @@ import org.mockito.ArgumentCaptor; import org.signal.event.NoOpAdminEventLogger; import org.whispersystems.textsecuregcm.auth.AuthenticatedAccount; import org.whispersystems.textsecuregcm.auth.DisabledPermittedAuthenticatedAccount; -import org.whispersystems.textsecuregcm.controllers.RemoteConfigController; import org.whispersystems.textsecuregcm.entities.UserRemoteConfig; import org.whispersystems.textsecuregcm.entities.UserRemoteConfigList; import org.whispersystems.textsecuregcm.mappers.DeviceLimitExceededExceptionMapper; diff --git a/service/src/test/java/org/whispersystems/textsecuregcm/tests/controllers/SecureStorageControllerTest.java b/service/src/test/java/org/whispersystems/textsecuregcm/controllers/SecureStorageControllerTest.java similarity index 96% rename from service/src/test/java/org/whispersystems/textsecuregcm/tests/controllers/SecureStorageControllerTest.java rename to service/src/test/java/org/whispersystems/textsecuregcm/controllers/SecureStorageControllerTest.java index 8740c023a..1a7c276ac 100644 --- a/service/src/test/java/org/whispersystems/textsecuregcm/tests/controllers/SecureStorageControllerTest.java +++ b/service/src/test/java/org/whispersystems/textsecuregcm/controllers/SecureStorageControllerTest.java @@ -3,7 +3,7 @@ * SPDX-License-Identifier: AGPL-3.0-only */ -package org.whispersystems.textsecuregcm.tests.controllers; +package org.whispersystems.textsecuregcm.controllers; import static org.assertj.core.api.AssertionsForClassTypes.assertThat; import static org.mockito.Mockito.when; @@ -22,7 +22,6 @@ import org.whispersystems.textsecuregcm.auth.DisabledPermittedAuthenticatedAccou import org.whispersystems.textsecuregcm.auth.ExternalServiceCredentials; import org.whispersystems.textsecuregcm.auth.ExternalServiceCredentialsGenerator; import org.whispersystems.textsecuregcm.configuration.SecureStorageServiceConfiguration; -import org.whispersystems.textsecuregcm.controllers.SecureStorageController; import org.whispersystems.textsecuregcm.tests.util.AuthHelper; import org.whispersystems.textsecuregcm.util.MockUtils; import org.whispersystems.textsecuregcm.util.SystemMapper; diff --git a/service/src/test/java/org/whispersystems/textsecuregcm/tests/controllers/StickerControllerTest.java b/service/src/test/java/org/whispersystems/textsecuregcm/controllers/StickerControllerTest.java similarity index 95% rename from service/src/test/java/org/whispersystems/textsecuregcm/tests/controllers/StickerControllerTest.java rename to service/src/test/java/org/whispersystems/textsecuregcm/controllers/StickerControllerTest.java index ff21cb7ce..962703473 100644 --- a/service/src/test/java/org/whispersystems/textsecuregcm/tests/controllers/StickerControllerTest.java +++ b/service/src/test/java/org/whispersystems/textsecuregcm/controllers/StickerControllerTest.java @@ -3,7 +3,7 @@ * SPDX-License-Identifier: AGPL-3.0-only */ -package org.whispersystems.textsecuregcm.tests.controllers; +package org.whispersystems.textsecuregcm.controllers; import static org.assertj.core.api.Assertions.assertThat; import static org.mockito.Mockito.mock; @@ -23,8 +23,6 @@ import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.ExtendWith; import org.whispersystems.textsecuregcm.auth.AuthenticatedAccount; import org.whispersystems.textsecuregcm.auth.DisabledPermittedAuthenticatedAccount; -import org.whispersystems.textsecuregcm.controllers.RateLimitExceededException; -import org.whispersystems.textsecuregcm.controllers.StickerController; import org.whispersystems.textsecuregcm.entities.StickerPackFormUploadAttributes; import org.whispersystems.textsecuregcm.limits.RateLimiter; import org.whispersystems.textsecuregcm.limits.RateLimiters; diff --git a/service/src/test/java/org/whispersystems/textsecuregcm/currency/FixerClientTest.java b/service/src/test/java/org/whispersystems/textsecuregcm/currency/FixerClientTest.java index b869c6e86..94d1fd469 100644 --- a/service/src/test/java/org/whispersystems/textsecuregcm/currency/FixerClientTest.java +++ b/service/src/test/java/org/whispersystems/textsecuregcm/currency/FixerClientTest.java @@ -1,3 +1,8 @@ +/* + * Copyright 2023 Signal Messenger, LLC + * SPDX-License-Identifier: AGPL-3.0-only + */ + package org.whispersystems.textsecuregcm.currency; import static org.assertj.core.api.Assertions.assertThat; diff --git a/service/src/test/java/org/whispersystems/textsecuregcm/tests/entities/PreKeyTest.java b/service/src/test/java/org/whispersystems/textsecuregcm/entities/PreKeyTest.java similarity index 84% rename from service/src/test/java/org/whispersystems/textsecuregcm/tests/entities/PreKeyTest.java rename to service/src/test/java/org/whispersystems/textsecuregcm/entities/PreKeyTest.java index 1dfeee56d..37e033e84 100644 --- a/service/src/test/java/org/whispersystems/textsecuregcm/tests/entities/PreKeyTest.java +++ b/service/src/test/java/org/whispersystems/textsecuregcm/entities/PreKeyTest.java @@ -1,9 +1,9 @@ /* - * Copyright 2013-2020 Signal Messenger, LLC + * Copyright 2013 Signal Messenger, LLC * SPDX-License-Identifier: AGPL-3.0-only */ -package org.whispersystems.textsecuregcm.tests.entities; +package org.whispersystems.textsecuregcm.entities; import static org.hamcrest.CoreMatchers.equalTo; import static org.hamcrest.CoreMatchers.is; @@ -11,11 +11,9 @@ import static org.hamcrest.MatcherAssert.assertThat; import static org.whispersystems.textsecuregcm.tests.util.JsonHelpers.asJson; import static org.whispersystems.textsecuregcm.tests.util.JsonHelpers.jsonFixture; +import java.util.Base64; import org.junit.jupiter.api.Test; import org.signal.libsignal.protocol.ecc.ECPublicKey; -import org.whispersystems.textsecuregcm.entities.ECPreKey; - -import java.util.Base64; class PreKeyTest { diff --git a/service/src/test/java/org/whispersystems/textsecuregcm/tests/http/FaultTolerantHttpClientTest.java b/service/src/test/java/org/whispersystems/textsecuregcm/http/FaultTolerantHttpClientTest.java similarity index 97% rename from service/src/test/java/org/whispersystems/textsecuregcm/tests/http/FaultTolerantHttpClientTest.java rename to service/src/test/java/org/whispersystems/textsecuregcm/http/FaultTolerantHttpClientTest.java index 9d882ce8f..81bfb7ef7 100644 --- a/service/src/test/java/org/whispersystems/textsecuregcm/tests/http/FaultTolerantHttpClientTest.java +++ b/service/src/test/java/org/whispersystems/textsecuregcm/http/FaultTolerantHttpClientTest.java @@ -1,9 +1,9 @@ /* - * Copyright 2013-2021 Signal Messenger, LLC + * Copyright 2013 Signal Messenger, LLC * SPDX-License-Identifier: AGPL-3.0-only */ -package org.whispersystems.textsecuregcm.tests.http; +package org.whispersystems.textsecuregcm.http; import static com.github.tomakehurst.wiremock.client.WireMock.aResponse; import static com.github.tomakehurst.wiremock.client.WireMock.get; @@ -30,7 +30,6 @@ import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.RegisterExtension; import org.whispersystems.textsecuregcm.configuration.CircuitBreakerConfiguration; import org.whispersystems.textsecuregcm.configuration.RetryConfiguration; -import org.whispersystems.textsecuregcm.http.FaultTolerantHttpClient; class FaultTolerantHttpClientTest { diff --git a/service/src/test/java/org/whispersystems/textsecuregcm/push/APNSenderTest.java b/service/src/test/java/org/whispersystems/textsecuregcm/push/APNSenderTest.java index 22d0162a5..d302cf5ef 100644 --- a/service/src/test/java/org/whispersystems/textsecuregcm/push/APNSenderTest.java +++ b/service/src/test/java/org/whispersystems/textsecuregcm/push/APNSenderTest.java @@ -1,5 +1,5 @@ /* - * Copyright 2013-2022 Signal Messenger, LLC + * Copyright 2013 Signal Messenger, LLC * SPDX-License-Identifier: AGPL-3.0-only */ diff --git a/service/src/test/java/org/whispersystems/textsecuregcm/push/FcmSenderTest.java b/service/src/test/java/org/whispersystems/textsecuregcm/push/FcmSenderTest.java index dcc871bb2..7b337cfcf 100644 --- a/service/src/test/java/org/whispersystems/textsecuregcm/push/FcmSenderTest.java +++ b/service/src/test/java/org/whispersystems/textsecuregcm/push/FcmSenderTest.java @@ -1,5 +1,5 @@ /* - * Copyright 2013-2022 Signal Messenger, LLC + * Copyright 2013 Signal Messenger, LLC * SPDX-License-Identifier: AGPL-3.0-only */ diff --git a/service/src/test/java/org/whispersystems/textsecuregcm/redis/ClusterLuaScriptTest.java b/service/src/test/java/org/whispersystems/textsecuregcm/redis/ClusterLuaScriptTest.java index 98febfce7..992df8921 100644 --- a/service/src/test/java/org/whispersystems/textsecuregcm/redis/ClusterLuaScriptTest.java +++ b/service/src/test/java/org/whispersystems/textsecuregcm/redis/ClusterLuaScriptTest.java @@ -1,5 +1,5 @@ /* - * Copyright 2013-2020 Signal Messenger, LLC + * Copyright 2013 Signal Messenger, LLC * SPDX-License-Identifier: AGPL-3.0-only */ diff --git a/service/src/test/java/org/whispersystems/textsecuregcm/tests/redis/ReplicatedJedisPoolTest.java b/service/src/test/java/org/whispersystems/textsecuregcm/redis/ReplicatedJedisPoolTest.java similarity index 97% rename from service/src/test/java/org/whispersystems/textsecuregcm/tests/redis/ReplicatedJedisPoolTest.java rename to service/src/test/java/org/whispersystems/textsecuregcm/redis/ReplicatedJedisPoolTest.java index bba66d03f..6ba51918c 100644 --- a/service/src/test/java/org/whispersystems/textsecuregcm/tests/redis/ReplicatedJedisPoolTest.java +++ b/service/src/test/java/org/whispersystems/textsecuregcm/redis/ReplicatedJedisPoolTest.java @@ -1,9 +1,9 @@ /* - * Copyright 2013-2020 Signal Messenger, LLC + * Copyright 2013 Signal Messenger, LLC * SPDX-License-Identifier: AGPL-3.0-only */ -package org.whispersystems.textsecuregcm.tests.redis; +package org.whispersystems.textsecuregcm.redis; import static org.assertj.core.api.Assertions.assertThat; import static org.mockito.Mockito.mock; @@ -18,7 +18,6 @@ import java.util.Collections; import java.util.LinkedList; import org.junit.jupiter.api.Test; import org.whispersystems.textsecuregcm.configuration.CircuitBreakerConfiguration; -import org.whispersystems.textsecuregcm.redis.ReplicatedJedisPool; import redis.clients.jedis.Jedis; import redis.clients.jedis.JedisPool; import redis.clients.jedis.exceptions.JedisException; diff --git a/service/src/test/java/org/whispersystems/textsecuregcm/tests/s3/PolicySignerTest.java b/service/src/test/java/org/whispersystems/textsecuregcm/s3/PolicySignerTest.java similarity index 91% rename from service/src/test/java/org/whispersystems/textsecuregcm/tests/s3/PolicySignerTest.java rename to service/src/test/java/org/whispersystems/textsecuregcm/s3/PolicySignerTest.java index 5ba3ef827..52df80c4c 100644 --- a/service/src/test/java/org/whispersystems/textsecuregcm/tests/s3/PolicySignerTest.java +++ b/service/src/test/java/org/whispersystems/textsecuregcm/s3/PolicySignerTest.java @@ -1,9 +1,9 @@ /* - * Copyright 2013-2020 Signal Messenger, LLC + * Copyright 2013 Signal Messenger, LLC * SPDX-License-Identifier: AGPL-3.0-only */ -package org.whispersystems.textsecuregcm.tests.s3; +package org.whispersystems.textsecuregcm.s3; import static org.junit.jupiter.api.Assertions.assertEquals; @@ -11,7 +11,6 @@ import java.time.Instant; import java.time.ZoneOffset; import java.time.ZonedDateTime; import org.junit.jupiter.api.Test; -import org.whispersystems.textsecuregcm.s3.PolicySigner; class PolicySignerTest { diff --git a/service/src/test/java/org/whispersystems/textsecuregcm/tests/storage/AccountDatabaseCrawlerTest.java b/service/src/test/java/org/whispersystems/textsecuregcm/storage/AccountDatabaseCrawlerTest.java similarity index 85% rename from service/src/test/java/org/whispersystems/textsecuregcm/tests/storage/AccountDatabaseCrawlerTest.java rename to service/src/test/java/org/whispersystems/textsecuregcm/storage/AccountDatabaseCrawlerTest.java index e47504fc2..f17a13b61 100644 --- a/service/src/test/java/org/whispersystems/textsecuregcm/tests/storage/AccountDatabaseCrawlerTest.java +++ b/service/src/test/java/org/whispersystems/textsecuregcm/storage/AccountDatabaseCrawlerTest.java @@ -1,9 +1,9 @@ /* - * Copyright 2013-2020 Signal Messenger, LLC + * Copyright 2013 Signal Messenger, LLC * SPDX-License-Identifier: AGPL-3.0-only */ -package org.whispersystems.textsecuregcm.tests.storage; +package org.whispersystems.textsecuregcm.storage; import static org.mockito.ArgumentMatchers.any; import static org.mockito.ArgumentMatchers.anyInt; @@ -21,12 +21,6 @@ import java.util.Optional; import java.util.UUID; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; -import org.whispersystems.textsecuregcm.storage.Account; -import org.whispersystems.textsecuregcm.storage.AccountCrawlChunk; -import org.whispersystems.textsecuregcm.storage.AccountDatabaseCrawler; -import org.whispersystems.textsecuregcm.storage.AccountDatabaseCrawlerCache; -import org.whispersystems.textsecuregcm.storage.AccountDatabaseCrawlerListener; -import org.whispersystems.textsecuregcm.storage.AccountsManager; class AccountDatabaseCrawlerTest { diff --git a/service/src/test/java/org/whispersystems/textsecuregcm/tests/storage/AccountTest.java b/service/src/test/java/org/whispersystems/textsecuregcm/storage/AccountTest.java similarity index 98% rename from service/src/test/java/org/whispersystems/textsecuregcm/tests/storage/AccountTest.java rename to service/src/test/java/org/whispersystems/textsecuregcm/storage/AccountTest.java index 609de3604..45b24fd04 100644 --- a/service/src/test/java/org/whispersystems/textsecuregcm/tests/storage/AccountTest.java +++ b/service/src/test/java/org/whispersystems/textsecuregcm/storage/AccountTest.java @@ -1,9 +1,9 @@ /* - * Copyright 2013-2022 Signal Messenger, LLC + * Copyright 2013 Signal Messenger, LLC * SPDX-License-Identifier: AGPL-3.0-only */ -package org.whispersystems.textsecuregcm.tests.storage; +package org.whispersystems.textsecuregcm.storage; import static org.assertj.core.api.Assertions.assertThat; import static org.junit.jupiter.api.Assertions.assertDoesNotThrow; @@ -25,9 +25,6 @@ import java.util.UUID; import java.util.concurrent.TimeUnit; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; -import org.whispersystems.textsecuregcm.storage.Account; -import org.whispersystems.textsecuregcm.storage.AccountBadge; -import org.whispersystems.textsecuregcm.storage.Device; import org.whispersystems.textsecuregcm.storage.Device.DeviceCapabilities; import org.whispersystems.textsecuregcm.tests.util.AccountsHelper; import org.whispersystems.textsecuregcm.util.TestClock; diff --git a/service/src/test/java/org/whispersystems/textsecuregcm/storage/ChangeNumberManagerTest.java b/service/src/test/java/org/whispersystems/textsecuregcm/storage/ChangeNumberManagerTest.java index b1d702f2f..7ce758211 100644 --- a/service/src/test/java/org/whispersystems/textsecuregcm/storage/ChangeNumberManagerTest.java +++ b/service/src/test/java/org/whispersystems/textsecuregcm/storage/ChangeNumberManagerTest.java @@ -1,5 +1,5 @@ /* - * Copyright 2013-2022 Signal Messenger, LLC + * Copyright 2013 Signal Messenger, LLC * SPDX-License-Identifier: AGPL-3.0-only */ package org.whispersystems.textsecuregcm.storage; diff --git a/service/src/test/java/org/whispersystems/textsecuregcm/storage/KeysManagerTest.java b/service/src/test/java/org/whispersystems/textsecuregcm/storage/KeysManagerTest.java index 6dfc16b40..dbd0abcd9 100644 --- a/service/src/test/java/org/whispersystems/textsecuregcm/storage/KeysManagerTest.java +++ b/service/src/test/java/org/whispersystems/textsecuregcm/storage/KeysManagerTest.java @@ -1,5 +1,5 @@ /* - * Copyright 2021-2022 Signal Messenger, LLC + * Copyright 2021 Signal Messenger, LLC * SPDX-License-Identifier: AGPL-3.0-only */ diff --git a/service/src/test/java/org/whispersystems/textsecuregcm/storage/MessagesCacheTest.java b/service/src/test/java/org/whispersystems/textsecuregcm/storage/MessagesCacheTest.java index 55092f292..2bae8bec7 100644 --- a/service/src/test/java/org/whispersystems/textsecuregcm/storage/MessagesCacheTest.java +++ b/service/src/test/java/org/whispersystems/textsecuregcm/storage/MessagesCacheTest.java @@ -1,5 +1,5 @@ /* - * Copyright 2013-2022 Signal Messenger, LLC + * Copyright 2013 Signal Messenger, LLC * SPDX-License-Identifier: AGPL-3.0-only */ diff --git a/service/src/test/java/org/whispersystems/textsecuregcm/storage/MessagesDynamoDbTest.java b/service/src/test/java/org/whispersystems/textsecuregcm/storage/MessagesDynamoDbTest.java index 38e92820e..df47ab23e 100644 --- a/service/src/test/java/org/whispersystems/textsecuregcm/storage/MessagesDynamoDbTest.java +++ b/service/src/test/java/org/whispersystems/textsecuregcm/storage/MessagesDynamoDbTest.java @@ -1,5 +1,5 @@ /* - * Copyright 2013-2022 Signal Messenger, LLC + * Copyright 2013 Signal Messenger, LLC * SPDX-License-Identifier: AGPL-3.0-only */ diff --git a/service/src/test/java/org/whispersystems/textsecuregcm/tests/storage/ProfilesManagerTest.java b/service/src/test/java/org/whispersystems/textsecuregcm/storage/ProfilesManagerTest.java similarity index 93% rename from service/src/test/java/org/whispersystems/textsecuregcm/tests/storage/ProfilesManagerTest.java rename to service/src/test/java/org/whispersystems/textsecuregcm/storage/ProfilesManagerTest.java index 894f12de0..51ef4f71e 100644 --- a/service/src/test/java/org/whispersystems/textsecuregcm/tests/storage/ProfilesManagerTest.java +++ b/service/src/test/java/org/whispersystems/textsecuregcm/storage/ProfilesManagerTest.java @@ -1,9 +1,9 @@ /* - * Copyright 2013-2020 Signal Messenger, LLC + * Copyright 2013 Signal Messenger, LLC * SPDX-License-Identifier: AGPL-3.0-only */ -package org.whispersystems.textsecuregcm.tests.storage; +package org.whispersystems.textsecuregcm.storage; import static org.assertj.core.api.Assertions.assertThat; import static org.junit.jupiter.api.Assertions.assertEquals; @@ -25,9 +25,6 @@ import java.util.UUID; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; import org.whispersystems.textsecuregcm.redis.FaultTolerantRedisCluster; -import org.whispersystems.textsecuregcm.storage.Profiles; -import org.whispersystems.textsecuregcm.storage.ProfilesManager; -import org.whispersystems.textsecuregcm.storage.VersionedProfile; import org.whispersystems.textsecuregcm.tests.util.RedisClusterHelper; public class ProfilesManagerTest { diff --git a/service/src/test/java/org/whispersystems/textsecuregcm/tests/storage/PushFeedbackProcessorTest.java b/service/src/test/java/org/whispersystems/textsecuregcm/storage/PushFeedbackProcessorTest.java similarity index 95% rename from service/src/test/java/org/whispersystems/textsecuregcm/tests/storage/PushFeedbackProcessorTest.java rename to service/src/test/java/org/whispersystems/textsecuregcm/storage/PushFeedbackProcessorTest.java index ad77860da..62bd69c64 100644 --- a/service/src/test/java/org/whispersystems/textsecuregcm/tests/storage/PushFeedbackProcessorTest.java +++ b/service/src/test/java/org/whispersystems/textsecuregcm/storage/PushFeedbackProcessorTest.java @@ -1,9 +1,9 @@ /* - * Copyright 2013-2020 Signal Messenger, LLC + * Copyright 2013 Signal Messenger, LLC * SPDX-License-Identifier: AGPL-3.0-only */ -package org.whispersystems.textsecuregcm.tests.storage; +package org.whispersystems.textsecuregcm.storage; import static org.mockito.Mockito.any; import static org.mockito.Mockito.anyBoolean; @@ -26,10 +26,6 @@ import java.util.concurrent.Executors; import java.util.concurrent.TimeUnit; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; -import org.whispersystems.textsecuregcm.storage.Account; -import org.whispersystems.textsecuregcm.storage.AccountsManager; -import org.whispersystems.textsecuregcm.storage.Device; -import org.whispersystems.textsecuregcm.storage.PushFeedbackProcessor; import org.whispersystems.textsecuregcm.tests.util.AccountsHelper; import org.whispersystems.textsecuregcm.util.Util; diff --git a/service/src/test/java/org/whispersystems/textsecuregcm/tests/storage/RedeemedReceiptsManagerTest.java b/service/src/test/java/org/whispersystems/textsecuregcm/storage/RedeemedReceiptsManagerTest.java similarity index 91% rename from service/src/test/java/org/whispersystems/textsecuregcm/tests/storage/RedeemedReceiptsManagerTest.java rename to service/src/test/java/org/whispersystems/textsecuregcm/storage/RedeemedReceiptsManagerTest.java index 8170ba63c..f0f35d120 100644 --- a/service/src/test/java/org/whispersystems/textsecuregcm/tests/storage/RedeemedReceiptsManagerTest.java +++ b/service/src/test/java/org/whispersystems/textsecuregcm/storage/RedeemedReceiptsManagerTest.java @@ -3,11 +3,9 @@ * SPDX-License-Identifier: AGPL-3.0-only */ -package org.whispersystems.textsecuregcm.tests.storage; +package org.whispersystems.textsecuregcm.storage; import static org.assertj.core.api.Assertions.assertThat; -import static org.mockito.Mockito.mock; -import static org.mockito.Mockito.when; import java.security.SecureRandom; import java.time.Clock; @@ -20,9 +18,7 @@ import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.RegisterExtension; import org.signal.libsignal.zkgroup.InvalidInputException; import org.signal.libsignal.zkgroup.receipts.ReceiptSerial; -import org.whispersystems.textsecuregcm.storage.DynamoDbExtension; import org.whispersystems.textsecuregcm.storage.DynamoDbExtensionSchema.Tables; -import org.whispersystems.textsecuregcm.storage.RedeemedReceiptsManager; import org.whispersystems.textsecuregcm.tests.util.AuthHelper; import org.whispersystems.textsecuregcm.util.TestClock; diff --git a/service/src/test/java/org/whispersystems/textsecuregcm/storage/RemoteConfigsTest.java b/service/src/test/java/org/whispersystems/textsecuregcm/storage/RemoteConfigsTest.java index d3db9ccbe..92f874d16 100644 --- a/service/src/test/java/org/whispersystems/textsecuregcm/storage/RemoteConfigsTest.java +++ b/service/src/test/java/org/whispersystems/textsecuregcm/storage/RemoteConfigsTest.java @@ -1,19 +1,19 @@ /* - * Copyright 2013-2021 Signal Messenger, LLC + * Copyright 2013 Signal Messenger, LLC * SPDX-License-Identifier: AGPL-3.0-only */ package org.whispersystems.textsecuregcm.storage; +import static org.assertj.core.api.Assertions.assertThat; + +import java.util.List; +import java.util.Set; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.RegisterExtension; -import org.whispersystems.textsecuregcm.tests.util.AuthHelper; import org.whispersystems.textsecuregcm.storage.DynamoDbExtensionSchema.Tables; -import java.util.List; -import java.util.Set; - -import static org.assertj.core.api.Assertions.assertThat; +import org.whispersystems.textsecuregcm.tests.util.AuthHelper; class RemoteConfigsTest { diff --git a/service/src/test/java/org/whispersystems/textsecuregcm/storage/RepeatedUseECSignedPreKeyStoreTest.java b/service/src/test/java/org/whispersystems/textsecuregcm/storage/RepeatedUseECSignedPreKeyStoreTest.java index 1f6476d8c..57dcdfe95 100644 --- a/service/src/test/java/org/whispersystems/textsecuregcm/storage/RepeatedUseECSignedPreKeyStoreTest.java +++ b/service/src/test/java/org/whispersystems/textsecuregcm/storage/RepeatedUseECSignedPreKeyStoreTest.java @@ -5,6 +5,12 @@ package org.whispersystems.textsecuregcm.storage; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertFalse; +import static org.junit.jupiter.api.Assertions.assertTrue; + +import java.util.Optional; +import java.util.UUID; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.RegisterExtension; @@ -12,12 +18,6 @@ import org.signal.libsignal.protocol.ecc.Curve; import org.signal.libsignal.protocol.ecc.ECKeyPair; import org.whispersystems.textsecuregcm.entities.ECSignedPreKey; import org.whispersystems.textsecuregcm.tests.util.KeysHelper; -import java.util.Optional; -import java.util.UUID; - -import static org.junit.jupiter.api.Assertions.assertEquals; -import static org.junit.jupiter.api.Assertions.assertFalse; -import static org.junit.jupiter.api.Assertions.assertTrue; class RepeatedUseECSignedPreKeyStoreTest extends RepeatedUseSignedPreKeyStoreTest { diff --git a/service/src/test/java/org/whispersystems/textsecuregcm/tests/util/DevicesHelper.java b/service/src/test/java/org/whispersystems/textsecuregcm/tests/util/DevicesHelper.java index 4ee2ef2ad..54ed18e7d 100644 --- a/service/src/test/java/org/whispersystems/textsecuregcm/tests/util/DevicesHelper.java +++ b/service/src/test/java/org/whispersystems/textsecuregcm/tests/util/DevicesHelper.java @@ -6,7 +6,6 @@ package org.whispersystems.textsecuregcm.tests.util; import java.util.Random; - import org.signal.libsignal.protocol.ecc.Curve; import org.whispersystems.textsecuregcm.storage.Device; import org.whispersystems.textsecuregcm.util.Util; diff --git a/service/src/test/java/org/whispersystems/textsecuregcm/tests/util/MockRedisFuture.java b/service/src/test/java/org/whispersystems/textsecuregcm/tests/util/MockRedisFuture.java index fa9110cfd..363631c72 100644 --- a/service/src/test/java/org/whispersystems/textsecuregcm/tests/util/MockRedisFuture.java +++ b/service/src/test/java/org/whispersystems/textsecuregcm/tests/util/MockRedisFuture.java @@ -6,17 +6,8 @@ package org.whispersystems.textsecuregcm.tests.util; import io.lettuce.core.RedisFuture; -import org.jetbrains.annotations.NotNull; import java.util.concurrent.CompletableFuture; -import java.util.concurrent.CompletionStage; -import java.util.concurrent.ExecutionException; -import java.util.concurrent.Executor; import java.util.concurrent.TimeUnit; -import java.util.concurrent.TimeoutException; -import java.util.function.BiConsumer; -import java.util.function.BiFunction; -import java.util.function.Consumer; -import java.util.function.Function; public class MockRedisFuture extends CompletableFuture implements RedisFuture { diff --git a/service/src/test/java/org/whispersystems/textsecuregcm/tests/util/RedisClusterHelper.java b/service/src/test/java/org/whispersystems/textsecuregcm/tests/util/RedisClusterHelper.java index 2ce6db09f..e0f8201b6 100644 --- a/service/src/test/java/org/whispersystems/textsecuregcm/tests/util/RedisClusterHelper.java +++ b/service/src/test/java/org/whispersystems/textsecuregcm/tests/util/RedisClusterHelper.java @@ -1,5 +1,5 @@ /* - * Copyright 2013-2020 Signal Messenger, LLC + * Copyright 2013 Signal Messenger, LLC * SPDX-License-Identifier: AGPL-3.0-only */ diff --git a/service/src/test/java/org/whispersystems/textsecuregcm/tests/util/SynchronousExecutorService.java b/service/src/test/java/org/whispersystems/textsecuregcm/tests/util/SynchronousExecutorService.java index 1bf95b74a..b8552b14f 100644 --- a/service/src/test/java/org/whispersystems/textsecuregcm/tests/util/SynchronousExecutorService.java +++ b/service/src/test/java/org/whispersystems/textsecuregcm/tests/util/SynchronousExecutorService.java @@ -1,12 +1,11 @@ /* - * Copyright 2013-2020 Signal Messenger, LLC + * Copyright 2013 Signal Messenger, LLC * SPDX-License-Identifier: AGPL-3.0-only */ package org.whispersystems.textsecuregcm.tests.util; import com.google.common.util.concurrent.SettableFuture; - import java.util.Collection; import java.util.Collections; import java.util.LinkedList; diff --git a/service/src/test/java/org/whispersystems/textsecuregcm/tests/util/LocaleTest.java b/service/src/test/java/org/whispersystems/textsecuregcm/util/LocaleTest.java similarity index 91% rename from service/src/test/java/org/whispersystems/textsecuregcm/tests/util/LocaleTest.java rename to service/src/test/java/org/whispersystems/textsecuregcm/util/LocaleTest.java index c428d5821..bc7685e91 100644 --- a/service/src/test/java/org/whispersystems/textsecuregcm/tests/util/LocaleTest.java +++ b/service/src/test/java/org/whispersystems/textsecuregcm/util/LocaleTest.java @@ -1,4 +1,9 @@ -package org.whispersystems.textsecuregcm.tests.util; +/* + * Copyright 2023 Signal Messenger, LLC + * SPDX-License-Identifier: AGPL-3.0-only + */ + +package org.whispersystems.textsecuregcm.util; import static org.junit.jupiter.api.Assertions.assertEquals; @@ -12,7 +17,6 @@ import javax.annotation.Nullable; import org.junit.jupiter.params.ParameterizedTest; import org.junit.jupiter.params.provider.Arguments; import org.junit.jupiter.params.provider.MethodSource; -import org.whispersystems.textsecuregcm.util.Util; class LocaleTest { diff --git a/service/src/test/java/org/whispersystems/textsecuregcm/tests/util/NumberPrefixTest.java b/service/src/test/java/org/whispersystems/textsecuregcm/util/NumberPrefixTest.java similarity index 77% rename from service/src/test/java/org/whispersystems/textsecuregcm/tests/util/NumberPrefixTest.java rename to service/src/test/java/org/whispersystems/textsecuregcm/util/NumberPrefixTest.java index 95d77fc4a..7ca106d5a 100644 --- a/service/src/test/java/org/whispersystems/textsecuregcm/tests/util/NumberPrefixTest.java +++ b/service/src/test/java/org/whispersystems/textsecuregcm/util/NumberPrefixTest.java @@ -1,14 +1,13 @@ /* - * Copyright 2013-2020 Signal Messenger, LLC + * Copyright 2013 Signal Messenger, LLC * SPDX-License-Identifier: AGPL-3.0-only */ -package org.whispersystems.textsecuregcm.tests.util; +package org.whispersystems.textsecuregcm.util; import static org.assertj.core.api.AssertionsForClassTypes.assertThat; import org.junit.jupiter.api.Test; -import org.whispersystems.textsecuregcm.util.Util; class NumberPrefixTest { diff --git a/service/src/test/java/org/whispersystems/textsecuregcm/tests/util/ValidNumberTest.java b/service/src/test/java/org/whispersystems/textsecuregcm/util/ValidNumberTest.java similarity index 85% rename from service/src/test/java/org/whispersystems/textsecuregcm/tests/util/ValidNumberTest.java rename to service/src/test/java/org/whispersystems/textsecuregcm/util/ValidNumberTest.java index a1566d9ee..de8bcc258 100644 --- a/service/src/test/java/org/whispersystems/textsecuregcm/tests/util/ValidNumberTest.java +++ b/service/src/test/java/org/whispersystems/textsecuregcm/util/ValidNumberTest.java @@ -1,9 +1,9 @@ /* - * Copyright 2013-2020 Signal Messenger, LLC + * Copyright 2013 Signal Messenger, LLC * SPDX-License-Identifier: AGPL-3.0-only */ -package org.whispersystems.textsecuregcm.tests.util; +package org.whispersystems.textsecuregcm.util; import static org.junit.jupiter.api.Assertions.assertDoesNotThrow; import static org.junit.jupiter.api.Assertions.assertThrows; @@ -11,9 +11,6 @@ import static org.junit.jupiter.api.Assertions.assertThrows; import org.junit.jupiter.api.Test; import org.junit.jupiter.params.ParameterizedTest; import org.junit.jupiter.params.provider.ValueSource; -import org.whispersystems.textsecuregcm.util.ImpossiblePhoneNumberException; -import org.whispersystems.textsecuregcm.util.NonNormalizedPhoneNumberException; -import org.whispersystems.textsecuregcm.util.Util; class ValidNumberTest {