Skip to content

Commit ff2531e

Browse files
committed
Issue mozilla-mobile#2346: Fix Kotlin compiler warnings in support-ktx.
1 parent 91cd7e2 commit ff2531e

File tree

4 files changed

+14
-8
lines changed

4 files changed

+14
-8
lines changed

buildSrc/src/main/java/KotlinCompiler.kt

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,6 @@ object KotlinCompiler {
4343
"service-firefox-accounts",
4444
"service-fretboard",
4545
"service-glean",
46-
"support-ktx",
4746
"support-test",
4847
"support-utils",
4948
"tooling-lint",

components/support/ktx/src/test/java/mozilla/components/support/ktx/android/content/res/ResourcesTest.kt

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,8 @@
11
package mozilla.components.support.ktx.android.content.res
22

3+
import android.content.Context
34
import android.util.DisplayMetrics
5+
import androidx.test.core.app.ApplicationProvider
46
import org.junit.Assert
57
import org.junit.Test
68
import org.junit.runner.RunWith
@@ -9,11 +11,12 @@ import org.robolectric.RuntimeEnvironment
911

1012
@RunWith(RobolectricTestRunner::class)
1113
class ResourcesTest {
14+
private val context: Context
15+
get() = ApplicationProvider.getApplicationContext()
1216

1317
@Test
1418
fun `dp returns same value as manual conversion`() {
15-
16-
val resources = RuntimeEnvironment.application.resources
19+
val resources = context.resources
1720
val metrics = resources.displayMetrics
1821

1922
for (i in 1..500) {

components/support/ktx/src/test/java/mozilla/components/support/ktx/android/os/StrictModeTest.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@ class StrictModeTest {
3939
StrictMode.setThreadPolicy(this)
4040
}
4141

42-
var exceptionCaught = false
42+
val exceptionCaught: Boolean
4343

4444
assertEquals(policy.toString(), StrictMode.getThreadPolicy().toString())
4545

components/support/ktx/src/test/java/mozilla/components/support/ktx/android/view/ViewTest.kt

Lines changed: 8 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -4,24 +4,28 @@
44

55
package mozilla.components.support.ktx.android.view
66

7+
import android.content.Context
78
import android.view.View
89
import android.widget.EditText
910
import android.widget.TextView
11+
import androidx.test.core.app.ApplicationProvider
1012
import mozilla.components.support.base.android.Padding
1113
import org.junit.Assert.assertEquals
1214
import org.junit.Assert.assertFalse
1315
import org.junit.Assert.assertTrue
1416
import org.junit.Test
1517
import org.junit.runner.RunWith
1618
import org.robolectric.RobolectricTestRunner
17-
import org.robolectric.RuntimeEnvironment
1819
import org.robolectric.shadows.ShadowLooper
1920

2021
@RunWith(RobolectricTestRunner::class)
2122
class ViewTest {
23+
private val context: Context
24+
get() = ApplicationProvider.getApplicationContext()
25+
2226
@Test
2327
fun `showKeyboard should request focus`() {
24-
val view = EditText(RuntimeEnvironment.application)
28+
val view = EditText(context)
2529
assertFalse(view.hasFocus())
2630

2731
view.showKeyboard()
@@ -32,7 +36,7 @@ class ViewTest {
3236

3337
@Test
3438
fun `visibility helper methods`() {
35-
val view = TextView(RuntimeEnvironment.application)
39+
val view = TextView(context)
3640

3741
view.visibility = View.GONE
3842

@@ -55,7 +59,7 @@ class ViewTest {
5559

5660
@Test
5761
fun `setPadding should set padding`() {
58-
val view = TextView(RuntimeEnvironment.application)
62+
val view = TextView(context)
5963

6064
assertEquals(view.paddingLeft, 0)
6165
assertEquals(view.paddingTop, 0)

0 commit comments

Comments
 (0)