From cdd223378eec21693bb5a99e5b8bb621c4fcd1bc Mon Sep 17 00:00:00 2001 From: Michele Sollecito Date: Thu, 21 Jun 2018 15:37:45 +0100 Subject: [PATCH] Fixes (#1045) --- .../kotlin/net/corda/node/BootTests.kt | 11 +++++------ .../services/events/ScheduledFlowIntegrationTests.kt | 10 ++++++++++ .../kotlin/net/corda/testMessage/ScheduledState.kt | 10 ++++++++++ .../corda/node/services/config/NodeConfiguration.kt | 2 +- .../test/kotlin/net/corda/node/internal/NodeTest.kt | 2 +- 5 files changed, 27 insertions(+), 8 deletions(-) diff --git a/node/src/integration-test/kotlin/net/corda/node/BootTests.kt b/node/src/integration-test/kotlin/net/corda/node/BootTests.kt index 01595469f6..b9d2674f7b 100644 --- a/node/src/integration-test/kotlin/net/corda/node/BootTests.kt +++ b/node/src/integration-test/kotlin/net/corda/node/BootTests.kt @@ -13,7 +13,6 @@ package net.corda.node import co.paralleluniverse.fibers.Suspendable import net.corda.client.rpc.CordaRPCClient import net.corda.core.CordaRuntimeException -import net.corda.core.concurrent.CordaFuture import net.corda.core.flows.FlowLogic import net.corda.core.flows.StartableByRPC import net.corda.core.internal.div @@ -24,8 +23,9 @@ import net.corda.core.utilities.getOrThrow import net.corda.node.internal.NodeStartup import net.corda.node.services.Permissions.Companion.startFlow import net.corda.nodeapi.exceptions.InternalNodeException -import net.corda.testing.common.internal.ProjectStructure.projectRootDir -import net.corda.testing.core.* +import net.corda.testing.core.ALICE_NAME +import net.corda.testing.core.BOB_NAME +import net.corda.testing.core.DUMMY_NOTARY_NAME import net.corda.testing.driver.DriverParameters import net.corda.testing.driver.NodeHandle import net.corda.testing.driver.NodeParameters @@ -35,7 +35,6 @@ import net.corda.testing.internal.IntegrationTestSchemas import net.corda.testing.internal.toDatabaseSchemaName import net.corda.testing.node.User import net.corda.testing.node.internal.startNode -import org.assertj.core.api.Assertions.assertThat import org.assertj.core.api.Assertions.assertThatThrownBy import org.junit.ClassRule import org.junit.Test @@ -46,11 +45,11 @@ import java.io.Serializable import kotlin.test.assertEquals class BootTests : IntegrationTest() { - companion object { + companion object { @ClassRule @JvmField val databaseSchemas = IntegrationTestSchemas(ALICE_NAME.toDatabaseSchemaName(), BOB_NAME.toDatabaseSchemaName(), DUMMY_NOTARY_NAME.toDatabaseSchemaName()) - } + } @Test fun `java deserialization is disabled`() { diff --git a/node/src/integration-test/kotlin/net/corda/node/services/events/ScheduledFlowIntegrationTests.kt b/node/src/integration-test/kotlin/net/corda/node/services/events/ScheduledFlowIntegrationTests.kt index 7f47122619..ddf20d700c 100644 --- a/node/src/integration-test/kotlin/net/corda/node/services/events/ScheduledFlowIntegrationTests.kt +++ b/node/src/integration-test/kotlin/net/corda/node/services/events/ScheduledFlowIntegrationTests.kt @@ -1,3 +1,13 @@ +/* + * R3 Proprietary and Confidential + * + * Copyright (c) 2018 R3 Limited. All rights reserved. + * + * The intellectual and technical concepts contained herein are proprietary to R3 and its suppliers and are protected by trade secret law. + * + * Distribution of this file or any portion thereof via any medium without the express permission of R3 is strictly prohibited. + */ + package net.corda.node.services.events import co.paralleluniverse.fibers.Suspendable diff --git a/node/src/integration-test/kotlin/net/corda/testMessage/ScheduledState.kt b/node/src/integration-test/kotlin/net/corda/testMessage/ScheduledState.kt index 189d0fc9f4..cc5f14e8ee 100644 --- a/node/src/integration-test/kotlin/net/corda/testMessage/ScheduledState.kt +++ b/node/src/integration-test/kotlin/net/corda/testMessage/ScheduledState.kt @@ -1,3 +1,13 @@ +/* + * R3 Proprietary and Confidential + * + * Copyright (c) 2018 R3 Limited. All rights reserved. + * + * The intellectual and technical concepts contained herein are proprietary to R3 and its suppliers and are protected by trade secret law. + * + * Distribution of this file or any portion thereof via any medium without the express permission of R3 is strictly prohibited. + */ + package net.corda.testMessage import co.paralleluniverse.fibers.Suspendable diff --git a/node/src/main/kotlin/net/corda/node/services/config/NodeConfiguration.kt b/node/src/main/kotlin/net/corda/node/services/config/NodeConfiguration.kt index 80c0e4fa24..7ce32bdb9f 100644 --- a/node/src/main/kotlin/net/corda/node/services/config/NodeConfiguration.kt +++ b/node/src/main/kotlin/net/corda/node/services/config/NodeConfiguration.kt @@ -348,7 +348,7 @@ data class NodeConfigurationImpl( } } - // if compatibiliZoneURL is set then it will be copied into the networkServices field and thus skipping + // if compatibilityZoneURL is set then it will be copied into the networkServices field and thus skipping // this check by returning above is fine. networkServices?.let { if (devModeOptions?.allowCompatibilityZone != true) { diff --git a/node/src/test/kotlin/net/corda/node/internal/NodeTest.kt b/node/src/test/kotlin/net/corda/node/internal/NodeTest.kt index 411071a4a8..45f7f48f0c 100644 --- a/node/src/test/kotlin/net/corda/node/internal/NodeTest.kt +++ b/node/src/test/kotlin/net/corda/node/internal/NodeTest.kt @@ -104,7 +104,7 @@ class NodeTest { } @Test - fun `Node can start with multiple keypairs for it's identity`() { + fun `Node can start with multiple keypairs for its identity`() { val configuration = createConfig(ALICE_NAME) val (nodeInfo1, _) = createNodeInfoAndSigned(ALICE_NAME) val (nodeInfo2, _) = createNodeInfoAndSigned(ALICE_NAME)