ExternalVendorCode/corda
1
0
Fork 0
mirror of https://github.com/corda/corda.git synced 2025-06-18 23:28:21 +00:00
Code Issues Actions 2 Packages Projects Releases Wiki Activity

Use assert methods from test framework. Don't use Java assert. (#625)

Browse Source
This commit is contained in:
Chris Rankin
2017-05-03 17:32:30 +01:00
committed by GitHub
parent a1fd215863
commit e22ad19fcd
12 changed files with 56 additions and 59 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
node/src/test/kotlin/net/corda/node/services/statemachine/StateMachineManagerTests.kt
View File

@ -43,7 +43,6 @@ import net.corda.testing.sequence
import org.assertj.core.api.Assertions.assertThat
import org.assertj.core.api.Assertions.assertThatThrownBy
import org.assertj.core.api.AssertionsForClassTypes.assertThatExceptionOfType
import org.bouncycastle.asn1.x500.X500Name
import org.junit.After
import org.junit.Before
import org.junit.Test
@ -334,7 +333,7 @@ class StateMachineManagerTests {
}
val endpoint = net.messagingNetwork.endpoint(notary1.net.myAddress as InMemoryMessagingNetwork.PeerHandle)!!
val party1Info = notary1.services.networkMapCache.getPartyInfo(notary1.info.notaryIdentity)!!
assert(party1Info is PartyInfo.Service)
assertTrue(party1Info is PartyInfo.Service)
val notary1Address: MessageRecipients = endpoint.getAddressOfParty(notary1.services.networkMapCache.getPartyInfo(notary1.info.notaryIdentity)!!)
assertThat(notary1Address).isInstanceOf(InMemoryMessagingNetwork.ServiceHandle::class.java)
assertEquals(notary1Address, endpoint.getAddressOfParty(notary2.services.networkMapCache.getPartyInfo(notary2.info.notaryIdentity)!!))

14
node/src/test/kotlin/net/corda/node/utilities/AffinityExecutorTests.kt
View File

@ -5,9 +5,7 @@ import org.junit.Test
import java.util.*
import java.util.concurrent.CountDownLatch
import java.util.concurrent.atomic.AtomicReference
import kotlin.test.assertEquals
import kotlin.test.assertFails
import kotlin.test.assertNotEquals
import kotlin.test.*
class AffinityExecutorTests {
var _executor: AffinityExecutor.ServiceAffinityExecutor? = null
@ -28,13 +26,13 @@ class AffinityExecutorTests {
}
latch.countDown()
executor.flush()
assert(nestedRan)
assertTrue(nestedRan)
}
@Test fun `single threaded affinity executor runs on correct thread`() {
val thisThread = Thread.currentThread()
_executor = AffinityExecutor.ServiceAffinityExecutor("test thread", 1)
assert(!executor.isOnThread)
assertTrue(!executor.isOnThread)
assertFails { executor.checkOnThread() }
val thread = AtomicReference<Thread>()
@ -54,7 +52,7 @@ class AffinityExecutorTests {
@Test fun `pooled executor`() {
_executor = AffinityExecutor.ServiceAffinityExecutor("test2", 3)
assert(!executor.isOnThread)
assertFalse(executor.isOnThread)
val latch = CountDownLatch(1)
val latch2 = CountDownLatch(2)
@ -62,7 +60,7 @@ class AffinityExecutorTests {
fun blockAThread() {
executor.execute {
assert(executor.isOnThread)
assertTrue(executor.isOnThread)
threads += Thread.currentThread()
latch2.countDown()
latch.await()
@ -73,7 +71,7 @@ class AffinityExecutorTests {
latch2.await()
assertEquals(2, threads.size)
val numThreads = executor.fetchFrom {
assert(executor.isOnThread)
assertTrue(executor.isOnThread)
threads += Thread.currentThread()
threads.distinct().size
}