From b17a70b132bbb2b20ffb8790671f03425e20abd1 Mon Sep 17 00:00:00 2001 From: ninabreznik Date: Wed, 21 Feb 2018 11:39:31 +0000 Subject: [PATCH] Update tests --- contracts/folder1/contract1.sol | 2 +- test-browser/tests/compiling.js | 110 ++++++++++++++++---------------- 2 files changed, 55 insertions(+), 57 deletions(-) diff --git a/contracts/folder1/contract1.sol b/contracts/folder1/contract1.sol index 11122d3008..66dc9051da 100644 --- a/contracts/folder1/contract1.sol +++ b/contracts/folder1/contract1.sol @@ -1 +1 @@ -contract test1 { function get () returns (uint) { return 10; }} \ No newline at end of file +undefined \ No newline at end of file diff --git a/test-browser/tests/compiling.js b/test-browser/tests/compiling.js index 45378f0b93..0fb2a13dc4 100644 --- a/test-browser/tests/compiling.js +++ b/test-browser/tests/compiling.js @@ -46,8 +46,8 @@ function testSimpleContract (browser, callback) { '0xa178c603400a184ce5fedbcfab392d9b77822f6ffa7facdec693aded214523bc', `[vm]\nfrom:0xca3...a733c\nto:TestContract.f() 0x692...77b3a\nvalue:0 wei\ndata:0x261...21ff0\nlogs:0\nhash:0xa17...523bc`, null, `{ - "0": "uint256: 8" - }`) + "0": "uint256: 8" +}`) .pause(500) .perform((client, done) => { contractHelper.useFilter(browser, '0x12332162e2e31397dc1e07ed0a1cf08f728e9b4487c6f9ed79d2f39410c92782', '', () => { @@ -56,13 +56,12 @@ function testSimpleContract (browser, callback) { }) .testFunction('g - transact (not payable)', '0xb1532162e2e31397dc1e07ed0a1cf08f728e9b4487c6f9ed79d2f39410c92781', - `[vm]\nfrom:0xca3...a733c\nto:TestContract.g() 0x692...77b3a\nvalue:0 wei\ndata:0xe21...79b8e\nlogs:0\nhash:0xb15...92781`, null, - `{ - "0": "uint256: 345", - "1": "string: comment_comment_", - "2": "bool: true", - "3": "uint256: 4" - }`).perform(() => { callback(null, browser) }) + `[vm]\nfrom:0xca3...a733c\nto:TestContract.g() 0x692...77b3a\nvalue:0 wei\ndata:0xe21...79b8e\nlogs:0\nhash:0xb15...92781`, null, `{ + "0": "uint256: 345", + "1": "string: comment_comment_", + "2": "bool: true", + "3": "uint256: 4" +}`).perform(() => { callback(null, browser) }) }) } @@ -76,32 +75,31 @@ function testReturnValues (browser, callback) { `[vm]\nfrom:0xca3...a733c\nto:testReturnValues.retunValues1() 0x5e7...26e9f\nvalue:0 wei\ndata:0x9ed...59eb7\nlogs:0\nhash:0x79d...d1f7f`, null, `{ - "0": "bool: _b true", - "1": "uint256: _u 345", - "2": "int256: _i -345", - "3": "address: _a 0xca35b7d915458ef540ade6068dfe2f44e8fa733c" - }`) + "0": "bool: _b true", + "1": "uint256: _u 345", + "2": "int256: _i -345", + "3": "address: _a 0xca35b7d915458ef540ade6068dfe2f44e8fa733c" +}`) .pause(500) .testFunction('retunValues2 - transact (not payable)', '0x09175dcb30227b3af422d75786dbba3b0549985e5c7f59f86d12c7e1043ccb8c', - `[vm]\nfrom:0xca3...a733c\nto:testReturnValues.retunValues2() 0x5e7...26e9f\nvalue:0 wei\ndata:0xf57...4036c\nlogs:0\nhash:0x091...ccb8c`, null, - `{ - "0": "bytes1: _b 0x12", - "1": "bytes2: _b2 0x1223", - "2": "bytes3: _b3 0x000000", - "3": "bytes: _blit 0x123498", - "4": "bytes5: _b5 0x0000043245", - "5": "bytes6: _b6 0x002345532532", - "6": "string: _str this is a long string _ this is a long string _ this is a long string _ this is a long string _ this is a long string _ this is a long string _ this is a long string _ this is a long string _ this is a long string _ this is a long string _ this is a long string _ this is a long string _ this is a long string _ this is a long string _ this is a long string", - "7": "bytes7: _b7 0x03252353253253", - "8": "bytes22: _b22 0x00000000000000000000325235235325325325235325", - "9": "bytes32: _b32 0x0000000000000000000000000000000000032523532532523532523532523532" - }`).pause(500).testFunction('retunValues3 - transact (not payable)', - '0x7faab07aeaafc8afe6bf283bb83be70c000dff381dec04e779354e354da14aff', - `[vm]\nfrom:0xca3...a733c\nto:testReturnValues.retunValues3() 0x5e7...26e9f\nvalue:0 wei\ndata:0x033...e0a7d\nlogs:0\nhash:0x7fa...14aff`, null, `{ - "0": "uint8: _en 2", - "1": "int256[5][]: _a1 1,-45,-78,56,60, -1,42,334,-45455,-446, 1,10,-5435,45,-7" - }`).perform(() => { callback(null, browser) }) + `[vm]\nfrom:0xca3...a733c\nto:testReturnValues.retunValues2() 0x5e7...26e9f\nvalue:0 wei\ndata:0xf57...4036c\nlogs:0\nhash:0x091...ccb8c`, null, `{ + "0": "bytes1: _b 0x12", + "1": "bytes2: _b2 0x1223", + "2": "bytes3: _b3 0x000000", + "3": "bytes: _blit 0x123498", + "4": "bytes5: _b5 0x0000043245", + "5": "bytes6: _b6 0x002345532532", + "6": "string: _str this is a long string _ this is a long string _ this is a long string _ this is a long string _ this is a long string _ this is a long string _ this is a long string _ this is a long string _ this is a long string _ this is a long string _ this is a long string _ this is a long string _ this is a long string _ this is a long string _ this is a long string", + "7": "bytes7: _b7 0x03252353253253", + "8": "bytes22: _b22 0x00000000000000000000325235235325325325235325", + "9": "bytes32: _b32 0x0000000000000000000000000000000000032523532532523532523532523532" +}`).pause(500).testFunction('retunValues3 - transact (not payable)', + '0x7faab07aeaafc8afe6bf283bb83be70c000dff381dec04e779354e354da14aff', + '[vm]\nfrom:0xca3...a733c\nto:testReturnValues.retunValues3() 0x5e7...26e9f\nvalue:0 wei\ndata:0x033...e0a7d\nlogs:0\nhash:0x7fa...14aff', null, `{ + "0": "uint8: _en 2", + "1": "int256[5][]: _a1 1,-45,-78,56,60, -1,42,334,-45455,-446, 1,10,-5435,45,-7" +}`).perform(() => { callback(null, browser) }) }) } @@ -115,30 +113,30 @@ function testInputValues (browser, callback) { `[vm]\nfrom:0xca3...a733c\nto:test.inputValue1(uint256,int256,string) 0x8c1...401f5\nvalue:0 wei\ndata:0xd69...00000\nlogs:0\nhash:0x917...832ae`, {types: 'uint256 _u, int256 _i, string _str', values: '"2343242", "-4324324", "string _ string _ string _ string _ string _ string _ string _ string _ string _ string _"'}, `{ - "0": "uint256: _uret 2343242", - "1": "int256: _iret -4324324", - "2": "string: _strret string _ string _ string _ string _ string _ string _ string _ string _ string _ string _" - }`).pause(500).testFunction('inputValue2 - transact (not payable)', - '0x487d09e244853bcb108b3a22cd6ee57b6431e50869619c9b918e9764fc16ef7f', - `[vm]\nfrom:0xca3...a733c\nto:test.inputValue2(uint256[3],bytes8[4]) 0x8c1...401f5\nvalue:0 wei\ndata:0x1b7...00000\nlogs:0\nhash:0x487...6ef7f`, - {types: 'uint256[3] _n, bytes8[4] _b8', values: '[1,2,3], ["0x1234", "0x1234","0x1234","0x1234"]'}, - `{ - "0": "uint256[3]: _nret 1, 2, 3", - "1": "bytes8[4]: _b8ret 0x1234000000000000, 0x1234000000000000, 0x1234000000000000, 0x1234000000000000" - }`, `[ - { - "topic": "d30981760edbf605bda8689e945f622877f230c9a77cbfbd448aa4b7d8ac6e7f", - "event": "event1", - "args": [ - "-123", - "000000000000000000000000000000000000000000000000000000000000007b", - "9c22ff5f21f0b81b113e63f7db6da94fedef11b2119b4088b89664fb9a3cb658", - "0x00001234", - "test _ test _ test _ test test _ test test _ test test _ test test _ test test _ test test _ test " - ] - } - ]`) - .perform(() => { callback(null, browser) }) + "0": "uint256: _uret 2343242", + "1": "int256: _iret -4324324", + "2": "string: _strret string _ string _ string _ string _ string _ string _ string _ string _ string _ string _" +}`).pause(500).testFunction('inputValue2 - transact (not payable)', + '0x487d09e244853bcb108b3a22cd6ee57b6431e50869619c9b918e9764fc16ef7f', + `[vm]\nfrom:0xca3...a733c\nto:test.inputValue2(uint256[3],bytes8[4]) 0x8c1...401f5\nvalue:0 wei\ndata:0x1b7...00000\nlogs:1\nhash:0x487...6ef7f`, + {types: 'uint256[3] _n, bytes8[4] _b8', values: '[1,2,3], ["0x1234", "0x1234","0x1234","0x1234"]'}, + `{ + "0": "uint256[3]: _nret 1, 2, 3", + "1": "bytes8[4]: _b8ret 0x1234000000000000, 0x1234000000000000, 0x1234000000000000, 0x1234000000000000" +}`, `[ + { + "topic": "d30981760edbf605bda8689e945f622877f230c9a77cbfbd448aa4b7d8ac6e7f", + "event": "event1", + "args": [ + "-123", + "000000000000000000000000000000000000000000000000000000000000007b", + "9c22ff5f21f0b81b113e63f7db6da94fedef11b2119b4088b89664fb9a3cb658", + "0x00001234", + "test _ test _ test _ test test _ test test _ test test _ test test _ test test _ test test _ test " + ] + } +]`) + .perform(() => { callback(null, browser) }) }) }