Signal/Android
1
0
Fork 0
mirror of https://github.com/signalapp/Signal-Android.git synced 2026-04-24 10:51:27 +01:00
Code Issues Packages Projects Releases Wiki Activity

Rewrite the AppDependencies system.

Browse Source
This commit is contained in:
Greyson Parrelli
2024-05-22 15:44:24 -04:00
committed by Cody Henthorne
parent a0131bf39b
commit b6a4e1f145
560 changed files with 2909 additions and 3036 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
app/src/test/java/org/thoughtcrime/securesms/components/emoji/EmojiUtilTest_isEmoji.java
View File

@@ -15,7 +15,7 @@ import org.mockito.junit.MockitoRule;
import org.robolectric.ParameterizedRobolectricTestRunner;
import org.robolectric.annotation.Config;
import org.thoughtcrime.securesms.crypto.AttachmentSecretProvider;
import org.thoughtcrime.securesms.dependencies.ApplicationDependencies;
import org.thoughtcrime.securesms.dependencies.AppDependencies;
import org.thoughtcrime.securesms.emoji.EmojiSource;
import org.thoughtcrime.securesms.keyvalue.InternalValues;
import org.thoughtcrime.securesms.keyvalue.SignalStore;
@@ -61,7 +61,7 @@ public class EmojiUtilTest_isEmoji {
}
@Mock
private MockedStatic<ApplicationDependencies> applicationDependenciesMockedStatic;
private MockedStatic<AppDependencies> applicationDependenciesMockedStatic;
@Mock
private MockedStatic<AttachmentSecretProvider> attachmentSecretProviderMockedStatic;
@@ -81,7 +81,7 @@ public class EmojiUtilTest_isEmoji {
public void isEmoji() throws Exception {
Application application = ApplicationProvider.getApplicationContext();
when(ApplicationDependencies.getApplication()).thenReturn(application);
when(AppDependencies.getApplication()).thenReturn(application);
when(AttachmentSecretProvider.getInstance(any())).thenThrow(RuntimeException.class);
when(SignalStore.internalValues()).thenReturn(mock(InternalValues.class));
EmojiSource.refresh();

6
app/src/test/java/org/thoughtcrime/securesms/components/settings/app/account/export/ExportAccountDataTest.kt
View File

@@ -17,7 +17,7 @@ import org.junit.Test
import org.junit.runner.RunWith
import org.robolectric.RobolectricTestRunner
import org.robolectric.annotation.Config
import org.thoughtcrime.securesms.dependencies.ApplicationDependencies
import org.thoughtcrime.securesms.dependencies.AppDependencies
import org.thoughtcrime.securesms.dependencies.MockApplicationDependencyProvider
import org.thoughtcrime.securesms.providers.BlobProvider
import org.thoughtcrime.securesms.util.JsonUtils
@@ -66,8 +66,8 @@ class ExportAccountDataTest {
@Before
fun setup() {
if (!ApplicationDependencies.isInitialized()) {
ApplicationDependencies.init(ApplicationProvider.getApplicationContext(), MockApplicationDependencyProvider())
if (!AppDependencies.isInitialized) {
AppDependencies.init(ApplicationProvider.getApplicationContext(), MockApplicationDependencyProvider())
}
}

22
app/src/test/java/org/thoughtcrime/securesms/components/settings/app/subscription/SubscriptionsConfigurationExtensionsKtTest.kt
View File

@@ -11,7 +11,7 @@ import org.junit.Test
import org.junit.runner.RunWith
import org.robolectric.RobolectricTestRunner
import org.robolectric.annotation.Config
import org.thoughtcrime.securesms.dependencies.ApplicationDependencies
import org.thoughtcrime.securesms.dependencies.AppDependencies
import org.whispersystems.signalservice.internal.push.SubscriptionsConfiguration
import org.whispersystems.signalservice.internal.util.JsonUtil
import java.util.Currency
@@ -49,8 +49,8 @@ class SubscriptionsConfigurationExtensionsKtTest {
@Test
fun `When I getGiftBadges, then I expect exactly 1 badge with the id GIFT`() {
mockkStatic(ApplicationDependencies::class) {
every { ApplicationDependencies.getApplication() } returns ApplicationProvider.getApplicationContext()
mockkStatic(AppDependencies::class) {
every { AppDependencies.application } returns ApplicationProvider.getApplicationContext()
val giftBadges = testSubject.getGiftBadges()
@@ -61,8 +61,8 @@ class SubscriptionsConfigurationExtensionsKtTest {
@Test
fun `When I getBoostBadges, then I expect exactly 1 badge with the id BOOST`() {
mockkStatic(ApplicationDependencies::class) {
every { ApplicationDependencies.getApplication() } returns ApplicationProvider.getApplicationContext()
mockkStatic(AppDependencies::class) {
every { AppDependencies.application } returns ApplicationProvider.getApplicationContext()
val boostBadges = testSubject.getBoostBadges()
@@ -163,8 +163,8 @@ class SubscriptionsConfigurationExtensionsKtTest {
@Test
fun `Given GIFT_LEVEL, When I getBadge, then I expect the gift badge`() {
mockkStatic(ApplicationDependencies::class) {
every { ApplicationDependencies.getApplication() } returns ApplicationProvider.getApplicationContext()
mockkStatic(AppDependencies::class) {
every { AppDependencies.application } returns ApplicationProvider.getApplicationContext()
val badge = testSubject.getBadge(SubscriptionsConfiguration.GIFT_LEVEL)
assertTrue(badge.isGift())
@@ -173,8 +173,8 @@ class SubscriptionsConfigurationExtensionsKtTest {
@Test
fun `Given BOOST_LEVEL, When I getBadge, then I expect the boost badge`() {
mockkStatic(ApplicationDependencies::class) {
every { ApplicationDependencies.getApplication() } returns ApplicationProvider.getApplicationContext()
mockkStatic(AppDependencies::class) {
every { AppDependencies.application } returns ApplicationProvider.getApplicationContext()
val badge = testSubject.getBadge(SubscriptionsConfiguration.BOOST_LEVEL)
assertTrue(badge.isBoost())
@@ -183,8 +183,8 @@ class SubscriptionsConfigurationExtensionsKtTest {
@Test
fun `Given a sub level, When I getBadge, then I expect a sub badge`() {
mockkStatic(ApplicationDependencies::class) {
every { ApplicationDependencies.getApplication() } returns ApplicationProvider.getApplicationContext()
mockkStatic(AppDependencies::class) {
every { AppDependencies.application } returns ApplicationProvider.getApplicationContext()
val badge = testSubject.getBadge(SubscriptionsConfiguration.SUBSCRIPTION_LEVELS.first())
assertTrue(badge.isSubscription())