address for equal and notEqual

pull/5370/head
aniket-engg 5 years ago committed by Aniket
parent 62a3bd9d2a
commit 78adf3d47d
  1. 11
      libs/remix-tests/sol/tests.sol.ts
  2. 4
      libs/remix-tests/src/assertionEvents.ts
  3. 8
      libs/remix-tests/tests/examples_0/assert_equal_test.sol
  4. 8
      libs/remix-tests/tests/examples_0/assert_notEqual_test.sol
  5. 24
      libs/remix-tests/tests/testRunner.spec.ts

@ -29,6 +29,13 @@ library Assert {
bool expected
);
event AssertionEventAddress(
bool passed,
string message,
address returned,
address expected
);
function ok(bool a, string memory message) public returns (bool result) {
result = a;
emit AssertionEvent(result, message);
@ -63,7 +70,7 @@ library Assert {
function equal(address a, address b, string memory message) public returns (bool result) {
result = (a == b);
emit AssertionEvent(result, message);
emit AssertionEventAddress(result, message, a, b);
}
function equal(bytes32 a, bytes32 b, string memory message) public returns (bool result) {
@ -105,7 +112,7 @@ library Assert {
function notEqual(address a, address b, string memory message) public returns (bool result) {
result = (a != b);
emit AssertionEvent(result, message);
emit AssertionEventAddress(result, message, a, b);
}
function notEqual(bytes32 a, bytes32 b, string memory message) public returns (bool result) {

@ -14,6 +14,10 @@ const assertionEvents = [
{
name: 'AssertionEventBool',
params: ['bool', 'string', 'bool', 'bool']
},
{
name: 'AssertionEventAddress',
params: ['bool', 'string', 'address', 'address']
}
]

@ -25,4 +25,12 @@ contract AssertEqualTest {
function equalBoolFailTest() public {
Assert.equal(true, false, "equalBoolFailTest fails");
}
function equalAddressPassTest() public {
Assert.equal(0x7994f14563F39875a2F934Ce42cAbF48a93FdDA9, 0x7994f14563F39875a2F934Ce42cAbF48a93FdDA9, "equalAddressPassTest passes");
}
function equalAddressFailTest() public {
Assert.equal(0x7994f14563F39875a2F934Ce42cAbF48a93FdDA9, 0x1c6637567229159d1eFD45f95A6675e77727E013, "equalAddressFailTest fails");
}
}

@ -25,4 +25,12 @@ contract AssertNotEqualTest {
function notEqualBoolFailTest() public {
Assert.notEqual(true, true, "notEqualBoolFailTest fails");
}
function notEqualAddressPassTest() public {
Assert.notEqual(0x7994f14563F39875a2F934Ce42cAbF48a93FdDA9, 0x1c6637567229159d1eFD45f95A6675e77727E013, "notEqualAddressPassTest passes");
}
function notEqualAddressFailTest() public {
Assert.notEqual(0x7994f14563F39875a2F934Ce42cAbF48a93FdDA9, 0x7994f14563F39875a2F934Ce42cAbF48a93FdDA9, "notEqualAddressFailTest fails");
}
}

@ -143,12 +143,12 @@ describe('testRunner', () => {
afterAll(() => { tests = [] })
it('should have 3 passing test', () => {
assert.equal(results.passingNum, 3)
it('should have 4 passing test', () => {
assert.equal(results.passingNum, 4)
})
it('should have 3 failing test', () => {
assert.equal(results.failureNum, 3)
it('should have 4 failing test', () => {
assert.equal(results.failureNum, 4)
})
it('should return', () => {
@ -160,7 +160,9 @@ describe('testRunner', () => {
{ type: 'testPass', value: 'Equal int pass test', context: 'AssertEqualTest' },
{ type: 'testFailure', value: 'Equal int fail test', errMsg: 'equalIntFailTest fails', context: 'AssertEqualTest', expected: '2', returned: '-1'},
{ type: 'testPass', value: 'Equal bool pass test', context: 'AssertEqualTest' },
{ type: 'testFailure', value: 'Equal bool fail test', errMsg: 'equalBoolFailTest fails', context: 'AssertEqualTest', expected: false, returned: true}
{ type: 'testFailure', value: 'Equal bool fail test', errMsg: 'equalBoolFailTest fails', context: 'AssertEqualTest', expected: false, returned: true},
{ type: 'testPass', value: 'Equal address pass test', context: 'AssertEqualTest' },
{ type: 'testFailure', value: 'Equal address fail test', errMsg: 'equalAddressFailTest fails', context: 'AssertEqualTest', expected: '0x1c6637567229159d1eFD45f95A6675e77727E013', returned: '0x7994f14563F39875a2F934Ce42cAbF48a93FdDA9'}
], ['time'])
})
})
@ -176,12 +178,12 @@ describe('testRunner', () => {
afterAll(() => { tests = [] })
it('should have 3 passing test', () => {
assert.equal(results.passingNum, 3)
it('should have 4 passing test', () => {
assert.equal(results.passingNum, 4)
})
it('should have 3 failing test', () => {
assert.equal(results.failureNum, 3)
it('should have 4 failing test', () => {
assert.equal(results.failureNum, 4)
})
it('should return', () => {
@ -193,7 +195,9 @@ describe('testRunner', () => {
{ type: 'testPass', value: 'Not equal int pass test', context: 'AssertNotEqualTest' },
{ type: 'testFailure', value: 'Not equal int fail test', errMsg: 'notEqualIntFailTest fails', context: 'AssertNotEqualTest', expected: '-2', returned: '-2'},
{ type: 'testPass', value: 'Not equal bool pass test', context: 'AssertNotEqualTest' },
{ type: 'testFailure', value: 'Not equal bool fail test', errMsg: 'notEqualBoolFailTest fails', context: 'AssertNotEqualTest', expected: true, returned: true}
{ type: 'testFailure', value: 'Not equal bool fail test', errMsg: 'notEqualBoolFailTest fails', context: 'AssertNotEqualTest', expected: true, returned: true},
{ type: 'testPass', value: 'Not equal address pass test', context: 'AssertNotEqualTest' },
{ type: 'testFailure', value: 'Not equal address fail test', errMsg: 'notEqualAddressFailTest fails', context: 'AssertNotEqualTest', expected: 0x7994f14563F39875a2F934Ce42cAbF48a93FdDA9, returned: 0x7994f14563F39875a2F934Ce42cAbF48a93FdDA9}
], ['time'])
})
})

Loading…
Cancel
Save