Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Refactor browser test #2103

Merged
merged 6 commits into from
Jun 20, 2019
Merged

Refactor browser test #2103

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
e96bd6b
refactor ballot
yann300 Jun 20, 2019
a3fcd86
refactor browser tests
yann300 Jun 20, 2019
cd58964
general test refactor
yann300 Jun 20, 2019
ce59159
naming
yann300 Jun 20, 2019
f9b34af
fix ending tests
yann300 Jun 20, 2019
78bc8a1
standard
yann300 Jun 20, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
22 changes: 12 additions & 10 deletions test-browser/tests/ballot.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,14 +14,8 @@ module.exports = {
'@sources': function () {
return sources
},
'Ballot': function (browser) {
runTests(browser)
},
tearDown: sauce
}

function runTests (browser, testData) {
browser
'Deploy Ballot': function (browser) {
browser
.waitForElementVisible('#icon-panel', 10000)
.clickLaunchIcon('solidity')
.testContracts('Untitled.sol', sources[0]['browser/Untitled.sol'], ['Ballot'])
Expand All @@ -33,7 +27,10 @@ function runTests (browser, testData) {
.testFunction('delegate - transact (not payable)', '0x0571a2439ea58bd349dd130afb8aff62a33af14c06de0dbc3928519bdf13ce2e',
`[vm]\nfrom:0xca3...a733c\nto:Ballot.delegate(address) 0x692...77b3a\nvalue:0 wei\ndata:0x5c1...4d2db\nlogs:0\nhash:0x057...3ce2e`,
{types: 'address to', values: '"0x4b0897b0513fdc7c541b6d9d7e929c4e5364d2db"'}, null, null)
.pause(500)
},

'Debug Ballot / delegate': function (browser) {
browser.pause(500)
.click('span#tx0x0571a2439ea58bd349dd130afb8aff62a33af14c06de0dbc3928519bdf13ce2e button[class^="debug"]')
.pause(2000)
.clickLaunchIcon('debugger')
Expand All @@ -43,7 +40,10 @@ function runTests (browser, testData) {
.pause(1000)
.checkVariableDebug('soliditystate', stateCheck)
.checkVariableDebug('soliditylocals', localsCheck)
.clickLaunchIcon('run')
},

'Access Ballot via at address': function (browser) {
browser.clickLaunchIcon('run')
.click('button[class^="udappClose"]')
.addFile('ballot.abi', { content: ballotABI })
.addAtAddressInstance('0x692a70D2e424a56D2C6C27aA97D1a86395877b3B', true, false)
Expand All @@ -56,6 +56,8 @@ function runTests (browser, testData) {
`[vm]\nfrom:0xca3...a733c\nto:Ballot.delegate(address) 0x692...77b3a\nvalue:0 wei\ndata:0x5c1...4d2db\nlogs:0\nhash:0xd3c...df10f`,
{types: 'address to', values: '"0x4b0897b0513fdc7c541b6d9d7e929c4e5364d2db"'}, null, null)
.end()
},
tearDown: sauce
}

var localsCheck = {
Expand Down
47 changes: 18 additions & 29 deletions test-browser/tests/compiling.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
'use strict'
var init = require('../helpers/init')
var sauce = require('./sauce')
var async = require('async')
var testRecorder = require('./units/testRecorder')

module.exports = {
Expand All @@ -11,26 +10,9 @@ module.exports = {
'@sources': function () {
return sources
},
'Compiling': function (browser) {
runTests(browser)
},
tearDown: sauce
}

function runTests (browser) {
browser
.waitForElementVisible('#icon-panel', 10000)
.clickLaunchIcon('solidity')
.perform(() => {
// the first fn is used to pass browser to the other ones.
async.waterfall([function (callback) { callback(null, browser) }, testSimpleContract, testReturnValues, testInputValues, testRecorder.test], function () {
browser.end()
})
})
}

function testSimpleContract (browser, callback) {
browser.testContracts('Untitled.sol', sources[0]['browser/Untitled.sol'], ['TestContract'])
'Test Simple Contract': function (browser) {
browser.testContracts('Untitled.sol', sources[0]['browser/Untitled.sol'], ['TestContract'])
.clickLaunchIcon('run')
.click('#runTabView button[class^="instanceButton"]')
.waitForElementPresent('.instance:nth-of-type(2)')
Expand All @@ -54,11 +36,10 @@ function testSimpleContract (browser, callback) {
"3": "uint256: 4"
}`)
.click('i[class^="clearinstance"]')
.perform(() => { callback(null, browser) })
}
},

function testReturnValues (browser, callback) {
browser.testContracts('returnValues.sol', sources[1]['browser/returnValues.sol'], ['testReturnValues'])
'Test Return Values': function (browser) {
browser.testContracts('returnValues.sol', sources[1]['browser/returnValues.sol'], ['testReturnValues'])
.clickLaunchIcon('run')
.click('#runTabView button[class^="instanceButton"]')
.waitForElementPresent('.instance:nth-of-type(2)')
Expand Down Expand Up @@ -91,11 +72,11 @@ function testReturnValues (browser, callback) {
'[vm]\nfrom:0xca3...a733c\nto:testReturnValues.retunValues3() 0x5e7...26e9f\nvalue:0 wei\ndata:0x033...e0a7d\nlogs:0\nhash:0x94c...9d28a', null, `{
"0": "uint8: _en 2",
"1": "int256[5][]: _a1 1,-45,-78,56,60,-1,42,334,-45455,-446,1,10,-5435,45,-7"
}`).click('i[class^="clearinstance"]').perform(() => { callback(null, browser) })
}
}`).click('i[class^="clearinstance"]')
},

function testInputValues (browser, callback) {
browser.testContracts('inputValues.sol', sources[2]['browser/inputValues.sol'], ['test'])
'Test Input Values': function (browser) {
browser.testContracts('inputValues.sol', sources[2]['browser/inputValues.sol'], ['test'])
.clickLaunchIcon('run')
.click('#runTabView button[class^="instanceButton"]')
.waitForElementPresent('.instance:nth-of-type(2)')
Expand Down Expand Up @@ -144,7 +125,15 @@ function testInputValues (browser, callback) {
}
]`)
.click('i[class^="clearinstance"]')
.perform(() => { callback(null, browser) })
},

'Test Recorder': function (browser) {
testRecorder.test(browser, () => {
browser.end()
})
},

tearDown: sauce
}

// @TODO test: bytes8[3][] type as input
Expand Down
211 changes: 85 additions & 126 deletions test-browser/tests/generalTests.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
'use strict'
var init = require('../helpers/init')
var sauce = require('./sauce')
var async = require('async')

module.exports = {
before: function (browser, done) {
Expand All @@ -10,110 +9,97 @@ module.exports = {
'@sources': function () {
return sources
},
'Simple Contract': function (browser) {
runTests(browser)
'Test Simple Contract': function (browser) {
console.log('testSimpleContract')
browser.testContracts('Untitled.sol', sources[0]['browser/Untitled.sol'], ['test1', 'test2'])
},
'Test Success Import': function (browser) {
console.log('testSuccessImport')
browser.addFile('Untitled1.sol', sources[1]['browser/Untitled1.sol'])
.addFile('Untitled2.sol', sources[1]['browser/Untitled2.sol'])
.switchFile('browser/Untitled1.sol')
.verifyContracts(['test6', 'test4', 'test5'])
},
tearDown: sauce
}

function runTests (browser) {
browser
.waitForElementVisible('#icon-panel', 10000)
.clickLaunchIcon('solidity')
.clickLaunchIcon('fileExplorers')
.perform(() => {
// the first fn is used to pass browser to the other ones.
async.waterfall([function (callback) { callback(null, browser) },
testSimpleContract,
testSuccessImport,
testFailedImport, /* testGitHubImport, */
addDeployLibTestFile,
testAutoDeployLib,
testManualDeployLib,
testSignature
],
function () {
browser.end()
})
})
}

function testSimpleContract (browser, callback) {
console.log('testSimpleContract')
browser.testContracts('Untitled.sol', sources[0]['browser/Untitled.sol'], ['test1', 'test2'])
.perform(() => {
callback(null, browser)
})
}

function testSuccessImport (browser, callback) {
console.log('testSuccessImport')
browser.addFile('Untitled1.sol', sources[1]['browser/Untitled1.sol'])
.addFile('Untitled2.sol', sources[1]['browser/Untitled2.sol'])
.switchFile('browser/Untitled1.sol')
.verifyContracts(['test6', 'test4', 'test5'])
.perform(() => {
callback(null, browser)
})
}

function testFailedImport (browser, callback) {
console.log('testFailedImport')
browser.addFile('Untitled3.sol', sources[2]['browser/Untitled3.sol'])
.clickLaunchIcon('solidity')
.assert.containsText('#compileTabView .error pre', 'Unable to import "browser/Untitled11.sol": File not found')
.perform(function () {
callback(null, browser)
})
}

function addDeployLibTestFile (browser, callback) {
browser.addFile('Untitled5.sol', sources[5]['browser/Untitled5.sol'])
.perform(() => {
callback(null, browser)
})
}

function testAutoDeployLib (browser, callback) {
console.log('testAutoDeployLib')
let addressRef
browser.verifyContracts(['test'])
.selectContract('test')
.createContract('')
.getAddressAtPosition(0, (address) => {
console.log('testAutoDeployLib ' + address)
addressRef = address
})
.waitForElementPresent('.instance:nth-of-type(2)')
.click('.instance:nth-of-type(2) > div > button')
.perform(() => {
browser
.testConstantFunction(addressRef, 'get - call', '', '0: uint256: 45')
.perform(() => {
callback(null, browser)
'Test Failed Import': function (browser) {
console.log('testFailedImport')
browser.addFile('Untitled3.sol', sources[2]['browser/Untitled3.sol'])
.clickLaunchIcon('solidity')
.assert.containsText('#compileTabView .error pre', 'Unable to import "browser/Untitled11.sol": File not found')
},
'Add Lib Test File': function (browser) {
browser.addFile('Untitled5.sol', sources[5]['browser/Untitled5.sol'])
},
'Test Auto Deploy Lib': function (browser) {
console.log('testAutoDeployLib')
let addressRef
browser.verifyContracts(['test'])
.selectContract('test')
.createContract('')
.getAddressAtPosition(0, (address) => {
console.log('testAutoDeployLib ' + address)
addressRef = address
})
})
}

function testManualDeployLib (browser, callback) {
console.log('testManualDeployLib')
browser.click('i[class^="clearinstance"]')
.pause(5000)
.clickLaunchIcon('settings')
.click('#generatecontractmetadata')
.clickLaunchIcon('solidity')
.click('#compileTabView button[title="Compile"]') // that should generate the JSON artefact
.verifyContracts(['test'])
.selectContract('lib') // deploy lib
.createContract('')
.getAddressAtPosition(0, (address) => {
console.log(address)
checkDeployShouldFail(browser, () => {
checkDeployShouldSucceed(browser, address, () => {
callback(null, browser)
.waitForElementPresent('.instance:nth-of-type(2)')
.click('.instance:nth-of-type(2) > div > button')
.perform((done) => {
browser.testConstantFunction(addressRef, 'get - call', '', '0: uint256: 45').perform(() => {
done()
})
})
},
'Test Manual Deploy Lib': function (browser) {
console.log('testManualDeployLib')
browser.click('i[class^="clearinstance"]')
.pause(5000)
.clickLaunchIcon('settings')
.click('#generatecontractmetadata')
.clickLaunchIcon('solidity')
.click('#compileTabView button[title="Compile"]') // that should generate the JSON artefact
.verifyContracts(['test'])
.selectContract('lib') // deploy lib
.createContract('')
.perform((done) => {
browser.getAddressAtPosition(0, (address) => {
console.log(address)
checkDeployShouldFail(browser, () => {
checkDeployShouldSucceed(browser, address, () => {
done()
})
})
})
})
},
'Test Signature': function (browser) {
let hash, signature
browser.signMessage('test message', (h, s) => {
hash = h
signature = s
browser.assert.ok(typeof hash.value === 'string', 'type of hash.value must be String')
browser.assert.ok(typeof signature.value === 'string', 'type of signature.value must be String')
})
.addFile('signMassage.sol', sources[6]['browser/signMassage.sol'])
.switchFile('browser/signMassage.sol')
.selectContract('ECVerify')
.createContract('')
.waitForElementPresent('.instance:nth-of-type(4)')
.click('.instance:nth-of-type(4) > div > button')
.perform((done) => {
browser.getAttribute('.instance:nth-of-type(4)', 'id', (result) => {
// skip 'instance' part of e.g. 'instance0x692a70d2e424a56d2c6c27aa97d1a86395877b3a'
const address = result.value.slice('instance'.length)
browser.clickFunction('ecrecovery - call', {types: 'bytes32 hash, bytes sig', values: `"${hash.value}","${signature.value}"`})
.verifyCallReturnValue(
address,
['0: address: 0xCA35b7d915458EF540aDe6068dFe2F44E8fa733c'])
.perform(() => {
done()
})
})
})
.end()
},
tearDown: sauce
}

function checkDeployShouldFail (browser, callback) {
Expand Down Expand Up @@ -160,33 +146,6 @@ function checkDeployShouldSucceed (browser, address, callback) {
})
}

function testSignature (browser, callback) {
let hash, signature
browser.signMessage('test message', (h, s) => {
hash = h
signature = s
browser.assert.ok(typeof hash.value === 'string', 'type of hash.value must be String')
browser.assert.ok(typeof signature.value === 'string', 'type of signature.value must be String')
})
.addFile('signMassage.sol', sources[6]['browser/signMassage.sol'])
.switchFile('browser/signMassage.sol')
.selectContract('ECVerify')
.createContract('')
.waitForElementPresent('.instance:nth-of-type(4)')
.click('.instance:nth-of-type(4) > div > button')
.getAttribute('.instance:nth-of-type(4)', 'id', (result) => {
// skip 'instance' part of e.g. 'instance0x692a70d2e424a56d2c6c27aa97d1a86395877b3a'
const address = result.value.slice('instance'.length)
browser.clickFunction('ecrecovery - call', {types: 'bytes32 hash, bytes sig', values: `"${hash.value}","${signature.value}"`})
.verifyCallReturnValue(
address,
['0: address: 0xCA35b7d915458EF540aDe6068dFe2F44E8fa733c'])
.perform(() => {
callback(null, browser)
})
})
}

/*
function testGitHubImport (browser, callback) {
contractHelper.addFile(browser, 'Untitled4.sol', sources[3]['browser/Untitled4.sol'], () => {
Expand Down
2 changes: 1 addition & 1 deletion test-browser/tests/sharedFolderExplorer.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@ module.exports = {
'@sources': function () {
return sources
},
'SharedFolderExplorer': function (browser) {
'Test Shared Folder Explorer': function (browser) {
runTests(browser)
},
tearDown: sauce
Expand Down
2 changes: 1 addition & 1 deletion test-browser/tests/units/testRecorder.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
'use strict'

module.exports = {
'@disabled': true, // run by compiling.j
'@disabled': true, // run by compiling.
'@sources': function () {
return sources
},
Expand Down