From b0f7f74551b030afb9bd1414d4883c1fbadc161c Mon Sep 17 00:00:00 2001
From: andreivladbrg <andreivladbrg@gmail.com>
Date: Fri, 10 Jan 2025 19:09:29 +0200
Subject: [PATCH] test: refactor tests to use Unit_Test

---
 tests/unit/adminable/transferAdmin.t.sol         | 8 +++-----
 tests/unit/batch/batch.t.sol                     | 6 +++---
 tests/unit/no-delegate-call/noDelegateCall.t.sol | 6 +++---
 3 files changed, 9 insertions(+), 11 deletions(-)

diff --git a/tests/unit/adminable/transferAdmin.t.sol b/tests/unit/adminable/transferAdmin.t.sol
index 25742e8..5ff7935 100644
--- a/tests/unit/adminable/transferAdmin.t.sol
+++ b/tests/unit/adminable/transferAdmin.t.sol
@@ -4,16 +4,14 @@ pragma solidity >=0.8.22 <0.9.0;
 import { IAdminable } from "src/interfaces/IAdminable.sol";
 import { Errors } from "src/libraries/Errors.sol";
 
-import { CommonBase } from "../../Base.t.sol";
+import { Unit_Test } from "../Unit.t.sol";
 import { AdminableMock } from "../../mocks/AdminableMock.sol";
 
-contract TransferAdmin_Unit_Concrete_Test is CommonBase {
+contract TransferAdmin_Unit_Concrete_Test is Unit_Test {
     AdminableMock internal adminableMock;
-    address internal admin;
-    address internal eve;
 
     function setUp() public virtual override {
-        CommonBase.setUp();
+        Unit_Test.setUp();
 
         admin = createUser("admin");
         eve = createUser("eve");
diff --git a/tests/unit/batch/batch.t.sol b/tests/unit/batch/batch.t.sol
index 9aab306..1c6f47c 100644
--- a/tests/unit/batch/batch.t.sol
+++ b/tests/unit/batch/batch.t.sol
@@ -1,17 +1,17 @@
 // SPDX-License-Identifier: UNLICENSED
 pragma solidity >=0.8.22;
 
-import { CommonBase } from "../../Base.t.sol";
+import { Unit_Test } from "../Unit.t.sol";
 import { BatchMock } from "../../mocks/BatchMock.sol";
 
-contract Batch_Unit_Concrete_Test is CommonBase {
+contract Batch_Unit_Concrete_Test is Unit_Test {
     BatchMock internal batchMock;
     bytes[] internal calls;
     uint256 internal newNumber = 100;
     bytes[] internal results;
 
     function setUp() public virtual override {
-        CommonBase.setUp();
+        Unit_Test.setUp();
 
         batchMock = new BatchMock();
     }
diff --git a/tests/unit/no-delegate-call/noDelegateCall.t.sol b/tests/unit/no-delegate-call/noDelegateCall.t.sol
index 74608e7..868b8c8 100644
--- a/tests/unit/no-delegate-call/noDelegateCall.t.sol
+++ b/tests/unit/no-delegate-call/noDelegateCall.t.sol
@@ -3,14 +3,14 @@ pragma solidity >=0.8.22;
 
 import { Errors } from "src/libraries/Errors.sol";
 
-import { CommonBase } from "../../Base.t.sol";
+import { Unit_Test } from "../Unit.t.sol";
 import { NoDelegateCallMock } from "../../mocks/NoDelegateCallMock.sol";
 
-contract NoDelegateCall_Unit_Concrete_Test is CommonBase {
+contract NoDelegateCall_Unit_Concrete_Test is Unit_Test {
     NoDelegateCallMock internal noDelegateCallMock;
 
     function setUp() public virtual override {
-        CommonBase.setUp();
+        Unit_Test.setUp();
 
         noDelegateCallMock = new NoDelegateCallMock();
     }