myArrayList done

.idea/workspace.xml

@@ -20,10 +20,12 @@
           <file leaf-file-name="MyArrayList.java" pinned="false" current-in-tab="true">
             <entry file="file://$PROJECT_DIR$/src/main/java/MyArrayList.java">
               <provider selected="true" editor-type-id="text-editor">
-                <state relative-caret-position="492">
-                  <caret line="76" column="25" selection-start-line="76" selection-start-column="25" selection-end-line="76" selection-end-column="25" />
+                <state relative-caret-position="329">
+                  <caret line="104" column="25" selection-start-line="104" selection-start-column="25" selection-end-line="104" selection-end-column="25" />
                   <folding>
                     <element signature="imports" expanded="true" />
+                    <element signature="e#863#864#0" expanded="true" />
+                    <element signature="e#900#901#0" expanded="true" />
                     <element signature="e#1164#1165#0" expanded="true" />
                     <element signature="e#1200#1201#0" expanded="true" />
                   </folding>
@@ -34,8 +36,8 @@
           <file leaf-file-name="ArrayList.java" pinned="false" current-in-tab="false">
             <entry file="jar:///Library/Java/JavaVirtualMachines/jdk1.8.0_171.jdk/Contents/Home/src.zip!/java/util/ArrayList.java">
               <provider selected="true" editor-type-id="text-editor">
-                <state relative-caret-position="4307">
-                  <caret line="529" column="16" lean-forward="true" selection-start-line="529" selection-start-column="16" selection-end-line="529" selection-end-column="16" />
+                <state relative-caret-position="125">
+                  <caret line="549" column="44" selection-start-line="549" selection-start-column="39" selection-end-line="549" selection-end-column="44" />
                 </state>
               </provider>
             </entry>
@@ -47,8 +49,8 @@
           <file leaf-file-name="MyArrayListTest.java" pinned="false" current-in-tab="true">
             <entry file="file://$PROJECT_DIR$/src/test/java/MyArrayListTest.java">
               <provider selected="true" editor-type-id="text-editor">
-                <state relative-caret-position="569">
-                  <caret line="73" lean-forward="true" selection-start-line="73" selection-end-line="73" />
+                <state relative-caret-position="344">
+                  <caret line="128" column="37" lean-forward="true" selection-start-line="128" selection-start-column="37" selection-end-line="128" selection-end-column="37" />
                   <folding>
                     <element signature="imports" expanded="true" />
                     <element signature="e#184#193#0" expanded="true" />
@@ -71,6 +73,7 @@
   <component name="FindInProjectRecents">
     <findStrings>
       <find>remove</find>
+      <find>clear</find>
     </findStrings>
   </component>
   <component name="Git.Settings">
@@ -79,8 +82,8 @@
   <component name="IdeDocumentHistory">
     <option name="CHANGED_PATHS">
       <list>
-        <option value="$PROJECT_DIR$/src/main/java/MyArrayList.java" />
         <option value="$PROJECT_DIR$/src/test/java/MyArrayListTest.java" />
+        <option value="$PROJECT_DIR$/src/main/java/MyArrayList.java" />
       </list>
     </option>
   </component>
@@ -182,17 +185,17 @@
       </list>
     </option>
   </component>
-  <component name="RunManager" selected="JUnit.MyArrayListTest.setTest">
+  <component name="RunManager" selected="JUnit.MyArrayListTest.sizeTest">
     <configuration default="true" type="Application" factoryName="Application">
       <option name="WORKING_DIRECTORY" value="$PROJECT_DIR$" />
     </configuration>
-    <configuration name="MyArrayListTest.get1Test" type="JUnit" factoryName="JUnit" temporary="true" nameIsGenerated="true">
+    <configuration name="MyArrayListTest.containsTest" type="JUnit" factoryName="JUnit" temporary="true" nameIsGenerated="true">
       <module name="generics" />
       <option name="ALTERNATIVE_JRE_PATH_ENABLED" value="false" />
       <option name="ALTERNATIVE_JRE_PATH" />
       <option name="PACKAGE_NAME" value="" />
       <option name="MAIN_CLASS_NAME" value="MyArrayListTest" />
-      <option name="METHOD_NAME" value="get1Test" />
+      <option name="METHOD_NAME" value="containsTest" />
       <option name="TEST_OBJECT" value="method" />
       <option name="VM_PARAMETERS" value="-ea" />
       <option name="PARAMETERS" />
@@ -203,13 +206,13 @@
       </option>
       <patterns />
     </configuration>
-    <configuration name="MyArrayListTest.get2Test" type="JUnit" factoryName="JUnit" temporary="true" nameIsGenerated="true">
+    <configuration name="MyArrayListTest.containsTest1" type="JUnit" factoryName="JUnit" temporary="true" nameIsGenerated="true">
       <module name="generics" />
       <option name="ALTERNATIVE_JRE_PATH_ENABLED" value="false" />
       <option name="ALTERNATIVE_JRE_PATH" />
       <option name="PACKAGE_NAME" value="" />
       <option name="MAIN_CLASS_NAME" value="MyArrayListTest" />
-      <option name="METHOD_NAME" value="get2Test" />
+      <option name="METHOD_NAME" value="containsTest1" />
       <option name="TEST_OBJECT" value="method" />
       <option name="VM_PARAMETERS" value="-ea" />
       <option name="PARAMETERS" />
@@ -220,13 +223,13 @@
       </option>
       <patterns />
     </configuration>
-    <configuration name="MyArrayListTest.getTest" type="JUnit" factoryName="JUnit" temporary="true" nameIsGenerated="true">
+    <configuration name="MyArrayListTest.isEmptyTest" type="JUnit" factoryName="JUnit" temporary="true" nameIsGenerated="true">
       <module name="generics" />
       <option name="ALTERNATIVE_JRE_PATH_ENABLED" value="false" />
       <option name="ALTERNATIVE_JRE_PATH" />
       <option name="PACKAGE_NAME" value="" />
       <option name="MAIN_CLASS_NAME" value="MyArrayListTest" />
-      <option name="METHOD_NAME" value="getTest" />
+      <option name="METHOD_NAME" value="isEmptyTest" />
       <option name="TEST_OBJECT" value="method" />
       <option name="VM_PARAMETERS" value="-ea" />
       <option name="PARAMETERS" />
@@ -237,13 +240,13 @@
       </option>
       <patterns />
     </configuration>
-    <configuration name="MyArrayListTest.removeTest" type="JUnit" factoryName="JUnit" temporary="true" nameIsGenerated="true">
+    <configuration name="MyArrayListTest.isEmptyTest1" type="JUnit" factoryName="JUnit" temporary="true" nameIsGenerated="true">
       <module name="generics" />
       <option name="ALTERNATIVE_JRE_PATH_ENABLED" value="false" />
       <option name="ALTERNATIVE_JRE_PATH" />
       <option name="PACKAGE_NAME" value="" />
       <option name="MAIN_CLASS_NAME" value="MyArrayListTest" />
-      <option name="METHOD_NAME" value="removeTest" />
+      <option name="METHOD_NAME" value="isEmptyTest1" />
       <option name="TEST_OBJECT" value="method" />
       <option name="VM_PARAMETERS" value="-ea" />
       <option name="PARAMETERS" />
@@ -254,13 +257,13 @@
       </option>
       <patterns />
     </configuration>
-    <configuration name="MyArrayListTest.setTest" type="JUnit" factoryName="JUnit" temporary="true" nameIsGenerated="true">
+    <configuration name="MyArrayListTest.sizeTest" type="JUnit" factoryName="JUnit" temporary="true" nameIsGenerated="true">
       <module name="generics" />
       <option name="ALTERNATIVE_JRE_PATH_ENABLED" value="false" />
       <option name="ALTERNATIVE_JRE_PATH" />
       <option name="PACKAGE_NAME" value="" />
       <option name="MAIN_CLASS_NAME" value="MyArrayListTest" />
-      <option name="METHOD_NAME" value="setTest" />
+      <option name="METHOD_NAME" value="sizeTest" />
       <option name="TEST_OBJECT" value="method" />
       <option name="VM_PARAMETERS" value="-ea" />
       <option name="PARAMETERS" />
@@ -310,19 +313,19 @@
       <listeners />
     </configuration>
     <list>
-      <item itemvalue="JUnit.MyArrayListTest.getTest" />
-      <item itemvalue="JUnit.MyArrayListTest.get1Test" />
-      <item itemvalue="JUnit.MyArrayListTest.get2Test" />
-      <item itemvalue="JUnit.MyArrayListTest.removeTest" />
-      <item itemvalue="JUnit.MyArrayListTest.setTest" />
+      <item itemvalue="JUnit.MyArrayListTest.isEmptyTest" />
+      <item itemvalue="JUnit.MyArrayListTest.isEmptyTest1" />
+      <item itemvalue="JUnit.MyArrayListTest.containsTest" />
+      <item itemvalue="JUnit.MyArrayListTest.containsTest1" />
+      <item itemvalue="JUnit.MyArrayListTest.sizeTest" />
     </list>
     <recent_temporary>
       <list>
-        <item itemvalue="JUnit.MyArrayListTest.setTest" />
-        <item itemvalue="JUnit.MyArrayListTest.removeTest" />
-        <item itemvalue="JUnit.MyArrayListTest.get2Test" />
-        <item itemvalue="JUnit.MyArrayListTest.get1Test" />
-        <item itemvalue="JUnit.MyArrayListTest.getTest" />
+        <item itemvalue="JUnit.MyArrayListTest.sizeTest" />
+        <item itemvalue="JUnit.MyArrayListTest.containsTest1" />
+        <item itemvalue="JUnit.MyArrayListTest.containsTest" />
+        <item itemvalue="JUnit.MyArrayListTest.isEmptyTest1" />
+        <item itemvalue="JUnit.MyArrayListTest.isEmptyTest" />
       </list>
     </recent_temporary>
   </component>
@@ -337,44 +340,44 @@
       <option name="presentableId" value="Default" />
       <updated>1530106571709</updated>
       <workItem from="1530106581652" duration="58000" />
-      <workItem from="1530122909636" duration="10967000" />
+      <workItem from="1530122909636" duration="12816000" />
     </task>
     <servers />
   </component>
   <component name="TestHistory">
-    <history-entry file="MyArrayListTest_add1Test - 2018.06.27 at 16h 22m 27s.xml">
-      <configuration name="MyArrayListTest.add1Test" configurationId="JUnit" />
+    <history-entry file="MyArrayListTest_setTest1 - 2018.06.27 at 18h 51m 39s.xml">
+      <configuration name="MyArrayListTest.setTest1" configurationId="JUnit" />
     </history-entry>
-    <history-entry file="MyArrayListTest_getTest - 2018.06.27 at 16h 37m 49s.xml">
-      <configuration name="MyArrayListTest.getTest" configurationId="JUnit" />
+    <history-entry file="MyArrayListTest_setTest1 - 2018.06.27 at 18h 52m 26s.xml">
+      <configuration name="MyArrayListTest.setTest1" configurationId="JUnit" />
     </history-entry>
-    <history-entry file="MyArrayListTest_getTest - 2018.06.27 at 16h 39m 28s.xml">
-      <configuration name="MyArrayListTest.getTest" configurationId="JUnit" />
+    <history-entry file="MyArrayListTest_setTest1 - 2018.06.27 at 18h 52m 45s.xml">
+      <configuration name="MyArrayListTest.setTest1" configurationId="JUnit" />
     </history-entry>
-    <history-entry file="MyArrayListTest_get1Test - 2018.06.27 at 16h 39m 58s.xml">
-      <configuration name="MyArrayListTest.get1Test" configurationId="JUnit" />
+    <history-entry file="MyArrayListTest_clearTest - 2018.06.27 at 19h 05m 27s.xml">
+      <configuration name="MyArrayListTest.clearTest" configurationId="JUnit" />
     </history-entry>
-    <history-entry file="MyArrayListTest_get1Test - 2018.06.27 at 16h 40m 04s.xml">
-      <configuration name="MyArrayListTest.get1Test" configurationId="JUnit" />
+    <history-entry file="MyArrayListTest_clearTest - 2018.06.27 at 19h 05m 47s.xml">
+      <configuration name="MyArrayListTest.clearTest" configurationId="JUnit" />
     </history-entry>
-    <history-entry file="MyArrayListTest_get2Test - 2018.06.27 at 16h 42m 41s.xml">
-      <configuration name="MyArrayListTest.get2Test" configurationId="JUnit" />
+    <history-entry file="MyArrayListTest_clearTest - 2018.06.27 at 19h 06m 03s.xml">
+      <configuration name="MyArrayListTest.clearTest" configurationId="JUnit" />
     </history-entry>
-    <history-entry file="MyArrayListTest_get2Test - 2018.06.27 at 16h 45m 56s.xml">
-      <configuration name="MyArrayListTest.get2Test" configurationId="JUnit" />
+    <history-entry file="MyArrayListTest_isEmptyTest - 2018.06.27 at 19h 09m 07s.xml">
+      <configuration name="MyArrayListTest.isEmptyTest" configurationId="JUnit" />
     </history-entry>
-    <history-entry file="MyArrayListTest_removeTest - 2018.06.27 at 17h 07m 04s.xml">
-      <configuration name="MyArrayListTest.removeTest" configurationId="JUnit" />
+    <history-entry file="MyArrayListTest_isEmptyTest - 2018.06.27 at 19h 09m 35s.xml">
+      <configuration name="MyArrayListTest.isEmptyTest" configurationId="JUnit" />
     </history-entry>
-    <history-entry file="MyArrayListTest_removeTest - 2018.06.27 at 17h 11m 14s.xml">
-      <configuration name="MyArrayListTest.removeTest" configurationId="JUnit" />
+    <history-entry file="MyArrayListTest_isEmptyTest1 - 2018.06.27 at 19h 09m 57s.xml">
+      <configuration name="MyArrayListTest.isEmptyTest1" configurationId="JUnit" />
     </history-entry>
-    <history-entry file="MyArrayListTest_removeTest - 2018.06.27 at 17h 11m 25s.xml">
-      <configuration name="MyArrayListTest.removeTest" configurationId="JUnit" />
+    <history-entry file="MyArrayListTest_containsTest - 2018.06.27 at 19h 12m 33s.xml">
+      <configuration name="MyArrayListTest.containsTest" configurationId="JUnit" />
     </history-entry>
   </component>
   <component name="TimeTrackingManager">
-    <option name="totallyTimeSpent" value="11025000" />
+    <option name="totallyTimeSpent" value="12874000" />
   </component>
   <component name="ToolWindowManager">
     <frame x="-208" y="-927" width="1881" height="941" extended-state="0" />
@@ -382,14 +385,14 @@
     <layout>
       <window_info anchor="right" id="Palette" order="3" />
       <window_info anchor="bottom" id="TODO" order="6" />
-      <window_info anchor="bottom" id="Messages" weight="0.06942753" />
+      <window_info anchor="bottom" id="Messages" weight="0.24238734" />
       <window_info anchor="right" id="Palette&#9;" order="3" />
       <window_info id="Image Layers" order="2" />
       <window_info anchor="right" id="Capture Analysis" order="3" />
       <window_info anchor="bottom" id="Event Log" order="7" side_tool="true" />
       <window_info anchor="right" id="Maven Projects" order="3" />
       <window_info anchor="bottom" id="Database Changes" order="7" show_stripe_button="false" />
-      <window_info active="true" anchor="bottom" id="Run" order="2" visible="true" weight="0.12423874" />
+      <window_info active="true" anchor="bottom" id="Run" order="2" visible="true" weight="0.3227771" />
       <window_info anchor="bottom" id="Version Control" order="7" />
       <window_info anchor="bottom" id="Terminal" order="7" weight="0.32886723" />
       <window_info id="Capture Tool" order="2" />
@@ -418,7 +421,7 @@
   </component>
   <component name="XDebuggerManager">
     <breakpoint-manager>
-      <option name="time" value="1" />
+      <option name="time" value="2" />
     </breakpoint-manager>
   </component>
   <component name="editorHistoryManager">
@@ -434,17 +437,19 @@
     </entry>
     <entry file="jar:///Library/Java/JavaVirtualMachines/jdk1.8.0_171.jdk/Contents/Home/src.zip!/java/util/ArrayList.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="4307">
-          <caret line="529" column="16" lean-forward="true" selection-start-line="529" selection-start-column="16" selection-end-line="529" selection-end-column="16" />
+        <state relative-caret-position="125">
+          <caret line="549" column="44" selection-start-line="549" selection-start-column="39" selection-end-line="549" selection-end-column="44" />
         </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="492">
-          <caret line="76" column="25" selection-start-line="76" selection-start-column="25" selection-end-line="76" selection-end-column="25" />
+        <state relative-caret-position="329">
+          <caret line="104" column="25" selection-start-line="104" selection-start-column="25" selection-end-line="104" selection-end-column="25" />
           <folding>
             <element signature="imports" expanded="true" />
+            <element signature="e#863#864#0" expanded="true" />
+            <element signature="e#900#901#0" expanded="true" />
             <element signature="e#1164#1165#0" expanded="true" />
             <element signature="e#1200#1201#0" expanded="true" />
           </folding>
@@ -453,8 +458,8 @@
     </entry>
     <entry file="file://$PROJECT_DIR$/src/test/java/MyArrayListTest.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="569">
-          <caret line="73" lean-forward="true" selection-start-line="73" selection-end-line="73" />
+        <state relative-caret-position="344">
+          <caret line="128" column="37" lean-forward="true" selection-start-line="128" selection-start-column="37" selection-end-line="128" selection-end-column="37" />
           <folding>
             <element signature="imports" expanded="true" />
             <element signature="e#184#193#0" expanded="true" />
@@ -479,7 +484,7 @@
       </state>
       <state key="FacetStructureConfigurable.UI">
         <settings>
-          <last-edited>No facets are configured</last-edited>
+          <last-edited />
           <splitter-proportions>
             <option name="proportions">
               <list>
@@ -539,7 +544,7 @@
       </state>
       <state key="ProjectLibrariesConfigurable.UI">
         <settings>
-          <last-edited>Maven: junit:junit:4.12</last-edited>
+          <last-edited />
           <splitter-proportions>
             <option name="proportions">
               <list>

src/main/java/MyArrayList.java

@@ -37,6 +37,10 @@ public class MyArrayList <T>{
         }
     }
 
+    public int sizeWithNull(){
+        return element.length;
+    }
+
     public int size(){
         long size = Arrays.stream(element)
                           .filter(s -> (s != null))
@@ -79,4 +83,31 @@ public class MyArrayList <T>{
         element = new Object[element.length+i];
         arrCopy(element, temp);
     }
+
+    public void clear() {
+        for(int i = 0; i < element.length; i++){
+            element[i] = null;
+        }
+    }
+
+    public boolean isEmpty() {
+        for(Object o: element){
+            if (!(o ==null)){
+                return false;
+            }
+        }
+        return true;
+    }
+
+    public boolean contains(T i) {
+        for(Object o: element){
+            if(o == null){
+                continue;
+            }
+            if (o.equals(i)){
+                return true;
+            }
+        }
+        return false;
+    }
 }

src/test/java/MyArrayListTest.java

@@ -73,22 +73,89 @@ public class MyArrayListTest {
     }
 
     @Test
+    public void setTest1(){
+        MyArrayList<String> myArrayList = new MyArrayList<>();
+        myArrayList.set(12, "dog");
+        myArrayList.set(2, "cat");
+        String expected = "cat";
+        int expectedSize = 22;
+        String actual = myArrayList.get(2);
+        Assert.assertEquals(expected, actual);
+        Assert.assertTrue(expectedSize == myArrayList.sizeWithNull());
+    }
+
+    @Test
+    public void arrayExpanderTest(){
+        MyArrayList<String> myArrayList = new MyArrayList<>();
+        myArrayList.arrayExpander(2);
+        int expected = 12;
+        int actual = myArrayList.sizeWithNull();
+        Assert.assertEquals(expected, actual);
+    }
+
+    @Test
     public void clearTest(){
+        MyArrayList<Integer> myArrayList = new MyArrayList<>();
+        myArrayList.add(2);
+        myArrayList.add(3);
+        myArrayList.clear();
+        Integer expected = null;
+        Integer sizeExpected = 10;
+        Assert.assertEquals(expected, myArrayList.get(1));
+        Assert.assertTrue(sizeExpected == myArrayList.sizeWithNull());
 
     }
 
     @Test
     public void isEmptyTest(){
+        MyArrayList<Integer> myArrayList = new MyArrayList<>();
+        boolean actual = myArrayList.isEmpty();
+        Assert.assertTrue(actual);
+    }
 
+    @Test
+    public void isEmptyTest1(){
+        MyArrayList<Integer> myArrayList = new MyArrayList<>();
+        myArrayList.add(1);
+        boolean actual = myArrayList.isEmpty();
+        Assert.assertFalse(actual);
     }
 
     @Test
     public void containsTest(){
+        MyArrayList<Integer> myArrayList = new MyArrayList<>();
+        myArrayList.add(1);
+        boolean contains = myArrayList.contains(3);
+        Assert.assertFalse(contains);
+    }
 
+    @Test
+    public void containsTest1(){
+        MyArrayList<Integer> myArrayList = new MyArrayList<>();
+        myArrayList.add(1);
+        myArrayList.add(1);
+        myArrayList.add(4);
+        myArrayList.add(1);
+        myArrayList.add(1);
+        myArrayList.add(1);
+        boolean contains = myArrayList.contains(4);
+        Assert.assertTrue(contains);
     }
 
     @Test
     public void sizeTest(){
-
+        MyArrayList<Integer> myArrayList = new MyArrayList<>();
+        myArrayList.add(1);
+        myArrayList.add(1);
+        myArrayList.add(4);
+        myArrayList.add(1);
+        myArrayList.add(1);
+        myArrayList.add(1);
+        myArrayList.add(1);
+        myArrayList.add(1);
+        myArrayList.add(1);
+        myArrayList.add(1);
+        myArrayList.add(1);
+        Assert.assertTrue(myArrayList.size() == 11);
     }
 }