test: Add MyShinyFacetTest for shine functionality

Author: dadadave80

test/MyShinyFacetTest.t.sol

@@ -0,0 +1,13 @@
+// SPDX-License-Identifier: MIT
+pragma solidity ^0.8.4;
+
+import {Test, console} from "forge-std/Test.sol";
+import {MyShinyFacet} from "@diamond/facets/MyShinyFacet.sol";
+import {AddMyShinyFacetState} from "./helpers/TestStates.sol";
+
+contract MyShinyFacetTest is AddMyShinyFacetState {
+    function testSetAndGetShine() public {
+        MyShinyFacet(address(diamond)).setShine(50);
+        assertEq(MyShinyFacet(address(diamond)).getShine(), 50);
+    }
+}

test/helpers/TestStates.sol

@@ -3,20 +3,21 @@ pragma solidity ^0.8.4;
 
 import {Test, console} from "forge-std/Test.sol";
 import {DeployDiamond} from "@diamond-script/DeployDiamond.s.sol";
+import {DeployDiamondHelper} from "@diamond-test/helpers/DeployDiamondHelper.sol";
 import {Diamond} from "@diamond/Diamond.sol";
 import {IDiamondCut} from "@diamond/interfaces/IDiamondCut.sol";
 import {IDiamondLoupe} from "@diamond/interfaces/IDiamondLoupe.sol";
 import {HelperContract} from "@diamond-test/helpers/HelperContract.sol";
+import {MyShinyFacet} from "@diamond/facets/MyShinyFacet.sol";
+import {AddMyShinyFacet} from "@diamond-script/AddMyShinyFacet.s.sol";
+import {AddMyShinyFacetHelper} from "@diamond-test/helpers/AddMyShinyFacetHelper.sol";
 
 /// @notice Provides shared state for tests involving a freshly deployed Diamond contract.
 /// @dev Sets up references to deployed facets, interfaces, and the diamond itself for testing.
-abstract contract DeployedDiamondState is HelperContract {
+abstract contract DeployedDiamondState is DeployDiamondHelper {
     /// @notice Instance of the deployed Diamond contract.
     Diamond public diamond;
 
-    /// @notice Script used to deploy the Diamond contract.
-    DeployDiamond public deployDiamond;
-
     /// @notice Interface for the DiamondCut functionality of the deployed diamond.
     IDiamondCut public diamondCut;
 
@@ -32,12 +33,43 @@ abstract contract DeployedDiamondState is HelperContract {
     /// @notice Deploys the Diamond contract and initializes interface references and facet addresses.
     /// @dev This function is intended to be called in a test setup phase (e.g., `setUp()` in Foundry).
     function setUp() public {
-        deployDiamond = new DeployDiamond();
-        diamond = deployDiamond.run();
+        diamond = _deployDiamond(diamondOwner);
+
+        diamondCut = IDiamondCut(address(diamond));
+        diamondLoupe = IDiamondLoupe(address(diamond));
+
+        facetAddresses = diamondLoupe.facetAddresses();
+    }
+}
+
+abstract contract AddMyShinyFacetState is DeployDiamondHelper, AddMyShinyFacetHelper {
+    /// @notice Instance of the deployed Diamond contract.
+    Diamond public diamond;
+
+    /// @notice Interface for the DiamondCut functionality of the deployed diamond.
+    IDiamondCut public diamondCut;
+
+    /// @notice Interface for the DiamondLoupe functionality of the deployed diamond.
+    IDiamondLoupe public diamondLoupe;
+
+    /// @notice Stores the facet addresses returned from the diamond loupe.
+    address[] public facetAddresses;
+
+    MyShinyFacet public myShinyFacet;
+
+    AddMyShinyFacet public addMyShinyFacet;
+
+    string[4] public facetNames = ["DiamondCutFacet", "DiamondLoupeFacet", "OwnableRolesFacet", "MyShinyFacet"];
+
+    function setUp() public {
+        vm.startPrank(diamondOwner);
+        diamond = _deployDiamond(diamondOwner);
 
         diamondCut = IDiamondCut(address(diamond));
         diamondLoupe = IDiamondLoupe(address(diamond));
 
+        myShinyFacet = _addMyShinyFacet(diamond);
+
         facetAddresses = diamondLoupe.facetAddresses();
     }
 }