From 9375cd21c1e365f8001708e4ff6e36697bb941d7 Mon Sep 17 00:00:00 2001 From: Clinton Alexander Date: Wed, 20 Jul 2016 14:27:24 +0100 Subject: [PATCH 1/2] All Tests can now be run on Windows as tests are now forked by class. --- .idea/runConfigurations/All_tests.xml | 1 + 1 file changed, 1 insertion(+) diff --git a/.idea/runConfigurations/All_tests.xml b/.idea/runConfigurations/All_tests.xml index 1062a01a0b..845ad5e5cc 100644 --- a/.idea/runConfigurations/All_tests.xml +++ b/.idea/runConfigurations/All_tests.xml @@ -17,6 +17,7 @@ + From e81d8b9928baf8383cfb3ef36e08ff178b67f32d Mon Sep 17 00:00:00 2001 From: Clinton Alexander Date: Tue, 26 Jul 2016 10:43:41 +0100 Subject: [PATCH 2/2] Removed reference from progress tracker output to improve output readability. --- .../kotlin/com/r3corda/protocols/TwoPartyDealProtocol.kt | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/core/src/main/kotlin/com/r3corda/protocols/TwoPartyDealProtocol.kt b/core/src/main/kotlin/com/r3corda/protocols/TwoPartyDealProtocol.kt index 506cd87499..e55e28b6c9 100644 --- a/core/src/main/kotlin/com/r3corda/protocols/TwoPartyDealProtocol.kt +++ b/core/src/main/kotlin/com/r3corda/protocols/TwoPartyDealProtocol.kt @@ -439,12 +439,12 @@ object TwoPartyDealProtocol { */ class FixingRoleDecider(val ref: StateRef, val timeout: Duration, - override val progressTracker: ProgressTracker = tracker(ref.toString())) : ProtocolLogic() { + override val progressTracker: ProgressTracker = tracker()) : ProtocolLogic() { companion object { - class LOADING(ref: String) : ProgressTracker.Step("Loading state $ref to decide fixing role") + class LOADING() : ProgressTracker.Step("Loading state to decide fixing role") - fun tracker(ref: String) = ProgressTracker(LOADING(ref)) + fun tracker() = ProgressTracker(LOADING()) } override val topic: String get() = FIX_INITIATE_TOPIC