e135cf062c
Merge commit '5f70b6e04954a6dc64a1a56089eeccb2966bb0ae' into chrisr3-os-merge
2018-04-24 18:09:41 +01:00
8e507d0b88
CORDA-1263: Replace deprecated kotlin-stdlib-jre8 with kotlin-stdlib-jdk8. ( #2992 )
2018-04-24 14:03:41 +01:00
15c015e0d6
Merge branch 'master' into colljos-merge-230418
2018-04-23 12:12:16 +01:00
247a97f1a5
Remove superfluous registerInitiatedFlow calls from tutorial and example tests ( #2944 )
2018-04-20 16:56:27 +01:00
9b58114146
Merge remote-tracking branch 'open/master' into os-merge-f88542f
...
# Conflicts:
# docs/source/changelog.rst
# finance/src/integration-test/kotlin/net/corda/finance/flows/CashSelectionTest.kt
# node/src/test/kotlin/net/corda/node/services/vault/VaultQueryTests.kt
# testing/node-driver/src/integration-test/kotlin/net/corda/testing/driver/DriverTests.kt
2018-04-11 15:40:25 +01:00
f88542faa2
CORDA-1095: Fixed rare race where the startNode future completes before the default notary is visible ( #2947 )
2018-04-11 15:33:55 +01:00
7dbceaadcb
Merge remote-tracking branch 'open/master'
...
# Conflicts:
# node/src/main/kotlin/net/corda/node/services/events/NodeSchedulerService.kt
# node/src/test/kotlin/net/corda/node/services/events/NodeSchedulerServiceTest.kt
2018-03-26 15:46:26 +01:00
36d403dd7d
[CORDA-1262]: Added integration test for Cash Selection. ( #2874 )
2018-03-26 14:07:17 +01:00
c4dc8accde
Merge remote-tracking branch 'remotes/opensource/master' into merges/1
2018-03-16 17:52:01 +00:00
fb37a5bcf1
CORDA-792 Fix local shell in trader demo and SIMM valuation demo. ( #2837 )
...
Added rpcSettings to start RPC so the local shell can connect to the node.
2018-03-16 16:41:34 +00:00
da1afd9c55
Introduced copyright in all source files. ( #519 )
2018-03-06 17:29:21 +00:00
c72b3ad4fa
Merge remote-tracking branch 'open/master' into anthony-os-merge-2
...
# Conflicts:
# .ci/api-current.txt
# client/jfx/src/integration-test/kotlin/net/corda/client/jfx/NodeMonitorModelTest.kt
# client/rpc/src/integration-test/kotlin/net/corda/client/rpc/FlowsExecutionModeRpcTest.kt
# docs/source/example-code/src/integration-test/kotlin/net/corda/docs/IntegrationTestingTutorial.kt
# docs/source/example-code/src/main/kotlin/net/corda/docs/tutorial/mocknetwork/TutorialMockNetwork.kt
# finance/src/test/kotlin/net/corda/finance/flows/CashPaymentFlowTests.kt
# node/src/integration-test/kotlin/net/corda/node/CordappScanningDriverTest.kt
# node/src/integration-test/kotlin/net/corda/node/NodePerformanceTests.kt
# node/src/integration-test/kotlin/net/corda/node/services/BFTNotaryServiceTests.kt
# node/src/integration-test/kotlin/net/corda/node/services/RaftNotaryServiceTests.kt
# node/src/integration-test/kotlin/net/corda/node/services/network/NetworkMapTest.kt
# node/src/integration-test/kotlin/net/corda/node/services/rpc/RpcSslTest.kt
# node/src/integration-test/kotlin/net/corda/node/services/statemachine/FlowVersioningTest.kt
# node/src/integration-test/kotlin/net/corda/node/services/statemachine/LargeTransactionsTest.kt
# node/src/integration-test/kotlin/net/corda/services/messaging/MQSecurityTest.kt
# node/src/integration-test/kotlin/net/corda/services/messaging/P2PMessagingTest.kt
# node/src/integration-test/kotlin/net/corda/test/node/NodeStatePersistenceTests.kt
# node/src/test/kotlin/net/corda/node/CordaRPCOpsImplTest.kt
# node/src/test/kotlin/net/corda/node/modes/draining/ScheduledFlowsDrainingModeTest.kt
# node/src/test/kotlin/net/corda/node/services/messaging/ArtemisMessagingTest.kt
# node/src/test/kotlin/net/corda/node/services/statemachine/FlowFrameworkTests.kt
# node/src/test/kotlin/net/corda/node/services/transactions/MaxTransactionSizeTests.kt
# samples/trader-demo/src/integration-test/kotlin/net/corda/traderdemo/TraderDemoTest.kt
# testing/node-driver/src/main/kotlin/net/corda/testing/node/InMemoryMessagingNetwork.kt
# testing/node-driver/src/main/kotlin/net/corda/testing/node/MockServices.kt
# testing/node-driver/src/main/kotlin/net/corda/testing/node/internal/NodeBasedTest.kt
# verifier/src/integration-test/kotlin/net/corda/verifier/VerifierTests.kt
2018-02-28 16:55:15 +00:00
577033441a
[CORDA-1035] Testing api KDoc Updates ( #2584 )
...
* Testing api KDoc Updates
* Update after code review
* Update api-current
* Revert changes to compiler.xml
* Made comment changes from review
* Fixing merge conflict
* Don't expose net.corda.node through test API (first pass)
* Fixing merge conflicts
* Update api-current
* Addressing review commits
* Fix exposure of internal implementation of MessageHandlerRegistration
* Make InProcess expose ServiceHub instead of internal StartedNodeServices
* Move InternalMockMessaginService interface to internal namespace
* Move MOCK_VERSION_INFO to internal namespace to avoid exposing VersionInfo
* Don't expose WritableTransactionStorage via testing api
* Create public VerifierType enum
* Update api-current and modify check-api-changes to check for net.corda.node exposures
* Fix merge conflicts
* Fixing another merge conflict
* Fix accidentally broken unit tests
* Make getInternalServices a property
* Fix failing unit tests
* Add todo to check-api-changes
* Fix rpc sender thread busy looping
* Fix tests
* Fixing tests
* Address mike's comments
* Fixing tests
* Make random port allocation internal
* Update api
2018-02-28 13:26:49 +00:00
25263c20c7
Merge remote-tracking branch 'open/master' into aslemmer-merge-19-Feb
2018-02-20 15:52:09 +00:00
6b2b7b6a3c
Merge commit 'fa4b5d16ba6249f85b50851c2f52dc697eebdee6' into aslemmer-merge-19-Feb
2018-02-20 13:26:31 +00:00
b91dd43a83
Test driver default parameters removal ( #2519 )
...
* Removed long parameter list in test driver, replaced with DriverParameters object
2018-02-13 13:15:05 +00:00
ad1be79900
Reorders params to put non-default args first. Creates simpler default constructors.
2018-02-12 17:02:34 +00:00
7b65b7971a
CORDA-939 - Don't expose StartedNode and AbstractNode as part of public test api ( #2472 )
...
* Don't expose StartedNode via Node Driver
* Dont expose StartedNode/Abstract Node via MockNetwork
* Remove internal var from constructor as it doesn't hide from public api and change to internal initialisation method
* Update api
* Rename MockNode to StartedMockNode to avoid confusion
Update documentation
Update api-current.txt
* Fix typo
* Fix test failure
* Modify flow tests to use internal mock network and remove additional internal exposures from StartedMockNode
* Fix api-current
* Change InProcess and OutOfProcess to interfaces
* Explicitly declare MockNetwork parameters
Dont expose StateMachineManager
Move affected tests to use internal mock network
* Fix api-current
* Changes requested via review
* Fix IRS Demo address
* Fix api
* Remove internal attribute from classes in internal package
* Remove accidentally added code
* Move useHttps into NodeHandleInternal
* Remove duplicated code
* Update api-current
* Make webAddress internal on NodeHandle
* Make sure parameters in public api are explicitly specified
* Use correct address in IRS Demo
* Get webaddress from webserver handle
* Update api-current
2018-02-12 10:09:59 +00:00
336aeb96e5
Merge fixes
2018-01-26 13:45:03 +00:00
4b86362391
Merge remote-tracking branch 'open/master' into shams-os-merge-250118
...
# Conflicts:
# client/rpc/src/integration-test/kotlin/net/corda/client/rpc/BlacklistKotlinClosureTest.kt
# client/rpc/src/integration-test/kotlin/net/corda/client/rpc/RPCStabilityTests.kt
# core/src/test/java/net/corda/core/flows/FlowsInJavaTest.java
# docs/source/changelog.rst
# docs/source/corda-configuration-file.rst
# docs/source/upgrade-notes.rst
# finance/src/test/kotlin/net/corda/finance/contracts/CommercialPaperTests.kt
# finance/src/test/kotlin/net/corda/finance/contracts/asset/CashTests.kt
# gradle/wrapper/gradle-wrapper.properties
# node-api/src/main/kotlin/net/corda/nodeapi/internal/KeyStoreConfigHelpers.kt
# node-api/src/test/kotlin/net/corda/nodeapi/internal/serialization/SetsSerializationTest.kt
# node/src/integration-test/kotlin/net/corda/node/AuthDBTests.kt
# node/src/integration-test/kotlin/net/corda/node/BootTests.kt
# node/src/integration-test/kotlin/net/corda/node/NodeKeystoreCheckTest.kt
# node/src/integration-test/kotlin/net/corda/node/NodePerformanceTests.kt
# node/src/integration-test/kotlin/net/corda/node/SSHServerTest.kt
# node/src/integration-test/kotlin/net/corda/node/services/AttachmentLoadingTests.kt
# node/src/integration-test/kotlin/net/corda/node/services/BFTNotaryServiceTests.kt
# node/src/integration-test/kotlin/net/corda/node/services/RaftNotaryServiceTests.kt
# node/src/integration-test/kotlin/net/corda/node/services/network/NetworkMapTest.kt
# node/src/integration-test/kotlin/net/corda/node/services/network/PersistentNetworkMapCacheTest.kt
# node/src/integration-test/kotlin/net/corda/node/services/statemachine/FlowVersioningTest.kt
# node/src/integration-test/kotlin/net/corda/node/utilities/registration/NodeRegistrationTest.kt
# node/src/integration-test/kotlin/net/corda/services/messaging/MQSecurityTest.kt
# node/src/integration-test/kotlin/net/corda/services/messaging/P2PMessagingTest.kt
# node/src/integration-test/kotlin/net/corda/test/node/NodeStatePersistenceTests.kt
# node/src/main/kotlin/net/corda/node/internal/AbstractNode.kt
# node/src/main/kotlin/net/corda/node/services/config/NodeConfiguration.kt
# node/src/main/resources/reference.conf
# node/src/test/java/net/corda/node/services/vault/VaultQueryJavaTests.java
# node/src/test/kotlin/net/corda/node/CordaRPCOpsImplTest.kt
# node/src/test/kotlin/net/corda/node/services/config/NodeConfigurationImplTest.kt
# node/src/test/kotlin/net/corda/node/services/network/NetworkMapCacheTest.kt
# node/src/test/kotlin/net/corda/node/services/persistence/DBCheckpointStorageTests.kt
# samples/attachment-demo/src/integration-test/kotlin/net/corda/attachmentdemo/AttachmentDemoTest.kt
# samples/network-visualiser/src/main/kotlin/net/corda/netmap/NetworkMapVisualiser.kt
# samples/notary-demo/src/main/kotlin/net/corda/notarydemo/RaftNotaryCordform.kt
# samples/simm-valuation-demo/src/integration-test/kotlin/net/corda/vega/SimmValuationTest.kt
# testing/node-driver/src/integration-test/kotlin/net/corda/testing/driver/DriverTests.kt
# testing/node-driver/src/main/kotlin/net/corda/testing/node/InMemoryMessagingNetwork.kt
# testing/node-driver/src/main/kotlin/net/corda/testing/node/MockNode.kt
# testing/node-driver/src/main/kotlin/net/corda/testing/node/MockServices.kt
# testing/node-driver/src/main/kotlin/net/corda/testing/node/NodeTestUtils.kt
# testing/node-driver/src/main/kotlin/net/corda/testing/node/internal/NodeBasedTest.kt
# testing/smoke-test-utils/src/main/kotlin/net/corda/smoketesting/NodeProcess.kt
# testing/test-utils/src/main/kotlin/net/corda/testing/internal/TestNodeInfoBuilder.kt
# tools/explorer/src/main/kotlin/net/corda/explorer/ExplorerSimulation.kt
# verifier/src/integration-test/kotlin/net/corda/verifier/VerifierTests.kt
# webserver/src/integration-test/kotlin/net/corda/webserver/WebserverDriverTests.kt
2018-01-25 17:51:13 +00:00
9783f11ba8
Exposed RPC SSL settings through Cordformation ( #2419 )
2018-01-25 14:32:58 +00:00
142f52fa82
[CORDA:936]: Enable RPC layer to work with SSL
2018-01-23 16:23:37 +00:00
1fc646cfa8
CORDA-716 Move test-utils and node-driver to stable API section in docs ( #2335 )
...
* Move test-utils and node-driver to stable section.
* Move FlowStackSnapshotFactory to testing.services package & update docs
* Move SerializationTestHelpers to testing.core package
* Move TestConstants.kt to core namespace
* Move Expect.kt to core namespace
* Move CoreTestUtils to core.TestUtils - rename class and update imports
* Added some clarification to documents after re-reading them
* Added static imports
* Removing unused import
* Fix merge conflict
* Fixing merge conflict
2018-01-22 11:28:41 +00:00
eb3798da5e
Merge remote-tracking branch 'open/master' into colljos-merge-160118
2018-01-16 12:13:49 +00:00
1367cd4adb
CORDA-912 Stop exposing internal node user, create user in testing infrastructu… ( #2361 )
...
* Stop exposing internal node user, create user in testing infrastructure instead
* Update kdocs
2018-01-15 19:30:33 +00:00
1e9e1a61d9
Moved IntegrationTest class into internal package
2018-01-04 22:08:16 +00:00
52173219c3
Merge remote-tracking branch 'open/master' into shams-os-merge-020118
...
# Conflicts:
# client/rpc/src/integration-test/java/net/corda/client/rpc/CordaRPCJavaClientTest.java
# node/src/integration-test/kotlin/net/corda/node/NodeKeystoreCheckTest.kt
# node/src/integration-test/kotlin/net/corda/node/services/network/NetworkMapTest.kt
# node/src/integration-test/kotlin/net/corda/node/utilities/registration/NodeRegistrationTest.kt
# node/src/integration-test/kotlin/net/corda/services/messaging/MQSecurityTest.kt
# node/src/main/kotlin/net/corda/node/services/config/ConfigUtilities.kt
# node/src/test/kotlin/net/corda/node/services/events/NodeSchedulerServiceTest.kt
# testing/node-driver/src/main/kotlin/net/corda/testing/node/internal/DriverDSLImpl.kt
2018-01-02 15:32:32 +00:00
f8f5639b38
More descriptive error message ( #2295 )
2017-12-28 09:12:06 +00:00
e9fc6f7c8d
Merge remote-tracking branch 'open/master' into colljos-os-merge-rc01
2017-12-18 10:24:38 +00:00
8114a20abd
CORDA-716 Move non-API things to internal ( #2256 )
2017-12-17 18:44:35 +00:00
2319bf396c
Renamed TestIdentity.key to keyPair and pubkey to publicKey ( #2249 )
2017-12-14 11:30:55 +00:00
bc56a60d4a
Final renaming of invalid constants in Integration tests following rebase from OS master.
2017-12-13 13:10:04 +00:00
d1998b2c94
Merge remote-tracking branch 'open-hc02/master' into colljos-os-hc02-merge-121217
2017-12-13 11:02:58 +00:00
c3b9955344
CORDA-716 Fix split packages in testing ( #2232 )
2017-12-12 19:37:01 +00:00
905c8252a6
CORDA-654 Remaining key constants ( #2226 )
2017-12-12 18:03:06 +00:00
8a6e9c52f3
Merge remote-tracking branch 'open-hc01/master' into colljos-os-hc01-merge-111217
2017-12-11 09:21:52 +00:00
c36bea3af5
CORDA-654 MockServices no longer has hard-coded identities ( #2192 )
...
* Resurrect a test
* Fix a broken test
* Pass in the initial identity
* Make IdentityService easier to mock
2017-12-07 11:55:18 +00:00
8461837f1a
Cleaned up Driver.kt so that only the relevant bits are exposed as public API
2017-12-05 23:52:15 +00:00
cb43091ff8
Merge Open Source into Enterprise
...
# Resolved conflicts:
# core/src/main/kotlin/net/corda/core/node/services/TransactionStorage.kt
# node/src/integration-test/kotlin/net/corda/node/BootTests.kt
# node/src/integration-test/kotlin/net/corda/node/CordappScanningDriverTest.kt
# node/src/integration-test/kotlin/net/corda/node/NodePerformanceTests.kt
# node/src/integration-test/kotlin/net/corda/node/SSHServerTest.kt
# node/src/integration-test/kotlin/net/corda/node/services/AttachmentLoadingTests.kt
# node/src/integration-test/kotlin/net/corda/test/node/NodeStatePersistenceTests.kt
# node/src/main/kotlin/net/corda/node/Corda.kt
# node/src/main/kotlin/net/corda/node/internal/AbstractNode.kt
# node/src/main/kotlin/net/corda/node/internal/StartedNode.kt
# node/src/test/kotlin/net/corda/node/services/events/NodeSchedulerServiceTest.kt
# samples/attachment-demo/src/integration-test/kotlin/net/corda/attachmentdemo/AttachmentDemoTest.kt
# samples/trader-demo/src/integration-test/kotlin/net/corda/traderdemo/TraderDemoTest.kt
# testing/node-driver/src/main/kotlin/net/corda/testing/NodeTestUtils.kt
# testing/node-driver/src/main/kotlin/net/corda/testing/internal/NodeBasedTest.kt
# testing/node-driver/src/main/kotlin/net/corda/testing/node/MockServices.kt
2017-12-05 17:35:54 +00:00
5264072752
Renamed n.c.nodeapi.config to n.c.nodeapi.internal.config as that config code is not public API. For the same reason, also moved User into the same internal package.
2017-12-03 17:20:30 +00:00
709b3791a3
SQL Azure and SQL Server database integration tests ( #115 )
...
* Integration test are parameterised (extends IntegrationTest) to run against a remote database with 4 db scripts run @BeforeClass, @Before, @After and @AfterClass.
* SQL script for SQL Azure and SQL Server databases and templates of JDBC configuration.
2017-12-01 17:17:51 +00:00
dbe2dca7b9
CORDA-654 Make VaultFiller a class so I can change its hardcoded bits ( #2141 )
2017-11-29 09:49:34 +00:00
4bd6fef0f9
StateMachineManager is no longer lateinit. ( #2123 )
2017-11-27 17:55:08 +00:00
f26aa33553
Introduce contextLogger ( #2085 )
...
* Revert with comment, probably lazy for a reason.
2017-11-20 11:31:08 +00:00
e4f5e16bf4
Clean up identities in tests, stage 1 ( #2059 )
...
* Clean up identities in CashTests so that the mini/mega corp keys and identities are correctly
paired together throughout. Previously `miniCorpServices` presented the same key as the
MegaCorp identity, but with the name Mini Corp attached.
* Correct key/name matches in VaultWithCashTest
* Split services in CashTests to not have multiple identities per service hub
2017-11-16 17:17:45 +00:00
2fe41715cc
On exit, the driver will automaticallly shutdown any nodes which weren't waited for.
...
The motivation for this came with the recent change that a default notary is started by the driver, which if ignored will leak the notary process.
Also, waitForAllNodesToFinish() has been replaced by a driver parameter.
2017-11-14 20:20:00 +00:00
3bb018a5ce
Removed the ability to manually start notary nodes from the driver and MockNetwork. Instead by default a single notary is automatically started. This can be customised at creation time of the driver and MockNetwork. This more accurately models the concept of network parameters in a CZ.
...
Also added helper methods to retrieve this default notary.
2017-11-05 22:55:33 +00:00
d04e48740b
Introducing network parameters.
...
network-parameters file read in by the node at startup, of which only the list of notaries is used. For now, the driver and MockNetwork have been updated to require notaries to be started first. This is so that the same set of network parameters can be defined for all the nodes.
CN in the legal name is not longer disallowed since it's no longer reserved for distributed notary names.
Single-node notaries now only have one identity, their main identity. Nodes part of a cluster continue to have two.
(Based off Kasia's work)
2017-11-03 09:46:10 +00:00
d882f8871e
[CORDA-758]: Permissions are now checked for each RPC method. ( #1985 )
...
* Permissions are now checked for each RPC method.
* Fixed NodeMonitorModelTest
* Fixed IRSDemoTest
2017-11-02 15:09:49 +00:00
00e682a544
[CORDA-446] Clean up other mentions of network map node and logic ( #1974 )
...
* [CORDA-446] Clean up other mentions of network map node and logic
* Rename AbstractNetworkMapService to NetworkMapService and remove the empty NetworkMapService
* fix build
* fix artemismessaging tests
* pr comments
2017-11-01 14:25:48 +00:00
