From 768c7c2d359fe937b9c1489240215134ee9656d6 Mon Sep 17 00:00:00 2001 From: Emily Kager Date: Thu, 12 Sep 2019 11:14:34 -0700 Subject: [PATCH] Closes #5268 - Fix 2 detekt errors --- .../org/mozilla/fenix/ext/DrawableTest.kt | 9 ++++--- .../mozilla/fenix/ext/NavControllerTest.kt | 25 ++++++++----------- 2 files changed, 17 insertions(+), 17 deletions(-) diff --git a/app/src/test/java/org/mozilla/fenix/ext/DrawableTest.kt b/app/src/test/java/org/mozilla/fenix/ext/DrawableTest.kt index 12a7bf1bb..55e7101ed 100644 --- a/app/src/test/java/org/mozilla/fenix/ext/DrawableTest.kt +++ b/app/src/test/java/org/mozilla/fenix/ext/DrawableTest.kt @@ -29,13 +29,16 @@ class DrawableTest { assertTrue(returnRec.contains(0, 0, -10, 10)) } - private class TestDrawable() : Drawable() { + private class TestDrawable : Drawable() { var boundsChanged: Boolean = false - override fun getOpacity(): Int { return 0 } + override fun getOpacity(): Int { + return 0 + } + override fun draw(canvas: Canvas) {} override fun setAlpha(alpha: Int) {} override fun setColorFilter(cf: ColorFilter) {} - protected override fun onBoundsChange(bounds: Rect) { + override fun onBoundsChange(bounds: Rect) { boundsChanged = true super.onBoundsChange(bounds) } diff --git a/app/src/test/java/org/mozilla/fenix/ext/NavControllerTest.kt b/app/src/test/java/org/mozilla/fenix/ext/NavControllerTest.kt index 92cb24dbd..c2b7c9644 100644 --- a/app/src/test/java/org/mozilla/fenix/ext/NavControllerTest.kt +++ b/app/src/test/java/org/mozilla/fenix/ext/NavControllerTest.kt @@ -1,28 +1,26 @@ package org.mozilla.fenix.ext -import kotlinx.coroutines.ObsoleteCoroutinesApi -import org.mozilla.fenix.TestApplication -import org.junit.Test -import org.junit.runner.RunWith -import org.robolectric.RobolectricTestRunner -import org.robolectric.annotation.Config -import io.mockk.mockk -import io.mockk.verify -import io.mockk.every -import io.mockk.mockkClass import android.os.Bundle import androidx.navigation.NavController +import androidx.navigation.NavDestination import androidx.navigation.NavDirections import androidx.navigation.NavOptions -import org.mozilla.fenix.BuildConfig -import androidx.navigation.NavDestination import androidx.navigation.Navigator.Extras +import io.mockk.every +import io.mockk.mockk +import io.mockk.verify +import kotlinx.coroutines.ObsoleteCoroutinesApi +import org.junit.Test +import org.junit.runner.RunWith +import org.mozilla.fenix.TestApplication +import org.robolectric.RobolectricTestRunner +import org.robolectric.annotation.Config @ObsoleteCoroutinesApi @RunWith(RobolectricTestRunner::class) @Config(application = TestApplication::class) -class NavControllerTest() { +class NavControllerTest { val navController: NavController = mockk(relaxed = true) val navDirections = mockk(relaxed = true) @@ -30,7 +28,6 @@ class NavControllerTest() { val mockExtras: Extras = mockk(relaxed = true) val mockOptions: NavOptions = mockk(relaxed = true) val mockBundle: Bundle = mockk(relaxed = true) - val mockBuildConfig = mockkClass(BuildConfig::class) @Test fun `Nav with id and directions args`() {