Merge pull request OpenZeppelin#661 from facuspagnuolo/enhancement/or…

…ganize_test_files Organize test files following contracts folders structure
klivin · Jan 16, 2018 · 146a22c · 146a22c
2 parents 7532dab + b925b2d
commit 146a22c
Show file tree

Hide file tree

Showing 31 changed files with 55 additions and 56 deletions.
diff --git a/test/CappedCrowdsale.test.js → test/crowdsale/CappedCrowdsale.test.js b/test/CappedCrowdsale.test.js → test/crowdsale/CappedCrowdsale.test.js
@@ -1,8 +1,8 @@
-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;
 

diff --git a/test/Crowdsale.test.js → test/crowdsale/Crowdsale.test.js b/test/Crowdsale.test.js → test/crowdsale/Crowdsale.test.js
@@ -1,8 +1,8 @@
-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;
 

diff --git a/test/FinalizableCrowdsale.test.js → test/crowdsale/FinalizableCrowdsale.test.js b/test/FinalizableCrowdsale.test.js → test/crowdsale/FinalizableCrowdsale.test.js
@@ -1,7 +1,7 @@
-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;
 

diff --git a/test/RefundVault.test.js → test/crowdsale/RefundVault.test.js b/test/RefundVault.test.js → test/crowdsale/RefundVault.test.js
@@ -1,5 +1,5 @@
-import ether from './helpers/ether';
-import EVMRevert from './helpers/EVMRevert';
+import ether from '../helpers/ether';
+import EVMRevert from '../helpers/EVMRevert';
 
 const BigNumber = web3.BigNumber;
 

diff --git a/test/RefundableCrowdsale.test.js → test/crowdsale/RefundableCrowdsale.test.js b/test/RefundableCrowdsale.test.js → test/crowdsale/RefundableCrowdsale.test.js
@@ -1,8 +1,8 @@
-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;
 

diff --git a/test/SampleCrowdsale.test.js → test/examples/SampleCrowdsale.test.js b/test/SampleCrowdsale.test.js → test/examples/SampleCrowdsale.test.js
@@ -1,8 +1,8 @@
-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;
 

diff --git a/test/Destructible.test.js → test/lifecycle/Destructible.test.js b/test/Destructible.test.js → test/lifecycle/Destructible.test.js
@@ -1,6 +1,6 @@
 
 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 () {

diff --git a/test/Pausable.test.js → test/lifecycle/Pausable.test.js b/test/Pausable.test.js → test/lifecycle/Pausable.test.js
@@ -1,5 +1,5 @@
 
-import assertRevert from './helpers/assertRevert';
+import assertRevert from '../helpers/assertRevert';
 const PausableMock = artifacts.require('mocks/PausableMock.sol');
 
 contract('Pausable', function (accounts) {

diff --git a/test/TokenDestructible.test.js → test/lifecycle/TokenDestructible.test.js b/test/TokenDestructible.test.js → test/lifecycle/TokenDestructible.test.js
@@ -1,7 +1,7 @@
 
 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;

diff --git a/test/SafeMath.test.js → test/math/SafeMath.test.js b/test/SafeMath.test.js → test/math/SafeMath.test.js
@@ -1,5 +1,5 @@
-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) {

diff --git a/test/CanReclaimToken.test.js → test/ownership/CanReclaimToken.test.js b/test/CanReclaimToken.test.js → test/ownership/CanReclaimToken.test.js
@@ -1,5 +1,5 @@
 
-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');

diff --git a/test/Claimable.test.js → test/ownership/Claimable.test.js b/test/Claimable.test.js → test/ownership/Claimable.test.js
@@ -1,5 +1,5 @@
 
-import assertRevert from './helpers/assertRevert';
+import assertRevert from '../helpers/assertRevert';
 
 var Claimable = artifacts.require('../contracts/ownership/Claimable.sol');
 

diff --git a/test/Contactable.test.js → test/ownership/Contactable.test.js b/test/Contactable.test.js → test/ownership/Contactable.test.js
diff --git a/test/DelayedClaimble.test.js → test/ownership/DelayedClaimble.test.js b/test/DelayedClaimble.test.js → test/ownership/DelayedClaimble.test.js
@@ -1,5 +1,4 @@
-
-import assertRevert from './helpers/assertRevert';
+import assertRevert from '../helpers/assertRevert';
 
 var DelayedClaimable = artifacts.require('../contracts/ownership/DelayedClaimable.sol');
 

diff --git a/test/HasNoContracts.test.js → test/ownership/HasNoContracts.test.js b/test/HasNoContracts.test.js → test/ownership/HasNoContracts.test.js
@@ -1,5 +1,5 @@
 
-import expectThrow from './helpers/expectThrow';
+import expectThrow from '../helpers/expectThrow';
 
 const Ownable = artifacts.require('../contracts/ownership/Ownable.sol');
 const HasNoContracts = artifacts.require(

diff --git a/test/HasNoEther.test.js → test/ownership/HasNoEther.test.js b/test/HasNoEther.test.js → test/ownership/HasNoEther.test.js
@@ -1,6 +1,6 @@
 
-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');
 

diff --git a/test/HasNoTokens.test.js → test/ownership/HasNoTokens.test.js b/test/HasNoTokens.test.js → test/ownership/HasNoTokens.test.js
@@ -1,5 +1,5 @@
 
-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');

diff --git a/test/Ownable.test.js → test/ownership/Ownable.test.js b/test/Ownable.test.js → test/ownership/Ownable.test.js
@@ -1,5 +1,5 @@
 
-import assertRevert from './helpers/assertRevert';
+import assertRevert from '../helpers/assertRevert';
 
 var Ownable = artifacts.require('../contracts/ownership/Ownable.sol');
 

diff --git a/test/RBAC.test.js → test/ownership/rbac/RBAC.test.js b/test/RBAC.test.js → test/ownership/rbac/RBAC.test.js
@@ -1,5 +1,5 @@
-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');
 

diff --git a/test/PullPayment.test.js → test/payment/PullPayment.test.js b/test/PullPayment.test.js → test/payment/PullPayment.test.js
diff --git a/test/SplitPayment.test.js → test/payment/SplitPayment.test.js b/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]) {

diff --git a/test/BasicToken.test.js → test/token/BasicToken.test.js b/test/BasicToken.test.js → test/token/BasicToken.test.js
@@ -1,4 +1,4 @@
-import assertRevert from './helpers/assertRevert';
+import assertRevert from '../helpers/assertRevert';
 
 var BasicTokenMock = artifacts.require('mocks/BasicTokenMock.sol');
 

diff --git a/test/BurnableToken.test.js → test/token/BurnableToken.test.js b/test/BurnableToken.test.js → test/token/BurnableToken.test.js
@@ -1,5 +1,5 @@
 
-const EVMRevert = require('./helpers/EVMRevert.js');
+const EVMRevert = require('../helpers/EVMRevert.js');
 const BurnableTokenMock = artifacts.require('mocks/BurnableTokenMock.sol');
 const BigNumber = web3.BigNumber;
 

diff --git a/test/CappedToken.test.js → test/token/CappedToken.test.js b/test/CappedToken.test.js → test/token/CappedToken.test.js
@@ -1,6 +1,6 @@
 
-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');
 

diff --git a/test/DetailedERC20.test.js → test/token/DetailedERC20.test.js b/test/DetailedERC20.test.js → test/token/DetailedERC20.test.js
diff --git a/test/MintableToken.test.js → test/token/MintableToken.test.js b/test/MintableToken.test.js → test/token/MintableToken.test.js
@@ -1,5 +1,5 @@
 
-import expectThrow from './helpers/expectThrow';
+import expectThrow from '../helpers/expectThrow';
 var MintableToken = artifacts.require('../contracts/Tokens/MintableToken.sol');
 
 contract('Mintable', function (accounts) {

diff --git a/test/PausableToken.test.js → test/token/PausableToken.test.js b/test/PausableToken.test.js → test/token/PausableToken.test.js
@@ -1,6 +1,6 @@
 'user strict';
 
-import assertRevert from './helpers/assertRevert';
+import assertRevert from '../helpers/assertRevert';
 var PausableTokenMock = artifacts.require('./mocks/PausableTokenMock.sol');
 
 contract('PausableToken', function (accounts) {

diff --git a/test/SafeERC20.test.js → test/token/SafeERC20.test.js b/test/SafeERC20.test.js → test/token/SafeERC20.test.js
@@ -1,4 +1,4 @@
-import EVMThrow from './helpers/EVMThrow';
+import EVMThrow from '../helpers/EVMThrow';
 
 require('chai')
   .use(require('chai-as-promised'))

diff --git a/test/StandardToken.test.js → test/token/StandardToken.test.js b/test/StandardToken.test.js → test/token/StandardToken.test.js
@@ -1,5 +1,5 @@
 
-import assertRevert from './helpers/assertRevert';
+import assertRevert from '../helpers/assertRevert';
 
 var StandardTokenMock = artifacts.require('mocks/StandardTokenMock.sol');
 

diff --git a/test/TokenTimelock.test.js → test/token/TokenTimelock.test.js b/test/TokenTimelock.test.js → test/token/TokenTimelock.test.js
@@ -1,5 +1,5 @@
-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;
 

diff --git a/test/TokenVesting.test.js → test/token/TokenVesting.test.js b/test/TokenVesting.test.js → test/token/TokenVesting.test.js
@@ -1,6 +1,6 @@
-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;