From 493d4d5890615a7a28e60ba5cc4bb91a06208510 Mon Sep 17 00:00:00 2001
From: Mike Hearn <mike@r3.com>
Date: Wed, 4 Jul 2018 20:33:13 +0200
Subject: [PATCH] Minor: slightly improve an exception message with clarifying
 quotes

---
 .../test/kotlin/net/corda/client/rpc/RPCFailureTests.kt   | 8 ++++----
 .../serialization/internal/amqp/SerializationHelper.kt    | 2 +-
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/client/rpc/src/test/kotlin/net/corda/client/rpc/RPCFailureTests.kt b/client/rpc/src/test/kotlin/net/corda/client/rpc/RPCFailureTests.kt
index 2ab308af1d..7806bc9b40 100644
--- a/client/rpc/src/test/kotlin/net/corda/client/rpc/RPCFailureTests.kt
+++ b/client/rpc/src/test/kotlin/net/corda/client/rpc/RPCFailureTests.kt
@@ -3,7 +3,7 @@ package net.corda.client.rpc
 import net.corda.core.CordaRuntimeException
 import net.corda.core.concurrent.CordaFuture
 import net.corda.core.internal.concurrent.openFuture
-import net.corda.core.messaging.*
+import net.corda.core.messaging.RPCOps
 import net.corda.core.utilities.getOrThrow
 import net.corda.testing.core.SerializationEnvironmentRule
 import net.corda.testing.node.internal.rpcDriver
@@ -60,10 +60,10 @@ class RPCFailureTests {
     }
 
     @Test
-    fun `unserializable`() = rpc {
+    fun unserializable() = rpc {
         assertThatThrownBy { it.getUnserializable() }.isInstanceOf(CordaRuntimeException::class.java)
                 .hasMessageContaining("java.io.NotSerializableException:")
-                .hasMessageContaining("Unserializable is not on the whitelist or annotated with @CordaSerializable.")
+                .hasMessageContaining("Unserializable\" is not on the whitelist or annotated with @CordaSerializable.")
     }
 
     @Test
@@ -71,6 +71,6 @@ class RPCFailureTests {
         val future = it.getUnserializableAsync()
         assertThatThrownBy { future.getOrThrow() }.isInstanceOf(CordaRuntimeException::class.java)
                 .hasMessageContaining("java.io.NotSerializableException:")
-                .hasMessageContaining("Unserializable is not on the whitelist or annotated with @CordaSerializable.")
+                .hasMessageContaining("Unserializable\" is not on the whitelist or annotated with @CordaSerializable.")
     }
 }
diff --git a/serialization/src/main/kotlin/net/corda/serialization/internal/amqp/SerializationHelper.kt b/serialization/src/main/kotlin/net/corda/serialization/internal/amqp/SerializationHelper.kt
index 4a8605d295..f9f5880053 100644
--- a/serialization/src/main/kotlin/net/corda/serialization/internal/amqp/SerializationHelper.kt
+++ b/serialization/src/main/kotlin/net/corda/serialization/internal/amqp/SerializationHelper.kt
@@ -524,7 +524,7 @@ private fun Throwable.setMessage(newMsg: String) {
 
 fun ClassWhitelist.requireWhitelisted(type: Type) {
     if (!this.isWhitelisted(type.asClass()!!)) {
-        throw NotSerializableException("Class $type is not on the whitelist or annotated with @CordaSerializable.")
+        throw NotSerializableException("Class \"$type\" is not on the whitelist or annotated with @CordaSerializable.")
     }
 }