map half done

.idea/workspace.xml

@@ -2,12 +2,8 @@
 <project version="4">
   <component name="ChangeListManager">
     <list default="true" id="4722a4ca-84fe-4509-a5b7-de0cc14e62a2" name="Default Changelist" comment="">
-      <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/ArrayList.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/ArrayList.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/test/java/ArrayListTest.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/test/java/ArrayListTest.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/test/java/MySetTest.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/test/java/MySetTest.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" />
@@ -51,7 +47,7 @@
       </usages-collector>
       <usages-collector id="statistics.file.types.edit">
         <counts>
-          <entry key="JAVA" value="3545" />
+          <entry key="JAVA" value="4700" />
         </counts>
       </usages-collector>
       <usages-collector id="statistics.js.language.service.starts" />
@@ -60,7 +56,7 @@
       <usages-collector id="statistics.spring.boot.run.usages" />
       <usages-collector id="statistics.file.extensions.edit">
         <counts>
-          <entry key="java" value="3545" />
+          <entry key="java" value="4700" />
         </counts>
       </usages-collector>
     </session>
@@ -82,19 +78,15 @@
       <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="385">
-              <caret line="37" column="26" selection-start-line="37" selection-start-column="26" selection-end-line="37" selection-end-column="26" />
+            <state relative-caret-position="309">
+              <caret line="65" column="13" lean-forward="true" selection-start-line="65" selection-start-column="13" selection-end-line="65" selection-end-column="13" />
               <folding>
-                <element signature="e#185#186#0" expanded="true" />
-                <element signature="e#211#212#0" expanded="true" />
-                <element signature="e#248#249#0" expanded="true" />
-                <element signature="e#278#279#0" expanded="true" />
-                <element signature="e#317#318#0" expanded="true" />
-                <element signature="e#349#350#0" expanded="true" />
-                <element signature="e#402#403#0" expanded="true" />
-                <element signature="e#444#445#0" expanded="true" />
                 <element signature="e#569#570#0" expanded="true" />
                 <element signature="e#601#602#0" expanded="true" />
+                <element signature="e#726#727#0" expanded="true" />
+                <element signature="e#755#756#0" expanded="true" />
+                <element signature="e#531#532#0" expanded="true" />
+                <element signature="e#555#556#0" expanded="true" />
               </folding>
             </state>
           </provider>
@@ -103,8 +95,11 @@
       <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>
-              <caret column="17" lean-forward="true" selection-start-column="17" selection-end-column="17" />
+            <state relative-caret-position="280">
+              <caret line="95" column="30" selection-start-line="95" selection-start-column="30" selection-end-line="95" selection-end-column="30" />
+              <folding>
+                <element signature="imports" expanded="true" />
+              </folding>
             </state>
           </provider>
         </entry>
@@ -130,7 +125,7 @@
       <file pinned="false" current-in-tab="false">
         <entry file="file://$PROJECT_DIR$/src/main/java/ArrayList.java">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="1140">
+            <state relative-caret-position="830">
               <caret line="88" column="40" lean-forward="true" selection-start-line="88" selection-start-column="40" selection-end-line="88" selection-end-column="40" />
               <folding>
                 <element signature="e#163#164#0" expanded="true" />
@@ -166,6 +161,7 @@
   <component name="FindInProjectRecents">
     <findStrings>
       <find>list</find>
+      <find>cust</find>
     </findStrings>
   </component>
   <component name="Git.Settings">
@@ -249,7 +245,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="1542388194158" />
+    <property name="com.android.tools.idea.instantapp.provision.ProvisionBeforeRunTaskProvider.myTimeStamp" value="1542393492514" />
     <property name="last_opened_file_path" value="$PROJECT_DIR$" />
     <property name="nodejs_interpreter_path.stuck_in_default_project" value="undefined stuck path" />
     <property name="nodejs_npm_path_reset_for_default_project" value="true" />
@@ -266,69 +262,69 @@
       </list>
     </option>
   </component>
-  <component name="RunManager" selected="JUnit.MyMapTest.containsKeyFalseTest">
-    <configuration name="MyMapTest.addTest" type="JUnit" factoryName="JUnit" temporary="true" nameIsGenerated="true">
+  <component name="RunManager" selected="JUnit.MyMapTest">
+    <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="addTest" />
-      <option name="TEST_OBJECT" value="method" />
       <method v="2">
         <option name="Make" enabled="true" />
       </method>
     </configuration>
-    <configuration name="MyMapTest.clearTest" type="JUnit" factoryName="JUnit" temporary="true" nameIsGenerated="true">
+    <configuration name="MyMapTest.entrySetTest" 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="clearTest" />
+      <option name="METHOD_NAME" value="entrySetTest" />
       <option name="TEST_OBJECT" value="method" />
       <method v="2">
         <option name="Make" enabled="true" />
       </method>
     </configuration>
-    <configuration name="MyMapTest.containsKeyFalseTest" type="JUnit" factoryName="JUnit" temporary="true" nameIsGenerated="true">
+    <configuration name="MyMapTest.equalsFalseTest" 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="containsKeyFalseTest" />
+      <option name="METHOD_NAME" value="equalsFalseTest" />
       <option name="TEST_OBJECT" value="method" />
       <method v="2">
         <option name="Make" enabled="true" />
       </method>
     </configuration>
-    <configuration name="MyMapTest.containsKeyTrueTest" type="JUnit" factoryName="JUnit" temporary="true" nameIsGenerated="true">
+    <configuration name="MyMapTest.equalsTrueTest" 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="containsKeyTrueTest" />
+      <option name="METHOD_NAME" value="equalsTrueTest" />
       <option name="TEST_OBJECT" value="method" />
       <method v="2">
         <option name="Make" enabled="true" />
       </method>
     </configuration>
-    <configuration name="MySetTest" type="JUnit" factoryName="JUnit" temporary="true" nameIsGenerated="true">
+    <configuration name="MyMapTest.getTest" 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="getTest" />
+      <option name="TEST_OBJECT" value="method" />
       <method v="2">
         <option name="Make" enabled="true" />
       </method>
     </configuration>
     <list>
-      <item itemvalue="JUnit.MySetTest" />
-      <item itemvalue="JUnit.MyMapTest.addTest" />
-      <item itemvalue="JUnit.MyMapTest.clearTest" />
-      <item itemvalue="JUnit.MyMapTest.containsKeyTrueTest" />
-      <item itemvalue="JUnit.MyMapTest.containsKeyFalseTest" />
+      <item itemvalue="JUnit.MyMapTest.entrySetTest" />
+      <item itemvalue="JUnit.MyMapTest.equalsFalseTest" />
+      <item itemvalue="JUnit.MyMapTest.equalsTrueTest" />
+      <item itemvalue="JUnit.MyMapTest.getTest" />
+      <item itemvalue="JUnit.MyMapTest" />
     </list>
     <recent_temporary>
       <list>
-        <item itemvalue="JUnit.MyMapTest.containsKeyFalseTest" />
-        <item itemvalue="JUnit.MyMapTest.containsKeyTrueTest" />
-        <item itemvalue="JUnit.MyMapTest.clearTest" />
-        <item itemvalue="JUnit.MyMapTest.addTest" />
-        <item itemvalue="JUnit.MySetTest" />
+        <item itemvalue="JUnit.MyMapTest" />
+        <item itemvalue="JUnit.MyMapTest.entrySetTest" />
+        <item itemvalue="JUnit.MyMapTest.getTest" />
+        <item itemvalue="JUnit.MyMapTest.equalsFalseTest" />
+        <item itemvalue="JUnit.MyMapTest.equalsTrueTest" />
       </list>
     </recent_temporary>
   </component>
@@ -345,44 +341,44 @@
       <workItem from="1542144022926" duration="15263000" />
       <workItem from="1542247374356" duration="14000" />
       <workItem from="1542374483696" duration="4107000" />
-      <workItem from="1542378966058" duration="3300000" />
+      <workItem from="1542378966058" duration="7717000" />
     </task>
     <servers />
   </component>
   <component name="TestHistory">
-    <history-entry file="MySetTest_addtest - 2018.11.16 at 09h 14m 35s.xml">
-      <configuration name="MySetTest.addtest" configurationId="JUnit" />
+    <history-entry file="MyMapTest_entrySetTest - 2018.11.16 at 12h 59m 47s.xml">
+      <configuration name="MyMapTest.entrySetTest" configurationId="JUnit" />
     </history-entry>
-    <history-entry file="MySetTest_addtest - 2018.11.16 at 09h 14m 41s.xml">
-      <configuration name="MySetTest.addtest" configurationId="JUnit" />
+    <history-entry file="MyMapTest_equalsFalseTest - 2018.11.16 at 13h 06m 00s.xml">
+      <configuration name="MyMapTest.equalsFalseTest" configurationId="JUnit" />
     </history-entry>
-    <history-entry file="MySetTest_addtest - 2018.11.16 at 09h 14m 59s.xml">
-      <configuration name="MySetTest.addtest" configurationId="JUnit" />
+    <history-entry file="MyMapTest_equalsTrueTest - 2018.11.16 at 13h 06m 03s.xml">
+      <configuration name="MyMapTest.equalsTrueTest" configurationId="JUnit" />
     </history-entry>
-    <history-entry file="MySetTest - 2018.11.16 at 09h 15m 17s.xml">
-      <configuration name="MySetTest" configurationId="JUnit" />
+    <history-entry file="MyMapTest_equalsTrueTest - 2018.11.16 at 13h 10m 44s.xml">
+      <configuration name="MyMapTest.equalsTrueTest" configurationId="JUnit" />
     </history-entry>
-    <history-entry file="ArrayListTest_equalstest - 2018.11.16 at 09h 44m 40s.xml">
-      <configuration name="ArrayListTest.equalstest" configurationId="JUnit" />
+    <history-entry file="MyMapTest_equalsTrueTest - 2018.11.16 at 13h 21m 29s.xml">
+      <configuration name="MyMapTest.equalsTrueTest" configurationId="JUnit" />
     </history-entry>
-    <history-entry file="ArrayListTest_equalstest - 2018.11.16 at 09h 50m 54s.xml">
-      <configuration name="ArrayListTest.equalstest" configurationId="JUnit" />
+    <history-entry file="MyMapTest_equalsTrueTest - 2018.11.16 at 13h 22m 26s.xml">
+      <configuration name="MyMapTest.equalsTrueTest" configurationId="JUnit" />
     </history-entry>
-    <history-entry file="ArrayListTest_equalsFalsetest - 2018.11.16 at 09h 52m 00s.xml">
-      <configuration name="ArrayListTest.equalsFalsetest" configurationId="JUnit" />
+    <history-entry file="MyMapTest_equalsTrueTest - 2018.11.16 at 13h 23m 50s.xml">
+      <configuration name="MyMapTest.equalsTrueTest" configurationId="JUnit" />
     </history-entry>
-    <history-entry file="ArrayListTest_equalsFalsetest2 - 2018.11.16 at 09h 52m 23s.xml">
-      <configuration name="ArrayListTest.equalsFalsetest2" configurationId="JUnit" />
+    <history-entry file="MyMapTest_equalsTrueTest - 2018.11.16 at 13h 29m 20s.xml">
+      <configuration name="MyMapTest.equalsTrueTest" configurationId="JUnit" />
     </history-entry>
-    <history-entry file="MySetTest - 2018.11.16 at 11h 24m 23s.xml">
-      <configuration name="MySetTest" configurationId="JUnit" />
+    <history-entry file="MyMapTest_equalsTrueTest - 2018.11.16 at 13h 29m 25s.xml">
+      <configuration name="MyMapTest.equalsTrueTest" configurationId="JUnit" />
     </history-entry>
-    <history-entry file="MyMapTest_addTest - 2018.11.16 at 12h 03m 58s.xml">
-      <configuration name="MyMapTest.addTest" configurationId="JUnit" />
+    <history-entry file="MyMapTest_equalsFalseTest - 2018.11.16 at 13h 29m 27s.xml">
+      <configuration name="MyMapTest.equalsFalseTest" configurationId="JUnit" />
     </history-entry>
   </component>
   <component name="TimeTrackingManager">
-    <option name="totallyTimeSpent" value="22684000" />
+    <option name="totallyTimeSpent" value="27101000" />
   </component>
   <component name="ToolWindowManager">
     <frame x="0" y="23" width="1440" height="807" extended-state="6" />
@@ -398,7 +394,7 @@
       <window_info anchor="bottom" id="Message" order="0" />
       <window_info anchor="bottom" id="Find" order="1" />
       <window_info active="true" anchor="bottom" id="Run" order="2" visible="true" weight="0.33286715" />
-      <window_info anchor="bottom" id="Debug" order="3" weight="0.3986111" />
+      <window_info anchor="bottom" id="Debug" order="3" weight="0.3986014" />
       <window_info anchor="bottom" id="Cvs" order="4" weight="0.25" />
       <window_info anchor="bottom" id="Inspection" order="5" weight="0.4" />
       <window_info anchor="bottom" id="TODO" order="6" />
@@ -406,7 +402,7 @@
       <window_info anchor="bottom" id="Database Changes" order="8" show_stripe_button="false" />
       <window_info anchor="bottom" id="Terminal" order="9" />
       <window_info anchor="bottom" id="Event Log" order="10" side_tool="true" />
-      <window_info anchor="bottom" id="Messages" order="11" weight="0.3286908" />
+      <window_info anchor="bottom" id="Messages" order="11" weight="0.32867134" />
       <window_info anchor="right" id="Commander" internal_type="SLIDING" order="0" type="SLIDING" weight="0.4" />
       <window_info anchor="right" id="Ant Build" order="1" weight="0.25" />
       <window_info anchor="right" content_ui="combo" id="Hierarchy" order="2" weight="0.25" />
@@ -479,7 +475,7 @@
     </entry>
     <entry file="file://$PROJECT_DIR$/src/main/java/ArrayList.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="1140">
+        <state relative-caret-position="830">
           <caret line="88" column="40" lean-forward="true" selection-start-line="88" selection-start-column="40" selection-end-line="88" selection-end-column="40" />
           <folding>
             <element signature="e#163#164#0" expanded="true" />
@@ -499,27 +495,26 @@
     </entry>
     <entry file="file://$PROJECT_DIR$/src/main/java/MyMap.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="385">
-          <caret line="37" column="26" selection-start-line="37" selection-start-column="26" selection-end-line="37" selection-end-column="26" />
+        <state relative-caret-position="309">
+          <caret line="65" column="13" lean-forward="true" selection-start-line="65" selection-start-column="13" selection-end-line="65" selection-end-column="13" />
           <folding>
-            <element signature="e#185#186#0" expanded="true" />
-            <element signature="e#211#212#0" expanded="true" />
-            <element signature="e#248#249#0" expanded="true" />
-            <element signature="e#278#279#0" expanded="true" />
-            <element signature="e#317#318#0" expanded="true" />
-            <element signature="e#349#350#0" expanded="true" />
-            <element signature="e#402#403#0" expanded="true" />
-            <element signature="e#444#445#0" expanded="true" />
             <element signature="e#569#570#0" expanded="true" />
             <element signature="e#601#602#0" expanded="true" />
+            <element signature="e#726#727#0" expanded="true" />
+            <element signature="e#755#756#0" expanded="true" />
+            <element signature="e#531#532#0" expanded="true" />
+            <element signature="e#555#556#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>
-          <caret column="17" lean-forward="true" selection-start-column="17" selection-end-column="17" />
+        <state relative-caret-position="280">
+          <caret line="95" column="30" selection-start-line="95" selection-start-column="30" selection-end-line="95" selection-end-column="30" />
+          <folding>
+            <element signature="imports" expanded="true" />
+          </folding>
         </state>
       </provider>
     </entry>

src/main/java/MyMap.java

@@ -8,21 +8,6 @@ public class MyMap {
         arrayList = new ArrayList();
     }
 
-    public MySet getSet() {
-        return set;
-    }
-
-    public void setSet(MySet set) {
-        this.set = set;
-    }
-
-    public ArrayList getArrayList() {
-        return arrayList;
-    }
-
-    public void setArrayList(ArrayList arrayList) {
-        this.arrayList = arrayList;
-    }
 
     public void add(Object key, Object value){
         set.add(key);
@@ -41,4 +26,48 @@ public class MyMap {
     public boolean containsKey(Object o) {
         return set.contains(o);
     }
+
+    public boolean containsValue(Object o ){
+        return arrayList.contains(o);
+    }
+
+    public Object[][] entrySet() {
+        Object[][] entrySet = new Object[set.size()][2];
+        for(int i=0; i<set.size(); i++){
+            entrySet[i]= new Object[]{set.get(i), arrayList.get(i)};
+        }
+        return entrySet;
+    }
+
+    @Override
+    public boolean equals(Object obj){
+            if (this == obj) {
+                return true;
+            } else if (obj == null) {
+                return false;
+            } else if (obj instanceof MyMap) {
+                MyMap compareMap = (MyMap) obj;
+                for (int i=0; i<set.size(); i++) {
+                    for(int j = 0; j<2; j++) {
+                        if (compareMap.entrySet()[j][i]== this.entrySet()[j][i]) {
+                            return true;
+                        }
+                        return false;
+                    }
+                }
+            }
+            return false;
+        }
+
+    public Object get(Object key) {
+        for(int i = 0; i<set.size(); i++){
+            if(key == set.get(i)){
+                return arrayList.getArr()[i];
+            }
+        }
+        return -1;
+    }
 }
+
+
+

src/test/java/MyMapTest.java

@@ -4,6 +4,7 @@ import org.junit.Test;
 public class MyMapTest {
 
     MyMap map = new MyMap();
+    MyMap map2 = new MyMap();
 
 
 
@@ -41,4 +42,60 @@ public class MyMapTest {
         boolean actual = map.containsKey(5);
         Assert.assertFalse(actual);
     }
+
+    @Test
+    public void containsValueTrueTest(){
+        map.add(3,4);
+        map.add(7,5);
+        boolean actual = map.containsValue(4);
+        Assert.assertTrue(actual);
+    }
+    @Test
+    public void containsValueFalseTest(){
+        map.add(3,4);
+        map.add(7,5);
+        boolean actual = map.containsValue(7);
+        Assert.assertFalse(actual);
+    }
+
+    @Test
+    public void entrySetTest(){
+        map.add(3,4);
+        map.add(7,5);
+        map.add(5,6);
+        Object [][] actual = map.entrySet();
+        Object [][] expected = {{3,4}, {7,5}, {5,6}};
+        Assert.assertArrayEquals(expected, actual);
+    }
+
+    @Test
+    public void equalsTrueTest(){
+        map.add(3,4);
+        map.add(7,5);
+        map2.add(3,4);
+        map2.add(7,5);
+        boolean actual = map.equals(map2);
+        Assert.assertTrue(actual);
+    }
+
+    @Test
+    public void equalsFalseTest(){
+        map.add(3,4);
+        map.add(7,5);
+        map2.add(9,4);
+        map2.add(7,5);
+        boolean actual = map.equals(map2);
+        Assert.assertFalse(actual);
+    }
+
+    @Test
+    public void getTest(){
+        map.add(3,4);
+        map.add(7,5);
+        map.add(5,6);
+        Object actual = map.get(7);
+        Object expected = 5;
+        Assert.assertEquals(expected, actual);
+    }
+
 }