100 percent testcoverage for tests

Co-authored-by: IosifKoen <[email protected]>
cetceeve · Dec 16, 2023 · 347f502 · 347f502
1 parent 6f7e721
commit 347f502
Show file tree

Hide file tree

Showing 5 changed files with 86 additions and 23 deletions.
diff --git a/.github/workflows/codecov.yml b/.github/workflows/codecov.yml
diff --git a/contract/src/ItemBlocks.sol b/contract/src/ItemBlocks.sol
@@ -40,7 +40,7 @@ contract ItemBlocks is ERC721, Ownable {
     }
 
     function updatePassport(uint tokenId, string calldata name, string calldata desc, string calldata family, string calldata url, string calldata img) public returns(uint256) {        
-        require( isEligible(tokenId, msg.sender) == true, "Must be the owner of the item or the creator of it" );
+        require( isEligible(tokenId, msg.sender), "Must be the owner of the item or the creator of it" );
 
         itemPassports[tokenId] = Passport ({
             name: name,
@@ -67,8 +67,7 @@ contract ItemBlocks is ERC721, Ownable {
     // isEligible is a funtion that it takes the tokenId and userAddress and checks
     // if the user is eligible user for this item (tokenId)
     function isEligible(uint256 tokenId, address userAddress) public view returns(bool){
-        if (userAddress == ownerOf(tokenId) || userAddress == allItemOwners[tokenId][0]) return true;
-        return false;
+        return (userAddress == ownerOf(tokenId) || userAddress == allItemOwners[tokenId][0]);
     }
 
     function setCreator(address creatorAddress, uint256 tokenId) internal {

diff --git a/contract/test/ItemBlocksTest.t.sol b/contract/test/ItemBlocksTest.t.sol
@@ -57,11 +57,6 @@ contract ItemBlocksTest is Test{
         assertTrue(itemBlocks.isEligible(12, address(420)));
     }
 
-    // TESTS FOR updateOwnership
-    function testOwnershipShouldChange() public {
-
-    }
-
     // TESTS FOR setCreator
     // should place owner into the allItemOwners array
     function testSetCreator() public {
@@ -74,6 +69,12 @@ contract ItemBlocksTest is Test{
         itemBlocks.exposed_setCreator(address(0), 12);
     }
 
+    // should fail because zero address should not be allowed
+    function testUpdateSetCreatorZeroAddress() public {
+        vm.expectRevert();
+        itemBlocks.exposed_setCreator(address(0), 12);
+    }
+
     // should fail because token 13 should not be in the mapping
     function testFailUpdateSetCreatorNoToken() public {
         itemBlocks.exposed_setCreator(address(42), 12);
@@ -86,6 +87,13 @@ contract ItemBlocksTest is Test{
         itemBlocks.exposed_setCreator(address(44), 12);
     }
 
+    // should fail because token is already owned
+    function testSetCreatorAlreadyOwner() public {
+        itemBlocks.exposed_setCreator(address(42), 12);
+        vm.expectRevert();
+        itemBlocks.exposed_setCreator(address(44), 12);
+    }
+
     //TESTS for updateOwnership
     // should not allow transfer from zero address
     function testFailUpdateOwnershipFromZeroAddress() public {

diff --git a/contract/test/TestCreatePassport.t.sol b/contract/test/TestCreatePassport.t.sol
@@ -51,7 +51,7 @@ contract ItemBlocksTest is Test{
         itemBlocks.createPassport(7, testPassport.name, testPassport.desc, testPassport.family, testPassport.url, testPassport.img);
     }
 
-    function testUpdatePassportEligibility() public {
+    function testUpdatePassport() public {
         ItemBlocks.Passport memory testPassport = ItemBlocks.Passport({
             name: "TestItemName",
             desc: "TestItemDesc",
@@ -108,4 +108,58 @@ contract ItemBlocksTest is Test{
         itemBlocks.updatePassport(tokenId, updatedPassport.name, updatedPassport.desc, updatedPassport.family, updatedPassport.url, updatedPassport.img);
     }
 
+    function testUpdatePassportNotEligibility() public {
+        ItemBlocks.Passport memory testPassport = ItemBlocks.Passport({
+            name: "TestItemName",
+            desc: "TestItemDesc",
+            family: "TestItemFamily",
+            url: "TestItemUrl",
+            img: "TestItemImg"
+        });
+
+        vm.prank(address(42));
+        uint256 tokenId = itemBlocks.createPassport(7, testPassport.name, testPassport.desc, testPassport.family, testPassport.url, testPassport.img);
+
+        ItemBlocks.Passport memory updatedPassport = ItemBlocks.Passport({
+            name: "UpdatedItemName",
+            desc: "UpdatedItemDesc",
+            family: "UpdatedItemFamily",
+            url: "UpdatedItemUrl",
+            img: "UpdatedItemImg"
+        });
+
+        //Not eligible user for passport updates.
+        vm.prank(address(40));
+        vm.expectRevert();
+        itemBlocks.updatePassport(tokenId, updatedPassport.name, updatedPassport.desc, updatedPassport.family, updatedPassport.url, updatedPassport.img);
+    }
+
+    function testUpdatePassportEligibileCreator() public {
+        ItemBlocks.Passport memory testPassport = ItemBlocks.Passport({
+            name: "TestItemName",
+            desc: "TestItemDesc",
+            family: "TestItemFamily",
+            url: "TestItemUrl",
+            img: "TestItemImg"
+        });
+
+        vm.prank(address(42));
+        uint256 tokenId = itemBlocks.createPassport(7, testPassport.name, testPassport.desc, testPassport.family, testPassport.url, testPassport.img);
+
+        vm.prank(address(42));
+        itemBlocks.updateOwnership(address(42), address(43), 7);
+
+        ItemBlocks.Passport memory updatedPassport = ItemBlocks.Passport({
+            name: "UpdatedItemName",
+            desc: "UpdatedItemDesc",
+            family: "UpdatedItemFamily",
+            url: "UpdatedItemUrl",
+            img: "UpdatedItemImg"
+        });
+
+        //Eligible as the creator
+        vm.prank(address(42));
+        itemBlocks.updatePassport(tokenId, updatedPassport.name, updatedPassport.desc, updatedPassport.family, updatedPassport.url, updatedPassport.img);
+    }
+
 }
diff --git a/contract/test/TestGetters.t.sol b/contract/test/TestGetters.t.sol
@@ -40,7 +40,12 @@ contract ItemBlocksTest is Test {
     function testFailGetCreatedItemTokensZeroAddress() public view{
         itemBlocks.getCreatedItemTokens(address(0));
     }
-
+
+    // should fail for null address
+    function testGetCreatedItemTokensZeroAddress() public {
+        vm.expectRevert();
+        itemBlocks.getCreatedItemTokens(address(0));
+    }
     // should return list of users who owned this token
     function testGetUserHistory() public {
         assertEq(itemBlocks.getUserHistory(7)[0], address(42));
@@ -51,6 +56,11 @@ contract ItemBlocksTest is Test {
         itemBlocks.getUserHistory(1234);
     }
 
+    // should fail if token doesn't exits
+    function testUserHistoryZeroAddress() public {
+        vm.expectRevert();
+        itemBlocks.getUserHistory(1234);
+    }
     // should return passport
     function testGetPassport() public {
         ItemBlocks.Passport memory p = itemBlocks.getPassport(7);
@@ -66,4 +76,9 @@ contract ItemBlocksTest is Test {
         itemBlocks.getPassport(1234);
     }
 
+    // should fail if token doesn't exits
+    function testGetPassportNotToken() public {
+        vm.expectRevert();
+        itemBlocks.getPassport(1234);
+    }
 }