Skip to content

Commit e7e68f2

Browse files
dectorpocmo
dector
authored and
pocmo
committed
For mozilla-mobile#1481. Use androidx runner in service-experiments.
1 parent baba3e4 commit e7e68f2

16 files changed

+47
-43
lines changed

‎components/service/experiments/build.gradle

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,8 @@ android {
1919
proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'
2020
}
2121
}
22+
23+
testOptions.unitTests.includeAndroidResources = true
2224
}
2325

2426
dependencies {
@@ -34,7 +36,7 @@ dependencies {
3436

3537
testImplementation Dependencies.androidx_test_core
3638

37-
testImplementation Dependencies.testing_junit
39+
testImplementation Dependencies.androidx_test_junit
3840
testImplementation Dependencies.testing_robolectric
3941
testImplementation Dependencies.testing_mockito
4042
testImplementation Dependencies.testing_mockwebserver

‎components/service/experiments/gradle.properties

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
1+
# TODO remove and enable globally
2+
android.enableUnitTestBinaryResources=true

‎components/service/experiments/src/test/java/mozilla/components/service/experiments/ActiveExperimentTest.kt

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -6,19 +6,19 @@ package mozilla.components.service.experiments
66

77
import android.content.Context
88
import android.content.SharedPreferences
9+
import androidx.test.ext.junit.runners.AndroidJUnit4
910
import mozilla.components.support.test.mock
1011
import org.junit.Assert.assertEquals
1112
import org.junit.Assert.assertNull
1213
import org.junit.Test
1314
import org.junit.runner.RunWith
14-
import org.mockito.ArgumentMatchers.eq
1515
import org.mockito.ArgumentMatchers.anyString
16+
import org.mockito.ArgumentMatchers.eq
1617
import org.mockito.Mockito.`when`
1718
import org.mockito.Mockito.times
1819
import org.mockito.Mockito.verify
19-
import org.robolectric.RobolectricTestRunner
2020

21-
@RunWith(RobolectricTestRunner::class)
21+
@RunWith(AndroidJUnit4::class)
2222
class ActiveExperimentTest {
2323
private lateinit var context: Context
2424
private lateinit var sharedPrefs: SharedPreferences

‎components/service/experiments/src/test/java/mozilla/components/service/experiments/DeviceUuidFactoryTest.kt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@ package mozilla.components.service.experiments
66

77
import android.content.Context
88
import android.content.SharedPreferences
9+
import androidx.test.ext.junit.runners.AndroidJUnit4
910
import org.junit.Assert.assertEquals
1011
import org.junit.Test
1112
import org.junit.runner.RunWith
@@ -17,9 +18,8 @@ import org.mockito.ArgumentMatchers.eq
1718
import org.mockito.Mockito.`when`
1819
import org.mockito.Mockito.mock
1920
import org.mockito.Mockito.verify
20-
import org.robolectric.RobolectricTestRunner
2121

22-
@RunWith(RobolectricTestRunner::class)
22+
@RunWith(AndroidJUnit4::class)
2323
class DeviceUuidFactoryTest {
2424
@Test
2525
fun uuidNoPreference() {

‎components/service/experiments/src/test/java/mozilla/components/service/experiments/ExperimentEvaluatorTest.kt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@ import android.content.Context
88
import android.content.SharedPreferences
99
import android.content.pm.PackageInfo
1010
import android.content.pm.PackageManager
11+
import androidx.test.ext.junit.runners.AndroidJUnit4
1112
import mozilla.components.support.test.mock
1213
import mozilla.components.support.test.robolectric.testContext
1314
import org.junit.Assert
@@ -22,11 +23,10 @@ import org.mockito.ArgumentMatchers.anyString
2223
import org.mockito.ArgumentMatchers.eq
2324
import org.mockito.Mockito.`when`
2425
import org.mockito.Mockito.verify
25-
import org.robolectric.RobolectricTestRunner
2626
import kotlin.reflect.full.functions
2727
import kotlin.reflect.jvm.isAccessible
2828

29-
@RunWith(RobolectricTestRunner::class)
29+
@RunWith(AndroidJUnit4::class)
3030
class ExperimentEvaluatorTest {
3131
private lateinit var context: Context
3232
private lateinit var sharedPrefsOverrideEnabled: SharedPreferences

‎components/service/experiments/src/test/java/mozilla/components/service/experiments/ExperimentPayloadTest.kt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,14 +4,14 @@
44

55
package mozilla.components.service.experiments
66

7+
import androidx.test.ext.junit.runners.AndroidJUnit4
78
import org.junit.Assert.assertEquals
89
import org.junit.Assert.assertNull
910
import org.junit.Assert.assertTrue
1011
import org.junit.Test
1112
import org.junit.runner.RunWith
12-
import org.robolectric.RobolectricTestRunner
1313

14-
@RunWith(RobolectricTestRunner::class)
14+
@RunWith(AndroidJUnit4::class)
1515
class ExperimentPayloadTest {
1616
@Test
1717
fun get() {

‎components/service/experiments/src/test/java/mozilla/components/service/experiments/ExperimentTest.kt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,14 +4,14 @@
44

55
package mozilla.components.service.experiments
66

7+
import androidx.test.ext.junit.runners.AndroidJUnit4
78
import org.junit.Assert.assertEquals
89
import org.junit.Assert.assertFalse
910
import org.junit.Assert.assertTrue
1011
import org.junit.Test
1112
import org.junit.runner.RunWith
12-
import org.robolectric.RobolectricTestRunner
1313

14-
@RunWith(RobolectricTestRunner::class)
14+
@RunWith(AndroidJUnit4::class)
1515
class ExperimentTest {
1616
private var currentTime = System.currentTimeMillis() / 1000
1717

‎components/service/experiments/src/test/java/mozilla/components/service/experiments/ExperimentsSerializerTest.kt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,16 +4,16 @@
44

55
package mozilla.components.service.experiments
66

7+
import androidx.test.ext.junit.runners.AndroidJUnit4
78
import mozilla.components.support.ktx.android.org.json.toList
89
import org.json.JSONException
910
import org.json.JSONObject
1011
import org.junit.Assert.assertEquals
1112
import org.junit.Assert.assertNull
1213
import org.junit.Test
1314
import org.junit.runner.RunWith
14-
import org.robolectric.RobolectricTestRunner
1515

16-
@RunWith(RobolectricTestRunner::class)
16+
@RunWith(AndroidJUnit4::class)
1717
class ExperimentsSerializerTest {
1818
private var currentTime = System.currentTimeMillis() / 1000
1919
private var pastTime = currentTime - 1000

‎components/service/experiments/src/test/java/mozilla/components/service/experiments/ExperimentsTest.kt

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -9,35 +9,35 @@ import android.content.SharedPreferences
99
import android.content.pm.PackageInfo
1010
import android.content.pm.PackageManager
1111
import androidx.test.core.app.ApplicationProvider
12+
import androidx.test.ext.junit.runners.AndroidJUnit4
1213
import androidx.work.testing.WorkManagerTestInitHelper
1314
import kotlinx.coroutines.Dispatchers
1415
import kotlinx.coroutines.GlobalScope
1516
import kotlinx.coroutines.launch
1617
import kotlinx.coroutines.runBlocking
1718
import mozilla.components.support.test.any
19+
import mozilla.components.support.test.eq
20+
import mozilla.components.support.test.mock
1821
import org.junit.Assert.assertEquals
1922
import org.junit.Assert.assertFalse
2023
import org.junit.Assert.assertNull
2124
import org.junit.Assert.assertTrue
2225
import org.junit.Test
2326
import org.junit.runner.RunWith
24-
import org.robolectric.RobolectricTestRunner
25-
import java.io.File
26-
import mozilla.components.support.test.eq
27-
import mozilla.components.support.test.mock
28-
import org.mockito.ArgumentMatchers.anyString
2927
import org.mockito.ArgumentMatchers.anyBoolean
3028
import org.mockito.ArgumentMatchers.anyInt
29+
import org.mockito.ArgumentMatchers.anyString
3130
import org.mockito.ArgumentMatchers.isNull
31+
import org.mockito.Mockito.`when`
32+
import org.mockito.Mockito.doAnswer
3233
import org.mockito.Mockito.mock
3334
import org.mockito.Mockito.spy
34-
import org.mockito.Mockito.doAnswer
35-
import org.mockito.Mockito.`when`
35+
import org.mockito.Mockito.times
3636
import org.mockito.Mockito.verify
3737
import org.mockito.Mockito.verifyZeroInteractions
38-
import org.mockito.Mockito.times
38+
import java.io.File
3939

40-
@RunWith(RobolectricTestRunner::class)
40+
@RunWith(AndroidJUnit4::class)
4141
class ExperimentsTest {
4242
private var context: Context = ApplicationProvider.getApplicationContext()
4343
private lateinit var configuration: Configuration

‎components/service/experiments/src/test/java/mozilla/components/service/experiments/ExperimentsUpdaterTest.kt

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -6,24 +6,24 @@ package mozilla.components.service.experiments
66

77
import android.content.Context
88
import androidx.test.core.app.ApplicationProvider
9+
import androidx.test.ext.junit.runners.AndroidJUnit4
910
import androidx.work.NetworkType
1011
import androidx.work.PeriodicWorkRequest
1112
import androidx.work.WorkerParameters
1213
import androidx.work.testing.WorkManagerTestInitHelper
1314
import mozilla.components.support.test.mock
1415
import org.junit.Assert.assertEquals
15-
import org.junit.Before
16-
import org.junit.Test
1716
import org.junit.Assert.assertFalse
1817
import org.junit.Assert.assertNotNull
1918
import org.junit.Assert.assertTrue
19+
import org.junit.Before
20+
import org.junit.Test
2021
import org.junit.runner.RunWith
2122
import org.mockito.Mockito.`when`
2223
import org.mockito.Mockito.spy
23-
import org.robolectric.RobolectricTestRunner
2424
import java.util.concurrent.TimeUnit
2525

26-
@RunWith(RobolectricTestRunner::class)
26+
@RunWith(AndroidJUnit4::class)
2727
class ExperimentsUpdaterTest {
2828
private var context: Context = ApplicationProvider.getApplicationContext()
2929
private lateinit var configuration: Configuration

‎components/service/experiments/src/test/java/mozilla/components/service/experiments/FlatFileExperimentStorageTest.kt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@
44

55
package mozilla.components.service.experiments
66

7+
import androidx.test.ext.junit.runners.AndroidJUnit4
78
import mozilla.components.support.ktx.android.org.json.toList
89
import mozilla.components.support.test.robolectric.testContext
910
import org.json.JSONObject
@@ -13,12 +14,11 @@ import org.junit.Assert.assertNull
1314
import org.junit.Assert.assertTrue
1415
import org.junit.Test
1516
import org.junit.runner.RunWith
16-
import org.robolectric.RobolectricTestRunner
1717
import java.io.File
1818
import java.nio.file.Files
1919
import java.nio.file.Paths
2020

21-
@RunWith(RobolectricTestRunner::class)
21+
@RunWith(AndroidJUnit4::class)
2222
class FlatFileExperimentStorageTest {
2323
private var currentTime = System.currentTimeMillis() / 1000
2424
private var pastTime = currentTime - 1000

‎components/service/experiments/src/test/java/mozilla/components/service/experiments/JSONExperimentParserTest.kt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@
44

55
package mozilla.components.service.experiments
66

7+
import androidx.test.ext.junit.runners.AndroidJUnit4
78
import mozilla.components.support.ktx.android.org.json.tryGetInt
89
import org.json.JSONException
910
import org.json.JSONObject
@@ -13,9 +14,8 @@ import org.junit.Assert.assertNotEquals
1314
import org.junit.Assert.assertNull
1415
import org.junit.Test
1516
import org.junit.runner.RunWith
16-
import org.robolectric.RobolectricTestRunner
1717

18-
@RunWith(RobolectricTestRunner::class)
18+
@RunWith(AndroidJUnit4::class)
1919
class JSONExperimentParserTest {
2020
private var currentTime = System.currentTimeMillis() / 1000
2121

‎components/service/experiments/src/test/java/mozilla/components/service/experiments/KintoExperimentSourceTest.kt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@
44

55
package mozilla.components.service.experiments
66

7+
import androidx.test.ext.junit.runners.AndroidJUnit4
78
import mozilla.components.concept.fetch.Client
89
import mozilla.components.concept.fetch.MutableHeaders
910
import mozilla.components.concept.fetch.Response
@@ -14,9 +15,8 @@ import org.junit.Test
1415
import org.junit.runner.RunWith
1516
import org.mockito.Mockito.`when`
1617
import org.mockito.Mockito.mock
17-
import org.robolectric.RobolectricTestRunner
1818

19-
@RunWith(RobolectricTestRunner::class)
19+
@RunWith(AndroidJUnit4::class)
2020
class KintoExperimentSourceTest {
2121
private val baseUrl = "http://mydomain.test"
2222
private val bucketName = "fretboard"

‎components/service/experiments/src/test/java/mozilla/components/service/experiments/SignatureVerifierTest.kt

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@
44

55
package mozilla.components.service.experiments
66

7+
import androidx.test.ext.junit.runners.AndroidJUnit4
78
import mozilla.components.lib.fetch.httpurlconnection.HttpURLConnectionClient
89
import okhttp3.mockwebserver.Dispatcher
910
import okhttp3.mockwebserver.MockResponse
@@ -15,11 +16,10 @@ import org.junit.Assert.assertEquals
1516
import org.junit.Before
1617
import org.junit.Test
1718
import org.junit.runner.RunWith
18-
import org.robolectric.RobolectricTestRunner
19-
import java.util.Date
2019
import java.util.Calendar
20+
import java.util.Date
2121

22-
@RunWith(RobolectricTestRunner::class)
22+
@RunWith(AndroidJUnit4::class)
2323
class SignatureVerifierTest {
2424
private lateinit var server: MockWebServer
2525

‎components/service/experiments/src/test/java/mozilla/components/service/experiments/ValuesProviderTest.kt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,17 +5,17 @@
55
package mozilla.components.service.experiments
66

77
import android.content.Context
8+
import androidx.test.ext.junit.runners.AndroidJUnit4
89
import org.junit.Assert.assertEquals
910
import org.junit.Test
1011
import org.junit.runner.RunWith
1112
import org.mockito.Mockito.`when`
1213
import org.mockito.Mockito.mock
1314
import org.mockito.Mockito.spy
14-
import org.robolectric.RobolectricTestRunner
1515
import java.util.Locale
1616
import java.util.MissingResourceException
1717

18-
@RunWith(RobolectricTestRunner::class)
18+
@RunWith(AndroidJUnit4::class)
1919
class ValuesProviderTest {
2020
@Test
2121
fun `get language has three letter code`() {

‎components/service/experiments/src/test/java/mozilla/components/service/experiments/debug/ExperimentsDebugActivityTest.kt

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@ import android.content.Intent
99
import android.content.pm.ActivityInfo
1010
import android.content.pm.ResolveInfo
1111
import androidx.test.core.app.ApplicationProvider
12+
import androidx.test.ext.junit.runners.AndroidJUnit4
1213
import androidx.work.testing.WorkManagerTestInitHelper
1314
import kotlinx.coroutines.runBlocking
1415
import mozilla.components.service.experiments.Configuration
@@ -18,24 +19,23 @@ import mozilla.components.service.experiments.ExperimentsSnapshot
1819
import mozilla.components.service.experiments.ExperimentsUpdater
1920
import mozilla.components.service.glean.Glean
2021
import org.junit.Assert
21-
import org.junit.Assert.assertTrue
22-
import org.junit.Assert.assertFalse
2322
import org.junit.Assert.assertEquals
23+
import org.junit.Assert.assertFalse
2424
import org.junit.Assert.assertNotNull
25+
import org.junit.Assert.assertTrue
2526
import org.junit.Before
2627
import org.junit.Test
2728
import org.junit.runner.RunWith
2829
import org.mockito.Mockito.spy
2930
import org.mockito.Mockito.times
3031
import org.mockito.Mockito.verify
3132
import org.robolectric.Robolectric
32-
import org.robolectric.RobolectricTestRunner
3333
import org.robolectric.Shadows
3434

35-
@RunWith(RobolectricTestRunner::class)
35+
@RunWith(AndroidJUnit4::class)
3636
class ExperimentsDebugActivityTest {
3737

38-
private val testPackageName = "mozilla.components.service.experiments"
38+
private val testPackageName = "mozilla.components.service.experiments.test"
3939
private val context: Context = ApplicationProvider.getApplicationContext()
4040

4141
@Before

0 commit comments

Comments
 (0)