Commit Graph

962 Commits

Author SHA1 Message Date
b52f344eb3 Ensured that nodes are killed by process.destroyForcibly. Added random port numbers to test. 2016-06-28 14:03:32 +01:00
68867d21bb Fixed merge conflict problems. 2016-06-28 14:03:32 +01:00
5bf5e37572 Demos now fully handle process managment except in the case where the process is killed with something like pkill or the JVM being ended by task manager. 2016-06-28 14:03:32 +01:00
9d4f75f241 Improved readability and brevity of hasEmojiTerminal. 2016-06-28 14:03:32 +01:00
5858ff5c45 Ensured that test passes under correct conditions, which may be slow, but also that the node lives until the end. 2016-06-28 14:03:32 +01:00
ad45b5deaf Tests now fail if spawned processes take too long to finish. 2016-06-28 14:03:32 +01:00
9a2a7165a5 Fixed merge errors. 2016-06-28 14:03:32 +01:00
21dc8e7fd4 Increased timeout time for reads during HTTP connections to avoid demo failing when date it set far in the future. 2016-06-28 14:03:32 +01:00
609d80e630 Integration test module set correctly. 2016-06-28 14:03:32 +01:00
7a4a1363cb Removed unnecessary changes. 2016-06-28 14:03:32 +01:00
5a4215a312 Fixed a change resulting from an incorrect merge. 2016-06-28 14:03:32 +01:00
9973f8a33e Moved integration test utilities into a utility folder. 2016-06-28 14:03:32 +01:00
9638ea5b9e IRS demo test now uses the new status endpoint 2016-06-28 14:03:32 +01:00
36a0ff0503 Added an endpoint that allows querying for status of node. 2016-06-28 14:03:32 +01:00
03e2852880 The integration tests for demos now spawn a new JVM instead of using threads. Demos no longer need or contain any in memory node logic. 2016-06-28 14:03:32 +01:00
22dd36950c Moved the IRSSimulationTest back into the unit test directory. 2016-06-28 14:03:32 +01:00
bef4258430 Fixed Emoji crash where LANG envvar is not defined in particularly exotic setups (msys bash in Powershell for example) 2016-06-28 14:03:32 +01:00
ecdd0a23a2 Fixed bug in IRS demo where the node threads never exit during integration tests and cause other tests to fail. 2016-06-28 14:03:32 +01:00
99fdacd0dc Integration tests now run separately from unit tests (with caveats described in the gradle file) 2016-06-28 14:03:32 +01:00
532416ec5a Corrected name of the TraderDemoTest file. 2016-06-28 14:03:32 +01:00
2d9989c5df Rearranged code for improved reading locality. 2016-06-28 14:03:32 +01:00
3c11c26b12 Refactored IRSDemo to be more readable and to have minimal branches due to in memory mode in order to ensure tests are as similar to the real things as possible. 2016-06-28 14:03:32 +01:00
5986e785cf Broke up the runIRSDemo function into smaller functions for readability. 2016-06-28 14:03:32 +01:00
560989a914 Trader Demo test now works again. 2016-06-28 14:03:32 +01:00
10fa86002d Fixed merge error causing IRSDemo to fail. 2016-06-28 14:03:32 +01:00
a7ac54f280 Removed thread waits from tests instead relying on a lock passed to the demo environment. 2016-06-28 14:03:32 +01:00
929b752b42 Trader demo now works as a test using in memory messaging. 2016-06-28 14:03:32 +01:00
89b8b164f7 Trader Demo now has in memory nodes working. 2016-06-28 14:03:32 +01:00
b61b362891 Setup TraderDemo test. Moved DemoNode to a common file. Modified TraderDemo to be tested. 2016-06-28 14:03:32 +01:00
de27b1e8de Improved error handling in IRS demo 2016-06-28 14:03:32 +01:00
60daf8059f Removed dependency added in previous commit. Fixed upload code on IRS Demo 2016-06-28 14:03:32 +01:00
f6069e1e15 Error now occurs on upload if no files are sent. Added apache httpcomponents as a dependency. 2016-06-28 14:03:32 +01:00
b050411810 Fixed compile error in IRSDemo and updated demo data to match new format. 2016-06-28 14:03:32 +01:00
5de855e045 Fixed a merge error and parameterised host for upload rates. 2016-06-28 14:03:32 +01:00
9fc89fc4a2 Connections now timeout correctly if something goes wrong with the server. 2016-06-28 14:03:32 +01:00
90a24588bc Added TODOs and replaced default path with an exception. 2016-06-28 14:03:32 +01:00
507d9ea4ae Added new integration test for the IRSDemo and refactored the demo to
run in integration tests.
2016-06-28 14:03:32 +01:00
9639768069 Corrected the currency mismatch in the example trade. 2016-06-28 14:03:32 +01:00
0788e8d64c IRS demo to now has roles for NodeA/NodeB and most options are now~ optional. NodeA can be run without the shell script. 2016-06-28 14:03:32 +01:00
23c3112660 Merged in rnicoll-obligation-main (pull request #185)
Move Obligation contract into contracts module
2016-06-27 17:57:31 +01:00
228513671d Move Obligation contract into contracts module 2016-06-27 17:54:04 +01:00
9994d129f2 General cleanup based on first round of feedback
* Rename AggregateCommands to IssuanceCommands
 * Reorder comparisons to be consistent
 * Rename verifyDefaultCommand to verifySetLifecycleCommand
 * Rename currency to issued/product
 * Add note about needing to rethink timestamping
 * Rename issuer to obligor, and owner to beneficiary
 * Move lifecycle inversion code into SetLifecycle command
 * Correct comments regarding cash states
 * Rework description of contractHash parameter
 * Fixes 'netting equal balances due between parties', and add further netting tests
 * Separate calculations involving issued products and the underlying product
 * Use signed transactions in obligation tests
 * Add verification tests for changing lifecycle
2016-06-27 17:49:52 +01:00
7aa14dc75f Merged in mike-suppress-experimental-warnings (pull request #188)
Suppress compiler warnings in experimental. They are still expected to be fixed in the other modules.
2016-06-27 18:02:08 +02:00
24c237096b Merged in mike-codestyle-compiler-warnings (pull request #189)
Add a policy about compiler warnings.
2016-06-27 18:01:50 +02:00
cb90a8c09b Add a policy about compiler warnings. 2016-06-27 15:41:18 +02:00
848b998d26 Suppress compiler warnings in experimental. They are still expected to be fixed in the other modules. 2016-06-27 15:35:27 +02:00
560a735fa3 Merged in mike-fix-walletfiller (pull request #187)
Testing: Fix the wallet filler code.
2016-06-27 15:01:28 +02:00
10b17d6862 Merged in java-test-dsl (pull request #181)
Java test DSL
2016-06-24 18:53:02 +01:00
47decb3bbe coree: Expose MOCK_IDENTITY_SERVICE as MockIndentityService instead of IdentityService 2016-06-24 18:33:53 +01:00
5973725186 core: Make top-level side-effecting getters lazy instead 2016-06-24 18:33:21 +01:00