Commit Graph

981 Commits

Author SHA1 Message Date
Andrius Dagys
dd9a653ab4 TransactionBuilder: added a comment explaining the default notary parameter purpose 2016-06-29 16:32:29 +01:00
Andras Slemmer
d29dd121ff integtest: Change timestamp format to be compatible with Windows 2016-06-29 13:58:19 +01:00
Ross Nicoll
22e5a5dddc Merged in rnicoll-warnings (pull request #192)
Remove warnings from Obligation contract
2016-06-29 13:49:05 +01:00
Ross Nicoll
dc304199c8 Remove warnings from Obligation contract 2016-06-29 13:27:00 +01:00
Rick Parker
549a72bf77 Merged in fix-zip-path (pull request #191)
Fix up bug in attachment Zip file processing when path might not be normalised to start with
2016-06-29 09:26:33 +01:00
rick.parker
cfe54c5f21 Fix up bug in attachment Zip file processing when path might not be normalised to start with 2016-06-29 09:10:18 +01:00
Andras Slemmer
d17e649137 integtest: Double polling retry count 2016-06-28 17:55:04 +01:00
Andras Slemmer
5eefbaf622 Merged in add-integrationTest-to-test (pull request #190)
build: add integrationTest as a test dependency
2016-06-28 17:31:41 +01:00
Andras Slemmer
2daa8098c9 build: add integrationTest as a test dependency 2016-06-28 16:46:45 +01:00
Mike Hearn
93ea1db17c Merged in irsdemotest (pull request #136)
Added integration build step and created two integration tests (IRS Demo and Trader Demo tests)
2016-06-28 17:37:32 +02:00
Andras Slemmer
9e5bf7c32c integtest: Use separate folder for each integtest run, provide api address 2016-06-28 14:03:32 +01:00
Andras Slemmer
aa82d4441e irs-demo: Fix advertised services 2016-06-28 14:03:32 +01:00
Andras Slemmer
54967afb78 irs-demo: Rework CLI parsing, add api-address 2016-06-28 14:03:32 +01:00
Andras Slemmer
1e15e7a206 trader-demo: Put demo directory under build/, add corresponding cli option 2016-06-28 14:03:32 +01:00
Andras Slemmer
f2505fb504 integtest: Put delay in status polling 2016-06-28 14:03:32 +01:00
Andras Slemmer
e54dad9a8b node: Add apiAddress constructor parameter 2016-06-28 14:03:32 +01:00
Andras Slemmer
429d8aab74 node, integtest: Code style 2016-06-28 14:03:32 +01:00
Clinton Alexander
ffa9ad1bc9 Added port argument for IRS demo to allow web servers to not have binding collisions during testing and to allow more granular control over demos. 2016-06-28 14:03:32 +01:00
Clinton Alexander
4900c7eb26 Ports now randomised during demo tests. 2016-06-28 14:03:32 +01:00
Clinton Alexander
b52f344eb3 Ensured that nodes are killed by process.destroyForcibly. Added random port numbers to test. 2016-06-28 14:03:32 +01:00
Clinton Alexander
68867d21bb Fixed merge conflict problems. 2016-06-28 14:03:32 +01:00
Clinton Alexander
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
Clinton Alexander
9d4f75f241 Improved readability and brevity of hasEmojiTerminal. 2016-06-28 14:03:32 +01:00
Clinton Alexander
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
Clinton Alexander
ad45b5deaf Tests now fail if spawned processes take too long to finish. 2016-06-28 14:03:32 +01:00
Clinton Alexander
9a2a7165a5 Fixed merge errors. 2016-06-28 14:03:32 +01:00
Clinton Alexander
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
Clinton Alexander
609d80e630 Integration test module set correctly. 2016-06-28 14:03:32 +01:00
Clinton Alexander
7a4a1363cb Removed unnecessary changes. 2016-06-28 14:03:32 +01:00
Clinton Alexander
5a4215a312 Fixed a change resulting from an incorrect merge. 2016-06-28 14:03:32 +01:00
Clinton Alexander
9973f8a33e Moved integration test utilities into a utility folder. 2016-06-28 14:03:32 +01:00
Clinton Alexander
9638ea5b9e IRS demo test now uses the new status endpoint 2016-06-28 14:03:32 +01:00
Clinton Alexander
36a0ff0503 Added an endpoint that allows querying for status of node. 2016-06-28 14:03:32 +01:00
Clinton Alexander
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
Clinton Alexander
22dd36950c Moved the IRSSimulationTest back into the unit test directory. 2016-06-28 14:03:32 +01:00
Clinton Alexander
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
Clinton Alexander
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
Clinton Alexander
99fdacd0dc Integration tests now run separately from unit tests (with caveats described in the gradle file) 2016-06-28 14:03:32 +01:00
Clinton Alexander
532416ec5a Corrected name of the TraderDemoTest file. 2016-06-28 14:03:32 +01:00
Clinton Alexander
2d9989c5df Rearranged code for improved reading locality. 2016-06-28 14:03:32 +01:00
Clinton Alexander
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
Clinton Alexander
5986e785cf Broke up the runIRSDemo function into smaller functions for readability. 2016-06-28 14:03:32 +01:00
Clinton Alexander
560989a914 Trader Demo test now works again. 2016-06-28 14:03:32 +01:00
Clinton Alexander
10fa86002d Fixed merge error causing IRSDemo to fail. 2016-06-28 14:03:32 +01:00
Clinton Alexander
a7ac54f280 Removed thread waits from tests instead relying on a lock passed to the demo environment. 2016-06-28 14:03:32 +01:00
Clinton Alexander
929b752b42 Trader demo now works as a test using in memory messaging. 2016-06-28 14:03:32 +01:00
Clinton Alexander
89b8b164f7 Trader Demo now has in memory nodes working. 2016-06-28 14:03:32 +01:00
Clinton Alexander
b61b362891 Setup TraderDemo test. Moved DemoNode to a common file. Modified TraderDemo to be tested. 2016-06-28 14:03:32 +01:00
Clinton Alexander
de27b1e8de Improved error handling in IRS demo 2016-06-28 14:03:32 +01:00
Clinton Alexander
60daf8059f Removed dependency added in previous commit. Fixed upload code on IRS Demo 2016-06-28 14:03:32 +01:00