From 327f3383f9724eafe865debb60b2265961c14ec3 Mon Sep 17 00:00:00 2001 From: Mike Hearn Date: Fri, 4 May 2018 16:14:23 +0100 Subject: [PATCH] Revert "TEST FIX" This reverts commit 57b617c7d9d8ed12ac1090d9f993e751bc60527b. --- .../net/corda/client/rpc/ClientRPCInfrastructureTests.kt | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) diff --git a/client/rpc/src/test/kotlin/net/corda/client/rpc/ClientRPCInfrastructureTests.kt b/client/rpc/src/test/kotlin/net/corda/client/rpc/ClientRPCInfrastructureTests.kt index d2a0a2c977..43cd0c1ce1 100644 --- a/client/rpc/src/test/kotlin/net/corda/client/rpc/ClientRPCInfrastructureTests.kt +++ b/client/rpc/src/test/kotlin/net/corda/client/rpc/ClientRPCInfrastructureTests.kt @@ -1,6 +1,5 @@ package net.corda.client.rpc -import net.corda.core.CordaRuntimeException import net.corda.core.concurrent.CordaFuture import net.corda.core.internal.concurrent.doneFuture 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.rpcTestUser import org.assertj.core.api.Assertions.assertThat -import org.assertj.core.api.Assertions.assertThatThrownBy import org.junit.Test import org.junit.runner.RunWith import org.junit.runners.Parameterized @@ -79,10 +77,9 @@ class ClientRPCInfrastructureTests : AbstractRPCTest() { // Does nothing, doesn't throw. proxy.void() - assertThatThrownBy { proxy.barf() } - .isInstanceOf(CordaRuntimeException::class.java) - .hasMessage("java.lang.IllegalArgumentException: Barf!") - + assertEquals("Barf!", assertFailsWith { + proxy.barf() + }.message) assertEquals("hi 5", proxy.someCalculation("hi", 5)) }