From 1ebfccadd0b61a99c688b8247337c891b111c651 Mon Sep 17 00:00:00 2001 From: Joseph Zuniga-Daly Date: Fri, 3 Jul 2020 14:17:51 +0100 Subject: [PATCH] Rename class to have a shorter name --- .../MockNetworkCustomCheckpointSerializerTest.kt | 10 +++++----- ...omCheckpointSerializerCorDapp.kt => TestCorDapp.kt} | 5 ++++- 2 files changed, 9 insertions(+), 6 deletions(-) rename node/src/integration-test/kotlin/net/corda/node/customcheckpointserializer/{CustomCheckpointSerializerCorDapp.kt => TestCorDapp.kt} (97%) diff --git a/node/src/integration-test/kotlin/net/corda/node/customcheckpointserializer/MockNetworkCustomCheckpointSerializerTest.kt b/node/src/integration-test/kotlin/net/corda/node/customcheckpointserializer/MockNetworkCustomCheckpointSerializerTest.kt index 0b1809ec5a..00ff31dbfd 100644 --- a/node/src/integration-test/kotlin/net/corda/node/customcheckpointserializer/MockNetworkCustomCheckpointSerializerTest.kt +++ b/node/src/integration-test/kotlin/net/corda/node/customcheckpointserializer/MockNetworkCustomCheckpointSerializerTest.kt @@ -13,7 +13,7 @@ class MockNetworkCustomCheckpointSerializerTest { @Before fun setup() { - mockNetwork = MockNetwork(MockNetworkParameters(cordappsForAllNodes = listOf(CustomCheckpointSerializerCorDapp.getCorDapp()))) + mockNetwork = MockNetwork(MockNetworkParameters(cordappsForAllNodes = listOf(TestCorDapp.getCorDapp()))) } @After @@ -25,7 +25,7 @@ class MockNetworkCustomCheckpointSerializerTest { fun `flow suspend with custom kryo serializer`() { val node = mockNetwork.createPartyNode() val expected = 5 - val actual = node.startFlow(CustomCheckpointSerializerCorDapp.TestFlowWithDifficultToSerializeLocalVariable(5)).get() + val actual = node.startFlow(TestCorDapp.TestFlowWithDifficultToSerializeLocalVariable(5)).get() Assertions.assertThat(actual).isEqualTo(expected) } @@ -35,7 +35,7 @@ class MockNetworkCustomCheckpointSerializerTest { val node = mockNetwork.createPartyNode() val expectedReference = DifficultToSerialize.BrokenMapClass() expectedReference.putAll(mapOf("one" to 1)) - val actualReference = node.startFlow(CustomCheckpointSerializerCorDapp.TestFlowCheckingReferencesWork(expectedReference)).get() + val actualReference = node.startFlow(TestCorDapp.TestFlowCheckingReferencesWork(expectedReference)).get() Assertions.assertThat(actualReference).isSameAs(expectedReference) Assertions.assertThat(actualReference["one"]).isEqualTo(1) @@ -45,7 +45,7 @@ class MockNetworkCustomCheckpointSerializerTest { @Suspendable fun `check serilization of interfaces`() { val node = mockNetwork.createPartyNode() - val result = node.startFlow(CustomCheckpointSerializerCorDapp.TestFlowWithDifficultToSerializeLocalVariableAsInterface(5)).get() + val result = node.startFlow(TestCorDapp.TestFlowWithDifficultToSerializeLocalVariableAsInterface(5)).get() Assertions.assertThat(result).isEqualTo(5) } @@ -53,7 +53,7 @@ class MockNetworkCustomCheckpointSerializerTest { @Suspendable fun `check serilization of abstract classes`() { val node = mockNetwork.createPartyNode() - val result = node.startFlow(CustomCheckpointSerializerCorDapp.TestFlowWithDifficultToSerializeLocalVariableAsAbstract(5)).get() + val result = node.startFlow(TestCorDapp.TestFlowWithDifficultToSerializeLocalVariableAsAbstract(5)).get() Assertions.assertThat(result).isEqualTo(5) } } diff --git a/node/src/integration-test/kotlin/net/corda/node/customcheckpointserializer/CustomCheckpointSerializerCorDapp.kt b/node/src/integration-test/kotlin/net/corda/node/customcheckpointserializer/TestCorDapp.kt similarity index 97% rename from node/src/integration-test/kotlin/net/corda/node/customcheckpointserializer/CustomCheckpointSerializerCorDapp.kt rename to node/src/integration-test/kotlin/net/corda/node/customcheckpointserializer/TestCorDapp.kt index df42baa66c..df316a8e09 100644 --- a/node/src/integration-test/kotlin/net/corda/node/customcheckpointserializer/CustomCheckpointSerializerCorDapp.kt +++ b/node/src/integration-test/kotlin/net/corda/node/customcheckpointserializer/TestCorDapp.kt @@ -9,7 +9,10 @@ import net.corda.testing.node.internal.enclosedCordapp import org.assertj.core.api.Assertions import java.time.Duration -class CustomCheckpointSerializerCorDapp { +/** + * Contains all the flows and custom serializers for testing custom checkpoint serializers + */ +class TestCorDapp { companion object { fun getCorDapp(): CustomCordapp = enclosedCordapp()