keys & values functions tests

Author: NouDaimon

contracts/data/EnumerableMapAddressToAddressMock.sol

@@ -40,4 +40,12 @@ contract EnumerableMapAddressToAddressMock {
     {
         (keys, values) = map.toArray();
     }
+
+    function keys() external view returns (address[] memory keys) {
+        keys = map.keys();
+    }
+
+    function values() external view returns (address[] memory values) {
+        values = map.values();
+    }
 }

contracts/data/EnumerableMapUintToAddressMock.sol

@@ -40,4 +40,12 @@ contract EnumerableMapUintToAddressMock {
     {
         (keys, values) = map.toArray();
     }
+
+    function keys() external view returns (uint256[] memory keys) {
+        keys = map.keys();
+    }
+
+    function values() external view returns (address[] memory values) {
+        values = map.values();
+    }
 }

test/data/EnumerableMap.ts

@@ -200,6 +200,30 @@ describe('EnumerableMap', () => {
           expect(values).to.deep.equal([addressFour, addressFive, addressSix]);
         });
       });
+
+      describe('#keys()', () => {
+        it('returns array of keys in map', async () => {
+          await instance['set(address,address)'](addressOne, addressFour);
+          await instance['set(address,address)'](addressTwo, addressFive);
+          await instance['set(address,address)'](addressThree, addressSix);
+
+          const keys = await instance.callStatic['keys()']();
+
+          expect(keys).to.deep.equal([addressOne, addressTwo, addressThree]);
+        });
+      });
+
+      describe('#values()', () => {
+        it('returns array of values in map', async () => {
+          await instance['set(address,address)'](addressOne, addressFour);
+          await instance['set(address,address)'](addressTwo, addressFive);
+          await instance['set(address,address)'](addressThree, addressSix);
+
+          const values = await instance.callStatic['values()']();
+
+          expect(values).to.deep.equal([addressFour, addressFive, addressSix]);
+        });
+      });
     });
   });
 
@@ -391,6 +415,30 @@ describe('EnumerableMap', () => {
           expect(values).to.deep.equal([addressOne, addressTwo, addressThree]);
         });
       });
+
+      describe('#keys()', () => {
+        it('returns array of keys in map', async () => {
+          await instance['set(uint256,address)'](uintOne, addressOne);
+          await instance['set(uint256,address)'](uintTwo, addressTwo);
+          await instance['set(uint256,address)'](uintThree, addressThree);
+
+          const keys = await instance.callStatic['keys()']();
+
+          expect(keys).to.deep.equal([uintOne, uintTwo, uintThree]);
+        });
+      });
+
+      describe('#values()', () => {
+        it('returns array of values in map', async () => {
+          await instance['set(uint256,address)'](uintOne, addressOne);
+          await instance['set(uint256,address)'](uintTwo, addressTwo);
+          await instance['set(uint256,address)'](uintThree, addressThree);
+
+          const values = await instance.callStatic['values()']();
+
+          expect(values).to.deep.equal([addressOne, addressTwo, addressThree]);
+        });
+      });
     });
   });
 });