32011e05d1
Add missing logger. ( #817 )
...
* Add missing logger.
* Ensure scenario code is compiled as part of the standard gradle build task.
2018-05-10 14:42:30 +01:00
1963c29f01
Merge branch 'master' into kat-merge-20180508
2018-05-08 21:52:24 +07:00
28644b6514
Merge pull request #751 from corda/colljos-compatibility-testing
...
ENT-1834: Corda Behave extensions for CTS
2018-05-08 15:42:11 +01:00
406cdf39bb
Merge remote-tracking branch 'open/master' into kat-merge-20180508
2018-05-08 12:10:22 +01:00
0784f079ed
Revert "OS merge ( #806 )"
...
This reverts commit 5c0775f7b4
2018-05-04 16:09:11 +01:00
5c0775f7b4
OS merge ( #806 )
2018-05-04 15:47:36 +01:00
a61aa5d645
CORDA-847 - Pass serialization context down serialization call stack ( #3062 )
...
* CORDA-847 - Pass serialization context down serialization call stack
Needed for later work on AMQP RPC where we need to set per-thread
elements on a context. Could use some magic thread local but I'd rather
it was explicit on the stack and thus easier to reason about.
Additionally, now we're passing this around we can make better use of it
in the future
* Test Fix
* Test fixes
* REVIEW COMMENTS / CODE FORMAT
* Fix build issues
2018-05-03 16:09:03 +01:00
20570d72cf
CORDA-1238 - Move blob inspector initial work into experimental ( #3058 )
...
* CORDA-1238 - Initial blob inspector tool commit
Note this is WIP and not ready for prime time but it's time it moved off
of a personal branch and into the main code base, especially if I'm
passing the serialization code onto someone else's shoulders
* CORDA-1238 - Move blob inspector into experimental
It was developed locally in tools (as it's a tool), but it's no
where near production ready, so lets just ship it in experimental
for now
* CORDA-1238 - Tidyup and bug fixes
2018-05-03 13:25:29 +01:00
6c4da2a3a0
Added Java properties to configure location of Node configuration directories and JDBC driver jar.
2018-05-02 17:59:28 +01:00
3f0f603ded
Final clean-up.
2018-05-02 15:52:35 +01:00
8f47fe8c68
Extensions to Corda Behave for CTS.
...
Minor fixes following integration and regression testing with CordaRPCProxy
Remove unrelated code.
Address remaining PR review comments.
2018-05-02 12:31:22 +01:00
b25892e45b
resolved conflicts
2018-05-01 21:32:11 +01:00
6b78ee8c14
Fix incorrect imports. ( #3022 )
2018-04-27 11:52:51 +01:00
70b32636b5
Merge remote-tracking branch 'remotes/open/master' into merges/april-27-09-38
...
# Conflicts:
# docs/source/changelog.rst
# node-api/src/main/kotlin/net/corda/nodeapi/internal/config/ConfigUtilities.kt
# node/src/main/kotlin/net/corda/node/services/config/NodeConfiguration.kt
2018-04-27 10:12:15 +01:00
b208d03f5c
Corda Behave: compendium of minor changes and improvements ( #3008 )
...
* Compendium of minor changes and improvements:
- build fat behave-jar so can run scenarios from shell scripts (from TC)
- additional run script to execute basic scenarios (for TC)
- default staging path shortened to "corda" (removed deps)
- toned down logging (info -> debug)
- fixed all compiler warnings
- fixed couple of bugs in startup checking steps
- base scenarios use variables declared using Examples parameterization
* Added missing braces
* Changes to address PR feedback.
* Mark underlying Cucumber libraries for future de-coupling.
2018-04-26 16:13:34 +01:00
61d2212840
Merge remote-tracking branch 'open-source/master' into thomas-merge
...
experimental/behave/src/main/kotlin/net/corda/behave/logging/LogUtilities.kt
node/src/main/kotlin/net/corda/node/services/config/NodeConfiguration.kt
node/src/test/kotlin/net/corda/node/services/config/NodeConfigurationImplTest.kt
node/src/test/kotlin/net/corda/node/services/messaging/ArtemisMessagingTest.kt
2018-04-26 14:47:29 +01:00
5dc71fc350
Behave: use existing Core common utility functions for Logger creation and Ti… ( #2990 )
...
* Use existing Core common utility functions for Logger creation and Time durations.
* Updated JUnit tests.
2018-04-26 13:40:37 +01:00
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
5f781193b6
Merge remote-tracking branch 'open/master' into os-merge-d3446e2
...
# Conflicts:
# node/src/integration-test/kotlin/net/corda/node/BootTests.kt
# node/src/integration-test/kotlin/net/corda/node/services/AttachmentLoadingTests.kt
# node/src/main/kotlin/net/corda/node/services/statemachine/FlowStateMachineImpl.kt
# testing/smoke-test-utils/src/main/kotlin/net/corda/smoketesting/NodeProcess.kt
# tools/demobench/src/main/kotlin/net/corda/demobench/model/NodeController.kt
2018-04-23 15:50:24 +01:00
d3446e213c
Introduced a few more extension methods to Path, which are clearer than the static methods in Files. ( #2985 )
...
Also migrated code away from the old File API.
2018-04-23 14:31:49 +01:00
15c015e0d6
Merge branch 'master' into colljos-merge-230418
2018-04-23 12:12:16 +01:00
1c7def8e12
Fix streaming subscription bug. ( #2983 )
2018-04-20 11:07:36 +01:00
ca55c80bfc
Move kotlin utility helper out of public into internals. ( #2979 )
2018-04-19 13:48:13 +01:00
b3a4e3907f
OS -> ENT Merge ( #757 )
...
* Better cert path validation exception message for PartyAndCertificate.verify (#2976 )
* Corda Behave extensions for CTS (#2968 )
* Updated to Corda 3.0, added support for PostgreSQL, added STAGING_ROOT environment variable, incorporating Watch improvements (Maks), Steps Provider interface for auto-scanning of 3rd party steps providers, re-implemented StepBlocks, new ScenarioRunner executable tool, additional Steps definitions (Vault, issue/transfer cash, cordapps), other minor bug fixes and logging improvements.
* Updates incorporating PR review feedback.
* Reverted back to original - will re-test in ENT.
* Removed all SQL Server code (to be included in ENT only)
* Minor updates following second PR review.
* Fixed broken scenario tests.
* Final fix for PostgreSQL scenario test.
2018-04-19 11:49:17 +01:00
ec70478d70
Corda Behave extensions for CTS ( #2968 )
...
* Updated to Corda 3.0, added support for PostgreSQL, added STAGING_ROOT environment variable, incorporating Watch improvements (Maks), Steps Provider interface for auto-scanning of 3rd party steps providers, re-implemented StepBlocks, new ScenarioRunner executable tool, additional Steps definitions (Vault, issue/transfer cash, cordapps), other minor bug fixes and logging improvements.
* Updates incorporating PR review feedback.
* Reverted back to original - will re-test in ENT.
* Removed all SQL Server code (to be included in ENT only)
* Minor updates following second PR review.
* Fixed broken scenario tests.
* Final fix for PostgreSQL scenario test.
2018-04-19 09:56:16 +01:00
a97abbc8c0
Merge remote-tracking branch 'open/master' into os-merge-1b37cef
2018-04-05 17:23:03 +01:00
1b37cef822
Minor: use of ByteArray.inputStream() and introduced PublicKey.hash ( #2931 )
2018-04-05 17:18:27 +01:00
3ce5dac90f
Add experimental kubernetes support ( #617 )
2018-03-27 13:45:44 +01:00
8a561cddbf
Merge remote-tracking branch 'remotes/open/master' into merges/march-19-14-41
...
# Conflicts:
# client/rpc/src/test/kotlin/net/corda/client/rpc/RPCPerformanceTests.kt
# node-api/src/main/kotlin/net/corda/nodeapi/internal/persistence/CordaPersistence.kt
# node/src/integration-test/kotlin/net/corda/node/modes/draining/P2PFlowsDrainingModeTest.kt
# node/src/main/java/CordaCaplet.java
# node/src/main/kotlin/net/corda/node/internal/AbstractNode.kt
# testing/node-driver/src/main/kotlin/net/corda/testing/node/MockServices.kt
2018-03-19 15:17:49 +00:00
7a077e76f0
CORDA-1099: Orchestrated clean shutdown from Shell ( #2831 )
2018-03-19 14:20:10 +00:00
da1afd9c55
Introduced copyright in all source files. ( #519 )
2018-03-06 17:29:21 +00:00
cc8e38922e
Merge remote-tracking branch 'open/master' into andrius-merge-02-26
2018-02-26 11:55:17 +00:00
1bca591dd1
Disable unit test for experimental projects ( #2627 )
...
* Disable unit test for experimental projects
2018-02-23 20:48:39 +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
311475a81c
Switch to using our own quasar fork with thread leak fix ( #2443 )
...
* Switch to using our own quasar fork with thread leak fix
* Update quasar.jar in lib
* Review changes
* Bump to 3.0.7
2018-02-14 17:32:00 +00:00
3802066bf6
Merge pull request #2500 from corda/tlil/bdd-test-framework
...
Experimental - BDD Test Framework
2018-02-14 09:05:21 +00:00
ad1be79900
Reorders params to put non-default args first. Creates simpler default constructors.
2018-02-12 17:02:34 +00:00
407885c93b
Enable selective runs
2018-02-12 11:36:06 +00:00
74e65f392f
Fix prepare script and cash config check
2018-02-12 10:36:44 +00:00
cca71e3d6e
Make RPC scaffolding available for Node
2018-02-12 10:18:18 +00:00
c2503921ad
Update instructions
2018-02-12 10:07:27 +00:00
d5d5b12a2d
Ignore tests to not impede test pipeline
2018-02-09 19:31:03 +00:00
bd707eb9c8
Update README
2018-02-09 19:29:07 +00:00
cd079de4b8
Port library functionality from corda/behave
2018-02-09 19:08:26 +00:00
f3d2a7674c
Add module for end-to-end testing library
2018-02-02 12:20:14 +00:00
b71f0c49fb
Multi threaded state machine
2018-01-31 18:13:25 +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
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
