Skip to content

Commit d70d1de

Browse files
programadorthiprogramadorthi
committed
Moved screen annotation test to voyager module
1 parent 37cadef commit d70d1de

File tree

6 files changed

+241
-100
lines changed

6 files changed

+241
-100
lines changed

‎integration/voyager/build.gradle.kts

+25-11
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@ plugins {
55
kotlin("plugin.serialization")
66
alias(libs.plugins.jetbrains.compose)
77
alias(libs.plugins.compose.compiler)
8+
alias(libs.plugins.ksp)
89
id("org.jetbrains.kotlinx.kover")
910
alias(libs.plugins.maven.publish)
1011
}
@@ -49,20 +50,25 @@ kotlin {
4950
implementation(compose.runtimeSaveable)
5051
}
5152
}
53+
commonTest {
54+
dependencies {
55+
implementation(projects.ksp.coreAnnotations)
56+
}
57+
}
5258

53-
val jsMain by getting {
59+
jsMain {
5460
dependencies {
5561
implementation(libs.serialization.json)
5662
}
5763
}
5864

59-
val jvmMain by getting {
65+
jvmMain {
6066
dependsOn(commonMain.get())
6167
dependencies {
6268
api(libs.slf4j.api)
6369
}
6470
}
65-
val jvmTest by getting {
71+
jvmTest {
6672
dependsOn(commonTest.get())
6773
dependencies {
6874
implementation(libs.test.junit)
@@ -71,27 +77,35 @@ kotlin {
7177
}
7278
}
7379

74-
val nativeMain by creating {
80+
nativeMain {
7581
dependsOn(commonMain.get())
7682
}
7783

78-
val macosMain by creating {
79-
dependsOn(nativeMain)
84+
macosMain {
85+
dependsOn(nativeMain.get())
8086
}
8187
val macosX64Main by getting {
82-
dependsOn(macosMain)
88+
dependsOn(macosMain.get())
8389
}
8490
val macosArm64Main by getting {
85-
dependsOn(macosMain)
91+
dependsOn(macosMain.get())
8692
}
8793
val iosX64Main by getting {
88-
dependsOn(nativeMain)
94+
dependsOn(nativeMain.get())
8995
}
9096
val iosArm64Main by getting {
91-
dependsOn(nativeMain)
97+
dependsOn(nativeMain.get())
9298
}
9399
val iosSimulatorArm64Main by getting {
94-
dependsOn(nativeMain)
100+
dependsOn(nativeMain.get())
95101
}
96102
}
97103
}
104+
105+
dependencies {
106+
add("kspJvmTest", projects.ksp.coreProcessor)
107+
}
108+
109+
ksp {
110+
arg("Routing_Module_Name", "Voyager")
111+
}

‎integration/voyager/common/test/dev/programadorthi/routing/voyager/Screens.kt

+62
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,62 @@
1+
package dev.programadorthi.routing.voyager
2+
3+
import androidx.compose.runtime.Composable
4+
import cafe.adriel.voyager.core.screen.Screen
5+
import dev.programadorthi.routing.annotation.Body
6+
import dev.programadorthi.routing.annotation.Route
7+
8+
internal val invoked = mutableMapOf<String, List<Any?>>()
9+
10+
internal data class User(
11+
val id: Int,
12+
val name: String,
13+
)
14+
15+
@Route("/screen")
16+
class Screen1 : Screen {
17+
@Composable
18+
override fun Content() {
19+
invoked += "/screen" to emptyList()
20+
}
21+
}
22+
23+
@Route("/screen-object")
24+
object Screen2 : Screen {
25+
@Composable
26+
override fun Content() {
27+
invoked += "/screen-object" to emptyList()
28+
}
29+
}
30+
31+
@Route("/screen/{id}")
32+
class Screen3(val id: Int) : Screen {
33+
@Composable
34+
override fun Content() {
35+
invoked += "/screen/{id}" to listOf(id)
36+
}
37+
}
38+
39+
@Route("/screen-with-name/{name}")
40+
class Screen4(val name: String) : Screen {
41+
private var age: Int = -1
42+
43+
@Route("/screen-with-age/{age}")
44+
constructor(age: Int) : this("") {
45+
this.age = age
46+
}
47+
48+
@Composable
49+
override fun Content() {
50+
invoked += "/screen-with-name/{name}" to listOf(name)
51+
invoked += "/screen-with-age/{age}" to listOf(age)
52+
}
53+
}
54+
55+
@Route("/screen-with-body")
56+
internal class Screen5(@Body val user: User) : Screen {
57+
58+
@Composable
59+
override fun Content() {
60+
invoked += "/screen-with-body" to listOf(user)
61+
}
62+
}

‎integration/voyager/jvm/test/dev/programadorthi/routing/voyager/VoyagerRoutingByAnnotationsTest.kt

+154
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,154 @@
1+
package dev.programadorthi.routing.voyager
2+
3+
import dev.programadorthi.routing.core.push
4+
import dev.programadorthi.routing.core.pushWithBody
5+
import dev.programadorthi.routing.core.routing
6+
import dev.programadorthi.routing.generated.configure
7+
import dev.programadorthi.routing.voyager.helper.FakeScreen
8+
import dev.programadorthi.routing.voyager.helper.runComposeTest
9+
import kotlin.random.Random
10+
import kotlin.test.Test
11+
import kotlin.test.assertEquals
12+
import kotlinx.coroutines.ExperimentalCoroutinesApi
13+
import kotlinx.coroutines.test.advanceTimeBy
14+
15+
@OptIn(ExperimentalCoroutinesApi::class)
16+
internal class VoyagerRoutingByAnnotationsTest {
17+
18+
@Test
19+
fun shouldHandleScreenClass() =
20+
runComposeTest { coroutineContext, composition, clock ->
21+
// GIVEN
22+
val routing =
23+
routing(parentCoroutineContext = coroutineContext) {
24+
configure()
25+
}
26+
27+
composition.setContent {
28+
VoyagerRouting(
29+
routing = routing,
30+
initialScreen = FakeScreen(),
31+
)
32+
}
33+
34+
// WHEN
35+
routing.push("/screen")
36+
advanceTimeBy(99) // Ask for routing
37+
clock.sendFrame(0L) // Ask for recomposition
38+
39+
// THEN
40+
assertEquals(emptyList(), invoked.remove("/screen"))
41+
}
42+
43+
@Test
44+
fun shouldHandleScreenObject() =
45+
runComposeTest { coroutineContext, composition, clock ->
46+
// GIVEN
47+
val routing =
48+
routing(parentCoroutineContext = coroutineContext) {
49+
configure()
50+
}
51+
52+
composition.setContent {
53+
VoyagerRouting(
54+
routing = routing,
55+
initialScreen = FakeScreen(),
56+
)
57+
}
58+
59+
// WHEN
60+
routing.push("/screen-object")
61+
advanceTimeBy(99) // Ask for routing
62+
clock.sendFrame(0L) // Ask for recomposition
63+
64+
// THEN
65+
assertEquals(emptyList(), invoked.remove("/screen-object"))
66+
}
67+
68+
@Test
69+
fun shouldHandleScreenWithParameter() =
70+
runComposeTest { coroutineContext, composition, clock ->
71+
// GIVEN
72+
val routing =
73+
routing(parentCoroutineContext = coroutineContext) {
74+
configure()
75+
}
76+
77+
composition.setContent {
78+
VoyagerRouting(
79+
routing = routing,
80+
initialScreen = FakeScreen(),
81+
)
82+
}
83+
84+
// WHEN
85+
val nextInt = Random.Default.nextInt()
86+
routing.push("/screen/$nextInt")
87+
advanceTimeBy(99) // Ask for routing
88+
clock.sendFrame(0L) // Ask for recomposition
89+
90+
// THEN
91+
assertEquals(listOf(nextInt), invoked.remove("/screen/{id}"))
92+
}
93+
94+
@Test
95+
fun shouldHandleScreenWithMultipleConstructors() =
96+
runComposeTest { coroutineContext, composition, clock ->
97+
// GIVEN
98+
val routing =
99+
routing(parentCoroutineContext = coroutineContext) {
100+
configure()
101+
}
102+
103+
composition.setContent {
104+
VoyagerRouting(
105+
routing = routing,
106+
initialScreen = FakeScreen(),
107+
)
108+
}
109+
110+
// WHEN
111+
routing.push("/screen-with-name/Routing")
112+
advanceTimeBy(99) // Ask for routing
113+
clock.sendFrame(0L) // Ask for recomposition
114+
115+
val fromName = invoked.remove("/screen-with-name/{name}")
116+
117+
routing.push("/screen-with-age/18")
118+
advanceTimeBy(99) // Ask for routing
119+
clock.sendFrame(0L) // Ask for recomposition
120+
121+
val fromAge = invoked.remove("/screen-with-age/{age}")
122+
123+
// THEN
124+
assertEquals(listOf("Routing"), fromName)
125+
assertEquals(listOf(18), fromAge)
126+
}
127+
128+
@Test
129+
fun shouldHandleScreenWithBody() =
130+
runComposeTest { coroutineContext, composition, clock ->
131+
// GIVEN
132+
val routing =
133+
routing(parentCoroutineContext = coroutineContext) {
134+
configure()
135+
}
136+
137+
composition.setContent {
138+
VoyagerRouting(
139+
routing = routing,
140+
initialScreen = FakeScreen(),
141+
)
142+
}
143+
144+
// WHEN
145+
val body = User(id = 456, name = "With Body")
146+
routing.pushWithBody(path = "/screen-with-body", body = body)
147+
advanceTimeBy(99) // Ask for routing
148+
clock.sendFrame(0L) // Ask for recomposition
149+
150+
// THEN
151+
assertEquals(listOf(body), invoked.remove("/screen-with-body"))
152+
}
153+
154+
}

‎samples/ksp-sample/build.gradle.kts

-47
This file was deleted.

‎samples/ksp-sample/src/commonMain/kotlin/dev/programadorthi/routing/sample/Screens.kt

-41
This file was deleted.

‎settings.gradle.kts

-1
Original file line numberDiff line numberDiff line change
@@ -46,5 +46,4 @@ include(":integration:voyager")
4646
//include(":samples:android-sample")
4747
//include(":samples:multiplatform-voyager")
4848
//include(":samples:kotlin-js-sample")
49-
//include(":samples:ksp-sample")
5049
//include(":samples:win32-sample")

0 commit comments

Comments
 (0)