Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Upgrade Robolectric 4.3 -> 4.10.3 #42

Merged
merged 9 commits into from
Sep 29, 2023
Merged

Upgrade Robolectric 4.3 -> 4.10.3 #42

Show file tree
Hide file tree
Changes from 8 commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
718a493
Set `source/targetCompatibility` & `jvmTarget` to Java 11
kyrillosgait Sep 29, 2023
03e0a3f
Upgrade `Robolectric` 4.3 -> 4.10.3
kyrillosgait Sep 29, 2023
2de8727
Fix IllegalArgumentException when stubbing
kyrillosgait Sep 29, 2023
40590ad
Fix test case that requests permissions with empty list
kyrillosgait Sep 29, 2023
e2ca07c
Remove unnecessary stubbing in test
kyrillosgait Sep 29, 2023
18fc4dd
Don't stub method twice with same parameters from different coroutines
kyrillosgait Sep 29, 2023
3018f14
Fix stub syntax
kyrillosgait Sep 29, 2023
dd7e4c5
Adjust test stubs to match previous behavior
kyrillosgait Sep 29, 2023
2b8d7c2
Revert "Set `source/targetCompatibility` & `jvmTarget` to Java 11"
kyrillosgait Sep 29, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion buildSrc/src/main/kotlin/Dependencies.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ object Versions {
const val COROUTINES = "1.7.3"
const val ANDROID_GRADLE_PLUGIN = "7.4.2"
const val JUNIT = "4.13.2"
const val ROBOLECTRIC = "4.3"
const val ROBOLECTRIC = "4.10.3"
const val MOCKITO = "4.11.0"
const val MOCKITO_KOTLIN = "4.1.0"
const val CORE_KTX = "1.6.0"
Expand Down
9 changes: 9 additions & 0 deletions library/build.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,15 @@ group = "com.github.vinted"
android {
compileSdk = Versions.COMPILE_SDK_VERSION

compileOptions {
sourceCompatibility = JavaVersion.VERSION_11
targetCompatibility = JavaVersion.VERSION_11
}

kotlinOptions {
jvmTarget = "11"
}

defaultConfig {
minSdk = Versions.MIN_SDK_VERSION
}
Expand Down
78 changes: 43 additions & 35 deletions library/src/test/java/com/vinted/coper/CoperImplTest.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -430,11 +430,7 @@ class CoperImplTest {
val crashPermission = "crash"
mockCheckPermissions(crashPermission, PackageManager.PERMISSION_DENIED)


executePermissionRequest(
permissionsToRequest = emptyList(),
permissionResult = listOf(PermissionChecker.PERMISSION_GRANTED)
)
fixture.request(*emptyList<String>().toTypedArray())
}

@Test(expected = IllegalStateException::class)
Expand Down Expand Up @@ -518,19 +514,6 @@ class CoperImplTest {
fun request_permissionResultCameWithDifferentPermissions_jobIsNotCompleted() = runTest {
val permission = "permission"
mockCheckPermissions(permission, PackageManager.PERMISSION_DENIED)
val fragment = fixture.getFragmentSafely()
whenever(
fragment.requestPermissions(
eq(listOf(permission).toTypedArray()),
anyOrNull()
)
).then {
fragment.onRequestPermissionResult(
permissions = listOf("test"),
permissionsResult = listOf(PermissionChecker.PERMISSION_GRANTED),
requestCode = CoperFragment.REQUEST_CODE
)
}

val responseAsync = async {
fixture.request(permission)
Expand Down Expand Up @@ -560,17 +543,18 @@ class CoperImplTest {
fun request_twoIdenticalRequest_twoRequestCompleted() = runTest {
val permission = "sameRequest"
mockCheckPermissions(permission, PermissionChecker.PERMISSION_DENIED)

stubRequestPermission(
coperFragment = fixture.getFragmentSafely(),
permissions = listOf(permission),
permissionResults = listOf(PermissionChecker.PERMISSION_GRANTED),
)

val responseAsync1 = async {
executePermissionRequest(
permissionsToRequest = listOf(permission),
permissionResult = listOf(PermissionChecker.PERMISSION_GRANTED)
)
fixture.request(*listOf(permission).toTypedArray())
}
val responseAsync2 = async {
executePermissionRequest(
permissionsToRequest = listOf(permission),
permissionResult = listOf(PermissionChecker.PERMISSION_GRANTED)
)
fixture.request(*listOf(permission).toTypedArray())
}
val result2 = responseAsync2.await()
val result1 = responseAsync1.await()
Expand Down Expand Up @@ -615,8 +599,8 @@ class CoperImplTest {
val coperFragment = fixture.getFragmentSafely()
whenever(
coperFragment.requestPermissions(
eq(arrayOf(firstPermission, secondPermission)),
anyOrNull()
arrayOf(firstPermission, secondPermission),
CoperFragment.REQUEST_CODE
)
).then {
coperFragment.onRequestPermissionResult(
Expand Down Expand Up @@ -760,11 +744,35 @@ class CoperImplTest {
fun request_requestCodeIsNotOfCoperFragment_throwException() = runTest {
val requestedPermission = "requested_permission"

executePermissionRequest(
permissionsToRequest = listOf(requestedPermission),
permissionResult = listOf(PermissionChecker.PERMISSION_DENIED),
requestCode = 0
)
val coperFragment = fixture.getFragmentSafely()

whenever(
coperFragment.requestPermissions(
listOf(requestedPermission).toTypedArray(),
0,
)
).then {
coperFragment.onRequestPermissionResult(
permissions = listOf(requestedPermission),
permissionsResult = listOf(PermissionChecker.PERMISSION_DENIED),
requestCode = 0,
)
}

whenever(
coperFragment.requestPermissions(
listOf(requestedPermission).toTypedArray(),
CoperFragment.REQUEST_CODE
)
).then {
coperFragment.onRequestPermissionResult(
permissions = listOf(requestedPermission),
permissionsResult = listOf(PermissionChecker.PERMISSION_DENIED),
requestCode = 0,
)
}

fixture.request(*listOf(requestedPermission).toTypedArray())
}

private suspend fun executePermissionRequest(
Expand Down Expand Up @@ -813,8 +821,8 @@ class CoperImplTest {
) {
whenever(
coperFragment.requestPermissions(
eq(permissions.toTypedArray()),
anyOrNull()
permissions.toTypedArray(),
requestCode,
)
).then {
coperFragment.onRequestPermissionResult(
Expand Down
Loading