{final submit for now; map needs more work}

.idea/workspace.xml

@@ -2,7 +2,9 @@
 <project version="4">
   <component name="ChangeListManager">
     <list default="true" id="ada34df4-dfd8-4fb3-8f80-b9a79b2fcc05" name="Default Changelist" comment="">
-      <change beforePath="$PROJECT_DIR$/src/test/java/MyArrayListTest.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/test/java/MyArrayListTest.java" 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/MyMap.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/MyMap.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" />
@@ -24,30 +26,30 @@
           <entry key="JAVA/" value="3" />
           <entry key="JAVA/MyArrayList" value="1" />
           <entry key="MODULES/mdl-generics" value="1" />
-          <entry key="class" value="4" />
+          <entry key="class" value="5" />
           <entry key="iml" value="1" />
-          <entry key="java" value="6" />
+          <entry key="java" value="7" />
           <entry key="md" value="1" />
         </counts>
       </usages-collector>
       <usages-collector id="statistics.file.types.open">
         <counts>
-          <entry key="CLASS" value="4" />
+          <entry key="CLASS" value="5" />
           <entry key="IDEA_MODULE" value="1" />
-          <entry key="JAVA" value="6" />
+          <entry key="JAVA" value="7" />
           <entry key="Markdown" value="1" />
           <entry key="UML" value="5" />
         </counts>
       </usages-collector>
       <usages-collector id="statistics.file.extensions.edit">
         <counts>
-          <entry key="java" value="7861" />
+          <entry key="java" value="10524" />
           <entry key="txt" value="59" />
         </counts>
       </usages-collector>
       <usages-collector id="statistics.file.types.edit">
         <counts>
-          <entry key="JAVA" value="7861" />
+          <entry key="JAVA" value="10524" />
           <entry key="PLAIN_TEXT" value="59" />
         </counts>
       </usages-collector>
@@ -58,39 +60,50 @@
       <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="986">
-              <caret line="58" selection-start-line="58" selection-end-line="58" />
+            <state relative-caret-position="204">
+              <caret line="12" column="32" selection-start-line="12" selection-start-column="32" selection-end-line="12" selection-end-column="32" />
               <folding>
                 <element signature="e#67#68#0" expanded="true" />
                 <element signature="e#107#108#0" expanded="true" />
-                <element signature="e#216#217#0" expanded="true" />
-                <element signature="e#250#251#0" expanded="true" />
-                <element signature="e#1551#1552#0" expanded="true" />
-                <element signature="e#1596#1597#0" expanded="true" />
+                <element signature="e#215#216#0" expanded="true" />
+                <element signature="e#257#258#0" expanded="true" />
+                <element signature="e#1770#1771#0" expanded="true" />
+                <element signature="e#1804#1805#0" expanded="true" />
               </folding>
             </state>
           </provider>
         </entry>
       </file>
-      <file pinned="false" current-in-tab="true">
+      <file pinned="false" current-in-tab="false">
         <entry file="file://$PROJECT_DIR$/src/main/java/MyMap.java">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="335">
-              <caret line="39" column="21" selection-start-line="39" selection-start-column="21" selection-end-line="39" selection-end-column="21" />
+            <state relative-caret-position="272">
+              <caret line="16" lean-forward="true" selection-start-line="16" selection-end-line="16" />
               <folding>
-                <element signature="e#233#234#0" expanded="true" />
-                <element signature="e#266#267#0" expanded="true" />
-                <element signature="e#352#353#0" expanded="true" />
-                <element signature="e#378#379#0" expanded="true" />
-                <element signature="e#417#418#0" expanded="true" />
-                <element signature="e#438#439#0" expanded="true" />
-                <element signature="e#543#544#0" expanded="true" />
-                <element signature="e#570#571#0" expanded="true" />
+                <element signature="e#278#279#0" expanded="true" />
+                <element signature="e#327#328#0" expanded="true" />
+                <element signature="e#178#179#0" expanded="true" />
+                <element signature="e#214#215#0" expanded="true" />
+                <element signature="e#173#174#0" expanded="true" />
+                <element signature="e#200#201#0" expanded="true" />
+                <element signature="e#1247#1248#0" expanded="true" />
+                <element signature="e#1281#1282#0" expanded="true" />
+                <element signature="e#1320#1321#0" expanded="true" />
+                <element signature="e#1356#1357#0" expanded="true" />
               </folding>
             </state>
           </provider>
         </entry>
       </file>
+      <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="1462">
+              <caret line="90" column="8" selection-start-line="90" selection-start-column="8" selection-end-line="90" selection-end-column="8" />
+            </state>
+          </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">
@@ -119,7 +132,7 @@
       <file pinned="false" current-in-tab="false">
         <entry file="file://$PROJECT_DIR$/src/test/java/MySetTest.java">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="1411">
+            <state relative-caret-position="97">
               <caret line="83" column="14" lean-forward="true" selection-start-line="83" selection-start-column="14" selection-end-line="83" selection-end-column="14" />
               <folding>
                 <element signature="imports" expanded="true" />
@@ -147,21 +160,27 @@
   <component name="FileTemplateManagerImpl">
     <option name="RECENT_TEMPLATES">
       <list>
-        <option value="JUnit4 Test Class" />
         <option value="Class" />
+        <option value="JUnit4 Test Class" />
       </list>
     </option>
   </component>
+  <component name="FindInProjectRecents">
+    <findStrings>
+      <find>size</find>
+    </findStrings>
+  </component>
   <component name="Git.Settings">
     <option name="RECENT_GIT_ROOT_PATH" value="$PROJECT_DIR$" />
   </component>
   <component name="IdeDocumentHistory">
     <option name="CHANGED_PATHS">
       <list>
-        <option value="$PROJECT_DIR$/src/main/java/MyArrayList.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/MyArrayListTest.java" />
+        <option value="$PROJECT_DIR$/src/main/java/MyArrayList.java" />
+        <option value="$PROJECT_DIR$/src/test/java/MyMapTest.java" />
         <option value="$PROJECT_DIR$/src/main/java/MyMap.java" />
       </list>
     </option>
@@ -236,7 +255,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="1542421756423" />
+    <property name="com.android.tools.idea.instantapp.provision.ProvisionBeforeRunTaskProvider.myTimeStamp" value="1542558444322" />
     <property name="com.intellij.testIntegration.createTest.CreateTestDialog.defaultLibrary" value="JUnit4" />
     <property name="com.intellij.testIntegration.createTest.CreateTestDialog.defaultLibrarySuperClass.JUnit4" value="" />
     <property name="com.intellij.testIntegration.createTest.CreateTestDialog.includeInheritedMembers" value="true" />
@@ -268,65 +287,67 @@
       </list>
     </option>
   </component>
-  <component name="RunManager" selected="JUnit.All in generics">
-    <configuration name="All in generics" type="JUnit" factoryName="JUnit" temporary="true" nameIsGenerated="true">
+  <component name="RunManager" selected="JUnit.MyArrayListTest">
+    <configuration name="MyArrayListTest" type="JUnit" factoryName="JUnit" temporary="true" nameIsGenerated="true">
       <module name="generics" />
       <option name="PACKAGE_NAME" value="" />
-      <option name="TEST_OBJECT" value="package" />
+      <option name="MAIN_CLASS_NAME" value="MyArrayListTest" />
       <method v="2">
         <option name="Make" enabled="true" />
       </method>
     </configuration>
-    <configuration name="MyArrayListTest" 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="MyArrayListTest" />
+      <option name="MAIN_CLASS_NAME" value="MyMapTest" />
       <method v="2">
         <option name="Make" enabled="true" />
       </method>
     </configuration>
-    <configuration name="MySetTest" type="JUnit" factoryName="JUnit" temporary="true" nameIsGenerated="true">
+    <configuration name="MyMapTest.add" type="JUnit" factoryName="JUnit" temporary="true" nameIsGenerated="true">
       <module name="generics" />
       <option name="PACKAGE_NAME" value="" />
-      <option name="MAIN_CLASS_NAME" value="MySetTest" />
+      <option name="MAIN_CLASS_NAME" value="MyMapTest" />
+      <option name="METHOD_NAME" value="add" />
+      <option name="TEST_OBJECT" value="method" />
       <method v="2">
         <option name="Make" enabled="true" />
       </method>
     </configuration>
-    <configuration name="MySetTest.containsNopeTest" type="JUnit" factoryName="JUnit" temporary="true" nameIsGenerated="true">
+    <configuration name="MyMapTest.containsKey" type="JUnit" factoryName="JUnit" temporary="true" nameIsGenerated="true">
       <module name="generics" />
       <option name="PACKAGE_NAME" value="" />
-      <option name="MAIN_CLASS_NAME" value="MySetTest" />
-      <option name="METHOD_NAME" value="containsNopeTest" />
+      <option name="MAIN_CLASS_NAME" value="MyMapTest" />
+      <option name="METHOD_NAME" value="containsKey" />
       <option name="TEST_OBJECT" value="method" />
       <method v="2">
         <option name="Make" enabled="true" />
       </method>
     </configuration>
-    <configuration name="MySetTest.containsTest" type="JUnit" factoryName="JUnit" temporary="true" nameIsGenerated="true">
+    <configuration name="MyMapTest.putTest" type="JUnit" factoryName="JUnit" temporary="true" nameIsGenerated="true">
       <module name="generics" />
       <option name="PACKAGE_NAME" value="" />
-      <option name="MAIN_CLASS_NAME" value="MySetTest" />
-      <option name="METHOD_NAME" value="containsTest" />
+      <option name="MAIN_CLASS_NAME" value="MyMapTest" />
+      <option name="METHOD_NAME" value="putTest" />
       <option name="TEST_OBJECT" value="method" />
       <method v="2">
         <option name="Make" enabled="true" />
       </method>
     </configuration>
     <list>
-      <item itemvalue="JUnit.MySetTest.containsTest" />
-      <item itemvalue="JUnit.MySetTest.containsNopeTest" />
-      <item itemvalue="JUnit.MySetTest" />
+      <item itemvalue="JUnit.MyMapTest.containsKey" />
+      <item itemvalue="JUnit.MyMapTest.add" />
+      <item itemvalue="JUnit.MyMapTest" />
+      <item itemvalue="JUnit.MyMapTest.putTest" />
       <item itemvalue="JUnit.MyArrayListTest" />
-      <item itemvalue="JUnit.All in generics" />
     </list>
     <recent_temporary>
       <list>
-        <item itemvalue="JUnit.All in generics" />
         <item itemvalue="JUnit.MyArrayListTest" />
-        <item itemvalue="JUnit.MySetTest" />
-        <item itemvalue="JUnit.MySetTest.containsNopeTest" />
-        <item itemvalue="JUnit.MySetTest.containsTest" />
+        <item itemvalue="JUnit.MyMapTest" />
+        <item itemvalue="JUnit.MyMapTest.putTest" />
+        <item itemvalue="JUnit.MyMapTest.add" />
+        <item itemvalue="JUnit.MyMapTest.containsKey" />
       </list>
     </recent_temporary>
   </component>
@@ -340,44 +361,44 @@
       <option name="number" value="Default" />
       <option name="presentableId" value="Default" />
       <updated>1542236797011</updated>
-      <workItem from="1542236798436" duration="36911000" />
+      <workItem from="1542236798436" duration="46074000" />
     </task>
     <servers />
   </component>
   <component name="TestHistory">
-    <history-entry file="MySetTest_clearTest - 2018.11.16 at 18h 11m 41s.xml">
-      <configuration name="MySetTest.clearTest" configurationId="JUnit" />
+    <history-entry file="MyMapTest - 2018.11.17 at 21h 57m 46s.xml">
+      <configuration name="MyMapTest" configurationId="JUnit" />
     </history-entry>
-    <history-entry file="MySetTest - 2018.11.16 at 18h 12m 08s.xml">
-      <configuration name="MySetTest" configurationId="JUnit" />
+    <history-entry file="MyMapTest - 2018.11.18 at 10h 53m 08s.xml">
+      <configuration name="MyMapTest" configurationId="JUnit" />
     </history-entry>
-    <history-entry file="MySetTest_clearTest - 2018.11.16 at 21h 08m 27s.xml">
-      <configuration name="MySetTest.clearTest" configurationId="JUnit" />
+    <history-entry file="MyMapTest - 2018.11.18 at 10h 53m 12s.xml">
+      <configuration name="MyMapTest" configurationId="JUnit" />
     </history-entry>
-    <history-entry file="MySetTest_isEmptyTest - 2018.11.16 at 21h 10m 48s.xml">
-      <configuration name="MySetTest.isEmptyTest" configurationId="JUnit" />
+    <history-entry file="MyMapTest - 2018.11.18 at 10h 53m 20s.xml">
+      <configuration name="MyMapTest" configurationId="JUnit" />
     </history-entry>
-    <history-entry file="MySetTest_isEmptyTest2 - 2018.11.16 at 21h 11m 58s.xml">
-      <configuration name="MySetTest.isEmptyTest2" configurationId="JUnit" />
+    <history-entry file="MyMapTest_putTest - 2018.11.18 at 11h 02m 25s.xml">
+      <configuration name="MyMapTest.putTest" configurationId="JUnit" />
     </history-entry>
-    <history-entry file="MySetTest_containsTest - 2018.11.16 at 21h 14m 23s.xml">
-      <configuration name="MySetTest.containsTest" configurationId="JUnit" />
+    <history-entry file="MyMapTest - 2018.11.18 at 11h 02m 28s.xml">
+      <configuration name="MyMapTest" configurationId="JUnit" />
     </history-entry>
-    <history-entry file="MySetTest_containsNopeTest - 2018.11.16 at 21h 15m 31s.xml">
-      <configuration name="MySetTest.containsNopeTest" configurationId="JUnit" />
+    <history-entry file="MyMapTest_putTest - 2018.11.18 at 11h 02m 31s.xml">
+      <configuration name="MyMapTest.putTest" configurationId="JUnit" />
     </history-entry>
-    <history-entry file="MySetTest - 2018.11.16 at 21h 15m 51s.xml">
-      <configuration name="MySetTest" configurationId="JUnit" />
+    <history-entry file="MyMapTest_putTest - 2018.11.18 at 11h 06m 19s.xml">
+      <configuration name="MyMapTest.putTest" configurationId="JUnit" />
     </history-entry>
-    <history-entry file="MyArrayListTest - 2018.11.16 at 21h 16m 01s.xml">
-      <configuration name="MyArrayListTest" configurationId="JUnit" />
+    <history-entry file="MyMapTest_putTest - 2018.11.18 at 11h 09m 00s.xml">
+      <configuration name="MyMapTest.putTest" configurationId="JUnit" />
     </history-entry>
-    <history-entry file="All_in_generics - 2018.11.16 at 21h 16m 16s.xml">
-      <configuration name="All in generics" configurationId="JUnit" />
+    <history-entry file="MyMapTest_putTest - 2018.11.18 at 11h 09m 31s.xml">
+      <configuration name="MyMapTest.putTest" configurationId="JUnit" />
     </history-entry>
   </component>
   <component name="TimeTrackingManager">
-    <option name="totallyTimeSpent" value="36911000" />
+    <option name="totallyTimeSpent" value="46074000" />
   </component>
   <component name="ToolWindowManager">
     <frame x="0" y="23" width="1280" height="712" extended-state="0" />
@@ -439,13 +460,6 @@
         </state>
       </provider>
     </entry>
-    <entry file="jar://$MAVEN_REPOSITORY$/junit/junit/4.12/junit-4.12.jar!/org/junit/internal/runners/model/ReflectiveCallable.class">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="221">
-          <caret line="16" selection-start-line="16" selection-end-line="16" />
-        </state>
-      </provider>
-    </entry>
     <entry file="jar://$MAVEN_REPOSITORY$/junit/junit/4.12/junit-4.12.jar!/org/junit/Assert.class">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="94">
@@ -540,32 +554,6 @@
         </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="986">
-          <caret line="58" selection-start-line="58" selection-end-line="58" />
-          <folding>
-            <element signature="e#67#68#0" expanded="true" />
-            <element signature="e#107#108#0" expanded="true" />
-            <element signature="e#216#217#0" expanded="true" />
-            <element signature="e#250#251#0" expanded="true" />
-            <element signature="e#1551#1552#0" expanded="true" />
-            <element signature="e#1596#1597#0" expanded="true" />
-          </folding>
-        </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="1411">
-          <caret line="83" column="14" lean-forward="true" selection-start-line="83" selection-start-column="14" selection-end-line="83" selection-end-column="14" />
-          <folding>
-            <element signature="imports" expanded="true" />
-            <element signature="e#210#219#0" expanded="true" />
-          </folding>
-        </state>
-      </provider>
-    </entry>
     <entry file="file://$PROJECT_DIR$/src/test/java/MyArrayListTest.java">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="34">
@@ -577,6 +565,13 @@
         </state>
       </provider>
     </entry>
+    <entry file="jar://$MAVEN_REPOSITORY$/junit/junit/4.12/junit-4.12.jar!/org/junit/internal/runners/model/ReflectiveCallable.class">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="221">
+          <caret line="17" selection-start-line="17" selection-end-line="17" />
+        </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="170">
@@ -600,23 +595,58 @@
         </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="97">
+          <caret line="83" column="14" lean-forward="true" selection-start-line="83" selection-start-column="14" selection-end-line="83" selection-end-column="14" />
+          <folding>
+            <element signature="imports" expanded="true" />
+            <element signature="e#210#219#0" expanded="true" />
+          </folding>
+        </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="204">
+          <caret line="12" column="32" selection-start-line="12" selection-start-column="32" selection-end-line="12" selection-end-column="32" />
+          <folding>
+            <element signature="e#67#68#0" expanded="true" />
+            <element signature="e#107#108#0" expanded="true" />
+            <element signature="e#215#216#0" expanded="true" />
+            <element signature="e#257#258#0" expanded="true" />
+            <element signature="e#1770#1771#0" expanded="true" />
+            <element signature="e#1804#1805#0" 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="335">
-          <caret line="39" column="21" selection-start-line="39" selection-start-column="21" selection-end-line="39" selection-end-column="21" />
+        <state relative-caret-position="272">
+          <caret line="16" lean-forward="true" selection-start-line="16" selection-end-line="16" />
           <folding>
-            <element signature="e#233#234#0" expanded="true" />
-            <element signature="e#266#267#0" expanded="true" />
-            <element signature="e#352#353#0" expanded="true" />
-            <element signature="e#378#379#0" expanded="true" />
-            <element signature="e#417#418#0" expanded="true" />
-            <element signature="e#438#439#0" expanded="true" />
-            <element signature="e#543#544#0" expanded="true" />
-            <element signature="e#570#571#0" expanded="true" />
+            <element signature="e#278#279#0" expanded="true" />
+            <element signature="e#327#328#0" expanded="true" />
+            <element signature="e#178#179#0" expanded="true" />
+            <element signature="e#214#215#0" expanded="true" />
+            <element signature="e#173#174#0" expanded="true" />
+            <element signature="e#200#201#0" expanded="true" />
+            <element signature="e#1247#1248#0" expanded="true" />
+            <element signature="e#1281#1282#0" expanded="true" />
+            <element signature="e#1320#1321#0" expanded="true" />
+            <element signature="e#1356#1357#0" expanded="true" />
           </folding>
         </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="1462">
+          <caret line="90" column="8" selection-start-line="90" selection-start-column="8" selection-end-line="90" selection-end-column="8" />
+        </state>
+      </provider>
+    </entry>
   </component>
   <component name="masterDetails">
     <states>

src/main/java/MyArrayList.java

@@ -9,8 +9,8 @@ public class MyArrayList<T> {
 
     public MyArrayList() {}
 
-    public MyArrayList(int index) {
-        this.index = index;
+    public MyArrayList(int size) {
+        this.theArray = (T[]) new Object[size];
     }
 
         public void add(T elementToAdd){
@@ -64,8 +64,8 @@ public class MyArrayList<T> {
             return false;
         }
 
-        public int size() {
-           return theArray.length;
+        public Integer size() {
+            return this.theArray.length;
         }
 
 

src/main/java/MyMap.java

@@ -1,44 +1,77 @@
-public class MyMap <K, V> {
 
-    private K [] key;
-    private V [] value;
-    private int index;
+public class MyMap <K, V> {
 
+    private MyArrayList<Entry> entries;
 
-    public MyMap(K[] key, V[] value) {
-        this.key = key;
-        this.value = value;
+    public MyMap() {
+        entries = new MyArrayList<>();
     }
-    public MyMap() {}
 
-    public MyMap(int index) {
-        this.index = index;
+    public Integer size() {
+        return entries.size();
     }
 
     public void clear() {
-
+        this.entries.clear();
     }
 
-    public boolean containsKey(V value) {
-        return true;
+    public boolean containsKey(K key) {
+        for (int i = 0; i < entries.size(); i++) {
+            if (entries.get(i).getKey().equals(key)) {
+                return true;
+            }
+        }
+        return false;
     }
 
-    public boolean containsValue(K key) {
-        return true;
+
+    public boolean containsValue(V value) {
+        for (int i = 0; i < entries.size(); i++) {
+            if (entries.get(i).getValue().equals(value)) {
+                return true;
+            }
+        }
+        return false;
     }
 
-    public V get(K key) {
+    public Object get(K key) {
+        for (int i = 0; i < entries.size(); i++) {
+            if (entries.get(i).getKey().equals(key)) {
+                return entries.get(i).getValue();
+            }
+        }
         return null;
-        return V;
     }
 
-    public boolean isEmpty() {
-        return true;
-    }
 
-    public void add(K key, V value) {
-        //put method
+    public void put(K key, V value) {
+        //add method
+        for (int i = 0; i < entries.size(); i++) {
+            if(entries.get(i).getKey().equals(key)) {
+                entries.set(i, new Entry<>(key, value));
+                break;
+            }
+        }
+        entries.add(new Entry<>(key, value));
     }
 
 
+    private  class Entry <K, V> {
+        private K key;
+        private V value;
+
+        public Entry(K key, V value) {
+            this.key = key;
+            this.value = value;
+        }
+
+        public K getKey() {
+            return key;
+        }
+
+        public V getValue() {
+            return value;
+        }
+    }
+
 }

src/test/java/MyMapTest.java

@@ -1,30 +1,94 @@
+import org.junit.Assert;
 import org.junit.Test;
 
-import static org.junit.Assert.*;
 
 public class MyMapTest {
+    // I know why it's failing but I don't know how to fix it, so I'm going to move on for now and hopefully
+    //come back once I've been struck by genius
+
+    //SetUp
+    //Integer [] key = {1, 2, 3, 4, 5};
+    //String [] value = {"One", "Two", "Three", "Four", "Five"};
+    //String [] wordKey = {"I", "love", "weekends"};
+    //String [] wordValue = {"You", "hate", "weekdays"};
+    MyMap<Integer, String> myMap = new MyMap<>();
 
     @Test
-    public void clear() {
+    public void clearTest() {
+        //given
+
+        MyMap<String, Integer> myFamTest = new MyMap<>();
+        myFamTest.put("Nicole", 26);
+        myFamTest.put("Arpita", 26);
+        myFamTest.put("Chris", 24);
+        Object expected = null;
+
+        //when
+        myFamTest.clear();
+        Object actual = myFamTest.get("Josh");
+
+        //then
+        Assert.assertNull(actual);
     }
 
     @Test
-    public void containsKey() {
+    public void containsKeyTest() {
+        //given
+        MyMap<String, Integer> myMap = new MyMap<>();
+        myMap.put("Josh", 21);
+        boolean expected = true;
+
+        //when
+        boolean actual = myMap.containsKey("Josh");
+
+        //then
+        Assert.assertTrue(actual);
+
     }
 
     @Test
-    public void containsValue() {
+    public void containsValueTest() {
+        //given
+        MyMap<String, Integer> myPeeps = new MyMap<>();
+        myPeeps.put("Jordan", 19);
+        boolean expected = true;
+
+        //when
+        boolean actual = myPeeps.containsValue(19);
+
+        //then
+        Assert.assertEquals(expected, actual);
     }
 
     @Test
-    public void get() {
+    public void getTest() {
+        //given
+        MyMap<String, Integer> myMapTest = new MyMap<>();
+        Object expected = null;
+
+        //when
+        Object actual = myMapTest.get("Yo");
+
+        //then
+        Assert.assertEquals(expected, actual);
     }
 
+
     @Test
-    public void isEmpty() {
+    public void putTest() {
+        //given
+        MyMap<String, Integer> myMapTest = new MyMap<>();
+        Object expected = 1;
+
+        //when
+        myMapTest.put("Hello", 1);
+        Object actual = myMapTest.get("Hello");
+        //then
+        Assert.assertEquals(expected, actual);
     }
 
     @Test
-    public void add() {
+    public void sizeTest() {
+
     }
 }