Skip to content

Commit 5cba044

Browse files
technoir42hotchemi
authored andcommitted
Fix Conductor tests (#608)
1 parent 95c7286 commit 5cba044

File tree

3 files changed

+4
-1
lines changed

3 files changed

+4
-1
lines changed

test/src/test/java/permissions/dispatcher/test/ConductorControllerWithAllAnnotationsKtPermissionsDispatcherTest.kt

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -40,6 +40,7 @@ class ConductorWithAllAnnotationsKtPermissionsDispatcherTest {
4040
fun setUp() {
4141
controller = PowerMockito.mock(ConductorWithAllAnnotationsKt::class.java)
4242

43+
PowerMockito.mockStatic(ActivityCompat::class.java)
4344
PowerMockito.mockStatic(PermissionChecker::class.java)
4445
}
4546

test/src/test/java/permissions/dispatcher/test/ConductorWithAllAnnotationsPermissionsDispatcherTest.kt

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -41,6 +41,7 @@ class ConductorWithAllAnnotationsPermissionsDispatcherTest {
4141
fun setUp() {
4242
controller = PowerMockito.mock(ConductorWithAllAnnotations::class.java)
4343

44+
PowerMockito.mockStatic(ActivityCompat::class.java)
4445
PowerMockito.mockStatic(PermissionChecker::class.java)
4546
}
4647

test/src/test/java/permissions/dispatcher/test/Extensions.kt

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,7 @@ import androidx.fragment.app.Fragment
1313
import com.bluelinelabs.conductor.Controller
1414
import org.mockito.Matchers.any
1515
import org.mockito.Matchers.anyString
16+
import org.mockito.Matchers.same
1617
import org.powermock.api.mockito.PowerMockito
1718
import java.lang.reflect.Field
1819
import java.lang.reflect.Modifier
@@ -80,7 +81,7 @@ fun mockUriParse(result: Uri? = null) {
8081
}
8182

8283
fun mockShouldShowRequestPermissionRationaleConductorController(controller: Controller, result: Boolean) {
83-
PowerMockito.`when`(ActivityCompat.shouldShowRequestPermissionRationale(controller.activity!!, anyString())).thenReturn(result)
84+
PowerMockito.`when`(ActivityCompat.shouldShowRequestPermissionRationale(same(controller.activity!!), anyString())).thenReturn(result)
8485
}
8586

8687
fun mockGetActivity(controller: Controller, result: Activity) {

0 commit comments

Comments
 (0)