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

Minor: address more formatting issues spotted by Shams

Browse Source
This commit is contained in:
Mike Hearn
2017-04-11 14:28:56 +02:00
parent 4853e41a58
commit 0c0c5521c0
15 changed files with 28 additions and 67 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
client/rpc/src/test/kotlin/net/corda/client/rpc/AbstractClientRPC.kt → client/rpc/src/test/kotlin/net/corda/client/rpc/AbstractClientRPCTest.kt
View File

@ -24,8 +24,7 @@ import org.junit.Before
import java.util.*
import java.util.concurrent.locks.ReentrantLock
abstract class AbstractClientRPC {
abstract class AbstractClientRPCTest {
lateinit var artemis: EmbeddedActiveMQ
lateinit var serverSession: ClientSession
lateinit var clientSession: ClientSession
@ -93,8 +92,10 @@ abstract class AbstractClientRPC {
return CordaRPCClientImpl(clientSession, ReentrantLock(), rpcUser.username).proxyFor(type)
}
fun safeClose(obj: Any) = try {
(obj as AutoCloseable).close()
} catch (e: Exception) {
fun safeClose(obj: Any) {
try {
(obj as AutoCloseable).close()
} catch (e: Exception) {
}
}
}

2
client/rpc/src/test/kotlin/net/corda/client/rpc/ClientRPCInfrastructureTests.kt
View File

@ -23,7 +23,7 @@ import kotlin.test.assertEquals
import kotlin.test.assertFailsWith
import kotlin.test.assertTrue
class ClientRPCInfrastructureTests : AbstractClientRPC() {
class ClientRPCInfrastructureTests : AbstractClientRPCTest() {
// TODO: Test that timeouts work
lateinit var proxy: TestOps

2
client/rpc/src/test/kotlin/net/corda/client/rpc/RPCPermissionsTest.kt
View File

@ -8,7 +8,7 @@ import org.junit.After
import org.junit.Test
import kotlin.test.assertFailsWith
class RPCPermissionsTest : AbstractClientRPC() {
class RPCPermissionsTest : AbstractClientRPCTest() {
companion object {
const val DUMMY_FLOW = "StartFlow.net.corda.flows.DummyFlow"
const val OTHER_FLOW = "StartFlow.net.corda.flows.OtherFlow"