Revert "TEST FIX"

This reverts commit 57b617c7d9.
This commit is contained in:
Mike Hearn 2018-05-04 16:14:23 +01:00
parent 100f680042
commit 327f3383f9

View File

@ -1,6 +1,5 @@
package net.corda.client.rpc package net.corda.client.rpc
import net.corda.core.CordaRuntimeException
import net.corda.core.concurrent.CordaFuture import net.corda.core.concurrent.CordaFuture
import net.corda.core.internal.concurrent.doneFuture import net.corda.core.internal.concurrent.doneFuture
import net.corda.core.internal.concurrent.openFuture import net.corda.core.internal.concurrent.openFuture
@ -12,7 +11,6 @@ import net.corda.testing.node.internal.RPCDriverDSL
import net.corda.testing.node.internal.rpcDriver import net.corda.testing.node.internal.rpcDriver
import net.corda.testing.node.internal.rpcTestUser import net.corda.testing.node.internal.rpcTestUser
import org.assertj.core.api.Assertions.assertThat import org.assertj.core.api.Assertions.assertThat
import org.assertj.core.api.Assertions.assertThatThrownBy
import org.junit.Test import org.junit.Test
import org.junit.runner.RunWith import org.junit.runner.RunWith
import org.junit.runners.Parameterized import org.junit.runners.Parameterized
@ -79,10 +77,9 @@ class ClientRPCInfrastructureTests : AbstractRPCTest() {
// Does nothing, doesn't throw. // Does nothing, doesn't throw.
proxy.void() proxy.void()
assertThatThrownBy { proxy.barf() } assertEquals("Barf!", assertFailsWith<IllegalArgumentException> {
.isInstanceOf(CordaRuntimeException::class.java) proxy.barf()
.hasMessage("java.lang.IllegalArgumentException: Barf!") }.message)
assertEquals("hi 5", proxy.someCalculation("hi", 5)) assertEquals("hi 5", proxy.someCalculation("hi", 5))
} }