Refactor the test file structure

* Test Folder restructured

* Rename folder mistake

* adapt rest of references

* Delete TestFolderRefactoring.md

* adapt remappings

* Moving contracts into correct positions

* Move contract

* Moving more contracts

* Moving contract

* Fixing References

Author: FHieser

remappings.txt

@@ -9,3 +9,6 @@
 @lm_pc/=src/modules/logicModule/paymentClient/
 @aut/=src/modules/authorizer/
 @modLib/=src/modules/lib/
+@mocks/=test/mocks/
+@testUtilities/=test/testUtilities/
+@unitTest/=test/unit/

script/deploymentScript/TestnetDeploymentScript.s.sol

@@ -16,8 +16,8 @@ import {IERC20} from "@oz/token/ERC20/IERC20.sol";
 import {
     OptimisticOracleV3Mock,
     OptimisticOracleV3Interface
-} from "test/modules/logicModule/oracle/utils/OptimisiticOracleV3Mock.sol";
-import {ERC20Mock} from "test/utils/mocks/ERC20Mock.sol";
+} from "@mocks/modules/logicModule/oracle/OptimisiticOracleV3Mock.sol";
+import {ERC20Mock} from "@mocks/external/token/ERC20Mock.sol";
 
 /**
  * @title Inverter Testnet Deployment Script

src/templates/tests/unit/FM_Template_v1.t.sol

@@ -6,8 +6,8 @@ import {
     ModuleTest,
     IModule_v1,
     IOrchestrator_v1
-} from "test/modules/ModuleTest.sol";
-import {OZErrors} from "test/utils/errors/OZErrors.sol";
+} from "@unitTest/modules/ModuleTest.sol";
+import {OZErrors} from "@testUtilities/OZErrors.sol";
 import {IFundingManager_v1} from "@fm/IFundingManager_v1.sol";
 
 // External
@@ -16,11 +16,11 @@ import {Clones} from "@oz/proxy/Clones.sol";
 // Tests and Mocks
 import {FM_Template_v1_Exposed} from
     "src/templates/tests/unit/FM_Template_v1_Exposed.sol";
-import {ERC20Mock} from "test/utils/mocks/ERC20Mock.sol";
+import {ERC20Mock} from "@mocks/external/token/ERC20Mock.sol";
 import {
     IERC20PaymentClientBase_v2,
     ERC20PaymentClientBaseV2Mock
-} from "test/utils/mocks/modules/paymentClient/ERC20PaymentClientBaseV2Mock.sol";
+} from "@mocks/modules/paymentClient/ERC20PaymentClientBaseV2Mock.sol";
 
 // System under Test (SuT)
 import {IFM_Template_v1} from "src/templates/modules/IFM_Template_v1.sol";

src/templates/tests/unit/LM_PC_Template_v1.t.sol

@@ -6,9 +6,9 @@ import {
     ModuleTest,
     IModule_v1,
     IOrchestrator_v1
-} from "test/modules/ModuleTest.sol";
-import {OZErrors} from "test/utils/errors/OZErrors.sol";
-import {ERC20Mock} from "test/utils/mocks/ERC20Mock.sol";
+} from "@unitTest/modules/ModuleTest.sol";
+import {OZErrors} from "@testUtilities/OZErrors.sol";
+import {ERC20Mock} from "@mocks/external/token/ERC20Mock.sol";
 
 // External
 import {Clones} from "@oz/proxy/Clones.sol";
@@ -17,7 +17,7 @@ import {Clones} from "@oz/proxy/Clones.sol";
 import {
     IERC20PaymentClientBase_v2,
     ERC20PaymentClientBaseV2Mock
-} from "test/utils/mocks/modules/paymentClient/ERC20PaymentClientBaseV2Mock.sol";
+} from "@mocks/modules/paymentClient/ERC20PaymentClientBaseV2Mock.sol";
 
 // System under Test (SuT)
 import {LM_PC_Template_v1_Exposed} from

src/templates/tests/unit/PP_Template_v1.t.sol

@@ -6,8 +6,8 @@ import {
     ModuleTest,
     IModule_v1,
     IOrchestrator_v1
-} from "test/modules/ModuleTest.sol";
-import {OZErrors} from "test/utils/errors/OZErrors.sol";
+} from "@unitTest/modules/ModuleTest.sol";
+import {OZErrors} from "@testUtilities/OZErrors.sol";
 
 // External
 import {Clones} from "@oz/proxy/Clones.sol";
@@ -19,7 +19,7 @@ import {
     IERC20PaymentClientBase_v2,
     ERC20PaymentClientBaseV2Mock,
     ERC20Mock
-} from "test/utils/mocks/modules/paymentClient/ERC20PaymentClientBaseV2Mock.sol";
+} from "@mocks/modules/paymentClient/ERC20PaymentClientBaseV2Mock.sol";
 
 // System under Test (SuT)
 import {

test/e2e/E2ETest.sol

@@ -44,7 +44,7 @@ import {IFM_BC_Bancor_Redeeming_VirtualSupply_v1} from
 import {BancorFormula} from "@fm/bondingCurve/formulas/BancorFormula.sol";
 
 // Mocks
-import {ERC20Mock} from "test/utils/mocks/ERC20Mock.sol";
+import {ERC20Mock} from "@mocks/external/token/ERC20Mock.sol";
 
 // External Dependencies
 import {TransparentUpgradeableProxy} from

test/e2e/fundingManager/BondingCurveFundingManagerE2E.t.sol

@@ -17,7 +17,7 @@ import {
     FM_BC_Bancor_Redeeming_VirtualSupply_v1,
     IFM_BC_Bancor_Redeeming_VirtualSupply_v1
 } from
-    "test/modules/fundingManager/bondingCurve/FM_BC_Bancor_Redeeming_VirtualSupply_v1.t.sol";
+    "@unitTest/modules/fundingManager/bondingCurve/FM_BC_Bancor_Redeeming_VirtualSupply_v1.t.sol";
 import {IBondingCurveBase_v1} from
     "@fm/bondingCurve/interfaces/IBondingCurveBase_v1.sol";
 

test/e2e/fundingManager/BondingCurveTokenRescueE2E.t.sol

@@ -18,7 +18,7 @@ import {
     FM_BC_Bancor_Redeeming_VirtualSupply_v1,
     IFM_BC_Bancor_Redeeming_VirtualSupply_v1
 } from
-    "test/modules/fundingManager/bondingCurve/FM_BC_Bancor_Redeeming_VirtualSupply_v1.t.sol";
+    "@unitTest/modules/fundingManager/bondingCurve/FM_BC_Bancor_Redeeming_VirtualSupply_v1.t.sol";
 import {IBondingCurveBase_v1} from
     "@fm/bondingCurve/interfaces/IBondingCurveBase_v1.sol";
 

…dManualQueueBasedPaymentProcessorE2E.sol …dManualQueueBasedPaymentProcessorE2E.soltest/e2e/OracleFundingManagerAndManualQueueBasedPaymentProcessorE2E.sol renamed to test/e2e/fundingManager/oracle/OracleFundingManagerAndManualQueueBasedPaymentProcessorE2E.sol test/e2e/OracleFundingManagerAndManualQueueBasedPaymentProcessorE2E.sol renamed to test/e2e/fundingManager/oracle/OracleFundingManagerAndManualQueueBasedPaymentProcessorE2E.sol

@@ -37,7 +37,7 @@ import {ERC165Upgradeable} from
 
 import {InverterBeacon_v1} from "src/proxies/InverterBeacon_v1.sol";
 
-import {ERC20Mock} from "test/utils/mocks/ERC20Mock.sol";
+import {ERC20Mock} from "@mocks/external/token/ERC20Mock.sol";
 
 import {IERC20PaymentClientBase_v2} from
     "@lm/interfaces/IERC20PaymentClientBase_v2.sol";