ExternalVendorCode/corda
1
0
Fork 0
mirror of https://github.com/corda/corda.git synced 2025-01-19 03:06:36 +00:00
Code Issues Actions 2 Packages Projects Releases Wiki Activity

client: Add repeat\(n\) to Expect dsl

Browse Source
This commit is contained in:
Andras Slemmer 2016-09-01 09:35:13 +01:00
parent af641ab977
commit 0f54aec6ac
2 changed files with 12 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1,14 +1,12 @@
package com.r3corda.client.testing
import co.paralleluniverse.strands.SettableFuture
import com.r3corda.core.ThreadBox
import org.reactfx.EventStream
import org.slf4j.Logger
import org.slf4j.LoggerFactory
import rx.Observable
/**
* This file defines a simple DSL for testing non-deterministic sequence of events arriving on an [EventStream].
* This file defines a simple DSL for testing non-deterministic sequence of events arriving on an [Observable].
*
* [sequence] is used to impose ordering invariants on the stream, whereas [parallel] allows events to arrive in any order.
*
@ -57,8 +55,17 @@ fun <E> sequence(vararg expectations: ExpectCompose<E>): ExpectCompose<E> = Expe
*/
fun <E> parallel(vararg expectations: ExpectCompose<E>): ExpectCompose<E> = ExpectCompose.Parallel(listOf(*expectations))
/**
* Tests that N events of the same type arrive
*
* @param number The number of events expected.
* @param expectation The piece of DSL to run on each event, with the index of the event passed in.
*/
inline fun <E> repeat(number: Int, expectation: (Int) -> ExpectCompose<E>) = sequence(*Array(number) { expectation(it) })
/**
* Run the specified DSL against the event stream.
*
* @param isStrict If false non-matched events are disregarded (so the DSL will only check a subset of events).
* @param expectCompose The DSL we expect to match against the stream of events.
*/

22
client/src/test/kotlin/com/r3corda/client/WalletMonitorClientTests.kt
View File

@ -163,26 +163,8 @@ class WalletMonitorServiceTests {
is TransactionBuildResult.Failed -> fail(state.message)
}
},
expect { build: ServiceToClientEvent.Progress ->
// Requesting signature by notary service
},
expect { build: ServiceToClientEvent.Progress ->
// Structural step change in child of Requesting signature by notary service
},
expect { build: ServiceToClientEvent.Progress ->
// Requesting signature by notary service
},
expect { build: ServiceToClientEvent.Progress ->
// Validating response from Notary service
},
expect { build: ServiceToClientEvent.Progress ->
// Done
},
expect { build: ServiceToClientEvent.Progress ->
// Broadcasting transaction to participants
},
expect { build: ServiceToClientEvent.Progress ->
// Done
repeat(7) {
expect { build: ServiceToClientEvent.Progress -> }
}
),
expect { output: ServiceToClientEvent.OutputState ->