Re-enable solidity coverage

- Upgrade version
- Re-enable in travis.yml
- Move mocks to contracts folder for instrumentation

.gitignore

@@ -15,6 +15,7 @@ scTopics
 # Coverage directory used by tools like istanbul
 coverage
 coverage.json
+coverageEnv
 
 # node-waf configuration
 .lock-wscript

.solcover.js

@@ -1,5 +1,9 @@
 module.exports = {
     norpc: true,
     testCommand: 'node --max-old-space-size=4096 ../node_modules/.bin/truffle test --network coverage',
-    skipFiles: ['lifecycle/Migrations.sol']
+    compileCommand: 'node --max-old-space-size=4096 ../node_modules/.bin/truffle compile --network coverage',
+    skipFiles: [
+        'lifecycle/Migrations.sol',
+        'mocks'
+    ]
 }

.travis.yml

@@ -7,6 +7,13 @@ node_js:
 cache:
   directories:
     - node_modules
+env:
+  -
+  - SOLIDITY_COVERAGE=true
+matrix:
+  fast_finish: true
+  allow_failures:
+    - env: SOLIDITY_COVERAGE=true
 before_script:
   - truffle version
 script:

test/mocks/BasicTokenMock.sol → contracts/mocks/BasicTokenMock.sol

@@ -1,7 +1,7 @@
 pragma solidity ^0.4.18;
 
 
-import '../../contracts/token/BasicToken.sol';
+import '../token/BasicToken.sol';
 
 
 // mock class using BasicToken

test/mocks/BurnableTokenMock.sol → contracts/mocks/BurnableTokenMock.sol

@@ -1,6 +1,6 @@
 pragma solidity ^0.4.18;
 
-import '../../contracts/token/BurnableToken.sol';
+import '../token/BurnableToken.sol';
 
 contract BurnableTokenMock is BurnableToken {
 

test/mocks/CappedCrowdsaleImpl.sol → contracts/mocks/CappedCrowdsaleImpl.sol

@@ -1,7 +1,7 @@
 pragma solidity ^0.4.18;
 
 
-import '../../contracts/crowdsale/CappedCrowdsale.sol';
+import '../crowdsale/CappedCrowdsale.sol';
 
 
 contract CappedCrowdsaleImpl is CappedCrowdsale {

test/mocks/DetailedERC20Mock.sol → contracts/mocks/DetailedERC20Mock.sol

@@ -1,7 +1,7 @@
 pragma solidity ^0.4.18;
 
-import '../../contracts/token/StandardToken.sol';
-import '../../contracts/token/DetailedERC20.sol';
+import '../token/StandardToken.sol';
+import '../token/DetailedERC20.sol';
 
 contract DetailedERC20Mock is StandardToken, DetailedERC20 {
   function DetailedERC20Mock(string _name, string _symbol, uint8 _decimals) DetailedERC20(_name, _symbol, _decimals) public {}

test/mocks/ERC23TokenMock.sol → contracts/mocks/ERC23TokenMock.sol

@@ -1,7 +1,7 @@
 pragma solidity ^0.4.18;
 
 
-import '../../contracts/token/BasicToken.sol';
+import '../token/BasicToken.sol';
 
 
 contract ERC23ContractInterface {

test/mocks/FinalizableCrowdsaleImpl.sol → contracts/mocks/FinalizableCrowdsaleImpl.sol

@@ -1,7 +1,7 @@
 pragma solidity ^0.4.18;
 
 
-import '../../contracts/crowdsale/FinalizableCrowdsale.sol';
+import '../crowdsale/FinalizableCrowdsale.sol';
 
 
 contract FinalizableCrowdsaleImpl is FinalizableCrowdsale {

test/mocks/LimitBalanceMock.sol → contracts/mocks/LimitBalanceMock.sol

@@ -1,7 +1,7 @@
 pragma solidity ^0.4.18;
 
 
-import '../../contracts/LimitBalance.sol';
+import '../LimitBalance.sol';
 
 
 // mock class using LimitBalance

test/mocks/PausableMock.sol → contracts/mocks/PausableMock.sol

@@ -1,7 +1,7 @@
 pragma solidity ^0.4.18;
 
 
-import '../../contracts/lifecycle/Pausable.sol';
+import '../lifecycle/Pausable.sol';
 
 
 // mock class using Pausable

test/mocks/PausableTokenMock.sol → contracts/mocks/PausableTokenMock.sol

@@ -1,6 +1,6 @@
 pragma solidity ^0.4.18;
 
-import '../../contracts/token/PausableToken.sol';
+import '../token/PausableToken.sol';
 
 // mock class using PausableToken
 contract PausableTokenMock is PausableToken {

test/mocks/PullPaymentMock.sol → contracts/mocks/PullPaymentMock.sol

@@ -1,7 +1,7 @@
 pragma solidity ^0.4.18;
 
 
-import '../../contracts/payment/PullPayment.sol';
+import '../payment/PullPayment.sol';
 
 
 // mock class using PullPayment

test/mocks/RBACMock.sol → contracts/mocks/RBACMock.sol

@@ -1,6 +1,6 @@
 pragma solidity ^0.4.8;
 
-import '../../contracts/ownership/rbac/RBAC.sol';
+import '../ownership/rbac/RBAC.sol';
 
 
 contract RBACMock is RBAC {

test/mocks/ReentrancyMock.sol → contracts/mocks/ReentrancyMock.sol

@@ -1,6 +1,6 @@
 pragma solidity ^0.4.18;
 
-import '../../contracts/ReentrancyGuard.sol';
+import '../ReentrancyGuard.sol';
 import './ReentrancyAttack.sol';
 
 contract ReentrancyMock is ReentrancyGuard {

test/mocks/RefundableCrowdsaleImpl.sol → contracts/mocks/RefundableCrowdsaleImpl.sol

@@ -1,7 +1,7 @@
 pragma solidity ^0.4.18;
 
 
-import '../../contracts/crowdsale/RefundableCrowdsale.sol';
+import '../crowdsale/RefundableCrowdsale.sol';
 
 
 contract RefundableCrowdsaleImpl is RefundableCrowdsale {

test/mocks/SafeERC20Helper.sol → contracts/mocks/SafeERC20Helper.sol

@@ -1,7 +1,7 @@
 pragma solidity ^0.4.18;
 
-import '../../contracts/token/ERC20.sol';
-import '../../contracts/token/SafeERC20.sol';
+import '../token/ERC20.sol';
+import '../token/SafeERC20.sol';
 
 contract ERC20FailingMock is ERC20 {
   function transfer(address, uint256) public returns (bool) {

test/mocks/SafeMathMock.sol → contracts/mocks/SafeMathMock.sol

@@ -1,7 +1,7 @@
 pragma solidity ^0.4.18;
 
 
-import '../../contracts/math/SafeMath.sol';
+import '../math/SafeMath.sol';
 
 
 contract SafeMathMock {

test/mocks/StandardTokenMock.sol → contracts/mocks/StandardTokenMock.sol

@@ -1,7 +1,7 @@
 pragma solidity ^0.4.18;
 
 
-import '../../contracts/token/StandardToken.sol';
+import '../token/StandardToken.sol';
 
 
 // mock class using StandardToken

package.json

@@ -45,7 +45,7 @@
     "ethereumjs-testrpc": "^6.0.1",
     "ethereumjs-util": "^5.1.2",
     "mocha-lcov-reporter": "^1.3.0",
-    "solidity-coverage": "^0.2.2",
+    "solidity-coverage": "^0.4.3",
     "truffle": "^4.0.0",
     "truffle-hdwallet-provider": "0.0.3"
   },

test/BasicToken.test.js

@@ -1,6 +1,6 @@
 const assertRevert = require('./helpers/assertRevert');
 
-var BasicTokenMock = artifacts.require('./mocks/BasicTokenMock.sol');
+var BasicTokenMock = artifacts.require('mocks/BasicTokenMock.sol');
 
 contract('BasicToken', function (accounts) {
   it('should return the correct totalSupply after construction', async function () {

test/BurnableToken.test.js

@@ -1,6 +1,6 @@
 
 const EVMRevert = require('./helpers/EVMRevert.js');
-const BurnableTokenMock = artifacts.require('./mocks/BurnableTokenMock.sol');
+const BurnableTokenMock = artifacts.require('mocks/BurnableTokenMock.sol');
 const BigNumber = web3.BigNumber;
 
 require('chai')

test/CanReclaimToken.test.js

@@ -2,7 +2,7 @@
 import expectThrow from './helpers/expectThrow';
 
 const CanReclaimToken = artifacts.require('../contracts/ownership/CanReclaimToken.sol');
-const BasicTokenMock = artifacts.require('./mocks/BasicTokenMock.sol');
+const BasicTokenMock = artifacts.require('mocks/BasicTokenMock.sol');
 
 contract('CanReclaimToken', function (accounts) {
   let token = null;

test/CappedCrowdsale.test.js

@@ -11,7 +11,7 @@ require('chai')
   .use(require('chai-bignumber')(BigNumber))
   .should();
 
-const CappedCrowdsale = artifacts.require('./mocks/CappedCrowdsaleImpl.sol');
+const CappedCrowdsale = artifacts.require('mocks/CappedCrowdsaleImpl.sol');
 const MintableToken = artifacts.require('MintableToken');
 
 contract('CappedCrowdsale', function ([_, wallet]) {

test/DayLimit.test.js

@@ -4,7 +4,7 @@ import { increaseTimeTo, duration } from './helpers/increaseTime';
 
 const assertRevert = require('./helpers/assertRevert');
 
-const DayLimitMock = artifacts.require('./mocks/DayLimitMock.sol');
+const DayLimitMock = artifacts.require('mocks/DayLimitMock.sol');
 
 contract('DayLimit', function (accounts) {
   let dayLimit;

test/DetailedERC20.test.js

@@ -5,7 +5,7 @@ require('chai')
   .use(require('chai-bignumber')(BigNumber))
   .should();
 
-const DetailedERC20Mock = artifacts.require('./mocks/DetailedERC20Mock.sol');
+const DetailedERC20Mock = artifacts.require('mocks/DetailedERC20Mock.sol');
 
 contract('DetailedERC20', accounts => {
   let detailedERC20 = null;

test/FinalizableCrowdsale.test.js

@@ -10,7 +10,7 @@ const should = require('chai')
   .use(require('chai-bignumber')(BigNumber))
   .should();
 
-const FinalizableCrowdsale = artifacts.require('./mocks/FinalizableCrowdsaleImpl.sol');
+const FinalizableCrowdsale = artifacts.require('mocks/FinalizableCrowdsaleImpl.sol');
 const MintableToken = artifacts.require('MintableToken');
 
 contract('FinalizableCrowdsale', function ([_, owner, wallet, thirdparty]) {

test/HasNoTokens.test.js

@@ -2,7 +2,7 @@
 import expectThrow from './helpers/expectThrow';
 
 const HasNoTokens = artifacts.require('../contracts/lifecycle/HasNoTokens.sol');
-const ERC23TokenMock = artifacts.require('./mocks/ERC23TokenMock.sol');
+const ERC23TokenMock = artifacts.require('mocks/ERC23TokenMock.sol');
 
 contract('HasNoTokens', function (accounts) {
   let hasNoTokens = null;

test/PausableToken.test.js

@@ -1,7 +1,7 @@
 'user strict';
 
 const assertRevert = require('./helpers/assertRevert');
-var PausableTokenMock = artifacts.require('./mocks/PausableTokenMock.sol');
+var PausableTokenMock = artifacts.require('mocks/PausableTokenMock.sol');
 
 contract('PausableToken', function (accounts) {
   let token;

test/PullPayment.test.js

@@ -1,4 +1,4 @@
-var PullPaymentMock = artifacts.require('./mocks/PullPaymentMock.sol');
+var PullPaymentMock = artifacts.require('mocks/PullPaymentMock.sol');
 
 contract('PullPayment', function (accounts) {
   let ppce;

test/RBAC.test.js

@@ -1,7 +1,7 @@
 import expectThrow from './helpers/expectThrow';
 import expectEvent from './helpers/expectEvent';
 
-const RBACMock = artifacts.require('./mocks/RBACMock.sol');
+const RBACMock = artifacts.require('mocks/RBACMock.sol');
 
 require('chai')
   .use(require('chai-as-promised'))

test/RefundableCrowdsale.test.js

@@ -11,7 +11,7 @@ require('chai')
   .use(require('chai-bignumber')(BigNumber))
   .should();
 
-const RefundableCrowdsale = artifacts.require('./mocks/RefundableCrowdsaleImpl.sol');
+const RefundableCrowdsale = artifacts.require('mocks/RefundableCrowdsaleImpl.sol');
 
 contract('RefundableCrowdsale', function ([_, owner, wallet, investor]) {
   const rate = new BigNumber(1000);

test/SafeERC20.test.js

@@ -4,7 +4,7 @@ require('chai')
   .use(require('chai-as-promised'))
   .should();
 
-const SafeERC20Helper = artifacts.require('./mocks/SafeERC20Helper.sol');
+const SafeERC20Helper = artifacts.require('mocks/SafeERC20Helper.sol');
 
 contract('SafeERC20', function () {
   beforeEach(async function () {

test/SafeMath.test.js

@@ -1,6 +1,6 @@
 const assertRevert = require('./helpers/assertRevert');
 const assertJump = require('./helpers/assertJump');
-var SafeMathMock = artifacts.require('./mocks/SafeMathMock.sol');
+var SafeMathMock = artifacts.require('mocks/SafeMathMock.sol');
 
 contract('SafeMath', function (accounts) {
   let safeMath;

test/StandardToken.test.js

@@ -1,7 +1,7 @@
 
 const assertRevert = require('./helpers/assertRevert');
 
-var StandardTokenMock = artifacts.require('./mocks/StandardTokenMock.sol');
+var StandardTokenMock = artifacts.require('mocks/StandardTokenMock.sol');
 
 contract('StandardToken', function (accounts) {
   let token;

test/TokenDestructible.test.js

@@ -1,6 +1,6 @@
 
 var TokenDestructible = artifacts.require('../contracts/lifecycle/TokenDestructible.sol');
-var StandardTokenMock = artifacts.require('./mocks/StandardTokenMock.sol');
+var StandardTokenMock = artifacts.require('mocks/StandardTokenMock.sol');
 require('./helpers/transactionMined.js');
 
 contract('TokenDestructible', function (accounts) {