-
Notifications
You must be signed in to change notification settings - Fork 0
feat: pair userhandle and color resolvers #99
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.
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
Merged
MessiasLima
merged 3 commits into
main
from
79-implement-pair-userhandle-and-color-resolvers
Jul 6, 2026
Merged
Changes from all commits
Commits
Show all changes
3 commits
Select commit
Hold shift + click to select a range
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
37 changes: 36 additions & 1 deletion
37
android/src/main/java/dev/appoutlet/some/android/AndroidResolverProvider.kt
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,15 +1,50 @@ | ||
| package dev.appoutlet.some.android | ||
|
|
||
| import dev.appoutlet.some.android.resolver.BundleResolver | ||
| import dev.appoutlet.some.android.resolver.ColorResolver | ||
| import dev.appoutlet.some.android.resolver.PairResolver | ||
| import dev.appoutlet.some.android.resolver.PointFResolver | ||
| import dev.appoutlet.some.android.resolver.PointResolver | ||
| import dev.appoutlet.some.android.resolver.RectFResolver | ||
| import dev.appoutlet.some.android.resolver.RectResolver | ||
| import dev.appoutlet.some.android.resolver.SizeFResolver | ||
| import dev.appoutlet.some.android.resolver.SizeResolver | ||
| import dev.appoutlet.some.android.resolver.UriResolver | ||
| import dev.appoutlet.some.android.resolver.UserHandleResolver | ||
| import dev.appoutlet.some.core.Resolver | ||
| import dev.appoutlet.some.core.ResolverProvider | ||
| import dev.appoutlet.some.core.StrategyProvider | ||
| import kotlin.random.Random | ||
|
|
||
| /** | ||
| * Contributes Android-specific resolvers discovered through `ServiceLoader`. | ||
| * | ||
| * The returned resolvers extend the shared `some-core` chain with support for common Android framework | ||
| * value types such as `Uri`, geometry classes, `Bundle`, `Pair`, `UserHandle`, and `Color`. | ||
| */ | ||
| class AndroidResolverProvider : ResolverProvider { | ||
| /** | ||
| * Creates the Android resolver set using the shared [strategyProvider] and [random] source. | ||
| * | ||
| * Resolvers that depend on strategies receive [strategyProvider]; all others share the same [random] | ||
| * instance so generated Android values stay consistent with the rest of the fixture session. | ||
| */ | ||
| override fun createResolvers( | ||
| strategyProvider: StrategyProvider, | ||
| random: Random | ||
| ): List<Resolver> { | ||
| return emptyList() | ||
| return listOf( | ||
| UriResolver(strategyProvider, random), | ||
| BundleResolver(random), | ||
| RectResolver(random), | ||
| RectFResolver(random), | ||
| PointResolver(random), | ||
| PointFResolver(random), | ||
| SizeResolver(random), | ||
| SizeFResolver(random), | ||
| PairResolver(random), | ||
| UserHandleResolver(random), | ||
| ColorResolver(random) | ||
| ) | ||
| } | ||
| } |
27 changes: 27 additions & 0 deletions
27
android/src/main/java/dev/appoutlet/some/android/resolver/ColorResolver.kt
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,27 @@ | ||
| package dev.appoutlet.some.android.resolver | ||
|
|
||
| import android.graphics.Color | ||
| import dev.appoutlet.some.core.Resolver | ||
| import dev.appoutlet.some.core.ResolverChain | ||
| import kotlin.random.Random | ||
| import kotlin.reflect.KType | ||
| import kotlin.reflect.typeOf | ||
|
|
||
| /** | ||
| * Resolves [Color] values when the runtime API level supports [Color.valueOf]. | ||
| * | ||
| * @param random Random source used when generating RGB channel values. | ||
| */ | ||
| class ColorResolver( | ||
| private val random: Random | ||
| ) : Resolver { | ||
| override fun canResolve(type: KType): Boolean = type == typeOf<Color>() | ||
|
|
||
| override fun resolve(type: KType, chain: ResolverChain): Color { | ||
| return Color.valueOf( | ||
| random.nextFloat(), | ||
| random.nextFloat(), | ||
| random.nextFloat(), | ||
| ) | ||
| } | ||
|
MessiasLima marked this conversation as resolved.
|
||
| } | ||
30 changes: 30 additions & 0 deletions
30
android/src/main/java/dev/appoutlet/some/android/resolver/PairResolver.kt
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,30 @@ | ||
| package dev.appoutlet.some.android.resolver | ||
|
|
||
| import android.util.Pair | ||
| import dev.appoutlet.some.core.Resolver | ||
| import dev.appoutlet.some.core.ResolverChain | ||
| import kotlin.random.Random | ||
| import kotlin.reflect.KType | ||
|
|
||
| /** | ||
| * Resolves [Pair] types by delegating both generic type arguments back through the resolver chain. | ||
| * | ||
| * @param random Shared random source accepted for consistency with the resolver provider API. | ||
| */ | ||
| class PairResolver( | ||
| @Suppress("UNUSED_PARAMETER") | ||
| random: Random | ||
| ) : Resolver { | ||
|
MessiasLima marked this conversation as resolved.
|
||
| override fun canResolve(type: KType): Boolean = type.classifier == Pair::class | ||
|
|
||
| override fun resolve(type: KType, chain: ResolverChain): Any { | ||
| val firstType = requireNotNull(type.arguments.getOrNull(0)?.type) { | ||
| "Star projection not supported in Pair first type" | ||
| } | ||
| val secondType = requireNotNull(type.arguments.getOrNull(1)?.type) { | ||
| "Star projection not supported in Pair second type" | ||
| } | ||
|
|
||
| return Pair(chain.resolve(firstType), chain.resolve(secondType)) | ||
| } | ||
| } | ||
23 changes: 23 additions & 0 deletions
23
android/src/main/java/dev/appoutlet/some/android/resolver/UserHandleResolver.kt
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,23 @@ | ||
| package dev.appoutlet.some.android.resolver | ||
|
|
||
| import android.os.UserHandle | ||
| import dev.appoutlet.some.core.Resolver | ||
| import dev.appoutlet.some.core.ResolverChain | ||
| import kotlin.random.Random | ||
| import kotlin.reflect.KType | ||
| import kotlin.reflect.typeOf | ||
|
|
||
| /** | ||
| * Resolves [UserHandle] values when the runtime API level supports [UserHandle.getUserHandleForUid]. | ||
| * | ||
| * @param random Random source used when generating a non-system application UID. | ||
| */ | ||
| class UserHandleResolver( | ||
| private val random: Random | ||
| ) : Resolver { | ||
|
MessiasLima marked this conversation as resolved.
|
||
| override fun canResolve(type: KType): Boolean = type == typeOf<UserHandle>() | ||
|
|
||
| override fun resolve(type: KType, chain: ResolverChain): Any? { | ||
| return UserHandle.getUserHandleForUid(random.nextInt()) | ||
| } | ||
|
MessiasLima marked this conversation as resolved.
|
||
| } | ||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
45 changes: 45 additions & 0 deletions
45
android/src/test/java/dev/appoutlet/some/android/resolver/ColorResolverTest.kt
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,45 @@ | ||
| package dev.appoutlet.some.android.resolver | ||
|
|
||
| import android.graphics.Color | ||
| import android.os.UserHandle | ||
| import android.util.Pair | ||
| import dev.appoutlet.some.config.NullableStrategy | ||
| import dev.appoutlet.some.core.ResolverChain | ||
| import org.junit.Assert.assertFalse | ||
| import org.junit.Assert.assertTrue | ||
| import org.junit.Test | ||
| import org.junit.runner.RunWith | ||
| import org.robolectric.RobolectricTestRunner | ||
| import org.robolectric.annotation.Config | ||
| import kotlin.random.Random | ||
| import kotlin.reflect.typeOf | ||
|
|
||
| @RunWith(RobolectricTestRunner::class) | ||
| class ColorResolverTest { | ||
| @Test | ||
| @Config(sdk = [26]) | ||
| fun `ColorResolver generates Color values`() { | ||
| val resolver = ColorResolver(Random.Default) | ||
| val result = resolver.resolve(typeOf<Color>(), testChain) | ||
| assertTrue(result is Color) | ||
| } | ||
|
MessiasLima marked this conversation as resolved.
|
||
|
|
||
| @Test | ||
| fun `ColorResolver canResolve detects Color type`() { | ||
| val resolver = ColorResolver(Random.Default) | ||
| assertTrue(resolver.canResolve(typeOf<Color>())) | ||
| } | ||
|
|
||
| @Test | ||
| fun `ColorResolver rejects non-Color types`() { | ||
| val resolver = ColorResolver(Random.Default) | ||
| assertFalse(resolver.canResolve(typeOf<String>())) | ||
| assertFalse(resolver.canResolve(typeOf<Int>())) | ||
| assertFalse(resolver.canResolve(typeOf<UserHandle>())) | ||
| assertFalse(resolver.canResolve(typeOf<Pair<String, Int>>())) | ||
| } | ||
|
|
||
| companion object { | ||
| private val testChain = ResolverChain(emptyList(), NullableStrategy.NullOnCircularReference) | ||
| } | ||
| } | ||
68 changes: 68 additions & 0 deletions
68
android/src/test/java/dev/appoutlet/some/android/resolver/PairResolverTest.kt
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,68 @@ | ||
| package dev.appoutlet.some.android.resolver | ||
|
|
||
| import android.graphics.Color | ||
| import android.os.UserHandle | ||
| import android.util.Pair | ||
| import dev.appoutlet.some.config.NullableStrategy | ||
| import dev.appoutlet.some.core.Resolver | ||
| import dev.appoutlet.some.core.ResolverChain | ||
| import org.junit.Assert.assertEquals | ||
| import org.junit.Assert.assertFalse | ||
| import org.junit.Assert.assertTrue | ||
| import org.junit.Test | ||
| import org.junit.runner.RunWith | ||
| import org.robolectric.RobolectricTestRunner | ||
| import kotlin.random.Random | ||
| import kotlin.reflect.KType | ||
| import kotlin.reflect.typeOf | ||
|
|
||
| @RunWith(RobolectricTestRunner::class) | ||
| class PairResolverTest { | ||
| @Test | ||
| fun `PairResolver generates Pair values by delegating both generic types to the chain`() { | ||
| val resolver = PairResolver(Random.Default) | ||
| val resolvedTypes = mutableListOf<KType>() | ||
| val chain = ResolverChain( | ||
| listOf( | ||
| TrackingResolver(typeOf<String>(), "first-value", resolvedTypes), | ||
| TrackingResolver(typeOf<Int>(), 42, resolvedTypes) | ||
| ), | ||
| NullableStrategy.NullOnCircularReference | ||
| ) | ||
|
|
||
| val result = resolver.resolve(typeOf<Pair<String, Int>>(), chain) as Pair<*, *> | ||
|
|
||
| assertEquals("first-value", result.first) | ||
| assertEquals(42, result.second) | ||
| assertEquals(listOf(typeOf<String>(), typeOf<Int>()), resolvedTypes) | ||
| } | ||
|
|
||
| @Test | ||
| fun `PairResolver canResolve detects Pair type`() { | ||
| val resolver = PairResolver(Random.Default) | ||
| assertTrue(resolver.canResolve(typeOf<Pair<String, Int>>())) | ||
| } | ||
|
|
||
| @Test | ||
| fun `PairResolver rejects non-Pair types`() { | ||
| val resolver = PairResolver(Random.Default) | ||
| assertFalse(resolver.canResolve(typeOf<String>())) | ||
| assertFalse(resolver.canResolve(typeOf<Int>())) | ||
| assertFalse(resolver.canResolve(typeOf<Color>())) | ||
| assertFalse(resolver.canResolve(typeOf<UserHandle>())) | ||
| assertFalse(resolver.canResolve(typeOf<kotlin.Pair<String, Int>>())) | ||
| } | ||
|
|
||
| private class TrackingResolver( | ||
| private val supportedType: KType, | ||
| private val value: Any, | ||
| private val resolvedTypes: MutableList<KType> | ||
| ) : Resolver { | ||
| override fun canResolve(type: KType): Boolean = type == supportedType | ||
|
|
||
| override fun resolve(type: KType, chain: ResolverChain): Any { | ||
| resolvedTypes += type | ||
| return value | ||
| } | ||
| } | ||
| } |
45 changes: 45 additions & 0 deletions
45
android/src/test/java/dev/appoutlet/some/android/resolver/UserHandleResolverTest.kt
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,45 @@ | ||
| package dev.appoutlet.some.android.resolver | ||
|
|
||
| import android.graphics.Color | ||
| import android.os.UserHandle | ||
| import android.util.Pair | ||
| import dev.appoutlet.some.config.NullableStrategy | ||
| import dev.appoutlet.some.core.ResolverChain | ||
| import org.junit.Assert.assertFalse | ||
| import org.junit.Assert.assertTrue | ||
| import org.junit.Test | ||
| import org.junit.runner.RunWith | ||
| import org.robolectric.RobolectricTestRunner | ||
| import org.robolectric.annotation.Config | ||
| import kotlin.random.Random | ||
| import kotlin.reflect.typeOf | ||
|
|
||
| @RunWith(RobolectricTestRunner::class) | ||
| class UserHandleResolverTest { | ||
| @Test | ||
| @Config(sdk = [26]) | ||
| fun `UserHandleResolver generates UserHandle values when API level is supported`() { | ||
| val resolver = UserHandleResolver(Random.Default) | ||
| val result = resolver.resolve(typeOf<UserHandle>(), testChain) | ||
| assertTrue(result is UserHandle) | ||
| } | ||
|
MessiasLima marked this conversation as resolved.
|
||
|
|
||
| @Test | ||
| fun `UserHandleResolver canResolve detects UserHandle type`() { | ||
| val resolver = UserHandleResolver(Random.Default) | ||
| assertTrue(resolver.canResolve(typeOf<UserHandle>())) | ||
| } | ||
|
|
||
| @Test | ||
| fun `UserHandleResolver rejects non-UserHandle types`() { | ||
| val resolver = UserHandleResolver(Random.Default) | ||
| assertFalse(resolver.canResolve(typeOf<String>())) | ||
| assertFalse(resolver.canResolve(typeOf<Int>())) | ||
| assertFalse(resolver.canResolve(typeOf<Color>())) | ||
| assertFalse(resolver.canResolve(typeOf<Pair<String, Int>>())) | ||
| } | ||
|
|
||
| companion object { | ||
| private val testChain = ResolverChain(emptyList(), NullableStrategy.NullOnCircularReference) | ||
| } | ||
| } | ||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Uh oh!
There was an error while loading. Please reload this page.