Skip to content

O
openzeppelin-contracts-upgradeable
Unverified Commit 146a22cd by Facundo Spagnuolo Committed by GitHub
Options

Merge pull request #661 from facuspagnuolo/enhancement/organize_test_files 

Organize test files following contracts folders structure
parents 7532dab1 b925b2da
Showing with 55 additions and 56 deletions
test/CappedCrowdsale.test.js → test/crowdsale/CappedCrowdsale.test.js
import ether from './helpers/ether';
import { advanceBlock } from './helpers/advanceToBlock';
import { increaseTimeTo, duration } from './helpers/increaseTime';
import latestTime from './helpers/latestTime';
import EVMRevert from './helpers/EVMRevert';
import ether from '../helpers/ether';
import { advanceBlock } from '../helpers/advanceToBlock';
import { increaseTimeTo, duration } from '../helpers/increaseTime';
import latestTime from '../helpers/latestTime';
import EVMRevert from '../helpers/EVMRevert';
const BigNumber = web3.BigNumber;
......
test/Crowdsale.test.js → test/crowdsale/Crowdsale.test.js
import ether from './helpers/ether';
import { advanceBlock } from './helpers/advanceToBlock';
import { increaseTimeTo, duration } from './helpers/increaseTime';
import latestTime from './helpers/latestTime';
import EVMRevert from './helpers/EVMRevert';
import ether from '../helpers/ether';
import { advanceBlock } from '../helpers/advanceToBlock';
import { increaseTimeTo, duration } from '../helpers/increaseTime';
import latestTime from '../helpers/latestTime';
import EVMRevert from '../helpers/EVMRevert';
const BigNumber = web3.BigNumber;
......
test/FinalizableCrowdsale.test.js → test/crowdsale/FinalizableCrowdsale.test.js
import { advanceBlock } from './helpers/advanceToBlock';
import { increaseTimeTo, duration } from './helpers/increaseTime';
import latestTime from './helpers/latestTime';
import EVMRevert from './helpers/EVMRevert';
import { advanceBlock } from '../helpers/advanceToBlock';
import { increaseTimeTo, duration } from '../helpers/increaseTime';
import latestTime from '../helpers/latestTime';
import EVMRevert from '../helpers/EVMRevert';
const BigNumber = web3.BigNumber;
......
test/RefundVault.test.js → test/crowdsale/RefundVault.test.js
import ether from './helpers/ether';
import EVMRevert from './helpers/EVMRevert';
import ether from '../helpers/ether';
import EVMRevert from '../helpers/EVMRevert';
const BigNumber = web3.BigNumber;
......
test/RefundableCrowdsale.test.js → test/crowdsale/RefundableCrowdsale.test.js
import ether from './helpers/ether';
import { advanceBlock } from './helpers/advanceToBlock';
import { increaseTimeTo, duration } from './helpers/increaseTime';
import latestTime from './helpers/latestTime';
import EVMRevert from './helpers/EVMRevert';
import ether from '../helpers/ether';
import { advanceBlock } from '../helpers/advanceToBlock';
import { increaseTimeTo, duration } from '../helpers/increaseTime';
import latestTime from '../helpers/latestTime';
import EVMRevert from '../helpers/EVMRevert';
const BigNumber = web3.BigNumber;
......
test/SampleCrowdsale.test.js → test/examples/SampleCrowdsale.test.js
import ether from './helpers/ether';
import { advanceBlock } from './helpers/advanceToBlock';
import { increaseTimeTo, duration } from './helpers/increaseTime';
import latestTime from './helpers/latestTime';
import EVMRevert from './helpers/EVMRevert';
import ether from '../helpers/ether';
import { advanceBlock } from '../helpers/advanceToBlock';
import { increaseTimeTo, duration } from '../helpers/increaseTime';
import latestTime from '../helpers/latestTime';
import EVMRevert from '../helpers/EVMRevert';
const BigNumber = web3.BigNumber;
......
test/Destructible.test.js → test/lifecycle/Destructible.test.js
var Destructible = artifacts.require('../contracts/lifecycle/Destructible.sol');
require('./helpers/transactionMined.js');
require('../helpers/transactionMined.js');
contract('Destructible', function (accounts) {
it('should send balance to owner after destruction', async function () {
......
test/Pausable.test.js → test/lifecycle/Pausable.test.js
import assertRevert from './helpers/assertRevert';
import assertRevert from '../helpers/assertRevert';
const PausableMock = artifacts.require('mocks/PausableMock.sol');
contract('Pausable', function (accounts) {
......
test/TokenDestructible.test.js → test/lifecycle/TokenDestructible.test.js
var TokenDestructible = artifacts.require('../contracts/lifecycle/TokenDestructible.sol');
var StandardTokenMock = artifacts.require('mocks/StandardTokenMock.sol');
require('./helpers/transactionMined.js');
require('../helpers/transactionMined.js');
contract('TokenDestructible', function (accounts) {
let destructible;
......
test/SafeMath.test.js → test/math/SafeMath.test.js
import assertRevert from './helpers/assertRevert';
const assertJump = require('./helpers/assertJump');
import assertRevert from '../helpers/assertRevert';
const assertJump = require('../helpers/assertJump');
var SafeMathMock = artifacts.require('mocks/SafeMathMock.sol');
contract('SafeMath', function (accounts) {
......
test/CanReclaimToken.test.js → test/ownership/CanReclaimToken.test.js
import expectThrow from './helpers/expectThrow';
import expectThrow from '../helpers/expectThrow';
const CanReclaimToken = artifacts.require('../contracts/ownership/CanReclaimToken.sol');
const BasicTokenMock = artifacts.require('mocks/BasicTokenMock.sol');
......
test/Claimable.test.js → test/ownership/Claimable.test.js
import assertRevert from './helpers/assertRevert';
import assertRevert from '../helpers/assertRevert';
var Claimable = artifacts.require('../contracts/ownership/Claimable.sol');
......
test/DelayedClaimble.test.js → test/ownership/DelayedClaimble.test.js
import assertRevert from './helpers/assertRevert';
import assertRevert from '../helpers/assertRevert';
var DelayedClaimable = artifacts.require('../contracts/ownership/DelayedClaimable.sol');
......
test/HasNoContracts.test.js → test/ownership/HasNoContracts.test.js
import expectThrow from './helpers/expectThrow';
import expectThrow from '../helpers/expectThrow';
const Ownable = artifacts.require('../contracts/ownership/Ownable.sol');
const HasNoContracts = artifacts.require(
......
test/HasNoEther.test.js → test/ownership/HasNoEther.test.js
import expectThrow from './helpers/expectThrow';
import toPromise from './helpers/toPromise';
import expectThrow from '../helpers/expectThrow';
import toPromise from '../helpers/toPromise';
const HasNoEtherTest = artifacts.require('../mocks/HasNoEtherTest.sol');
const ForceEther = artifacts.require('../mocks/ForceEther.sol');
......
test/HasNoTokens.test.js → test/ownership/HasNoTokens.test.js
import expectThrow from './helpers/expectThrow';
import expectThrow from '../helpers/expectThrow';
const HasNoTokens = artifacts.require('../contracts/lifecycle/HasNoTokens.sol');
const ERC23TokenMock = artifacts.require('mocks/ERC23TokenMock.sol');
......
test/Ownable.test.js → test/ownership/Ownable.test.js
import assertRevert from './helpers/assertRevert';
import assertRevert from '../helpers/assertRevert';
var Ownable = artifacts.require('../contracts/ownership/Ownable.sol');
......
test/RBAC.test.js → test/ownership/rbac/RBAC.test.js
import expectThrow from './helpers/expectThrow';
import expectEvent from './helpers/expectEvent';
import expectThrow from '../../helpers/expectThrow';
import expectEvent from '../../helpers/expectEvent';
const RBACMock = artifacts.require('mocks/RBACMock.sol');
......
test/SplitPayment.test.js → test/payment/SplitPayment.test.js
......@@ -5,7 +5,7 @@ require('chai')
.use(require('chai-bignumber')(BigNumber))
.should();
const EVMThrow = require('./helpers/EVMThrow.js');
const EVMThrow = require('../helpers/EVMThrow.js');
const SplitPayment = artifacts.require('../contracts/payment/SplitPayment.sol');
contract('SplitPayment', function ([owner, payee1, payee2, payee3, nonpayee1, payer1]) {
......
test/BasicToken.test.js → test/token/BasicToken.test.js
import assertRevert from './helpers/assertRevert';
import assertRevert from '../helpers/assertRevert';
var BasicTokenMock = artifacts.require('mocks/BasicTokenMock.sol');
......
test/BurnableToken.test.js → test/token/BurnableToken.test.js
const EVMRevert = require('./helpers/EVMRevert.js');
const EVMRevert = require('../helpers/EVMRevert.js');
const BurnableTokenMock = artifacts.require('mocks/BurnableTokenMock.sol');
const BigNumber = web3.BigNumber;
......
test/CappedToken.test.js → test/token/CappedToken.test.js
import expectThrow from './helpers/expectThrow';
import ether from './helpers/ether';
import expectThrow from '../helpers/expectThrow';
import ether from '../helpers/ether';
var CappedToken = artifacts.require('../contracts/Tokens/CappedToken.sol');
......
test/MintableToken.test.js → test/token/MintableToken.test.js
import expectThrow from './helpers/expectThrow';
import expectThrow from '../helpers/expectThrow';
var MintableToken = artifacts.require('../contracts/Tokens/MintableToken.sol');
contract('Mintable', function (accounts) {
......
test/PausableToken.test.js → test/token/PausableToken.test.js
'user strict';
import assertRevert from './helpers/assertRevert';
import assertRevert from '../helpers/assertRevert';
var PausableTokenMock = artifacts.require('./mocks/PausableTokenMock.sol');
contract('PausableToken', function (accounts) {
......
test/SafeERC20.test.js → test/token/SafeERC20.test.js
import EVMThrow from './helpers/EVMThrow';
import EVMThrow from '../helpers/EVMThrow';
require('chai')
.use(require('chai-as-promised'))
......
test/StandardToken.test.js → test/token/StandardToken.test.js
import assertRevert from './helpers/assertRevert';
import assertRevert from '../helpers/assertRevert';
var StandardTokenMock = artifacts.require('mocks/StandardTokenMock.sol');
......
test/TokenTimelock.test.js → test/token/TokenTimelock.test.js
import latestTime from './helpers/latestTime';
import { increaseTimeTo, duration } from './helpers/increaseTime';
import latestTime from '../helpers/latestTime';
import { increaseTimeTo, duration } from '../helpers/increaseTime';
const BigNumber = web3.BigNumber;
......
test/TokenVesting.test.js → test/token/TokenVesting.test.js
import EVMRevert from './helpers/EVMRevert';
import latestTime from './helpers/latestTime';
import { increaseTimeTo, duration } from './helpers/increaseTime';
import EVMRevert from '../helpers/EVMRevert';
import latestTime from '../helpers/latestTime';
import { increaseTimeTo, duration } from '../helpers/increaseTime';
const BigNumber = web3.BigNumber;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment