mnalis/apps-android-commons
1
0
Fork 0
mirror of https://github.com/commons-app/apps-android-commons.git synced 2025-11-01 15:23:54 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

4671: Change the deprecated RuntimeEnvironment.application in all the Robolectric unit tests (#5140)

Browse source 
* Robolectric Unit Tests: change deprecated robolectric RuntimeEnvironment.application to ApplicationProvider and optimise imports

* Delete app/CommonsContributions directory

Removed unnecessary directory created in the process
This commit is contained in:
Ritika Pahwa 2023-02-06 13:47:16 +05:30 • committed by GitHub
parent 87f637f5c6
commit 1bc21c2629
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
60 changed files with 140 additions and 157 deletions
Download patch file Download diff file Expand all files Collapse all files

8
app/src/test/kotlin/fr/free/nrw/commons/auth/AccountUtilUnitTest.kt
View file

@ -1,5 +1,6 @@
package fr.free.nrw.commons.auth
import androidx.test.core.app.ApplicationProvider
import fr.free.nrw.commons.FakeContextWrapper
import fr.free.nrw.commons.FakeContextWrapperWithException
import fr.free.nrw.commons.TestCommonsApplication
@ -8,7 +9,6 @@ import org.junit.Before
import org.junit.Test
import org.junit.runner.RunWith
import org.robolectric.RobolectricTestRunner
import org.robolectric.RuntimeEnvironment
import org.robolectric.annotation.Config
@RunWith(RobolectricTestRunner::class)
@ -21,7 +21,7 @@ class AccountUtilUnitTest {
@Before
@Throws(Exception::class)
fun setUp() {
context = FakeContextWrapper(RuntimeEnvironment.application.applicationContext)
context = FakeContextWrapper(ApplicationProvider.getApplicationContext())
accountUtil = AccountUtil()
}
@ -41,7 +41,7 @@ class AccountUtilUnitTest {
@Throws(Exception::class)
fun testGetUserNameWithException() {
val context =
FakeContextWrapperWithException(RuntimeEnvironment.application.applicationContext)
FakeContextWrapperWithException(ApplicationProvider.getApplicationContext())
Assert.assertEquals(AccountUtil.getUserName(context), null)
}
@ -55,7 +55,7 @@ class AccountUtilUnitTest {
@Throws(Exception::class)
fun testAccountWithException() {
val context =
FakeContextWrapperWithException(RuntimeEnvironment.application.applicationContext)
FakeContextWrapperWithException(ApplicationProvider.getApplicationContext())
Assert.assertEquals(AccountUtil.account(context), null)
}
}

4
app/src/test/kotlin/fr/free/nrw/commons/auth/LoginActivityUnitTests.kt
View file

@ -10,6 +10,7 @@ import android.view.View
import android.view.ViewGroup
import android.view.inputmethod.EditorInfo
import android.widget.Button
import androidx.test.core.app.ApplicationProvider
import fr.free.nrw.commons.R
import fr.free.nrw.commons.TestAppAdapter
import fr.free.nrw.commons.TestCommonsApplication
@ -24,7 +25,6 @@ import org.mockito.MockitoAnnotations
import org.powermock.reflect.Whitebox
import org.robolectric.Robolectric
import org.robolectric.RobolectricTestRunner
import org.robolectric.RuntimeEnvironment
import org.robolectric.annotation.Config
import org.robolectric.fakes.RoboMenuItem
import org.wikipedia.AppAdapter
@ -77,7 +77,7 @@ class LoginActivityUnitTests {
MockitoAnnotations.initMocks(this)
AppAdapter.set(TestAppAdapter())
activity = Robolectric.buildActivity(LoginActivity::class.java).create().get()
context = RuntimeEnvironment.application.applicationContext
context = ApplicationProvider.getApplicationContext()
menuItem = RoboMenuItem(null)
Whitebox.setInternalState(activity, "progressDialog", progressDialog)
Whitebox.setInternalState(activity, "applicationKvStore", applicationKvStore)

6
app/src/test/kotlin/fr/free/nrw/commons/auth/SessionManagerUnitTests.kt
View file

@ -3,6 +3,7 @@ package fr.free.nrw.commons.auth
import android.accounts.Account
import android.accounts.AccountManager
import android.content.Context
import androidx.test.core.app.ApplicationProvider
import fr.free.nrw.commons.TestCommonsApplication
import fr.free.nrw.commons.kvstore.JsonKvStore
import org.junit.Assert
@ -13,7 +14,6 @@ import org.mockito.Mock
import org.mockito.MockitoAnnotations
import org.powermock.api.mockito.PowerMockito.`when`
import org.robolectric.RobolectricTestRunner
import org.robolectric.RuntimeEnvironment
import org.robolectric.Shadows.shadowOf
import org.robolectric.annotation.Config
import org.robolectric.annotation.LooperMode
@ -44,10 +44,10 @@ class SessionManagerUnitTests {
@Before
fun setUp() {
MockitoAnnotations.initMocks(this)
accountManager = AccountManager.get(RuntimeEnvironment.application)
accountManager = AccountManager.get(ApplicationProvider.getApplicationContext())
shadowOf(accountManager).addAccount(account)
sessionManager =
SessionManager(RuntimeEnvironment.application.applicationContext, defaultKvStore)
SessionManager(ApplicationProvider.getApplicationContext(), defaultKvStore)
}
@Test

4
app/src/test/kotlin/fr/free/nrw/commons/auth/WikiAccountAuthenticatorUnitTest.kt
View file

@ -6,6 +6,7 @@ import android.accounts.AccountManager
import android.content.Context
import android.content.Intent
import android.os.Bundle
import androidx.test.core.app.ApplicationProvider
import fr.free.nrw.commons.BuildConfig
import fr.free.nrw.commons.TestCommonsApplication
import org.junit.Assert
@ -15,7 +16,6 @@ import org.junit.runner.RunWith
import org.mockito.Mock
import org.mockito.MockitoAnnotations
import org.robolectric.RobolectricTestRunner
import org.robolectric.RuntimeEnvironment
import org.robolectric.annotation.Config
import org.robolectric.annotation.LooperMode
@ -36,7 +36,7 @@ class WikiAccountAuthenticatorUnitTest {
@Before
fun setUp() {
MockitoAnnotations.initMocks(this)
context = RuntimeEnvironment.application.applicationContext
context = ApplicationProvider.getApplicationContext()
authenticator = WikiAccountAuthenticator(context)
}