From 4c2f0d7913bc0d26c0ae3f3af9976b26d3c6ba97 Mon Sep 17 00:00:00 2001
From: Katelyn Baker <katelyn.baker@r3.com>
Date: Tue, 28 Nov 2017 10:03:01 +0000
Subject: [PATCH] Fix broken unit test

At the moment the test just asserts we can't evolve enums, it's a
placeholder for the next phase of the changes
---
 .../serialization/amqp/EnumEvolveTests.kt         |  14 ++++++--------
 .../EnumEvolveTests.deserialiseNewerSetToUnknown  | Bin 0 -> 818 bytes
 2 files changed, 6 insertions(+), 8 deletions(-)
 create mode 100644 node-api/src/test/resources/net/corda/nodeapi/internal/serialization/amqp/EnumEvolveTests.deserialiseNewerSetToUnknown

diff --git a/node-api/src/test/kotlin/net/corda/nodeapi/internal/serialization/amqp/EnumEvolveTests.kt b/node-api/src/test/kotlin/net/corda/nodeapi/internal/serialization/amqp/EnumEvolveTests.kt
index d984cff766..30bc7a990b 100644
--- a/node-api/src/test/kotlin/net/corda/nodeapi/internal/serialization/amqp/EnumEvolveTests.kt
+++ b/node-api/src/test/kotlin/net/corda/nodeapi/internal/serialization/amqp/EnumEvolveTests.kt
@@ -1,5 +1,6 @@
 package net.corda.nodeapi.internal.serialization.amqp
 
+import net.corda.core.serialization.CordaSerializationTransformEnumDefault
 import net.corda.core.serialization.SerializedBytes
 import org.assertj.core.api.Assertions
 import org.junit.Test
@@ -16,14 +17,10 @@ class EnumEvolveTests {
     // Version of the class as it was serialised
     //
     // @CordaSerializationTransformEnumDefault("D", "C")
-    // enum class DeserializeNewerSetToUnknown {
-    //     A, B, C, D
-    // }
+    // enum class DeserializeNewerSetToUnknown { A, B, C, D }
     //
     // Version of the class as it's used in the test
-    enum class DeserializeNewerSetToUnknown {
-        A, B, C
-    }
+    enum class DeserializeNewerSetToUnknown { A, B, C }
 
     @Test
     fun deserialiseNewerSetToUnknown() {
@@ -33,11 +30,12 @@ class EnumEvolveTests {
         data class C (val e : DeserializeNewerSetToUnknown)
 
         // Uncomment to re-generate test files
-        //File(URI("$localPath/$resource")).writeBytes(
+        // File(URI("$localPath/$resource")).writeBytes(
         //        SerializationOutput(sf).serialize(C(DeserializeNewerSetToUnknown.D)).bytes)
 
         Assertions.assertThatThrownBy {
-            DeserializationInput(sf).deserialize(SerializedBytes<C>(File(URI("$localPath/$resource")).readBytes()))
+            DeserializationInput(sf).deserialize(SerializedBytes<C>(
+                    File(EvolvabilityTests::class.java.getResource(resource).toURI()).readBytes()))
         }.isInstanceOf(NotSerializableException::class.java)
     }
 }
\ No newline at end of file
diff --git a/node-api/src/test/resources/net/corda/nodeapi/internal/serialization/amqp/EnumEvolveTests.deserialiseNewerSetToUnknown b/node-api/src/test/resources/net/corda/nodeapi/internal/serialization/amqp/EnumEvolveTests.deserialiseNewerSetToUnknown
new file mode 100644
index 0000000000000000000000000000000000000000..f559d20e26356aba7052a81459b5f7a12a5ba6b5
GIT binary patch
literal 818
zcmcIi%SyvQ6rD->z;@xrh2TmlZiJz>T0|(MZBi(xMNFU+H<M<n(R31%X{%lN2Y$og
zk4zWt{R+RsDby)O1VOqPF6W-hId{$-gt3Pq0O0w}l`jDB9RPht7CLy{qlBTsf^j-I
z>D;xePqna`IKBRHcX)etFl^N80>N)Q|1oNs9XDvZM~*vkDqZiU*1MFvoW`MP>q<wH
zI@<P9P}`J+rg~Y~g9Qm?`L(iuXy_3f`N*e?#1sc8A+e7Ge}<VKQiMkj5whrbWKF_g
zLTr+-q~wt$DIphRO5!WR?9ie2G@Q~>%dnKBF7~y*>}!Y^s-cV^c@7Eh|IeiPWpeh@
zq-7Y5rV`AFkK8)d42x$1KVeER{Vl)6Yl!oV8p?~j47<T$IR!O2JWN3?4l60h<glus
ljrohV&W-2g)!7woD0Wxr7Q~j$i;Igg$q<hN#-Vg;egas11up;q

literal 0
HcmV?d00001