Skip to content

Commit

Permalink
Organize mocks and test files (#517)
Browse files Browse the repository at this point in the history 
* contracts: organize mock contracts in sub dirs

* tests: organize contract tests in sub dirs
  • Loading branch information
@facuspagnuolo
facuspagnuolo authored May 2, 2019
1 parent 635dd96 commit 7052952
Show file tree
Hide file tree
Showing 71 changed files with 115 additions and 115 deletions.
2 changes: 1 addition & 1 deletion contracts/test/mocks/APMNamehashMock.sol → contracts/test/mocks/apm/APMNamehashMock.sol
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
pragma solidity 0.4.24;

import "../../apm/APMNamehash.sol";
import "../../../apm/APMNamehash.sol";


contract APMNamehashMock is APMNamehash {
Expand Down
4 changes: 2 additions & 2 deletions contracts/test/mocks/UnsafeRepo.sol → contracts/test/mocks/apm/UnsafeRepo.sol
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
pragma solidity 0.4.24;

import "../../apm/Repo.sol";
import "../../apps/UnsafeAragonApp.sol";
import "../../../apm/Repo.sol";
import "../../../apps/UnsafeAragonApp.sol";


// Allows Repo to be used without a proxy or access controls
Expand Down
6 changes: 3 additions & 3 deletions .../test/mocks/AppProxyPinnedStorageMock.sol → .../mocks/apps/AppProxyPinnedStorageMock.sol
View file
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
pragma solidity 0.4.24;

import "../../apps/AppProxyPinned.sol";
import "../../kernel/IKernel.sol";
import "../../kernel/Kernel.sol";
import "../../../apps/AppProxyPinned.sol";
import "../../../kernel/IKernel.sol";
import "../../../kernel/Kernel.sol";


contract FakeAppConstants {
Expand Down
2 changes: 1 addition & 1 deletion contracts/test/mocks/AppStorageMock.sol → contracts/test/mocks/apps/AppStorageMock.sol
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
pragma solidity 0.4.24;

import "../../apps/AppStorage.sol";
import "../../../apps/AppStorage.sol";


contract AppStorageMock is AppStorage {
Expand Down
6 changes: 3 additions & 3 deletions contracts/test/mocks/AppStub.sol → contracts/test/mocks/apps/AppStub.sol
View file
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
pragma solidity 0.4.24;

import "../../apps/AragonApp.sol";
import "../../apps/UnsafeAragonApp.sol";
import "../../kernel/IKernel.sol";
import "../../../apps/AragonApp.sol";
import "../../../apps/UnsafeAragonApp.sol";
import "../../../kernel/IKernel.sol";


contract AppStubStorage {
Expand Down
4 changes: 2 additions & 2 deletions ...test/mocks/AppStubConditionalRecovery.sol → ...mocks/apps/AppStubConditionalRecovery.sol
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
pragma solidity 0.4.24;

import "../../apps/AragonApp.sol";
import "../../common/DepositableStorage.sol";
import "../../../apps/AragonApp.sol";
import "../../../common/DepositableStorage.sol";


contract AppStubConditionalRecovery is AragonApp, DepositableStorage {
Expand Down
6 changes: 3 additions & 3 deletions contracts/test/mocks/AppStubDepositable.sol → ...ts/test/mocks/apps/AppStubDepositable.sol
View file
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
pragma solidity 0.4.24;

import "../../apps/AragonApp.sol";
import "../../apps/UnsafeAragonApp.sol";
import "../../common/DepositableStorage.sol";
import "../../../apps/AragonApp.sol";
import "../../../apps/UnsafeAragonApp.sol";
import "../../../common/DepositableStorage.sol";


contract AppStubDepositable is AragonApp, DepositableStorage {
Expand Down
2 changes: 1 addition & 1 deletion contracts/test/mocks/AppStubScriptRunner.sol → ...s/test/mocks/apps/AppStubScriptRunner.sol
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
pragma solidity 0.4.24;

import "../../apps/AragonApp.sol";
import "../../../apps/AragonApp.sol";


contract AppStubScriptRunner is AragonApp {
Expand Down
4 changes: 2 additions & 2 deletions contracts/test/mocks/UnsafeAragonAppMock.sol → ...s/test/mocks/apps/UnsafeAragonAppMock.sol
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
pragma solidity 0.4.24;

import "../../apps/UnsafeAragonApp.sol";
import "../../kernel/IKernel.sol";
import "../../../apps/UnsafeAragonApp.sol";
import "../../../kernel/IKernel.sol";


contract UnsafeAragonAppMock is UnsafeAragonApp {
Expand Down
4 changes: 2 additions & 2 deletions contracts/test/mocks/VaultMock.sol → contracts/test/mocks/apps/VaultMock.sol
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
pragma solidity 0.4.24;

import "../../apps/UnsafeAragonApp.sol";
import "../../common/DepositableStorage.sol";
import "../../../apps/UnsafeAragonApp.sol";
import "../../../common/DepositableStorage.sol";


contract VaultMock is UnsafeAragonApp, DepositableStorage {
Expand Down
2 changes: 1 addition & 1 deletion ...cts/test/mocks/DepositableStorageMock.sol → ...t/mocks/common/DepositableStorageMock.sol
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
pragma solidity 0.4.24;

import "../../common/DepositableStorage.sol";
import "../../../common/DepositableStorage.sol";


contract DepositableStorageMock is DepositableStorage {
Expand Down
2 changes: 1 addition & 1 deletion ...cts/test/mocks/EtherTokenConstantMock.sol → ...t/mocks/common/EtherTokenConstantMock.sol
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
pragma solidity 0.4.24;

import "../../common/EtherTokenConstant.sol";
import "../../../common/EtherTokenConstant.sol";


contract EtherTokenConstantMock is EtherTokenConstant {
Expand Down
2 changes: 1 addition & 1 deletion ...s/test/mocks/InitializableStorageMock.sol → ...mocks/common/InitializableStorageMock.sol
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
pragma solidity 0.4.24;

import "../../common/Initializable.sol";
import "../../../common/Initializable.sol";


contract InitializableStorageMock is Initializable {
Expand Down
0 contracts/test/mocks/KeccakConstants.sol → ...cts/test/mocks/common/KeccakConstants.sol
View file
File renamed without changes.
4 changes: 2 additions & 2 deletions contracts/test/mocks/LifecycleMock.sol → ...racts/test/mocks/common/LifecycleMock.sol
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
pragma solidity 0.4.24;

import "../../common/Initializable.sol";
import "../../common/Petrifiable.sol";
import "../../../common/Initializable.sol";
import "../../../common/Petrifiable.sol";


contract LifecycleMock is Initializable, Petrifiable {
Expand Down
4 changes: 2 additions & 2 deletions contracts/test/mocks/ReentrancyGuardMock.sol → ...test/mocks/common/ReentrancyGuardMock.sol
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
pragma solidity 0.4.24;

import "../../common/ReentrancyGuard.sol";
import "../../common/UnstructuredStorage.sol";
import "../../../common/ReentrancyGuard.sol";
import "../../../common/UnstructuredStorage.sol";


contract ReentrantActor {
Expand Down
2 changes: 1 addition & 1 deletion contracts/test/mocks/TimeHelpersMock.sol → ...cts/test/mocks/common/TimeHelpersMock.sol
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
pragma solidity 0.4.24;

import "../../common/TimeHelpers.sol";
import "../../../common/TimeHelpers.sol";


contract TimeHelpersMock is TimeHelpers {
Expand Down
2 changes: 1 addition & 1 deletion contracts/test/mocks/Uint256Mock.sol → contracts/test/mocks/common/Uint256Mock.sol
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
pragma solidity 0.4.24;

import "../../common/Uint256Helpers.sol";
import "../../../common/Uint256Helpers.sol";


contract Uint256Mock {
Expand Down
2 changes: 1 addition & 1 deletion contracts/test/mocks/ENSConstantsMock.sol → ...racts/test/mocks/ens/ENSConstantsMock.sol
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
pragma solidity 0.4.24;

import "../../ens/ENSConstants.sol";
import "../../../ens/ENSConstants.sol";


contract ENSConstantsMock is ENSConstants {
Expand Down
2 changes: 1 addition & 1 deletion ...acts/test/mocks/EVMScriptExecutorMock.sol → ...mocks/evmscript/EVMScriptExecutorMock.sol
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
pragma solidity 0.4.24;


import "../../evmscript/executors/BaseEVMScriptExecutor.sol";
import "../../../evmscript/executors/BaseEVMScriptExecutor.sol";

contract EVMScriptExecutorMock is BaseEVMScriptExecutor {
bytes32 internal constant EXECUTOR_TYPE = keccak256("MOCK_SCRIPT");
Expand Down
2 changes: 1 addition & 1 deletion ...t/mocks/EVMScriptExecutorNoReturnMock.sol → ...mscript/EVMScriptExecutorNoReturnMock.sol
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
pragma solidity 0.4.24;


import "../../evmscript/executors/BaseEVMScriptExecutor.sol";
import "../../../evmscript/executors/BaseEVMScriptExecutor.sol";

contract EVMScriptExecutorNoReturnMock is BaseEVMScriptExecutor {
bytes32 internal constant EXECUTOR_TYPE = keccak256("NO_RETURN_SCRIPT");
Expand Down
2 changes: 1 addition & 1 deletion ...est/mocks/EVMScriptExecutorRevertMock.sol → ...evmscript/EVMScriptExecutorRevertMock.sol
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
pragma solidity 0.4.24;


import "../../evmscript/executors/BaseEVMScriptExecutor.sol";
import "../../../evmscript/executors/BaseEVMScriptExecutor.sol";

contract EVMScriptExecutorRevertMock is BaseEVMScriptExecutor {
string public constant ERROR_MOCK_REVERT = "MOCK_REVERT";
Expand Down
2 changes: 1 addition & 1 deletion .../mocks/EVMScriptRegistryConstantsMock.sol → ...script/EVMScriptRegistryConstantsMock.sol
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
pragma solidity 0.4.24;

import "../../evmscript/IEVMScriptRegistry.sol";
import "../../../evmscript/IEVMScriptRegistry.sol";


contract EVMScriptRegistryConstantsMock is EVMScriptRegistryConstants {
Expand Down
0 contracts/test/mocks/ExecutionTarget.sol → .../test/mocks/evmscript/ExecutionTarget.sol
View file
File renamed without changes.
10 changes: 5 additions & 5 deletions ...cts/test/mocks/APMRegistryFactoryMock.sol → .../mocks/factory/APMRegistryFactoryMock.sol
View file
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
pragma solidity 0.4.24;

import "../../apm/APMRegistry.sol";
import "../../apm/Repo.sol";
import "../../ens/ENSSubdomainRegistrar.sol";
import "../../../apm/APMRegistry.sol";
import "../../../apm/Repo.sol";
import "../../../ens/ENSSubdomainRegistrar.sol";

import "../../factory/DAOFactory.sol";
import "../../factory/ENSFactory.sol";
import "../../../factory/DAOFactory.sol";
import "../../../factory/ENSFactory.sol";

// Mock that doesn't grant enough permissions
// Only usable with new ENS instance
Expand Down
2 changes: 1 addition & 1 deletion contracts/test/mocks/KernelConstantsMock.sol → ...test/mocks/kernel/KernelConstantsMock.sol
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
pragma solidity 0.4.24;

import "../../kernel/Kernel.sol";
import "../../../kernel/Kernel.sol";


contract KernelConstantsMock is Kernel {
Expand Down
4 changes: 2 additions & 2 deletions ...acts/test/mocks/KernelDepositableMock.sol → ...st/mocks/kernel/KernelDepositableMock.sol
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
pragma solidity 0.4.24;

import "../../common/DepositableStorage.sol";
import "../../kernel/Kernel.sol";
import "../../../common/DepositableStorage.sol";
import "../../../kernel/Kernel.sol";

contract KernelDepositableMock is Kernel, DepositableStorage {
constructor(bool _shouldPetrify) Kernel(_shouldPetrify) public {
Expand Down
4 changes: 2 additions & 2 deletions contracts/test/mocks/KernelOverloadMock.sol → .../test/mocks/kernel/KernelOverloadMock.sol
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
pragma solidity 0.4.24;

import "../../kernel/Kernel.sol";
import "../../lib/misc/ERCProxy.sol";
import "../../../kernel/Kernel.sol";
import "../../../lib/misc/ERCProxy.sol";


/** Ugly hack to work around this issue:
Expand Down
2 changes: 1 addition & 1 deletion contracts/test/mocks/KernelSetAppMock.sol → ...ts/test/mocks/kernel/KernelSetAppMock.sol
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
pragma solidity 0.4.24;

import "../../kernel/Kernel.sol";
import "../../../kernel/Kernel.sol";

contract KernelSetAppMock is Kernel {
constructor() Kernel(false) public {
Expand Down
2 changes: 1 addition & 1 deletion contracts/test/mocks/UpgradedKernel.sol → ...acts/test/mocks/kernel/UpgradedKernel.sol
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
pragma solidity 0.4.24;

import "../../kernel/Kernel.sol";
import "../../../kernel/Kernel.sol";


contract UpgradedKernel is Kernel {
Expand Down
2 changes: 1 addition & 1 deletion contracts/test/mocks/SafeMath64Mock.sol → ...ts/test/mocks/lib/math/SafeMath64Mock.sol
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
pragma solidity 0.4.24;

import "../../lib/math/SafeMath64.sol";
import "../../../../lib/math/SafeMath64.sol";


contract SafeMath64Mock {
Expand Down
2 changes: 1 addition & 1 deletion contracts/test/mocks/SafeMath8Mock.sol → ...cts/test/mocks/lib/math/SafeMath8Mock.sol
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
pragma solidity 0.4.24;

import "../../lib/math/SafeMath8.sol";
import "../../../../lib/math/SafeMath8.sol";


contract SafeMath8Mock {
Expand Down
2 changes: 1 addition & 1 deletion contracts/test/mocks/ERCProxyMock.sol → ...acts/test/mocks/lib/misc/ERCProxyMock.sol
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
pragma solidity 0.4.24;

import "../../lib/misc/ERCProxy.sol";
import "../../../../lib/misc/ERCProxy.sol";


contract ERCProxyMock is ERCProxy {
Expand Down
4 changes: 2 additions & 2 deletions contracts/test/mocks/SafeERC20Mock.sol → ...ts/test/mocks/lib/token/SafeERC20Mock.sol
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
pragma solidity 0.4.24;

import "../../common/SafeERC20.sol";
import "../../lib/token/ERC20.sol";
import "../../../../common/SafeERC20.sol";
import "../../../../lib/token/ERC20.sol";


contract SafeERC20Mock {
Expand Down
2 changes: 1 addition & 1 deletion contracts/test/mocks/TokenMock.sol → contracts/test/mocks/lib/token/TokenMock.sol
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

pragma solidity 0.4.24;

import "../../lib/math/SafeMath.sol";
import "../../../../lib/math/SafeMath.sol";


contract TokenMock {
Expand Down
0 ...racts/test/mocks/TokenReturnFalseMock.sol → .../mocks/lib/token/TokenReturnFalseMock.sol
View file
File renamed without changes.
2 changes: 1 addition & 1 deletion ...cts/test/mocks/TokenReturnMissingMock.sol → ...ocks/lib/token/TokenReturnMissingMock.sol
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@

pragma solidity 0.4.24;

import "../../lib/math/SafeMath.sol";
import "../../../../lib/math/SafeMath.sol";


contract TokenReturnMissingMock {
Expand Down
6 changes: 3 additions & 3 deletions contracts/test/TestACLInterpreter.sol → contracts/test/tests/TestACLInterpreter.sol
View file
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
pragma solidity 0.4.24;

import "../acl/ACL.sol";
import "./helpers/Assert.sol";
import "./helpers/ACLHelper.sol";
import "../../acl/ACL.sol";
import "../helpers/Assert.sol";
import "../helpers/ACLHelper.sol";


contract TestACLInterpreter is ACL, ACLHelper {
Expand Down
6 changes: 3 additions & 3 deletions contracts/test/TestConversionHelpers.sol → ...acts/test/tests/TestConversionHelpers.sol
View file
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
pragma solidity 0.4.24;

import "./helpers/Assert.sol";
import "./helpers/ThrowProxy.sol";
import "../helpers/Assert.sol";
import "../helpers/ThrowProxy.sol";

import "../common/ConversionHelpers.sol";
import "../../common/ConversionHelpers.sol";


contract InvalidBytesLengthConversionThrows {
Expand Down
8 changes: 4 additions & 4 deletions contracts/test/TestDelegateProxy.sol → contracts/test/tests/TestDelegateProxy.sol
View file
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
pragma solidity 0.4.24;

import "./helpers/Assert.sol";
import "./helpers/ThrowProxy.sol";
import "../helpers/Assert.sol";
import "../helpers/ThrowProxy.sol";

import "../common/DelegateProxy.sol";
import "../evmscript/ScriptHelpers.sol";
import "../../common/DelegateProxy.sol";
import "../../evmscript/ScriptHelpers.sol";


contract Target {
Expand Down
3 changes: 0 additions & 3 deletions test/acl_interpreter.js
View file

This file was deleted.

3 changes: 3 additions & 0 deletions test/contracts/acl/acl_interpreter.js
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
const runSolidityTest = require('../../helpers/runSolidityTest')

runSolidityTest('TestACLInterpreter')
0 test/apm_namehash.js → test/contracts/apm/apm_namehash.js
View file
File renamed without changes.
2 changes: 1 addition & 1 deletion test/apm_registry.js → test/contracts/apm/apm_registry.js
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
const { assertRevert } = require('./helpers/assertThrow')
const { assertRevert } = require('../../helpers/assertThrow')
const namehash = require('eth-ens-namehash').hash
const keccak256 = require('js-sha3').keccak_256

Expand Down
2 changes: 1 addition & 1 deletion test/apm_repo.js → test/contracts/apm/apm_repo.js
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
const { assertRevert } = require('./helpers/assertThrow')
const { assertRevert } = require('../../helpers/assertThrow')

const Repo = artifacts.require('UnsafeRepo')

Expand Down
4 changes: 2 additions & 2 deletions test/app_acl.js → test/contracts/apps/app_acl.js
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
const { assertRevert } = require('./helpers/assertThrow')
const { onlyIf } = require('./helpers/onlyIf')
const { assertRevert } = require('../../helpers/assertThrow')
const { onlyIf } = require('../../helpers/onlyIf')
const { hash } = require('eth-ens-namehash')

const ACL = artifacts.require('ACL')
Expand Down
4 changes: 2 additions & 2 deletions test/app_base_lifecycle.js → test/contracts/apps/app_base_lifecycle.js
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
const { assertRevert } = require('./helpers/assertThrow')
const { getBlockNumber } = require('./helpers/web3')
const { assertRevert } = require('../../helpers/assertThrow')
const { getBlockNumber } = require('../../helpers/web3')
const { hash } = require('eth-ens-namehash')
const { soliditySha3 } = require('web3-utils')

Expand Down
Loading

0 comments on commit 7052952

Please sign in to comment.