test: refactor heap testing

Author: MathisGD

test-foundry/helpers/CommonHeapOrdering.sol renamed to test-foundry/TestCommonHeapOrdering.t.sol

@@ -6,10 +6,10 @@ import "forge-std/Vm.sol";
 import "forge-std/console.sol";
 
 import "@contracts/HeapOrdering.sol";
-import "./ICommonHeapOrdering.sol";
+import "./helpers/IConcreteHeapOrdering.sol";
 
-abstract contract CommonHeapOrdering is Test {
-    ICommonHeapOrdering internal heap;
+abstract contract TestCommonHeapOrdering is Test {
+    IConcreteHeapOrdering internal heap;
 
     Vm public hevm = Vm(HEVM_ADDRESS);
 

test-foundry/TestHeapOrdering.t.sol

@@ -5,10 +5,10 @@ import "ds-test/test.sol";
 import "forge-std/Vm.sol";
 import "forge-std/console.sol";
 
-import "./helpers/CommonHeapOrdering.sol";
+import "./TestCommonHeapOrdering.t.sol";
 import "./helpers/ConcreteHeapOrdering.sol";
 
-contract TestHeapOrdering is CommonHeapOrdering {
+contract TestHeapOrdering is TestCommonHeapOrdering {
     constructor() {
         heap = new ConcreteHeapOrdering();
     }

test-foundry/TestThreeHeapOrdering.t.sol

@@ -5,10 +5,10 @@ import "forge-std/Vm.sol";
 import "forge-std/console.sol";
 import "forge-std/Test.sol";
 
-import "./helpers/CommonHeapOrdering.sol";
+import "./TestCommonHeapOrdering.t.sol";
 import "./helpers/ConcreteThreeHeapOrdering.sol";
 
-contract TestThreeHeapOrdering is CommonHeapOrdering {
+contract TestThreeHeapOrdering is TestCommonHeapOrdering {
     constructor() {
         heap = new ConcreteThreeHeapOrdering();
     }

test-foundry/helpers/ConcreteHeapOrdering.sol

@@ -2,9 +2,9 @@
 pragma solidity ^0.8.0;
 
 import "@contracts/HeapOrdering.sol";
-import "./ICommonHeapOrdering.sol";
+import "./IConcreteHeapOrdering.sol";
 
-contract ConcreteHeapOrdering is ICommonHeapOrdering {
+contract ConcreteHeapOrdering is IConcreteHeapOrdering {
     using HeapOrdering for HeapOrdering.HeapArray;
 
     HeapOrdering.HeapArray internal heap;

test-foundry/helpers/ConcreteThreeHeapOrdering.sol

@@ -2,9 +2,9 @@
 pragma solidity ^0.8.0;
 
 import "@contracts/ThreeHeapOrdering.sol";
-import "./ICommonHeapOrdering.sol";
+import "./IConcreteHeapOrdering.sol";
 
-contract ConcreteThreeHeapOrdering is ICommonHeapOrdering {
+contract ConcreteThreeHeapOrdering is IConcreteHeapOrdering {
     using ThreeHeapOrdering for ThreeHeapOrdering.HeapArray;
 
     ThreeHeapOrdering.HeapArray internal heap;

test-foundry/helpers/ICommonHeapOrdering.sol renamed to test-foundry/helpers/IConcreteHeapOrdering.sol

@@ -1,7 +1,7 @@
 // SPDX-License-Identifier: GNU AGPLv3
 pragma solidity ^0.8.0;
 
-interface ICommonHeapOrdering {
+interface IConcreteHeapOrdering {
     function update(
         address _id,
         uint256 _formerValue,

test-foundry/helpers/TestRandomHeap.sol

@@ -2,11 +2,11 @@
 pragma solidity ^0.8.13;
 
 import "./Random.sol";
-import "./ICommonHeapOrdering.sol";
+import "./IConcreteHeapOrdering.sol";
 import "forge-std/Test.sol";
 
 abstract contract TestRandomHeap is Test, Random {
-    ICommonHeapOrdering public heap;
+    IConcreteHeapOrdering public heap;
 
     address[] public ids;