Skip to content

Commit

Permalink
Revert "Fix intermittent failure of test project"
Browse files Browse the repository at this point in the history
  • Loading branch information
@hotchemi
hotchemi authored Apr 29, 2018
1 parent ddba5cf commit 5acc71f
Show file tree
Hide file tree
Showing 16 changed files with 47 additions and 189 deletions.
14 changes: 3 additions & 11 deletions .../java/permissions/dispatcher/test/ActivityOnlyNeedsPermissionPermissionsDispatcherTest.kt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,8 @@ import org.powermock.modules.junit4.PowerMockRunner
@PrepareForTest(ActivityCompat::class, PermissionChecker::class, AppOpsManagerCompat::class, Process::class)
class ActivityOnlyNeedsPermissionPermissionsDispatcherTest {

private lateinit var activity: ActivityOnlyNeedsPermission

companion object {
private var requestCode = 0

Expand All @@ -31,6 +33,7 @@ class ActivityOnlyNeedsPermissionPermissionsDispatcherTest {

@Before
fun setUp() {
activity = Mockito.mock(ActivityOnlyNeedsPermission::class.java)
PowerMockito.mockStatic(ActivityCompat::class.java)
PowerMockito.mockStatic(PermissionChecker::class.java)
PowerMockito.mockStatic(Process::class.java)
Expand All @@ -39,7 +42,6 @@ class ActivityOnlyNeedsPermissionPermissionsDispatcherTest {

@Test
fun `already granted call the method`() {
val activity = Mockito.mock(ActivityOnlyNeedsPermission::class.java)
mockCheckSelfPermission(true)

ActivityOnlyNeedsPermissionPermissionsDispatcher.showCameraWithPermissionCheck(activity)
Expand All @@ -49,7 +51,6 @@ class ActivityOnlyNeedsPermissionPermissionsDispatcherTest {

@Test
fun `not granted does not call the method`() {
val activity = Mockito.mock(ActivityOnlyNeedsPermission::class.java)
mockCheckSelfPermission(false)

ActivityOnlyNeedsPermissionPermissionsDispatcher.showCameraWithPermissionCheck(activity)
Expand All @@ -59,31 +60,27 @@ class ActivityOnlyNeedsPermissionPermissionsDispatcherTest {

@Test
fun `the method is called if verifyPermission is true`() {
val activity = Mockito.mock(ActivityOnlyNeedsPermission::class.java)
ActivityOnlyNeedsPermissionPermissionsDispatcher.onRequestPermissionsResult(activity, requestCode, intArrayOf(PackageManager.PERMISSION_GRANTED))

Mockito.verify(activity, Mockito.times(1)).showCamera()
}

@Test
fun `the method is not called if verifyPermission is false`() {
val activity = Mockito.mock(ActivityOnlyNeedsPermission::class.java)
ActivityOnlyNeedsPermissionPermissionsDispatcher.onRequestPermissionsResult(activity, requestCode, intArrayOf(PackageManager.PERMISSION_DENIED))

Mockito.verify(activity, Mockito.times(0)).showCamera()
}

@Test
fun `no method call if request code is not related to the library`() {
val activity = Mockito.mock(ActivityOnlyNeedsPermission::class.java)
ActivityOnlyNeedsPermissionPermissionsDispatcher.onRequestPermissionsResult(activity, requestCode + 1000, null)

Mockito.verify(activity, Mockito.times(0)).showCamera()
}

@Test
fun `xiaomi device permissionToOp returns null grant permission`() {
val activity = Mockito.mock(ActivityOnlyNeedsPermission::class.java)
testForXiaomi()
mockPermissionToOp(null)

Expand All @@ -94,7 +91,6 @@ class ActivityOnlyNeedsPermissionPermissionsDispatcherTest {

@Test
fun `xiaomi device grant permission`() {
val activity = Mockito.mock(ActivityOnlyNeedsPermission::class.java)
testForXiaomi()
mockPermissionToOp("")
mockNoteOp(AppOpsManagerCompat.MODE_ALLOWED)
Expand All @@ -107,7 +103,6 @@ class ActivityOnlyNeedsPermissionPermissionsDispatcherTest {

@Test
fun `xiaomi noteOp returns not allowed value should not call the method`() {
val activity = Mockito.mock(ActivityOnlyNeedsPermission::class.java)
testForXiaomi()
mockPermissionToOp("")
mockNoteOp(AppOpsManagerCompat.MODE_IGNORED)
Expand All @@ -120,7 +115,6 @@ class ActivityOnlyNeedsPermissionPermissionsDispatcherTest {

@Test
fun `xiaomi noteOp returns allowed but checkSelfPermission not allowed value should not call the method`() {
val activity = Mockito.mock(ActivityOnlyNeedsPermission::class.java)
testForXiaomi()
mockPermissionToOp("")
mockNoteOp(AppOpsManagerCompat.MODE_ALLOWED)
Expand All @@ -133,7 +127,6 @@ class ActivityOnlyNeedsPermissionPermissionsDispatcherTest {

@Test
fun `blow M follows checkSelfPermissions result false`() {
val activity = Mockito.mock(ActivityOnlyNeedsPermission::class.java)
overwriteCustomSdkInt(22)
mockCheckSelfPermission(false)

Expand All @@ -144,7 +137,6 @@ class ActivityOnlyNeedsPermissionPermissionsDispatcherTest {

@Test
fun `blow M follows checkSelfPermissions result true`() {
val activity = Mockito.mock(ActivityOnlyNeedsPermission::class.java)
overwriteCustomSdkInt(22)
mockCheckSelfPermission(true)

Expand Down
22 changes: 4 additions & 18 deletions ...java/permissions/dispatcher/test/ActivityWithAllAnnotationsKtPermissionsDispatcherTest.kt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -21,9 +21,11 @@ import permissions.dispatcher.PermissionRequest
@PrepareForTest(ActivityCompat::class, PermissionChecker::class, AppOpsManagerCompat::class, Process::class)
class ActivityWithAllAnnotationsKtPermissionsDispatcherTest {

private lateinit var activity: ActivityWithAllAnnotationsKt

companion object {
private var requestCode = 0
private lateinit var requestPermissions: Array<String>
lateinit private var requestPermissions: Array<String>

@BeforeClass
@JvmStatic
Expand All @@ -36,6 +38,7 @@ class ActivityWithAllAnnotationsKtPermissionsDispatcherTest {

@Before
fun setUp() {
activity = Mockito.mock(ActivityWithAllAnnotationsKt::class.java)
PowerMockito.mockStatic(ActivityCompat::class.java)
PowerMockito.mockStatic(PermissionChecker::class.java)
PowerMockito.mockStatic(Process::class.java)
Expand All @@ -44,7 +47,6 @@ class ActivityWithAllAnnotationsKtPermissionsDispatcherTest {

@Test
fun `already granted call the method`() {
val activity = Mockito.mock(ActivityWithAllAnnotationsKt::class.java)
mockCheckSelfPermission(true)

activity.showCameraWithPermissionCheck()
Expand All @@ -54,7 +56,6 @@ class ActivityWithAllAnnotationsKtPermissionsDispatcherTest {

@Test
fun `not granted does not call the method`() {
val activity = Mockito.mock(ActivityWithAllAnnotationsKt::class.java)
mockCheckSelfPermission(false)
mockShouldShowRequestPermissionRationaleActivity(true)

Expand All @@ -65,7 +66,6 @@ class ActivityWithAllAnnotationsKtPermissionsDispatcherTest {

@Test
fun `not granted permission and show rationale is true then call the rationale method`() {
val activity = Mockito.mock(ActivityWithAllAnnotationsKt::class.java)
mockCheckSelfPermission(false)
mockShouldShowRequestPermissionRationaleActivity(true)

Expand All @@ -76,7 +76,6 @@ class ActivityWithAllAnnotationsKtPermissionsDispatcherTest {

@Test
fun `not granted permission and show rationale is false then does not call the rationale method`() {
val activity = Mockito.mock(ActivityWithAllAnnotationsKt::class.java)
mockCheckSelfPermission(false)
mockShouldShowRequestPermissionRationaleActivity(false)

Expand All @@ -87,23 +86,20 @@ class ActivityWithAllAnnotationsKtPermissionsDispatcherTest {

@Test
fun `the method is called if verifyPermission is true`() {
val activity = Mockito.mock(ActivityWithAllAnnotationsKt::class.java)
activity.onRequestPermissionsResult(requestCode, intArrayOf(PackageManager.PERMISSION_GRANTED))

Mockito.verify(activity, Mockito.times(1)).showCamera()
}

@Test
fun `the method is not called if verifyPermission is false`() {
val activity = Mockito.mock(ActivityWithAllAnnotationsKt::class.java)
activity.onRequestPermissionsResult(requestCode, intArrayOf(PackageManager.PERMISSION_DENIED))

Mockito.verify(activity, Mockito.times(0)).showCamera()
}

@Test
fun `show never ask method is call if verifyPermission is false and shouldShowRequestPermissionRationale is false`() {
val activity = Mockito.mock(ActivityWithAllAnnotationsKt::class.java)
mockShouldShowRequestPermissionRationaleActivity(false)

activity.onRequestPermissionsResult(requestCode, intArrayOf(PackageManager.PERMISSION_DENIED))
Expand All @@ -113,7 +109,6 @@ class ActivityWithAllAnnotationsKtPermissionsDispatcherTest {

@Test
fun `show deny method is call if verifyPermission is false and shouldShowRequestPermissionRationale is true`() {
val activity = Mockito.mock(ActivityWithAllAnnotationsKt::class.java)
mockShouldShowRequestPermissionRationaleActivity(true)

activity.onRequestPermissionsResult(requestCode, intArrayOf(PackageManager.PERMISSION_DENIED))
Expand All @@ -123,31 +118,27 @@ class ActivityWithAllAnnotationsKtPermissionsDispatcherTest {

@Test
fun `no the method call if request code is not related to the library`() {
val activity = Mockito.mock(ActivityWithAllAnnotationsKt::class.java)
activity.onRequestPermissionsResult(requestCode + 1000, intArrayOf())

Mockito.verify(activity, Mockito.times(0)).showCamera()
}

@Test
fun `no denied method call if request code is not related to the library`() {
val activity = Mockito.mock(ActivityWithAllAnnotationsKt::class.java)
activity.onRequestPermissionsResult(requestCode + 1000, intArrayOf())

Mockito.verify(activity, Mockito.times(0)).showDeniedForCamera()
}

@Test
fun `no never ask method call if request code is not related to the library`() {
val activity = Mockito.mock(ActivityWithAllAnnotationsKt::class.java)
activity.onRequestPermissionsResult(requestCode + 1000, intArrayOf())

Mockito.verify(activity, Mockito.times(0)).showNeverAskForCamera()
}

@Test
fun `xiaomi device permissionToOp returns null grant permission`() {
val activity = Mockito.mock(ActivityWithAllAnnotationsKt::class.java)
testForXiaomi()
mockPermissionToOp(null)

Expand All @@ -158,7 +149,6 @@ class ActivityWithAllAnnotationsKtPermissionsDispatcherTest {

@Test
fun `xiaomi device grant permission`() {
val activity = Mockito.mock(ActivityWithAllAnnotationsKt::class.java)
testForXiaomi()
mockPermissionToOp("")
mockNoteOp(AppOpsManagerCompat.MODE_ALLOWED)
Expand All @@ -171,7 +161,6 @@ class ActivityWithAllAnnotationsKtPermissionsDispatcherTest {

@Test
fun `xiaomi noteOp returns not allowed value should not call the method`() {
val activity = Mockito.mock(ActivityWithAllAnnotationsKt::class.java)
testForXiaomi()
mockPermissionToOp("")
mockNoteOp(AppOpsManagerCompat.MODE_IGNORED)
Expand All @@ -184,7 +173,6 @@ class ActivityWithAllAnnotationsKtPermissionsDispatcherTest {

@Test
fun `xiaomi noteOp returns allowed but checkSelfPermission not allowed value should not call the method`() {
val activity = Mockito.mock(ActivityWithAllAnnotationsKt::class.java)
testForXiaomi()
mockPermissionToOp("")
mockNoteOp(AppOpsManagerCompat.MODE_ALLOWED)
Expand All @@ -197,7 +185,6 @@ class ActivityWithAllAnnotationsKtPermissionsDispatcherTest {

@Test
fun `blow M follows checkSelfPermissions result false`() {
val activity = Mockito.mock(ActivityWithAllAnnotationsKt::class.java)
overwriteCustomSdkInt(22)
mockCheckSelfPermission(false)

Expand All @@ -208,7 +195,6 @@ class ActivityWithAllAnnotationsKtPermissionsDispatcherTest {

@Test
fun `blow M follows checkSelfPermissions result true`() {
val activity = Mockito.mock(ActivityWithAllAnnotationsKt::class.java)
overwriteCustomSdkInt(22)
mockCheckSelfPermission(true)

Expand Down
Loading

0 comments on commit 5acc71f

Please sign in to comment.