Skip to content

Commit a1c6edf

Browse files
zach-klippensteinzach-klippenstein
authored
Merge pull request #73 from square/zachklipp/improve-testing-api-names
Improve naming of testing entry methods and types.
2 parents c19ba34 + 1d6cd78 commit a1c6edf

File tree

20 files changed

+328
-199
lines changed

20 files changed

+328
-199
lines changed

‎samples/dungeon/timemachine/src/test/java/com/squareup/sample/timemachine/RecorderWorkflowTest.kt‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ import com.google.common.truth.Truth.assertThat
1919
import com.squareup.sample.timemachine.RecorderWorkflow.RecorderProps.PlaybackAt
2020
import com.squareup.sample.timemachine.RecorderWorkflow.RecorderProps.RecordValue
2121
import com.squareup.sample.timemachine.RecorderWorkflow.Recording
22-
import com.squareup.workflow.testing.renderTester
22+
import com.squareup.workflow.testing.testRender
2323
import org.junit.Test
2424
import kotlin.time.ExperimentalTime
2525
import kotlin.time.TestTimeSource
@@ -72,7 +72,7 @@ class RecorderWorkflowTest {
7272
val startTime = clock.markNow()
7373

7474
workflow
75-
.renderTester(
75+
.testRender(
7676
props = RecordValue("bar"),
7777
initialState = Recording(
7878
startTime = startTime,
@@ -90,7 +90,7 @@ class RecorderWorkflowTest {
9090
val startTime = clock.markNow()
9191

9292
workflow
93-
.renderTester(
93+
.testRender(
9494
props = PlaybackAt(10.milliseconds),
9595
initialState = Recording(
9696
startTime = startTime,

‎samples/dungeon/timemachine/src/test/java/com/squareup/sample/timemachine/TimeMachineWorkflowTest.kt‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ import com.squareup.workflow.Sink
2323
import com.squareup.workflow.Workflow
2424
import com.squareup.workflow.makeEventSink
2525
import com.squareup.workflow.stateful
26-
import com.squareup.workflow.testing.testFromStart
26+
import com.squareup.workflow.testing.launchForTestingFromStartWith
2727
import org.junit.Test
2828
import kotlin.time.Duration
2929
import kotlin.time.ExperimentalTime
@@ -49,7 +49,7 @@ class TimeMachineWorkflowTest {
4949
val clock = TestTimeSource()
5050
val tmWorkflow = TimeMachineWorkflow(delegateWorkflow, clock)
5151

52-
tmWorkflow.testFromStart(Recording(Unit) as TimeMachineProps<Unit>) {
52+
tmWorkflow.launchForTestingFromStartWith(Recording(Unit) as TimeMachineProps<Unit>) {
5353
// Record some renderings.
5454
awaitNextRendering().let { rendering ->
5555
assertThat(rendering.value.state).isEqualTo("initial")

‎samples/tictactoe/common/src/test/java/com/squareup/sample/gameworkflow/TakeTurnsWorkflowTest.kt‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -21,8 +21,8 @@ import com.squareup.sample.gameworkflow.Ending.Quitted
2121
import com.squareup.sample.gameworkflow.Ending.Victory
2222
import com.squareup.sample.gameworkflow.Player.O
2323
import com.squareup.sample.gameworkflow.Player.X
24-
import com.squareup.workflow.testing.WorkflowTester
25-
import com.squareup.workflow.testing.testFromStart
24+
import com.squareup.workflow.testing.WorkflowTestRuntime
25+
import com.squareup.workflow.testing.launchForTestingFromStartWith
2626
import org.junit.Test
2727

2828
class TakeTurnsWorkflowTest {
@@ -35,7 +35,7 @@ class TakeTurnsWorkflowTest {
3535
}
3636

3737
@Test fun startsGameWithGivenNames() {
38-
RealTakeTurnsWorkflow().testFromStart(
38+
RealTakeTurnsWorkflow().launchForTestingFromStartWith(
3939
TakeTurnsProps.newGame(PlayerInfo("higgledy", "piggledy"))
4040
) {
4141
val (x, o) = awaitNextRendering().playerInfo
@@ -48,7 +48,7 @@ class TakeTurnsWorkflowTest {
4848
}
4949

5050
@Test fun xWins() {
51-
RealTakeTurnsWorkflow().testFromStart(
51+
RealTakeTurnsWorkflow().launchForTestingFromStartWith(
5252
TakeTurnsProps.newGame(PlayerInfo("higgledy", "piggledy"))
5353
) {
5454
takeSquare(0, 0)
@@ -71,7 +71,7 @@ class TakeTurnsWorkflowTest {
7171
}
7272

7373
@Test fun draw() {
74-
RealTakeTurnsWorkflow().testFromStart(
74+
RealTakeTurnsWorkflow().launchForTestingFromStartWith(
7575
TakeTurnsProps.newGame(PlayerInfo("higgledy", "piggledy"))
7676
) {
7777
takeSquare(0, 0) // X - -
@@ -102,7 +102,7 @@ class TakeTurnsWorkflowTest {
102102
@Test fun quiteAndResume() {
103103
var output: CompletedGame? = null
104104

105-
RealTakeTurnsWorkflow().testFromStart(
105+
RealTakeTurnsWorkflow().launchForTestingFromStartWith(
106106
TakeTurnsProps.newGame(PlayerInfo("higgledy", "piggledy"))
107107
) {
108108
awaitNextRendering().onQuit()
@@ -111,7 +111,7 @@ class TakeTurnsWorkflowTest {
111111

112112
assertThat(output!!.ending).isSameInstanceAs(Quitted)
113113

114-
RealTakeTurnsWorkflow().testFromStart(
114+
RealTakeTurnsWorkflow().launchForTestingFromStartWith(
115115
TakeTurnsProps.resumeGame(
116116
PlayerInfo("higgledy", "piggledy"),
117117
output!!.lastTurn
@@ -122,6 +122,6 @@ class TakeTurnsWorkflowTest {
122122
}
123123
}
124124

125-
private fun WorkflowTester<*, *, GamePlayScreen>.takeSquare(row: Int, col: Int) {
125+
private fun WorkflowTestRuntime<*, *, GamePlayScreen>.takeSquare(row: Int, col: Int) {
126126
awaitNextRendering().onClick(row, col)
127127
}

‎samples/tictactoe/common/src/test/java/com/squareup/sample/mainworkflow/MainWorkflowTest.kt‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ import com.squareup.workflow.Workflow
1212
import com.squareup.workflow.action
1313
import com.squareup.workflow.rendering
1414
import com.squareup.workflow.stateless
15-
import com.squareup.workflow.testing.testFromStart
15+
import com.squareup.workflow.testing.launchForTestingFromStartWith
1616
import com.squareup.workflow.ui.backstack.BackStackScreen
1717
import org.junit.Test
1818

@@ -22,7 +22,7 @@ import org.junit.Test
2222
*/
2323
class MainWorkflowTest {
2424
@Test fun `starts in auth over empty game`() {
25-
MainWorkflow(authWorkflow(), runGameWorkflow()).testFromStart {
25+
MainWorkflow(authWorkflow(), runGameWorkflow()).launchForTestingFromStartWith {
2626
awaitNextRendering()
2727
.let { screen ->
2828
assertThat(screen.panels).hasSize(1)
@@ -42,7 +42,7 @@ class MainWorkflowTest {
4242
authScreen()
4343
}
4444

45-
MainWorkflow(authWorkflow, runGameWorkflow()).testFromStart {
45+
MainWorkflow(authWorkflow, runGameWorkflow()).launchForTestingFromStartWith {
4646
awaitNextRendering()
4747
.let { screen ->
4848
assertThat(screen.panels).isEmpty()

‎workflow-rx2/src/test/java/com/squareup/workflow/rx2/PublisherWorkerTest.kt‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ import com.squareup.workflow.Worker
1919
import com.squareup.workflow.Workflow
2020
import com.squareup.workflow.action
2121
import com.squareup.workflow.stateless
22-
import com.squareup.workflow.testing.testFromStart
22+
import com.squareup.workflow.testing.launchForTestingFromStartWith
2323
import io.reactivex.BackpressureStrategy.BUFFER
2424
import io.reactivex.subjects.PublishSubject
2525
import org.reactivestreams.Publisher
@@ -41,7 +41,7 @@ class PublisherWorkerTest {
4141
runningWorker(worker) { action(it) }
4242
}
4343

44-
workflow.testFromStart {
44+
workflow.launchForTestingFromStartWith {
4545
assertFalse(hasOutput)
4646

4747
subject.onNext("one")

‎workflow-rx2/src/test/java/com/squareup/workflow/rx2/RxWorkersTest.kt‎

Lines changed: 26 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515
*/
1616
package com.squareup.workflow.rx2
1717

18-
import com.squareup.workflow.testing.test
18+
import com.squareup.workflow.testing.launchForTestingWith
1919
import io.reactivex.BackpressureStrategy.MISSING
2020
import io.reactivex.Flowable
2121
import io.reactivex.Maybe
@@ -40,7 +40,7 @@ class RxWorkersTest {
4040
// Should support out-projected parameters.
4141
val worker = (subject as Observable<out String?>).asWorker()
4242

43-
worker.test {
43+
worker.launchForTestingWith {
4444
subject.onNext("foo")
4545
assertEquals("foo", nextOutput())
4646

@@ -53,7 +53,7 @@ class RxWorkersTest {
5353
val subject = PublishSubject.create<String>()
5454
val worker = subject.asWorker()
5555

56-
worker.test {
56+
worker.launchForTestingWith {
5757
subject.onComplete()
5858
assertFinished()
5959
}
@@ -63,7 +63,7 @@ class RxWorkersTest {
6363
val subject = PublishSubject.create<String>()
6464
val worker = subject.asWorker()
6565

66-
worker.test {
66+
worker.launchForTestingWith {
6767
subject.onNext("foo")
6868
assertEquals("foo", nextOutput())
6969

@@ -76,7 +76,7 @@ class RxWorkersTest {
7676
val subject = PublishSubject.create<String>()
7777
val worker = subject.asWorker()
7878

79-
worker.test {
79+
worker.launchForTestingWith {
8080
subject.onError(ExpectedException())
8181
assertTrue(getException() is ExpectedException)
8282
}
@@ -90,7 +90,7 @@ class RxWorkersTest {
9090

9191
assertEquals(0, subscriptions)
9292

93-
worker.test {
93+
worker.launchForTestingWith {
9494
assertEquals(1, subscriptions)
9595
}
9696
}
@@ -103,7 +103,7 @@ class RxWorkersTest {
103103

104104
assertEquals(0, disposals)
105105

106-
worker.test {
106+
worker.launchForTestingWith {
107107
assertEquals(0, disposals)
108108
cancelWorker()
109109
assertEquals(1, disposals)
@@ -119,7 +119,7 @@ class RxWorkersTest {
119119
val worker = (subject.toFlowable(MISSING) as Flowable<out String?>)
120120
.asWorker()
121121

122-
worker.test {
122+
worker.launchForTestingWith {
123123
subject.onNext("foo")
124124
assertEquals("foo", nextOutput())
125125

@@ -133,7 +133,7 @@ class RxWorkersTest {
133133
val worker = subject.toFlowable(MISSING)
134134
.asWorker()
135135

136-
worker.test {
136+
worker.launchForTestingWith {
137137
subject.onComplete()
138138
assertFinished()
139139
}
@@ -144,7 +144,7 @@ class RxWorkersTest {
144144
val worker = subject.toFlowable(MISSING)
145145
.asWorker()
146146

147-
worker.test {
147+
worker.launchForTestingWith {
148148
subject.onNext("foo")
149149
assertEquals("foo", nextOutput())
150150

@@ -158,7 +158,7 @@ class RxWorkersTest {
158158
val worker = subject.toFlowable(MISSING)
159159
.asWorker()
160160

161-
worker.test {
161+
worker.launchForTestingWith {
162162
subject.onError(ExpectedException())
163163
assertTrue(getException() is ExpectedException)
164164
}
@@ -173,7 +173,7 @@ class RxWorkersTest {
173173

174174
assertEquals(0, subscriptions)
175175

176-
worker.test {
176+
worker.launchForTestingWith {
177177
assertEquals(1, subscriptions)
178178
}
179179
}
@@ -187,7 +187,7 @@ class RxWorkersTest {
187187

188188
assertEquals(0, cancels)
189189

190-
worker.test {
190+
worker.launchForTestingWith {
191191
assertEquals(0, cancels)
192192
cancelWorker()
193193
assertEquals(1, cancels)
@@ -202,7 +202,7 @@ class RxWorkersTest {
202202
val subject = MaybeSubject.create<String>()
203203
val worker = (subject as Maybe<out String?>).asWorker()
204204

205-
worker.test {
205+
worker.launchForTestingWith {
206206
subject.onSuccess("foo")
207207
assertEquals("foo", nextOutput())
208208
assertFinished()
@@ -213,7 +213,7 @@ class RxWorkersTest {
213213
val subject = MaybeSubject.create<String>()
214214
val worker = subject.asWorker()
215215

216-
worker.test {
216+
worker.launchForTestingWith {
217217
subject.onComplete()
218218
assertFinished()
219219
}
@@ -223,7 +223,7 @@ class RxWorkersTest {
223223
val subject = MaybeSubject.create<String>()
224224
val worker = subject.asWorker()
225225

226-
worker.test {
226+
worker.launchForTestingWith {
227227
subject.onError(ExpectedException())
228228
assertTrue(getException() is ExpectedException)
229229
}
@@ -237,7 +237,7 @@ class RxWorkersTest {
237237

238238
assertEquals(0, subscriptions)
239239

240-
worker.test {
240+
worker.launchForTestingWith {
241241
assertEquals(1, subscriptions)
242242
}
243243
}
@@ -250,7 +250,7 @@ class RxWorkersTest {
250250

251251
assertEquals(0, cancels)
252252

253-
worker.test {
253+
worker.launchForTestingWith {
254254
assertEquals(0, cancels)
255255
cancelWorker()
256256
assertEquals(1, cancels)
@@ -265,7 +265,7 @@ class RxWorkersTest {
265265
val subject = SingleSubject.create<String>()
266266
val worker = (subject as Single<out String?>).asWorker()
267267

268-
worker.test {
268+
worker.launchForTestingWith {
269269
subject.onSuccess("foo")
270270
assertEquals("foo", nextOutput())
271271
assertFinished()
@@ -276,7 +276,7 @@ class RxWorkersTest {
276276
val subject = SingleSubject.create<String>()
277277
val worker = subject.asWorker()
278278

279-
worker.test {
279+
worker.launchForTestingWith {
280280
subject.onError(ExpectedException())
281281
assertTrue(getException() is ExpectedException)
282282
}
@@ -290,7 +290,7 @@ class RxWorkersTest {
290290

291291
assertEquals(0, subscriptions)
292292

293-
worker.test {
293+
worker.launchForTestingWith {
294294
assertEquals(1, subscriptions)
295295
}
296296
}
@@ -303,7 +303,7 @@ class RxWorkersTest {
303303

304304
assertEquals(0, cancels)
305305

306-
worker.test {
306+
worker.launchForTestingWith {
307307
assertEquals(0, cancels)
308308
cancelWorker()
309309
assertEquals(1, cancels)
@@ -318,7 +318,7 @@ class RxWorkersTest {
318318
val subject = CompletableSubject.create()
319319
val worker = subject.asWorker()
320320

321-
worker.test {
321+
worker.launchForTestingWith {
322322
subject.onComplete()
323323
assertFinished()
324324
}
@@ -328,7 +328,7 @@ class RxWorkersTest {
328328
val subject = CompletableSubject.create()
329329
val worker = subject.asWorker()
330330

331-
worker.test {
331+
worker.launchForTestingWith {
332332
subject.onError(ExpectedException())
333333
assertTrue(getException() is ExpectedException)
334334
}
@@ -342,7 +342,7 @@ class RxWorkersTest {
342342

343343
assertEquals(0, subscriptions)
344344

345-
worker.test {
345+
worker.launchForTestingWith {
346346
assertEquals(1, subscriptions)
347347
}
348348
}
@@ -355,7 +355,7 @@ class RxWorkersTest {
355355

356356
assertEquals(0, cancels)
357357

358-
worker.test {
358+
worker.launchForTestingWith {
359359
assertEquals(0, cancels)
360360
cancelWorker()
361361
assertEquals(1, cancels)

0 commit comments

Comments
 (0)