33 Commits

Author SHA1 Message Date
Chris Rankin
4cb31f4c8b Merge commit '39434dcbecdd2cd656e40622530e84d02443b8e2' into chrisr3-os-merge 2018-10-08 10:42:55 +01:00
szymonsztuka
d1a831f7f2 Add missing empty methods to behave. 2018-09-20 17:55:43 +01:00
Shams Asari
725441b39c
Minor changes to bring in-sync with OS (#1390) 2018-09-13 12:53:06 +01:00
Anthony Keenan
4a70d1a996 Fixing enterprise only uses of NetworkMapCacheImpl 2018-09-06 14:50:44 +01:00
Michele Sollecito
31e58dd2e5 [CORDA-1937]: Fixes to enterprise float and bridge. 2018-09-04 11:20:34 +01:00
Mike Hearn
97aef9c8a1 Merge remote-tracking branch 'open/master' into mike-merge-f6ee263db10 2018-09-03 20:13:38 +02:00
Shams Asari
11e2bef240
ENT-2473: Removed copyright headers (#1364) 2018-09-03 16:38:52 +01:00
josecoll
4db315f81a
ENT-1424 - Setup Compatibility testing environment (#1211)
* Updated interoperability scenarios to use GA Release Candidate

* Removed "with proxy" and updated incorrect reference to OS master.

* Update to resolve Artifactory tools if available (blob-inspector, network-bootstrapper, database-migration)

* Allow passing in of argument to specify one or more scenarios to run.

* Updated to RC03.

* Added Oracle support in Behave framework and included functional test scenarios.

* behave test using snapshot (#970)

* make behave use snapshots from artifactory

* rebase and fix

* address PR issues

* address PR issues

* gradle task for bdd (#989)

* gradle task for bdd (#989)

* fix typo

* Publishing behave-api jar for use by external applications (eg. cordapp-option).
Fixed SIMMM valuation behave scenario test and startup.

* Publishing behave-api jar for use by external applications (eg. cordapp-option).
Fixed SIMMM valuation behave scenario test and startup.

* Various fixes to make BDD working in Teamcity (#1063)

* fix typo

* print docker log

* print docker log

* attempt to fix docker

* attempt to fix docker

* attempt to fix docker

* update to RC04

* disable clean up

* try to find out why the test pick up the wrong jar

* test

* minor fixes

* fix wrong bootstrapping procedure

* remove DISABLE_CLEANUP

* attempt to fix error

* fixes to get postgres working

* enable cleanup

* generate cucumber report

* bump to RC06

* attempt to make cucumber generate http report

* cucumber report

* some minor cleanup

* removed DP3 nodes from scenarios, added oracle and bumped to RC07

* fix licence issue

* fixed bootstrapper placing corda jar

* Update interoperability.feature

* Added missing published artifact.

* Fixed compilation errors raised by stricter compilation flag checking.

* Minor changes following rebase from master and re-testing.

* Updates to reflect last minute naming and versioning changes applied to 3.0 release.
Updated scenarios to use the officially released version of CE 3.0

* Updates following lastest PR review feedback.

* Updates following lastest PR review feedback.

* Align with master (maxMessageSize = mazTransactionSize).

* Fix snapshot version regex matching.

* Set logging level to DEBUG to ensure pattern matches catch log message output which has been downgraded from INFO

* Add all supported interoperable versions.
2018-07-31 17:53:24 +01:00
rick.parker
21a7b56161 Fix up compilation errors. 2018-07-13 14:33:13 +01:00
Shams Asari
0c8c914882 Removing warnings 2018-07-05 15:45:28 +01:00
Viktor Kolomeyko
ab3974ed60
Switch dependencies to rpcProxyCompile. (#1173)
The problem manifests itself in IntelliJ when full rebuilt is performed with Gradle delegation.
In this case IntelliJ executes the following tasks:
`:testing:qa:behave:tools:rpc-proxy:classes`, `:testing:qa:behave:tools:rpc-proxy:testClasses`, `:testing:qa:behave:tools:rpc-proxy:smokeTestClasses` and `:testing:qa:behave:tools:rpc-proxy:rpcProxyClasses`

Without the change when `rpcProxyClasses` task executed - the build fails.

The problem is likely to be caused by the fact that this is a multi-sourceSets project.
2018-07-02 17:08:55 +01:00
szymonsztuka
56e1f6c650 CORDA-1407 Node Explorer - fix total column 2018-06-19 12:21:40 +01:00
Tommy Lillehagen
a612ca234a Merge remote-tracking branch 'open/master' into tlil-os-merge-20180613 2018-06-13 21:45:00 +01:00
josecoll
c2f22e18a5
Corda Behave framework updates to decouple from Network Services (#914)
* Added new 'eventHorizonDays' configuration item.

* Added custom authenticator to provide ARTIFACTORY credentials upon resolving protected internal URL.

* Re-pointed functional test scenarios to point to Enterprise master.

* Enterprise corda network scenarios to use NetworkBootstrapper tool (instead of Doorman/NMS) since decision made by Product Management to split out Doorman/NMS from Enterprise.

* Configuration parameter changed to 'runMigration' since DP3.

* Fixed problem with logger upon startup.

* General improvements and additions to setup and execution scripts (eg. SIMM valuation demo now consists of 3 separate jars)

* Updates to decouple from Network Services.

* Download all JARs from artifactory for a given published distribution.

* Add TODOs for Doorman/NMS rework.

* Addressing TL PR review comments.

* Additional instructions for setting up the environment and running QA tests.

* Fixed repository URL references.
2018-06-05 15:02:07 +01:00
Tudor Malene
fd2f2eb14a ENT-1871 Rebrand R3Corda to Corda Enterprise (#838)
* ENT-1871 Rebrand R3Corda to Corda Enterprise

* ENT-1871 Address code review comments

* ENT-1871 Address code review comments

* ENT-1871 Address code review comments

* ENT-1871 Address code review comments
2018-05-31 08:59:05 +01:00
Shams Asari
b2f41d82f9 Merge fixes 2018-05-21 11:25:13 +01:00
Katelyn Baker
8c9773fc13 Merge build fix - add AMQP to RPC Proxy Web 2018-05-18 14:27:38 +01:00
Katelyn Baker
4ed3d779b0 merge build fix 2018-05-18 11:16:45 +01:00
Katelyn Baker
1cfc9c6e0c Post merge cleanup for Max Mem Size 2018-05-18 09:54:56 +01:00
josecoll
4afc7f3824
Behave: fix compilation problem in IntelliJ (#830)
* Sprinkled new gradle dust to make both IntelliJ and TC (gradle) compilation happy.

* Fix compilation problem once and for all + ignore the RPCProxyWebServiceTest smoke test.
2018-05-11 15:21:42 +01:00
josecoll
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
josecoll
0072d41958 Fixed incorrect references to (renamed) feature files. 2018-05-08 14:00:47 +01:00
Andrius Dagys
524ba27721 Fix merge issues 2018-05-03 13:52:11 +01:00
josecoll
c27003b471 Revert: Extensions to Corda Behave for CTS. 2018-05-02 15:51:45 +01:00
josecoll
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
josecoll
a5e2058a5b
Merge pull request #762 from corda/colljos-qa-scenarios
ENT-1834: Compatibility Test Suite QA scenarios
2018-05-02 12:30:47 +01:00
josecoll
f013c1dcb7 Address remaining PR review comments. 2018-05-02 11:09:25 +01:00
josecoll
ccd5f5fd5b Re-apply previous fixes. 2018-05-02 10:47:12 +01:00
josecoll
d840099049 Minor updates following PR review feedback. 2018-05-02 10:30:38 +01:00
josecoll
764af04608 Moved RPC Proxy to own module in testing/qa/behave/tools
Incorporating PR review feedback.

Minor fixes to default path and additional copying of startup script.
2018-05-01 17:04:46 +01:00
josecoll
10a0891ab8 Updated scenarios to include official release versions of OS and R3 Corda.
Grouped duplicate scenarios using examples.
Added additional README.md with explanation of feature/scenario types.
Updated scripts to reflect new directory location.
2018-04-25 14:13:22 +01:00
josecoll
685897a7d2 Incorporating PR review feedback. 2018-04-24 19:14:14 +01:00
josecoll
4c3d223d5a CTS QA Scenarios 2018-04-23 11:53:11 +01:00