ExternalVendorCode/corda
1
0
Fork 0
mirror of https://github.com/corda/corda.git synced 2024-12-22 06:17:55 +00:00
Code Issues Actions 2 Packages Projects Releases Wiki Activity

Fix hanging test and fail fast on hang.

Browse Source
This commit is contained in:
rick.parker 2016-09-15 16:39:58 +01:00
parent 8ea20dd0d2
commit 17c9d231f4
1 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
node/src/test/kotlin/com/r3corda/node/services/NodeSchedulerServiceTest.kt
View File

@ -34,6 +34,7 @@ import java.security.PublicKey
import java.time.Clock import java.time.Clock
import java.time.Instant import java.time.Instant
import java.util.concurrent.* import java.util.concurrent.*
import kotlin.test.assertTrue
class NodeSchedulerServiceTest : SingletonSerializeAsToken() { class NodeSchedulerServiceTest : SingletonSerializeAsToken() {
// Use an in memory file system for testing attachment storage. // Use an in memory file system for testing attachment storage.
@ -160,7 +161,7 @@ class NodeSchedulerServiceTest : SingletonSerializeAsToken() {
assertThat(calls).isEqualTo(0) assertThat(calls).isEqualTo(0)
testClock.advanceBy(1.days) testClock.advanceBy(1.days)
backgroundExecutor.shutdown() backgroundExecutor.shutdown()
backgroundExecutor.awaitTermination(60, TimeUnit.SECONDS) assertTrue(backgroundExecutor.awaitTermination(60, TimeUnit.SECONDS))
countDown.await() countDown.await()
assertThat(calls).isEqualTo(1) assertThat(calls).isEqualTo(1)
} }
@ -180,7 +181,7 @@ class NodeSchedulerServiceTest : SingletonSerializeAsToken() {
countDown.await() countDown.await()
assertThat(calls).isEqualTo(3) assertThat(calls).isEqualTo(3)
backgroundExecutor.shutdown() backgroundExecutor.shutdown()
backgroundExecutor.awaitTermination(60, TimeUnit.SECONDS) assertTrue(backgroundExecutor.awaitTermination(60, TimeUnit.SECONDS))
} }
@Test @Test
@ -193,14 +194,13 @@ class NodeSchedulerServiceTest : SingletonSerializeAsToken() {
assertThat(calls).isEqualTo(0) assertThat(calls).isEqualTo(0)
scheduleTX(time + 1.days, 3) scheduleTX(time + 1.days, 3)
backgroundExecutor.execute { schedulerGatedExecutor.waitAndRun() }
testClock.advanceBy(1.days) testClock.advanceBy(1.days)
countDown.await() countDown.await()
assertThat(calls).isEqualTo(1) assertThat(calls).isEqualTo(1)
testClock.advanceBy(1.days)
backgroundExecutor.execute { schedulerGatedExecutor.waitAndRun() } backgroundExecutor.execute { schedulerGatedExecutor.waitAndRun() }
testClock.advanceBy(1.days)
backgroundExecutor.shutdown() backgroundExecutor.shutdown()
backgroundExecutor.awaitTermination(60, TimeUnit.SECONDS) assertTrue(backgroundExecutor.awaitTermination(60, TimeUnit.SECONDS))
} }
@Test @Test
@ -217,7 +217,7 @@ class NodeSchedulerServiceTest : SingletonSerializeAsToken() {
countDown.await() countDown.await()
assertThat(calls).isEqualTo(1) assertThat(calls).isEqualTo(1)
backgroundExecutor.shutdown() backgroundExecutor.shutdown()
backgroundExecutor.awaitTermination(60, TimeUnit.SECONDS) assertTrue(backgroundExecutor.awaitTermination(60, TimeUnit.SECONDS))
} }
@Test @Test
@ -236,7 +236,7 @@ class NodeSchedulerServiceTest : SingletonSerializeAsToken() {
countDown.await() countDown.await()
assertThat(calls).isEqualTo(3) assertThat(calls).isEqualTo(3)
backgroundExecutor.shutdown() backgroundExecutor.shutdown()
backgroundExecutor.awaitTermination(60, TimeUnit.SECONDS) assertTrue(backgroundExecutor.awaitTermination(60, TimeUnit.SECONDS))
} }
@Test @Test
@ -251,7 +251,7 @@ class NodeSchedulerServiceTest : SingletonSerializeAsToken() {
testClock.advanceBy(1.days) testClock.advanceBy(1.days)
assertThat(calls).isEqualTo(0) assertThat(calls).isEqualTo(0)
backgroundExecutor.shutdown() backgroundExecutor.shutdown()
backgroundExecutor.awaitTermination(60, TimeUnit.SECONDS) assertTrue(backgroundExecutor.awaitTermination(60, TimeUnit.SECONDS))
} }
private fun scheduleTX(instant: Instant, increment: Int = 1): ScheduledStateRef? { private fun scheduleTX(instant: Instant, increment: Int = 1): ScheduledStateRef? {