Skip to content

Commit 7d8e885

Browse files
Merge pull request #884 from square/zachklipp/worker-finished-type
Paramaterize the return type of Worker.finished() to make it more convenient to use in tests.
2 parents 69dbee7 + f989c27 commit 7d8e885

File tree

3 files changed

+4
-4
lines changed

3 files changed

+4
-4
lines changed

kotlin/workflow-core/src/main/java/com/squareup/workflow/Worker.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -213,7 +213,7 @@ interface Worker<out OutputT> {
213213
/**
214214
* Returns a [Worker] that finishes immediately without emitting anything.
215215
*/
216-
fun finished(): Worker<Nothing> = FinishedWorker
216+
fun <T> finished(): Worker<T> = FinishedWorker
217217

218218
/**
219219
* Creates a [Worker] from a function that returns a single value.

kotlin/workflow-testing/src/test/java/com/squareup/workflow/WorkerTest.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -234,7 +234,7 @@ class WorkerTest {
234234
}
235235

236236
@Test fun `finished worker is equivalent to self`() {
237-
assertTrue(Worker.finished().doesSameWorkAs(Worker.finished()))
237+
assertTrue(Worker.finished<Nothing>().doesSameWorkAs(Worker.finished<Nothing>()))
238238
}
239239

240240
@Test fun `transformed workers are equivalent with equivalent source`() {

kotlin/workflow-testing/src/test/java/com/squareup/workflow/testing/RealRenderTesterTest.kt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -189,7 +189,7 @@ class RealRenderTesterTest {
189189
initialState = Unit,
190190
render = {
191191
// Need to satisfy the expectation.
192-
runningWorker(Worker.finished() as Worker<Unit>) { noAction() }
192+
runningWorker(Worker.finished<Unit>()) { noAction() }
193193
return@stateful actionSink.contraMap { it }
194194
}
195195
)
@@ -571,7 +571,7 @@ class RealRenderTesterTest {
571571
}
572572

573573
@Test fun `verifyAction verifies worker output`() {
574-
val worker: Worker<String> = Worker.finished()
574+
val worker = Worker.finished<String>()
575575
val workflow = Workflow.stateless<Unit, Nothing, Unit> {
576576
runningWorker(worker) { TestAction(it) }
577577
}

0 commit comments

Comments
 (0)