ExternalVendorCode/corda
1
0
Fork 0
mirror of https://github.com/corda/corda.git synced 2025-05-29 05:34:22 +00:00
Code Issues Actions 2 Packages Projects Releases Wiki Activity

client: Small cosmetics

Browse Source
This commit is contained in:
Andras Slemmer 2016-08-30 16:28:09 +01:00
parent 20ed97ff96
commit af641ab977
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
client/src/main/kotlin/com/r3corda/client/testing/Expect.kt
View File

@ -64,9 +64,10 @@ fun <E> parallel(vararg expectations: ExpectCompose<E>): ExpectCompose<E> = Expe
*/ */
fun <E : Any> Observable<E>.expectEvents(isStrict: Boolean = true, expectCompose: () -> ExpectCompose<E>) { fun <E : Any> Observable<E>.expectEvents(isStrict: Boolean = true, expectCompose: () -> ExpectCompose<E>) {
val finishFuture = SettableFuture<Unit>() val finishFuture = SettableFuture<Unit>()
val lockedState = ThreadBox(object { var state = ExpectComposeState.fromExpectCompose(expectCompose()) }) val stateLock = object {}
var state = ExpectComposeState.fromExpectCompose(expectCompose())
subscribe { event -> subscribe { event ->
lockedState.locked { synchronized(stateLock) {
if (state is ExpectComposeState.Finished) { if (state is ExpectComposeState.Finished) {
log.warn("Got event $event, but was expecting no further events") log.warn("Got event $event, but was expecting no further events")
return@subscribe return@subscribe
@ -109,7 +110,7 @@ internal data class Expect<E, T : E>(
val expectClosure: (T) -> Unit val expectClosure: (T) -> Unit
) )
private sealed class ExpectComposeState<E : Any>{ private sealed class ExpectComposeState<E : Any> {
class Finished<E : Any> : ExpectComposeState<E>() class Finished<E : Any> : ExpectComposeState<E>()
class Single<E : Any>(val single: ExpectCompose.Single<E>) : ExpectComposeState<E>() class Single<E : Any>(val single: ExpectCompose.Single<E>) : ExpectComposeState<E>()
class Sequential<E : Any>( class Sequential<E : Any>(
@ -118,8 +119,7 @@ private sealed class ExpectComposeState<E : Any>{
val state: ExpectComposeState<E> val state: ExpectComposeState<E>
) : ExpectComposeState<E>() ) : ExpectComposeState<E>()
class Parallel<E : Any>( class Parallel<E : Any>(
val parallel: val parallel: ExpectCompose.Parallel<E>,
ExpectCompose.Parallel<E>,
val states: List<ExpectComposeState<E>> val states: List<ExpectComposeState<E>>
) : ExpectComposeState<E>() ) : ExpectComposeState<E>()