Add test to improve code coverage

Author: rya-sge

foundry.toml

@@ -1,5 +1,5 @@
 [profile.default]
-solc = "0.8.30"
+solc = "0.8.33"
 src = 'src'
 out = 'out'
 libs = ['lib']

hardhat.config.js

@@ -2,7 +2,7 @@
 require("@nomicfoundation/hardhat-foundry");
 require('solidity-docgen');
 module.exports = {
-  solidity: "0.8.30",
+  solidity: "0.8.33",
   settings: {
     optimizer: {
       enabled: true,

src/mocks/RuleEngineExposed.sol

@@ -0,0 +1,37 @@
+// SPDX-License-Identifier: MPL-2.0
+pragma solidity ^0.8.20;
+
+import {RuleEngine} from "../RuleEngine.sol";
+import {RuleEngineOwnable} from "../RuleEngineOwnable.sol";
+
+/**
+ * @title RuleEngineExposed
+ * @dev Exposes internal functions for testing coverage
+ */
+contract RuleEngineExposed is RuleEngine {
+    constructor(
+        address admin,
+        address forwarder,
+        address token
+    ) RuleEngine(admin, forwarder, token) {}
+
+    function exposedMsgData() external view returns (bytes memory) {
+        return _msgData();
+    }
+}
+
+/**
+ * @title RuleEngineOwnableExposed
+ * @dev Exposes internal functions for testing coverage
+ */
+contract RuleEngineOwnableExposed is RuleEngineOwnable {
+    constructor(
+        address owner_,
+        address forwarder,
+        address token
+    ) RuleEngineOwnable(owner_, forwarder, token) {}
+
+    function exposedMsgData() external view returns (bytes memory) {
+        return _msgData();
+    }
+}

test/RuleEngine/RuleEngineCoverage.t.sol

@@ -0,0 +1,63 @@
+// SPDX-License-Identifier: MPL-2.0
+pragma solidity ^0.8.20;
+
+import "forge-std/Test.sol";
+import "../HelperContract.sol";
+import {RuleEngineExposed} from "src/mocks/RuleEngineExposed.sol";
+
+/**
+ * @title Coverage tests for RuleEngine (supportsInterface, _msgData)
+ */
+contract RuleEngineCoverageTest is Test, HelperContract {
+    RuleEngineExposed public ruleEngineExposed;
+
+    // Known interface IDs
+    bytes4 constant RULE_ENGINE_ID = 0x20c49ce7;
+    bytes4 constant ERC1404_EXTEND_ID = 0x78a8de7d;
+    bytes4 constant ERC165_ID = 0x01ffc9a7;
+    bytes4 constant INVALID_ID = 0xffffffff;
+
+    function setUp() public {
+        ruleEngineMock = new RuleEngine(
+            RULE_ENGINE_OPERATOR_ADDRESS,
+            ZERO_ADDRESS,
+            ZERO_ADDRESS
+        );
+        ruleEngineExposed = new RuleEngineExposed(
+            RULE_ENGINE_OPERATOR_ADDRESS,
+            ZERO_ADDRESS,
+            ZERO_ADDRESS
+        );
+    }
+
+    /*//////////////////////////////////////////////////////////////
+                        SUPPORTS INTERFACE
+    //////////////////////////////////////////////////////////////*/
+
+    function testSupportsRuleEngineInterface() public view {
+        assertTrue(ruleEngineMock.supportsInterface(RULE_ENGINE_ID));
+    }
+
+    function testSupportsERC1404ExtendInterface() public view {
+        assertTrue(ruleEngineMock.supportsInterface(ERC1404_EXTEND_ID));
+    }
+
+    function testSupportsERC165Interface() public view {
+        assertTrue(ruleEngineMock.supportsInterface(ERC165_ID));
+    }
+
+    function testDoesNotSupportInvalidInterface() public view {
+        assertFalse(ruleEngineMock.supportsInterface(INVALID_ID));
+    }
+
+    /*//////////////////////////////////////////////////////////////
+                            MSG DATA
+    //////////////////////////////////////////////////////////////*/
+
+    function testMsgDataReturnsCalldata() public view {
+        bytes memory data = ruleEngineExposed.exposedMsgData();
+        // Should return the calldata (selector of exposedMsgData)
+        assertEq(data.length, 4);
+        assertEq(bytes4(data), ruleEngineExposed.exposedMsgData.selector);
+    }
+}

test/RuleEngineOwnable/RuleEngineOwnableCoverage.t.sol

@@ -0,0 +1,70 @@
+// SPDX-License-Identifier: MPL-2.0
+pragma solidity ^0.8.20;
+
+import "forge-std/Test.sol";
+import "../HelperContractOwnable.sol";
+import {RuleEngineOwnableExposed} from "src/mocks/RuleEngineExposed.sol";
+
+/**
+ * @title Coverage tests for RuleEngineOwnable (supportsInterface fallback, _msgData)
+ */
+contract RuleEngineOwnableCoverageTest is Test, HelperContractOwnable {
+    RuleEngineOwnableExposed public ruleEngineOwnableExposed;
+
+    // Known interface IDs
+    bytes4 constant RULE_ENGINE_ID = 0x20c49ce7;
+    bytes4 constant ERC1404_EXTEND_ID = 0x78a8de7d;
+    bytes4 constant ERC173_ID = 0x7f5828d0;
+    bytes4 constant ERC165_ID = 0x01ffc9a7;
+    bytes4 constant INVALID_ID = 0xffffffff;
+
+    function setUp() public {
+        ruleEngineMock = new RuleEngineOwnable(
+            OWNER_ADDRESS,
+            ZERO_ADDRESS,
+            ZERO_ADDRESS
+        );
+        ruleEngineOwnableExposed = new RuleEngineOwnableExposed(
+            OWNER_ADDRESS,
+            ZERO_ADDRESS,
+            ZERO_ADDRESS
+        );
+    }
+
+    /*//////////////////////////////////////////////////////////////
+                        SUPPORTS INTERFACE
+    //////////////////////////////////////////////////////////////*/
+
+    function testSupportsRuleEngineInterface() public view {
+        assertTrue(ruleEngineMock.supportsInterface(RULE_ENGINE_ID));
+    }
+
+    function testSupportsERC1404ExtendInterface() public view {
+        assertTrue(ruleEngineMock.supportsInterface(ERC1404_EXTEND_ID));
+    }
+
+    function testSupportsERC173Interface() public view {
+        assertTrue(ruleEngineMock.supportsInterface(ERC173_ID));
+    }
+
+    function testSupportsERC165ViaAccessControlFallback() public view {
+        // This hits line 61: AccessControl.supportsInterface(interfaceId)
+        assertTrue(ruleEngineMock.supportsInterface(ERC165_ID));
+    }
+
+    function testDoesNotSupportInvalidInterface() public view {
+        // Falls through all checks including AccessControl.supportsInterface → false
+        assertFalse(ruleEngineMock.supportsInterface(INVALID_ID));
+    }
+
+    /*//////////////////////////////////////////////////////////////
+                            MSG DATA
+    //////////////////////////////////////////////////////////////*/
+
+    function testMsgDataReturnsCalldata() public view {
+        bytes memory data = ruleEngineOwnableExposed.exposedMsgData();
+        // Should return the calldata (selector of exposedMsgData)
+        assertEq(data.length, 4);
+        assertEq(bytes4(data), ruleEngineOwnableExposed.exposedMsgData.selector);
+    }
+}