Done part 3

.idea/workspace.xml

@@ -2,11 +2,10 @@
 <project version="4">
   <component name="ChangeListManager">
     <list default="true" id="83830738-28db-4c65-8a38-09ae1bf50ffe" name="Default Changelist" comment="">
-      <change afterPath="$PROJECT_DIR$/src/main/java/Entry.java" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/src/main/java/MyMap.java" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/src/test/java/MyMapTest.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/MyArrayList.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/MyArrayList.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/Entry.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/Entry.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/MyMap.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/MyMap.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/MySet.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/MySet.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/test/java/MyMapTest.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/test/java/MyMapTest.java" afterDir="false" />
     </list>
     <ignored path="$PROJECT_DIR$/target/" />
     <option name="EXCLUDED_CONVERTED_TO_IGNORED" value="true" />
@@ -17,11 +16,12 @@
   </component>
   <component name="CoverageDataManager">
     <SUITE FILE_PATH="coverage/generics$MyArrayListTest.ic" NAME="MyArrayListTest Coverage Results" MODIFIED="1542144019155" SOURCE_PROVIDER="com.intellij.coverage.DefaultCoverageFileProvider" RUNNER="idea" COVERAGE_BY_TEST_ENABLED="false" COVERAGE_TRACING_ENABLED="false" />
+    <SUITE FILE_PATH="coverage/generics$MyMapTest.ic" NAME="MyMapTest Coverage Results" MODIFIED="1542150510047" SOURCE_PROVIDER="com.intellij.coverage.DefaultCoverageFileProvider" RUNNER="idea" COVERAGE_BY_TEST_ENABLED="false" COVERAGE_TRACING_ENABLED="false" />
     <SUITE FILE_PATH="coverage/generics$MyArrayListTest_testContainsOfEmptyArray.ic" NAME="MyArrayListTest.testContainsOfEmptyArray Coverage Results" MODIFIED="1542141601234" SOURCE_PROVIDER="com.intellij.coverage.DefaultCoverageFileProvider" RUNNER="idea" COVERAGE_BY_TEST_ENABLED="false" COVERAGE_TRACING_ENABLED="false" />
     <SUITE FILE_PATH="coverage/generics$MySetTest.ic" NAME="MySetTest Coverage Results" MODIFIED="1542143972716" SOURCE_PROVIDER="com.intellij.coverage.DefaultCoverageFileProvider" RUNNER="idea" COVERAGE_BY_TEST_ENABLED="false" COVERAGE_TRACING_ENABLED="false" />
   </component>
   <component name="CoverageViewManager">
-    <option name="myElementSize" value="253" />
+    <option name="myElementSize" value="256" />
   </component>
   <component name="FUSProjectUsageTrigger">
     <session id="1662657773">
@@ -34,23 +34,23 @@
       <usages-collector id="statistics.file.extensions.open">
         <counts>
           <entry key="gitignore" value="1" />
-          <entry key="java" value="18" />
+          <entry key="java" value="20" />
         </counts>
       </usages-collector>
       <usages-collector id="statistics.file.types.open">
         <counts>
-          <entry key="JAVA" value="18" />
+          <entry key="JAVA" value="20" />
           <entry key="PLAIN_TEXT" value="1" />
         </counts>
       </usages-collector>
       <usages-collector id="statistics.file.extensions.edit">
         <counts>
-          <entry key="java" value="4372" />
+          <entry key="java" value="5489" />
         </counts>
       </usages-collector>
       <usages-collector id="statistics.file.types.edit">
         <counts>
-          <entry key="JAVA" value="4372" />
+          <entry key="JAVA" value="5489" />
         </counts>
       </usages-collector>
     </session>
@@ -62,8 +62,8 @@
           <file pinned="false" current-in-tab="false">
             <entry file="file://$PROJECT_DIR$/src/main/java/MyArrayList.java">
               <provider selected="true" editor-type-id="text-editor">
-                <state relative-caret-position="240">
-                  <caret line="16" column="21" lean-forward="true" selection-start-line="16" selection-start-column="21" selection-end-line="16" selection-end-column="21" />
+                <state relative-caret-position="-659">
+                  <caret line="34" column="34" selection-start-line="34" selection-start-column="34" selection-end-line="34" selection-end-column="34" />
                   <folding>
                     <element signature="e#258#259#0" expanded="true" />
                     <element signature="e#286#287#0" expanded="true" />
@@ -81,8 +81,8 @@
           <file pinned="false" current-in-tab="true">
             <entry file="file://$PROJECT_DIR$/src/main/java/MyMap.java">
               <provider selected="true" editor-type-id="text-editor">
-                <state relative-caret-position="178">
-                  <caret line="33" selection-start-line="33" selection-end-line="33" />
+                <state relative-caret-position="262">
+                  <caret line="91" column="4" selection-start-line="91" selection-start-column="4" selection-end-line="91" selection-end-column="4" />
                   <folding>
                     <element signature="e#110#111#0" expanded="true" />
                     <element signature="e#137#138#0" expanded="true" />
@@ -94,8 +94,8 @@
           <file pinned="false" current-in-tab="false">
             <entry file="file://$PROJECT_DIR$/src/main/java/Entry.java">
               <provider selected="true" editor-type-id="text-editor">
-                <state relative-caret-position="255">
-                  <caret line="17" column="11" selection-start-line="17" selection-start-column="11" selection-end-line="17" selection-end-column="11" />
+                <state relative-caret-position="180">
+                  <caret line="12" lean-forward="true" selection-start-line="12" selection-end-line="12" />
                   <folding>
                     <element signature="e#169#170#0" expanded="true" />
                     <element signature="e#195#196#0" expanded="true" />
@@ -110,6 +110,15 @@
               </provider>
             </entry>
           </file>
+          <file pinned="false" current-in-tab="false">
+            <entry file="file://$PROJECT_DIR$/src/main/java/MySet.java">
+              <provider selected="true" editor-type-id="text-editor">
+                <state relative-caret-position="533">
+                  <caret line="39" selection-start-line="39" selection-end-line="39" />
+                </state>
+              </provider>
+            </entry>
+          </file>
         </leaf>
       </split-first>
       <split-second>
@@ -117,8 +126,8 @@
           <file pinned="false" current-in-tab="true">
             <entry file="file://$PROJECT_DIR$/src/test/java/MyMapTest.java">
               <provider selected="true" editor-type-id="text-editor">
-                <state relative-caret-position="264">
-                  <caret line="70" column="46" lean-forward="true" selection-start-line="70" selection-start-column="46" selection-end-line="70" selection-end-column="46" />
+                <state relative-caret-position="504">
+                  <caret line="127" column="34" selection-start-line="127" selection-start-column="34" selection-end-line="127" selection-end-column="34" />
                   <folding>
                     <element signature="imports" expanded="true" />
                   </folding>
@@ -169,12 +178,12 @@
       <list>
         <option value="$PROJECT_DIR$/src/main/java/Node.java" />
         <option value="$PROJECT_DIR$/src/test/java/MyArrayListTest.java" />
-        <option value="$PROJECT_DIR$/src/main/java/MySet.java" />
         <option value="$PROJECT_DIR$/src/test/java/MySetTest.java" />
-        <option value="$PROJECT_DIR$/src/test/java/MyMapTest.java" />
+        <option value="$PROJECT_DIR$/src/main/java/MyArrayList.java" />
+        <option value="$PROJECT_DIR$/src/main/java/MySet.java" />
         <option value="$PROJECT_DIR$/src/main/java/Entry.java" />
+        <option value="$PROJECT_DIR$/src/test/java/MyMapTest.java" />
         <option value="$PROJECT_DIR$/src/main/java/MyMap.java" />
-        <option value="$PROJECT_DIR$/src/main/java/MyArrayList.java" />
       </list>
     </option>
   </component>
@@ -245,7 +254,7 @@
   <component name="PropertiesComponent">
     <property name="WebServerToolWindowFactoryState" value="false" />
     <property name="aspect.path.notification.shown" value="true" />
-    <property name="com.android.tools.idea.instantapp.provision.ProvisionBeforeRunTaskProvider.myTimeStamp" value="1542148562422" />
+    <property name="com.android.tools.idea.instantapp.provision.ProvisionBeforeRunTaskProvider.myTimeStamp" value="1542151686248" />
     <property name="nodejs_interpreter_path.stuck_in_default_project" value="undefined stuck path" />
     <property name="nodejs_npm_path_reset_for_default_project" value="true" />
   </component>
@@ -266,69 +275,67 @@
       </list>
     </option>
   </component>
-  <component name="RunManager" selected="JUnit.MyMapTest.testContainsValue">
-    <configuration name="MyArrayListTest" type="JUnit" factoryName="JUnit" temporary="true" nameIsGenerated="true">
+  <component name="RunManager" selected="JUnit.MyMapTest.testRemoveByKey">
+    <configuration name="All in generics" type="JUnit" factoryName="JUnit" temporary="true" nameIsGenerated="true">
       <module name="generics" />
       <option name="PACKAGE_NAME" value="" />
-      <option name="MAIN_CLASS_NAME" value="MyArrayListTest" />
+      <option name="TEST_OBJECT" value="package" />
       <method v="2">
         <option name="Make" enabled="true" />
       </method>
     </configuration>
-    <configuration name="MyMapTest.testClear" type="JUnit" factoryName="JUnit" temporary="true" nameIsGenerated="true">
+    <configuration name="MyMapTest" type="JUnit" factoryName="JUnit" temporary="true" nameIsGenerated="true">
       <module name="generics" />
       <option name="PACKAGE_NAME" value="" />
       <option name="MAIN_CLASS_NAME" value="MyMapTest" />
-      <option name="METHOD_NAME" value="testClear" />
-      <option name="TEST_OBJECT" value="method" />
       <method v="2">
         <option name="Make" enabled="true" />
       </method>
     </configuration>
-    <configuration name="MyMapTest.testContainsKey" type="JUnit" factoryName="JUnit" temporary="true" nameIsGenerated="true">
+    <configuration name="MyMapTest.testPutAll" type="JUnit" factoryName="JUnit" temporary="true" nameIsGenerated="true">
       <module name="generics" />
       <option name="PACKAGE_NAME" value="" />
       <option name="MAIN_CLASS_NAME" value="MyMapTest" />
-      <option name="METHOD_NAME" value="testContainsKey" />
+      <option name="METHOD_NAME" value="testPutAll" />
       <option name="TEST_OBJECT" value="method" />
       <method v="2">
         <option name="Make" enabled="true" />
       </method>
     </configuration>
-    <configuration name="MyMapTest.testContainsValue" type="JUnit" factoryName="JUnit" temporary="true" nameIsGenerated="true">
+    <configuration name="MyMapTest.testRemove" type="JUnit" factoryName="JUnit" temporary="true" nameIsGenerated="true">
       <module name="generics" />
       <option name="PACKAGE_NAME" value="" />
       <option name="MAIN_CLASS_NAME" value="MyMapTest" />
-      <option name="METHOD_NAME" value="testContainsValue" />
+      <option name="METHOD_NAME" value="testRemove" />
       <option name="TEST_OBJECT" value="method" />
       <method v="2">
         <option name="Make" enabled="true" />
       </method>
     </configuration>
-    <configuration name="MyMapTest.testSize2" type="JUnit" factoryName="JUnit" temporary="true" nameIsGenerated="true">
+    <configuration name="MyMapTest.testRemoveByKey" type="JUnit" factoryName="JUnit" temporary="true" nameIsGenerated="true">
       <module name="generics" />
       <option name="PACKAGE_NAME" value="" />
       <option name="MAIN_CLASS_NAME" value="MyMapTest" />
-      <option name="METHOD_NAME" value="testSize2" />
+      <option name="METHOD_NAME" value="testRemoveByKey" />
       <option name="TEST_OBJECT" value="method" />
       <method v="2">
         <option name="Make" enabled="true" />
       </method>
     </configuration>
     <list>
-      <item itemvalue="JUnit.MyMapTest.testSize2" />
-      <item itemvalue="JUnit.MyMapTest.testClear" />
-      <item itemvalue="JUnit.MyArrayListTest" />
-      <item itemvalue="JUnit.MyMapTest.testContainsKey" />
-      <item itemvalue="JUnit.MyMapTest.testContainsValue" />
+      <item itemvalue="JUnit.MyMapTest" />
+      <item itemvalue="JUnit.MyMapTest.testPutAll" />
+      <item itemvalue="JUnit.MyMapTest.testRemove" />
+      <item itemvalue="JUnit.MyMapTest.testRemoveByKey" />
+      <item itemvalue="JUnit.All in generics" />
     </list>
     <recent_temporary>
       <list>
-        <item itemvalue="JUnit.MyMapTest.testContainsValue" />
-        <item itemvalue="JUnit.MyMapTest.testContainsKey" />
-        <item itemvalue="JUnit.MyMapTest.testClear" />
-        <item itemvalue="JUnit.MyMapTest.testSize2" />
-        <item itemvalue="JUnit.MyArrayListTest" />
+        <item itemvalue="JUnit.MyMapTest.testRemoveByKey" />
+        <item itemvalue="JUnit.All in generics" />
+        <item itemvalue="JUnit.MyMapTest" />
+        <item itemvalue="JUnit.MyMapTest.testRemove" />
+        <item itemvalue="JUnit.MyMapTest.testPutAll" />
       </list>
     </recent_temporary>
   </component>
@@ -342,44 +349,44 @@
       <option name="number" value="Default" />
       <option name="presentableId" value="Default" />
       <updated>1542134351966</updated>
-      <workItem from="1542134355138" duration="14057000" />
+      <workItem from="1542134355138" duration="16962000" />
     </task>
     <servers />
   </component>
   <component name="TestHistory">
-    <history-entry file="MyMapTest_testContainsKey - 2018.11.13 at 17h 17m 25s.xml">
-      <configuration name="MyMapTest.testContainsKey" configurationId="JUnit" />
+    <history-entry file="MyMapTest_testRemoveByKey - 2018.11.13 at 18h 22m 10s.xml">
+      <configuration name="MyMapTest.testRemoveByKey" configurationId="JUnit" />
     </history-entry>
-    <history-entry file="MyMapTest_testContainsKey - 2018.11.13 at 17h 17m 43s.xml">
-      <configuration name="MyMapTest.testContainsKey" configurationId="JUnit" />
+    <history-entry file="MyMapTest_testRemoveByKey - 2018.11.13 at 18h 22m 44s.xml">
+      <configuration name="MyMapTest.testRemoveByKey" configurationId="JUnit" />
     </history-entry>
-    <history-entry file="MyMapTest_testContainsKey - 2018.11.13 at 17h 18m 22s.xml">
-      <configuration name="MyMapTest.testContainsKey" configurationId="JUnit" />
+    <history-entry file="MyMapTest_testRemoveByKey - 2018.11.13 at 18h 22m 55s.xml">
+      <configuration name="MyMapTest.testRemoveByKey" configurationId="JUnit" />
     </history-entry>
-    <history-entry file="MyMapTest_testContainsKey - 2018.11.13 at 17h 19m 34s.xml">
-      <configuration name="MyMapTest.testContainsKey" configurationId="JUnit" />
+    <history-entry file="MyMapTest_testRemoveByKey - 2018.11.13 at 18h 23m 42s.xml">
+      <configuration name="MyMapTest.testRemoveByKey" configurationId="JUnit" />
     </history-entry>
-    <history-entry file="MyMapTest_testContainsKey - 2018.11.13 at 17h 19m 56s.xml">
-      <configuration name="MyMapTest.testContainsKey" configurationId="JUnit" />
+    <history-entry file="MyMapTest - 2018.11.13 at 18h 23m 52s.xml">
+      <configuration name="MyMapTest" configurationId="JUnit" />
     </history-entry>
-    <history-entry file="MyMapTest_testContainsKey - 2018.11.13 at 17h 21m 24s.xml">
-      <configuration name="MyMapTest.testContainsKey" configurationId="JUnit" />
+    <history-entry file="MyMapTest_testRemoveByKey - 2018.11.13 at 18h 24m 13s.xml">
+      <configuration name="MyMapTest.testRemoveByKey" configurationId="JUnit" />
     </history-entry>
-    <history-entry file="MyMapTest_testContainsKey - 2018.11.13 at 17h 22m 05s.xml">
-      <configuration name="MyMapTest.testContainsKey" configurationId="JUnit" />
+    <history-entry file="MyMapTest_testRemoveByKey - 2018.11.13 at 18h 24m 32s.xml">
+      <configuration name="MyMapTest.testRemoveByKey" configurationId="JUnit" />
     </history-entry>
-    <history-entry file="MyMapTest_testContainsValue - 2018.11.13 at 17h 30m 21s.xml">
-      <configuration name="MyMapTest.testContainsValue" configurationId="JUnit" />
+    <history-entry file="MyMapTest_testRemoveByKey - 2018.11.13 at 18h 25m 39s.xml">
+      <configuration name="MyMapTest.testRemoveByKey" configurationId="JUnit" />
     </history-entry>
-    <history-entry file="MyMapTest_testContainsValue - 2018.11.13 at 17h 35m 11s.xml">
-      <configuration name="MyMapTest.testContainsValue" configurationId="JUnit" />
+    <history-entry file="MyMapTest - 2018.11.13 at 18h 25m 51s.xml">
+      <configuration name="MyMapTest" configurationId="JUnit" />
     </history-entry>
-    <history-entry file="MyMapTest_testContainsValue - 2018.11.13 at 17h 36m 06s.xml">
-      <configuration name="MyMapTest.testContainsValue" configurationId="JUnit" />
+    <history-entry file="All_in_generics - 2018.11.13 at 18h 25m 58s.xml">
+      <configuration name="All in generics" configurationId="JUnit" />
     </history-entry>
   </component>
   <component name="TimeTrackingManager">
-    <option name="totallyTimeSpent" value="14057000" />
+    <option name="totallyTimeSpent" value="16962000" />
   </component>
   <component name="ToolWindowManager">
     <frame x="36" y="23" width="1621" height="958" extended-state="0" />
@@ -443,13 +450,6 @@
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/MySet.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="66">
-          <caret line="5" column="16" selection-start-line="5" selection-start-column="16" selection-end-line="5" selection-end-column="16" />
-        </state>
-      </provider>
-    </entry>
     <entry file="file://$PROJECT_DIR$/src/test/java/MySetTest.java">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="855">
@@ -472,8 +472,8 @@
     </entry>
     <entry file="file://$PROJECT_DIR$/src/main/java/Entry.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="255">
-          <caret line="17" column="11" selection-start-line="17" selection-start-column="11" selection-end-line="17" selection-end-column="11" />
+        <state relative-caret-position="180">
+          <caret line="12" lean-forward="true" selection-start-line="12" selection-end-line="12" />
           <folding>
             <element signature="e#169#170#0" expanded="true" />
             <element signature="e#195#196#0" expanded="true" />
@@ -487,20 +487,17 @@
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/test/java/MyMapTest.java">
+    <entry file="file://$PROJECT_DIR$/src/main/java/MySet.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="264">
-          <caret line="70" column="46" lean-forward="true" selection-start-line="70" selection-start-column="46" selection-end-line="70" selection-end-column="46" />
-          <folding>
-            <element signature="imports" expanded="true" />
-          </folding>
+        <state relative-caret-position="533">
+          <caret line="39" selection-start-line="39" selection-end-line="39" />
         </state>
       </provider>
     </entry>
     <entry file="file://$PROJECT_DIR$/src/main/java/MyArrayList.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="240">
-          <caret line="16" column="21" lean-forward="true" selection-start-line="16" selection-start-column="21" selection-end-line="16" selection-end-column="21" />
+        <state relative-caret-position="-659">
+          <caret line="34" column="34" selection-start-line="34" selection-start-column="34" selection-end-line="34" selection-end-column="34" />
           <folding>
             <element signature="e#258#259#0" expanded="true" />
             <element signature="e#286#287#0" expanded="true" />
@@ -514,10 +511,20 @@
         </state>
       </provider>
     </entry>
+    <entry file="file://$PROJECT_DIR$/src/test/java/MyMapTest.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="504">
+          <caret line="127" column="34" selection-start-line="127" selection-start-column="34" selection-end-line="127" selection-end-column="34" />
+          <folding>
+            <element signature="imports" expanded="true" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
     <entry file="file://$PROJECT_DIR$/src/main/java/MyMap.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="178">
-          <caret line="33" selection-start-line="33" selection-end-line="33" />
+        <state relative-caret-position="262">
+          <caret line="91" column="4" selection-start-line="91" selection-start-column="4" selection-end-line="91" selection-end-column="4" />
           <folding>
             <element signature="e#110#111#0" expanded="true" />
             <element signature="e#137#138#0" expanded="true" />

src/main/java/Entry.java

@@ -1,4 +1,4 @@
-public class Entry<K, V> {
+public class Entry<K, V> extends Object{
     K key;
     V value;
 

src/main/java/MyMap.java

@@ -17,7 +17,9 @@ public class MyMap<K, V> extends MyArrayList<Entry>{
         if (getSize() == 0) {
             return false;
         } else {
-            for (Entry entry : getArray()) {
+            Object[] entries = getArray();
+            for (int i = 0; i < entries.length; i++) {
+                Entry entry = (Entry) entries[i];
                 if (entry.getKey().equals(key)) {
                     return true;
                 }
@@ -31,10 +33,10 @@ public class MyMap<K, V> extends MyArrayList<Entry>{
         if (getSize() == 0) {
             return false;
         } else {
-            Entry[] thisArray = (Entry[]) getArray();
-            for (Entry entry : thisArray) {
-                V thisValue = (V) entry.getValue();
-                if (thisValue.equals(value)) {
+            Object[] entries = getArray();
+            for (int i = 0; i < entries.length; i++) {
+                Entry entry = (Entry) entries[i];
+                if (entry.getValue().equals(value)) {
                     return true;
                 }
             }
@@ -46,12 +48,55 @@ public class MyMap<K, V> extends MyArrayList<Entry>{
         if (getSize() == 0) {
             return null;
         } else {
-            for (Entry entry : getArray()) {
-                if (entry.getKey().equals(key)) {
-                    return (V) entry.getValue();
+            Object[] entries = getArray();
+            for (int i = 0; i < entries.length; i++) {
+                Entry entry = (Entry) entries[i];
+                try {
+                    if (entry.getKey().equals(key)) {
+                        return (V) entry.getValue();
+                    }
+                } catch (NullPointerException e) {
+                    return null;
                 }
             }
         }
         return null;
     }
+
+    public MySet<K> keySet() {
+        MySet<K> keys = new MySet<>();
+        Object[] entries = getArray();
+        for (int i = 0; i < entries.length; i++) {
+            Entry entry = (Entry) entries[i];
+            keys.add((K) entry.getKey());
+        }
+        return keys;
+    }
+
+    public MyArrayList<V> values() {
+        MyArrayList<V> values = new MyArrayList<>();
+        Object[] entries = getArray();
+        for (int i = 0; i < entries.length; i++) {
+            Entry entry = (Entry) entries[i];
+            values.add((V) entry.getValue());
+        }
+        return values;
+    }
+
+    public void putAll(Entry[] entries) {
+        for(Entry entry : entries) {
+            put((K) entry.getKey(), (V) entry.getValue());
+        }
+    }
+
+
+    public void removeByKey(K key) {
+        Object[] entries = getArray();
+        for (int i = 0; i < entries.length; i++) {
+            Entry entry = (Entry) entries[i];
+            if (entry.getKey().equals(key)) {
+                remove(entry);
+            }
+        }
+    }
 }

src/main/java/MySet.java

@@ -36,4 +36,6 @@ public class MySet<T> extends MyArrayList<T> {
     public Object[] toArray(){
         return getArray();
     }
+
+
 }

src/test/java/MyMapTest.java

@@ -73,10 +73,61 @@ public class MyMapTest {
     }
 
     @Test
+    public void testKeySet() {
+        MyMap<Integer, String> map1 = new MyMap<>();
+        map1.put(numb1, str1);
+        MySet<Integer> keySet = new MySet<>();
+        keySet.add(numb1);
+        MySet<Integer> expected = keySet;
+        MySet<Integer> actual = map1.keySet();
+
+        Assert.assertArrayEquals(expected.getArray(), actual.getArray());
+
+    }
+
+    @Test
+    public void testValues() {
+        MyMap<Integer, String> map1 = new MyMap<>();
+        map1.put(numb1, str1);
+        MyArrayList<String> values = new MyArrayList<>();
+        values.add(str1);
+        MyArrayList<String> expected = values;
+        MyArrayList<String> actual = map1.values();
+
+        Assert.assertArrayEquals(expected.getArray(), actual.getArray());
+
+    }
+
+    @Test
     public void testIsEmpty() {
         MyMap<Integer, String> map1 = new MyMap<>();
 
         Assert.assertTrue(map1.isEmpty());
     }
+
+    @Test
+    public void testPutAll() {
+        MyMap<Integer, String> map1 = new MyMap<>();
+        Entry<Integer, String> entry1 = new Entry<>(numb1, str1);
+        Entry<Integer, String> entry2 = new Entry<>(numb2, str2);
+        Entry<Integer, String> entry3 = new Entry<>(numb3, str3);
+        Entry[] entries = {entry1, entry2, entry3};
+        map1.putAll(entries);
+        int expected = 3;
+        int actual = map1.getSize();
+
+        Assert.assertEquals(expected, actual);
+    }
+
+    @Test
+    public void testRemoveByKey() {
+        MyMap<Integer, String> map1 = new MyMap<>();
+        map1.put(numb1, str1);
+        map1.removeByKey(numb1);
+
+        Assert.assertNull(map1.get(numb1));
+
+    }
+
 }