From a61fd76b6b81d92ddd8c2cf76a134ee960ef19eb Mon Sep 17 00:00:00 2001
From: Keith Brinker <keithbrinker@zipcoders-MacBook-Pro-2.local>
Date: Fri, 9 Mar 2018 14:17:32 -0500
Subject: [PATCH 1/5] working

---
 .idea/.name                                   |   1 +
 .idea/compiler.xml                            |  16 +
 .idea/libraries/Maven__junit_junit_4_12.xml   |  13 +
 .../Maven__org_hamcrest_hamcrest_core_1_3.xml |  13 +
 .idea/misc.xml                                |  13 +
 .idea/modules.xml                             |   8 +
 .idea/vcs.xml                                 |   6 +
 .idea/workspace.xml                           | 470 ++++++++++++++++++
 generics.iml                                  |  16 +
 src/main/java/MyArrayList.java                |  55 ++
 src/test/java/TestMyArrayList.java            | 105 ++++
 11 files changed, 716 insertions(+)
 create mode 100644 .idea/.name
 create mode 100644 .idea/compiler.xml
 create mode 100644 .idea/libraries/Maven__junit_junit_4_12.xml
 create mode 100644 .idea/libraries/Maven__org_hamcrest_hamcrest_core_1_3.xml
 create mode 100644 .idea/misc.xml
 create mode 100644 .idea/modules.xml
 create mode 100644 .idea/vcs.xml
 create mode 100644 .idea/workspace.xml
 create mode 100644 generics.iml
 create mode 100644 src/main/java/MyArrayList.java
 create mode 100644 src/test/java/TestMyArrayList.java

diff --git a/.idea/.name b/.idea/.name
new file mode 100644
index 0000000..1f58a0f
--- /dev/null
+++ b/.idea/.name
@@ -0,0 +1 @@
+generics
\ No newline at end of file
diff --git a/.idea/compiler.xml b/.idea/compiler.xml
new file mode 100644
index 0000000..c20d346
--- /dev/null
+++ b/.idea/compiler.xml
@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="CompilerConfiguration">
+    <annotationProcessing>
+      <profile name="Maven default annotation processors profile" enabled="true">
+        <sourceOutputDir name="target/generated-sources/annotations" />
+        <sourceTestOutputDir name="target/generated-test-sources/test-annotations" />
+        <outputRelativeToContentRoot value="true" />
+        <module name="generics" />
+      </profile>
+    </annotationProcessing>
+    <bytecodeTargetLevel>
+      <module name="generics" target="1.7" />
+    </bytecodeTargetLevel>
+  </component>
+</project>
\ No newline at end of file
diff --git a/.idea/libraries/Maven__junit_junit_4_12.xml b/.idea/libraries/Maven__junit_junit_4_12.xml
new file mode 100644
index 0000000..d411041
--- /dev/null
+++ b/.idea/libraries/Maven__junit_junit_4_12.xml
@@ -0,0 +1,13 @@
+<component name="libraryTable">
+  <library name="Maven: junit:junit:4.12">
+    <CLASSES>
+      <root url="jar://$MAVEN_REPOSITORY$/junit/junit/4.12/junit-4.12.jar!/" />
+    </CLASSES>
+    <JAVADOC>
+      <root url="jar://$MAVEN_REPOSITORY$/junit/junit/4.12/junit-4.12-javadoc.jar!/" />
+    </JAVADOC>
+    <SOURCES>
+      <root url="jar://$MAVEN_REPOSITORY$/junit/junit/4.12/junit-4.12-sources.jar!/" />
+    </SOURCES>
+  </library>
+</component>
\ No newline at end of file
diff --git a/.idea/libraries/Maven__org_hamcrest_hamcrest_core_1_3.xml b/.idea/libraries/Maven__org_hamcrest_hamcrest_core_1_3.xml
new file mode 100644
index 0000000..f58bbc1
--- /dev/null
+++ b/.idea/libraries/Maven__org_hamcrest_hamcrest_core_1_3.xml
@@ -0,0 +1,13 @@
+<component name="libraryTable">
+  <library name="Maven: org.hamcrest:hamcrest-core:1.3">
+    <CLASSES>
+      <root url="jar://$MAVEN_REPOSITORY$/org/hamcrest/hamcrest-core/1.3/hamcrest-core-1.3.jar!/" />
+    </CLASSES>
+    <JAVADOC>
+      <root url="jar://$MAVEN_REPOSITORY$/org/hamcrest/hamcrest-core/1.3/hamcrest-core-1.3-javadoc.jar!/" />
+    </JAVADOC>
+    <SOURCES>
+      <root url="jar://$MAVEN_REPOSITORY$/org/hamcrest/hamcrest-core/1.3/hamcrest-core-1.3-sources.jar!/" />
+    </SOURCES>
+  </library>
+</component>
\ No newline at end of file
diff --git a/.idea/misc.xml b/.idea/misc.xml
new file mode 100644
index 0000000..d30d09e
--- /dev/null
+++ b/.idea/misc.xml
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="MavenProjectsManager">
+    <option name="originalFiles">
+      <list>
+        <option value="$PROJECT_DIR$/pom.xml" />
+      </list>
+    </option>
+  </component>
+  <component name="ProjectRootManager" version="2" languageLevel="JDK_1_8" project-jdk-name="1.8" project-jdk-type="JavaSDK">
+    <output url="file://$PROJECT_DIR$/classes" />
+  </component>
+</project>
\ No newline at end of file
diff --git a/.idea/modules.xml b/.idea/modules.xml
new file mode 100644
index 0000000..ca63f44
--- /dev/null
+++ b/.idea/modules.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="ProjectModuleManager">
+    <modules>
+      <module fileurl="file://$PROJECT_DIR$/generics.iml" filepath="$PROJECT_DIR$/generics.iml" />
+    </modules>
+  </component>
+</project>
\ No newline at end of file
diff --git a/.idea/vcs.xml b/.idea/vcs.xml
new file mode 100644
index 0000000..94a25f7
--- /dev/null
+++ b/.idea/vcs.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="VcsDirectoryMappings">
+    <mapping directory="$PROJECT_DIR$" vcs="Git" />
+  </component>
+</project>
\ No newline at end of file
diff --git a/.idea/workspace.xml b/.idea/workspace.xml
new file mode 100644
index 0000000..9ca3cbf
--- /dev/null
+++ b/.idea/workspace.xml
@@ -0,0 +1,470 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="ChangeListManager">
+    <list default="true" id="4517e1b3-e1e9-441b-9625-074d954a9ea9" name="Default" comment="">
+      <change beforePath="" afterPath="$PROJECT_DIR$/src/test/java/TestMyArrayList.java" />
+    </list>
+    <ignored path="$PROJECT_DIR$/target/" />
+    <option name="EXCLUDED_CONVERTED_TO_IGNORED" value="true" />
+    <option name="TRACKING_ENABLED" value="true" />
+    <option name="SHOW_DIALOG" value="false" />
+    <option name="HIGHLIGHT_CONFLICTS" value="true" />
+    <option name="HIGHLIGHT_NON_ACTIVE_CHANGELIST" value="false" />
+    <option name="LAST_RESOLUTION" value="IGNORE" />
+  </component>
+  <component name="FileEditorManager">
+    <splitter split-orientation="horizontal" split-proportion="0.45561665">
+      <split-first>
+        <leaf>
+          <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="118">
+                  <caret line="24" column="25" lean-forward="true" selection-start-line="24" selection-start-column="25" selection-end-line="24" selection-end-column="25" />
+                  <folding>
+                    <element signature="e#169#170#0" expanded="true" />
+                    <element signature="e#210#211#0" expanded="true" />
+                    <element signature="e#248#249#0" expanded="true" />
+                    <element signature="e#295#296#0" expanded="true" />
+                    <element signature="e#749#750#0" expanded="true" />
+                    <element signature="e#777#778#0" expanded="true" />
+                    <element signature="e#809#810#0" expanded="true" />
+                    <element signature="e#837#838#0" expanded="true" />
+                  </folding>
+                </state>
+              </provider>
+            </entry>
+          </file>
+        </leaf>
+      </split-first>
+      <split-second>
+        <leaf>
+          <file leaf-file-name="TestMyArrayList.java" pinned="false" current-in-tab="true">
+            <entry file="file://$PROJECT_DIR$/src/test/java/TestMyArrayList.java">
+              <provider selected="true" editor-type-id="text-editor">
+                <state relative-caret-position="316">
+                  <caret line="42" column="0" lean-forward="true" selection-start-line="42" selection-start-column="0" selection-end-line="42" selection-end-column="0" />
+                  <folding>
+                    <element signature="imports" expanded="true" />
+                  </folding>
+                </state>
+              </provider>
+            </entry>
+          </file>
+        </leaf>
+      </split-second>
+    </splitter>
+  </component>
+  <component name="FileTemplateManagerImpl">
+    <option name="RECENT_TEMPLATES">
+      <list>
+        <option value="Class" />
+      </list>
+    </option>
+  </component>
+  <component name="Git.Settings">
+    <option name="RECENT_GIT_ROOT_PATH" value="$PROJECT_DIR$" />
+  </component>
+  <component name="GradleLocalSettings">
+    <option name="externalProjectsViewState">
+      <projects_view />
+    </option>
+  </component>
+  <component name="IdeDocumentHistory">
+    <option name="CHANGED_PATHS">
+      <list>
+        <option value="$PROJECT_DIR$/src/main/java/MyArrayList.java" />
+        <option value="$PROJECT_DIR$/src/test/java/TestMyArrayList.java" />
+      </list>
+    </option>
+  </component>
+  <component name="JsBuildToolGruntFileManager" detection-done="true" sorting="DEFINITION_ORDER" />
+  <component name="JsBuildToolPackageJson" detection-done="true" sorting="DEFINITION_ORDER" />
+  <component name="JsGulpfileManager">
+    <detection-done>true</detection-done>
+    <sorting>DEFINITION_ORDER</sorting>
+  </component>
+  <component name="ProjectFrameBounds">
+    <option name="x" value="18" />
+    <option name="y" value="23" />
+    <option name="width" value="1422" />
+    <option name="height" value="838" />
+  </component>
+  <component name="ProjectLevelVcsManager" settingsEditedManually="true" />
+  <component name="ProjectView">
+    <navigator currentView="ProjectPane" proportions="" version="1">
+      <flattenPackages />
+      <showMembers />
+      <showModules />
+      <showLibraryContents />
+      <hideEmptyPackages />
+      <abbreviatePackageNames />
+      <autoscrollToSource />
+      <autoscrollFromSource />
+      <sortByType />
+      <manualOrder />
+      <foldersAlwaysOnTop value="true" />
+    </navigator>
+    <panes>
+      <pane id="ProjectPane">
+        <subPane>
+          <expand>
+            <path>
+              <item name="generics" type="b2602c69:ProjectViewProjectNode" />
+              <item name="CR-MicroLabs-Generics-MyArrayList" type="462c0819:PsiDirectoryNode" />
+            </path>
+            <path>
+              <item name="generics" type="b2602c69:ProjectViewProjectNode" />
+              <item name="CR-MicroLabs-Generics-MyArrayList" type="462c0819:PsiDirectoryNode" />
+              <item name="src" type="462c0819:PsiDirectoryNode" />
+            </path>
+            <path>
+              <item name="generics" type="b2602c69:ProjectViewProjectNode" />
+              <item name="CR-MicroLabs-Generics-MyArrayList" type="462c0819:PsiDirectoryNode" />
+              <item name="src" type="462c0819:PsiDirectoryNode" />
+              <item name="main" type="462c0819:PsiDirectoryNode" />
+            </path>
+            <path>
+              <item name="generics" type="b2602c69:ProjectViewProjectNode" />
+              <item name="CR-MicroLabs-Generics-MyArrayList" type="462c0819:PsiDirectoryNode" />
+              <item name="src" type="462c0819:PsiDirectoryNode" />
+              <item name="main" type="462c0819:PsiDirectoryNode" />
+              <item name="java" type="462c0819:PsiDirectoryNode" />
+            </path>
+            <path>
+              <item name="generics" type="b2602c69:ProjectViewProjectNode" />
+              <item name="CR-MicroLabs-Generics-MyArrayList" type="462c0819:PsiDirectoryNode" />
+              <item name="src" type="462c0819:PsiDirectoryNode" />
+              <item name="test" type="462c0819:PsiDirectoryNode" />
+            </path>
+            <path>
+              <item name="generics" type="b2602c69:ProjectViewProjectNode" />
+              <item name="CR-MicroLabs-Generics-MyArrayList" type="462c0819:PsiDirectoryNode" />
+              <item name="src" type="462c0819:PsiDirectoryNode" />
+              <item name="test" type="462c0819:PsiDirectoryNode" />
+              <item name="java" type="462c0819:PsiDirectoryNode" />
+            </path>
+          </expand>
+          <select />
+        </subPane>
+      </pane>
+      <pane id="Scope" />
+      <pane id="AndroidView" />
+      <pane id="Scratches" />
+      <pane id="PackagesPane" />
+    </panes>
+  </component>
+  <component name="PropertiesComponent">
+    <property name="nodejs_interpreter_path.stuck_in_default_project" value="undefined stuck path" />
+    <property name="WebServerToolWindowFactoryState" value="false" />
+    <property name="aspect.path.notification.shown" value="true" />
+    <property name="last_opened_file_path" value="$PROJECT_DIR$" />
+  </component>
+  <component name="RunDashboard">
+    <option name="ruleStates">
+      <list>
+        <RuleState>
+          <option name="name" value="ConfigurationTypeDashboardGroupingRule" />
+        </RuleState>
+        <RuleState>
+          <option name="name" value="StatusDashboardGroupingRule" />
+        </RuleState>
+      </list>
+    </option>
+  </component>
+  <component name="RunManager" selected="JUnit.TestMyArrayList">
+    <configuration default="true" type="Applet" factoryName="Applet">
+      <option name="HTML_USED" value="false" />
+      <option name="WIDTH" value="400" />
+      <option name="HEIGHT" value="300" />
+      <option name="POLICY_FILE" value="$APPLICATION_HOME_DIR$/bin/appletviewer.policy" />
+      <module />
+    </configuration>
+    <configuration default="true" type="Application" factoryName="Application">
+      <extension name="coverage" enabled="false" merge="false" sample_coverage="true" runner="idea" />
+      <option name="MAIN_CLASS_NAME" />
+      <option name="VM_PARAMETERS" />
+      <option name="PROGRAM_PARAMETERS" />
+      <option name="WORKING_DIRECTORY" value="$PROJECT_DIR$" />
+      <option name="ALTERNATIVE_JRE_PATH_ENABLED" value="false" />
+      <option name="ALTERNATIVE_JRE_PATH" />
+      <option name="ENABLE_SWING_INSPECTOR" value="false" />
+      <option name="ENV_VARIABLES" />
+      <option name="PASS_PARENT_ENVS" value="true" />
+      <module name="" />
+      <envs />
+    </configuration>
+    <configuration name="TestMyArrayList" type="JUnit" factoryName="JUnit" temporary="true" nameIsGenerated="true">
+      <extension name="coverage" enabled="false" merge="false" sample_coverage="true" runner="idea" />
+      <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="TestMyArrayList" />
+      <option name="METHOD_NAME" />
+      <option name="TEST_OBJECT" value="class" />
+      <option name="VM_PARAMETERS" value="-ea" />
+      <option name="PARAMETERS" />
+      <option name="WORKING_DIRECTORY" value="%MODULE_WORKING_DIR%" />
+      <option name="ENV_VARIABLES" />
+      <option name="PASS_PARENT_ENVS" value="true" />
+      <option name="TEST_SEARCH_SCOPE">
+        <value defaultName="singleModule" />
+      </option>
+      <envs />
+      <patterns />
+    </configuration>
+    <configuration name="TestMyArrayList.intAddTest" type="JUnit" factoryName="JUnit" temporary="true" nameIsGenerated="true">
+      <extension name="coverage" enabled="false" merge="false" sample_coverage="true" runner="idea" />
+      <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="TestMyArrayList" />
+      <option name="METHOD_NAME" value="intAddTest" />
+      <option name="TEST_OBJECT" value="method" />
+      <option name="VM_PARAMETERS" value="-ea" />
+      <option name="PARAMETERS" />
+      <option name="WORKING_DIRECTORY" value="%MODULE_WORKING_DIR%" />
+      <option name="ENV_VARIABLES" />
+      <option name="PASS_PARENT_ENVS" value="true" />
+      <option name="TEST_SEARCH_SCOPE">
+        <value defaultName="singleModule" />
+      </option>
+      <envs />
+      <patterns />
+    </configuration>
+    <configuration name="TestMyArrayList.strAddTest" type="JUnit" factoryName="JUnit" temporary="true" nameIsGenerated="true">
+      <extension name="coverage" enabled="false" merge="false" sample_coverage="true" runner="idea" />
+      <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="TestMyArrayList" />
+      <option name="METHOD_NAME" value="strAddTest" />
+      <option name="TEST_OBJECT" value="method" />
+      <option name="VM_PARAMETERS" value="-ea" />
+      <option name="PARAMETERS" />
+      <option name="WORKING_DIRECTORY" value="%MODULE_WORKING_DIR%" />
+      <option name="ENV_VARIABLES" />
+      <option name="PASS_PARENT_ENVS" value="true" />
+      <option name="TEST_SEARCH_SCOPE">
+        <value defaultName="singleModule" />
+      </option>
+      <envs />
+      <patterns />
+    </configuration>
+    <configuration default="true" type="JUnit" factoryName="JUnit">
+      <extension name="coverage" enabled="false" merge="false" sample_coverage="true" runner="idea" />
+      <module name="" />
+      <option name="ALTERNATIVE_JRE_PATH_ENABLED" value="false" />
+      <option name="ALTERNATIVE_JRE_PATH" />
+      <option name="PACKAGE_NAME" />
+      <option name="MAIN_CLASS_NAME" />
+      <option name="METHOD_NAME" />
+      <option name="TEST_OBJECT" value="class" />
+      <option name="VM_PARAMETERS" value="-ea" />
+      <option name="PARAMETERS" />
+      <option name="WORKING_DIRECTORY" value="%MODULE_WORKING_DIR%" />
+      <option name="ENV_VARIABLES" />
+      <option name="PASS_PARENT_ENVS" value="true" />
+      <option name="TEST_SEARCH_SCOPE">
+        <value defaultName="singleModule" />
+      </option>
+      <envs />
+      <patterns />
+    </configuration>
+    <configuration default="true" type="Remote" factoryName="Remote">
+      <option name="USE_SOCKET_TRANSPORT" value="true" />
+      <option name="SERVER_MODE" value="false" />
+      <option name="SHMEM_ADDRESS" value="javadebug" />
+      <option name="HOST" value="localhost" />
+      <option name="PORT" value="5005" />
+    </configuration>
+    <configuration default="true" type="TestNG" factoryName="TestNG">
+      <extension name="coverage" enabled="false" merge="false" sample_coverage="true" runner="idea" />
+      <module name="" />
+      <option name="ALTERNATIVE_JRE_PATH_ENABLED" value="false" />
+      <option name="ALTERNATIVE_JRE_PATH" />
+      <option name="SUITE_NAME" />
+      <option name="PACKAGE_NAME" />
+      <option name="MAIN_CLASS_NAME" />
+      <option name="METHOD_NAME" />
+      <option name="GROUP_NAME" />
+      <option name="TEST_OBJECT" value="CLASS" />
+      <option name="VM_PARAMETERS" value="-ea" />
+      <option name="PARAMETERS" />
+      <option name="WORKING_DIRECTORY" value="%MODULE_WORKING_DIR%" />
+      <option name="OUTPUT_DIRECTORY" />
+      <option name="ANNOTATION_TYPE" />
+      <option name="ENV_VARIABLES" />
+      <option name="PASS_PARENT_ENVS" value="true" />
+      <option name="TEST_SEARCH_SCOPE">
+        <value defaultName="singleModule" />
+      </option>
+      <option name="USE_DEFAULT_REPORTERS" value="false" />
+      <option name="PROPERTIES_FILE" />
+      <envs />
+      <properties />
+      <listeners />
+    </configuration>
+    <configuration default="true" type="#org.jetbrains.idea.devkit.run.PluginConfigurationType" factoryName="Plugin">
+      <module name="" />
+      <option name="VM_PARAMETERS" value="-Xmx512m -Xms256m -XX:MaxPermSize=250m -ea" />
+      <option name="PROGRAM_PARAMETERS" />
+      <predefined_log_file id="idea.log" enabled="true" />
+    </configuration>
+    <list size="3">
+      <item index="0" class="java.lang.String" itemvalue="JUnit.TestMyArrayList.intAddTest" />
+      <item index="1" class="java.lang.String" itemvalue="JUnit.TestMyArrayList.strAddTest" />
+      <item index="2" class="java.lang.String" itemvalue="JUnit.TestMyArrayList" />
+    </list>
+    <recent_temporary>
+      <list size="3">
+        <item index="0" class="java.lang.String" itemvalue="JUnit.TestMyArrayList" />
+        <item index="1" class="java.lang.String" itemvalue="JUnit.TestMyArrayList.strAddTest" />
+        <item index="2" class="java.lang.String" itemvalue="JUnit.TestMyArrayList.intAddTest" />
+      </list>
+    </recent_temporary>
+  </component>
+  <component name="ShelveChangesManager" show_recycled="false">
+    <option name="remove_strategy" value="false" />
+  </component>
+  <component name="SvnConfiguration">
+    <configuration />
+  </component>
+  <component name="TaskManager">
+    <task active="true" id="Default" summary="Default task">
+      <changelist id="4517e1b3-e1e9-441b-9625-074d954a9ea9" name="Default" comment="" />
+      <created>1520609608789</created>
+      <option name="number" value="Default" />
+      <option name="presentableId" value="Default" />
+      <updated>1520609608789</updated>
+      <workItem from="1520609611988" duration="7811000" />
+    </task>
+    <servers />
+  </component>
+  <component name="TestHistory">
+    <history-entry file="TestMyArrayList - 2018.03.09 at 14h 16m 27s.xml">
+      <configuration name="TestMyArrayList" configurationId="JUnit" />
+    </history-entry>
+    <history-entry file="TestMyArrayList_intAddTest - 2018.03.09 at 13h 25m 35s.xml">
+      <configuration name="TestMyArrayList.intAddTest" configurationId="JUnit" />
+    </history-entry>
+    <history-entry file="TestMyArrayList_intAddTest - 2018.03.09 at 13h 28m 02s.xml">
+      <configuration name="TestMyArrayList.intAddTest" configurationId="JUnit" />
+    </history-entry>
+    <history-entry file="TestMyArrayList_intAddTest - 2018.03.09 at 13h 30m 50s.xml">
+      <configuration name="TestMyArrayList.intAddTest" configurationId="JUnit" />
+    </history-entry>
+    <history-entry file="TestMyArrayList_intAddTest - 2018.03.09 at 13h 37m 10s.xml">
+      <configuration name="TestMyArrayList.intAddTest" configurationId="JUnit" />
+    </history-entry>
+    <history-entry file="TestMyArrayList_intAddTest - 2018.03.09 at 13h 52m 45s.xml">
+      <configuration name="TestMyArrayList.intAddTest" configurationId="JUnit" />
+    </history-entry>
+    <history-entry file="TestMyArrayList_intAddTest - 2018.03.09 at 13h 55m 54s.xml">
+      <configuration name="TestMyArrayList.intAddTest" configurationId="JUnit" />
+    </history-entry>
+    <history-entry file="TestMyArrayList_intAddTest - 2018.03.09 at 14h 08m 49s.xml">
+      <configuration name="TestMyArrayList.intAddTest" configurationId="JUnit" />
+    </history-entry>
+    <history-entry file="TestMyArrayList_intAddTest - 2018.03.09 at 14h 09m 46s.xml">
+      <configuration name="TestMyArrayList.intAddTest" configurationId="JUnit" />
+    </history-entry>
+    <history-entry file="TestMyArrayList_strAddTest - 2018.03.09 at 14h 13m 46s.xml">
+      <configuration name="TestMyArrayList.strAddTest" configurationId="JUnit" />
+    </history-entry>
+  </component>
+  <component name="TimeTrackingManager">
+    <option name="totallyTimeSpent" value="7811000" />
+  </component>
+  <component name="ToolWindowManager">
+    <frame x="18" y="23" width="1422" height="838" extended-state="0" />
+    <editor active="true" />
+    <layout>
+      <window_info id="Palette" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="-1" side_tool="false" content_ui="tabs" />
+      <window_info id="TODO" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="6" side_tool="false" content_ui="tabs" />
+      <window_info id="Messages" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.32898173" sideWeight="0.5" order="-1" side_tool="false" content_ui="tabs" />
+      <window_info id="Palette&#9;" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="-1" side_tool="false" content_ui="tabs" />
+      <window_info id="Image Layers" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="-1" side_tool="false" content_ui="tabs" />
+      <window_info id="Capture Analysis" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="-1" side_tool="false" content_ui="tabs" />
+      <window_info id="Event Log" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="-1" side_tool="true" content_ui="tabs" />
+      <window_info id="Maven Projects" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="-1" side_tool="false" content_ui="tabs" />
+      <window_info id="Run" active="true" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" show_stripe_button="true" weight="0.17885117" sideWeight="0.5" order="2" side_tool="false" content_ui="tabs" />
+      <window_info id="Version Control" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="-1" side_tool="false" content_ui="tabs" />
+      <window_info id="Terminal" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="-1" side_tool="false" content_ui="tabs" />
+      <window_info id="Capture Tool" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="-1" side_tool="false" content_ui="tabs" />
+      <window_info id="Designer" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="-1" side_tool="false" content_ui="tabs" />
+      <window_info id="Project" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" show_stripe_button="true" weight="0.104782" sideWeight="0.5" order="0" side_tool="false" content_ui="combo" />
+      <window_info id="Database" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="-1" side_tool="false" content_ui="tabs" />
+      <window_info id="Structure" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.25" sideWeight="0.5" order="1" side_tool="false" content_ui="tabs" />
+      <window_info id="Ant Build" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.25" sideWeight="0.5" order="1" side_tool="false" content_ui="tabs" />
+      <window_info id="UI Designer" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="-1" side_tool="false" content_ui="tabs" />
+      <window_info id="Theme Preview" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="-1" side_tool="false" content_ui="tabs" />
+      <window_info id="Debug" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.4" sideWeight="0.5" order="3" side_tool="false" content_ui="tabs" />
+      <window_info id="Favorites" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="-1" side_tool="true" content_ui="tabs" />
+      <window_info id="Cvs" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.25" sideWeight="0.5" order="4" side_tool="false" content_ui="tabs" />
+      <window_info id="Hierarchy" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.25" sideWeight="0.5" order="2" side_tool="false" content_ui="combo" />
+      <window_info id="Message" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="0" side_tool="false" content_ui="tabs" />
+      <window_info id="Commander" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.4" sideWeight="0.5" order="0" side_tool="false" content_ui="tabs" />
+      <window_info id="Find" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="1" side_tool="false" content_ui="tabs" />
+      <window_info id="Inspection" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.4" sideWeight="0.5" order="5" side_tool="false" content_ui="tabs" />
+    </layout>
+  </component>
+  <component name="TypeScriptGeneratedFilesManager">
+    <option name="version" value="1" />
+  </component>
+  <component name="VcsContentAnnotationSettings">
+    <option name="myLimit" value="2678400000" />
+  </component>
+  <component name="XDebuggerManager">
+    <breakpoint-manager />
+    <watches-manager />
+  </component>
+  <component name="editorHistoryManager">
+    <entry file="file://$PROJECT_DIR$/src/main/java/MyArrayList.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="118">
+          <caret line="24" column="25" lean-forward="true" selection-start-line="24" selection-start-column="25" selection-end-line="24" selection-end-column="25" />
+          <folding>
+            <element signature="e#169#170#0" expanded="true" />
+            <element signature="e#210#211#0" expanded="true" />
+            <element signature="e#248#249#0" expanded="true" />
+            <element signature="e#295#296#0" expanded="true" />
+            <element signature="e#749#750#0" expanded="true" />
+            <element signature="e#777#778#0" expanded="true" />
+            <element signature="e#809#810#0" expanded="true" />
+            <element signature="e#837#838#0" expanded="true" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/test/java/TestMyArrayList.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="316">
+          <caret line="42" column="0" lean-forward="true" selection-start-line="42" selection-start-column="0" selection-end-line="42" selection-end-column="0" />
+          <folding>
+            <element signature="imports" expanded="true" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+  </component>
+  <component name="masterDetails">
+    <states>
+      <state key="ProjectJDKs.UI">
+        <settings>
+          <last-edited>1.8</last-edited>
+          <splitter-proportions>
+            <option name="proportions">
+              <list>
+                <option value="0.2" />
+              </list>
+            </option>
+          </splitter-proportions>
+        </settings>
+      </state>
+    </states>
+  </component>
+</project>
\ No newline at end of file
diff --git a/generics.iml b/generics.iml
new file mode 100644
index 0000000..9717c26
--- /dev/null
+++ b/generics.iml
@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<module org.jetbrains.idea.maven.project.MavenProjectsManager.isMavenModule="true" type="JAVA_MODULE" version="4">
+  <component name="NewModuleRootManager" LANGUAGE_LEVEL="JDK_1_7">
+    <output url="file://$MODULE_DIR$/target/classes" />
+    <output-test url="file://$MODULE_DIR$/target/test-classes" />
+    <content url="file://$MODULE_DIR$">
+      <sourceFolder url="file://$MODULE_DIR$/src/main/java" isTestSource="false" />
+      <sourceFolder url="file://$MODULE_DIR$/src/test/java" isTestSource="true" />
+      <excludeFolder url="file://$MODULE_DIR$/target" />
+    </content>
+    <orderEntry type="inheritedJdk" />
+    <orderEntry type="sourceFolder" forTests="false" />
+    <orderEntry type="library" name="Maven: junit:junit:4.12" level="project" />
+    <orderEntry type="library" name="Maven: org.hamcrest:hamcrest-core:1.3" level="project" />
+  </component>
+</module>
\ No newline at end of file
diff --git a/src/main/java/MyArrayList.java b/src/main/java/MyArrayList.java
new file mode 100644
index 0000000..d816b2c
--- /dev/null
+++ b/src/main/java/MyArrayList.java
@@ -0,0 +1,55 @@
+import java.util.Arrays;
+
+public class MyArrayList <T> {
+
+    private T[] arr;
+    private T value;
+    private T[] newArr;
+
+    //Constructors
+    public MyArrayList() {
+        arr = (T[]) new Object[0];
+    }
+
+    public MyArrayList(int arrSize){
+        arr = (T[]) new Object[arrSize];
+    }
+
+
+    //Methods
+    public void add(T thing) {
+
+        Integer count = 0;
+        T[] newArr = Arrays.copyOf(arr, arr.length + 1);
+            newArr[newArr.length-1] = thing;
+            arr = newArr;
+        }
+
+
+    public T get(Integer i){
+        this.value = this.arr[i];
+        return this.value;
+    }
+
+    public void remove(T thing){
+
+    }
+
+    public void set(T thing){
+
+    }
+
+    public void clear(){
+
+    }
+
+    public boolean isEmpty(){
+        return false;
+    }
+
+    public boolean contains(){
+        return false;
+    }
+
+
+}
diff --git a/src/test/java/TestMyArrayList.java b/src/test/java/TestMyArrayList.java
new file mode 100644
index 0000000..2ec5ab8
--- /dev/null
+++ b/src/test/java/TestMyArrayList.java
@@ -0,0 +1,105 @@
+import org.junit.Assert;
+import org.junit.Test;
+
+public class TestMyArrayList {
+
+    @Test
+    public void intAddTest(){
+        //given
+        MyArrayList<Integer> myArrayList = new MyArrayList<>();
+        Integer expected = 5;
+        //when
+        myArrayList.add(expected);
+        //then
+        Integer actual = myArrayList.get(0);
+        Assert.assertEquals(expected, actual);
+    }
+
+
+    @Test
+    public void strAddTest(){
+        //given
+        MyArrayList<String> myArrayList = new MyArrayList<>();
+        String expected = "Cat";
+        //when
+        myArrayList.add(expected);
+        //then
+        String actual = myArrayList.get(0);
+        Assert.assertEquals(expected, actual);
+
+    }
+
+    @Test
+    public void doubleAddTest(){
+        //given
+        MyArrayList<Double> myArrayList = new MyArrayList<>();
+        Double expected = 1234.000;
+        //when
+        myArrayList.add(expected);
+        //then
+        Double actual = myArrayList.get(0);
+        Assert.assertEquals(expected, actual);
+    }
+
+    @Test
+    public void getTest(){
+        //given
+
+        //when
+
+        //then
+
+    }
+
+    @Test
+    public void removeTest(){
+        //given
+
+        //when
+
+        //then
+
+    }
+
+    @Test
+    public void setTest(){
+        //given
+
+        //when
+
+        //then
+
+    }
+
+    @Test
+    public void clearTest(){
+        //given
+
+        //when
+
+        //then
+
+    }
+
+    @Test
+    public void isEmptyTest(){
+        //given
+
+        //when
+
+        //then
+
+    }
+
+    @Test
+    public void containsTest(){
+        //given
+
+        //when
+
+        //then
+
+    }
+
+
+}

From 7c3b42dd340cc5a7b1e52199f91c916e64769ef3 Mon Sep 17 00:00:00 2001
From: Keith Brinker <keithbrinker@zipcoders-MacBook-Pro-2.local>
Date: Fri, 9 Mar 2018 16:00:52 -0500
Subject: [PATCH 2/5] making progress

---
 .idea/workspace.xml                | 169 ++++++++++++++++++-----------
 src/main/java/MyArrayList.java     |  27 +++--
 src/test/java/TestMyArrayList.java |  84 ++++++++++++--
 3 files changed, 201 insertions(+), 79 deletions(-)

diff --git a/.idea/workspace.xml b/.idea/workspace.xml
index 9ca3cbf..944b975 100644
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@@ -2,7 +2,8 @@
 <project version="4">
   <component name="ChangeListManager">
     <list default="true" id="4517e1b3-e1e9-441b-9625-074d954a9ea9" name="Default" comment="">
-      <change beforePath="" afterPath="$PROJECT_DIR$/src/test/java/TestMyArrayList.java" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/MyArrayList.java" afterPath="$PROJECT_DIR$/src/main/java/MyArrayList.java" />
+      <change beforePath="$PROJECT_DIR$/src/test/java/TestMyArrayList.java" afterPath="$PROJECT_DIR$/src/test/java/TestMyArrayList.java" />
     </list>
     <ignored path="$PROJECT_DIR$/target/" />
     <option name="EXCLUDED_CONVERTED_TO_IGNORED" value="true" />
@@ -13,23 +14,23 @@
     <option name="LAST_RESOLUTION" value="IGNORE" />
   </component>
   <component name="FileEditorManager">
-    <splitter split-orientation="horizontal" split-proportion="0.45561665">
+    <splitter split-orientation="horizontal" split-proportion="0.40219954">
       <split-first>
         <leaf>
           <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="118">
-                  <caret line="24" column="25" lean-forward="true" selection-start-line="24" selection-start-column="25" selection-end-line="24" selection-end-column="25" />
+                <state relative-caret-position="325">
+                  <caret line="46" column="23" lean-forward="false" selection-start-line="46" selection-start-column="23" selection-end-line="46" selection-end-column="23" />
                   <folding>
-                    <element signature="e#169#170#0" expanded="true" />
-                    <element signature="e#210#211#0" expanded="true" />
-                    <element signature="e#248#249#0" expanded="true" />
-                    <element signature="e#295#296#0" expanded="true" />
-                    <element signature="e#749#750#0" expanded="true" />
-                    <element signature="e#777#778#0" expanded="true" />
-                    <element signature="e#809#810#0" expanded="true" />
-                    <element signature="e#837#838#0" expanded="true" />
+                    <element signature="e#146#147#0" expanded="true" />
+                    <element signature="e#187#188#0" expanded="true" />
+                    <element signature="e#225#226#0" expanded="true" />
+                    <element signature="e#272#273#0" expanded="true" />
+                    <element signature="e#1076#1077#0" expanded="true" />
+                    <element signature="e#1104#1105#0" expanded="true" />
+                    <element signature="e#1136#1137#0" expanded="true" />
+                    <element signature="e#1164#1165#0" expanded="true" />
                   </folding>
                 </state>
               </provider>
@@ -42,8 +43,8 @@
           <file leaf-file-name="TestMyArrayList.java" pinned="false" current-in-tab="true">
             <entry file="file://$PROJECT_DIR$/src/test/java/TestMyArrayList.java">
               <provider selected="true" editor-type-id="text-editor">
-                <state relative-caret-position="316">
-                  <caret line="42" column="0" lean-forward="true" selection-start-line="42" selection-start-column="0" selection-end-line="42" selection-end-column="0" />
+                <state relative-caret-position="344">
+                  <caret line="138" column="0" lean-forward="true" selection-start-line="138" selection-start-column="0" selection-end-line="138" selection-end-column="0" />
                   <folding>
                     <element signature="imports" expanded="true" />
                   </folding>
@@ -172,7 +173,7 @@
       </list>
     </option>
   </component>
-  <component name="RunManager" selected="JUnit.TestMyArrayList">
+  <component name="RunManager" selected="JUnit.TestMyArrayList.stringSetTest">
     <configuration default="true" type="Applet" factoryName="Applet">
       <option name="HTML_USED" value="false" />
       <option name="WIDTH" value="400" />
@@ -214,14 +215,14 @@
       <envs />
       <patterns />
     </configuration>
-    <configuration name="TestMyArrayList.intAddTest" type="JUnit" factoryName="JUnit" temporary="true" nameIsGenerated="true">
+    <configuration name="TestMyArrayList.integerSetTest" type="JUnit" factoryName="JUnit" temporary="true" nameIsGenerated="true">
       <extension name="coverage" enabled="false" merge="false" sample_coverage="true" runner="idea" />
       <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="TestMyArrayList" />
-      <option name="METHOD_NAME" value="intAddTest" />
+      <option name="METHOD_NAME" value="integerSetTest" />
       <option name="TEST_OBJECT" value="method" />
       <option name="VM_PARAMETERS" value="-ea" />
       <option name="PARAMETERS" />
@@ -234,14 +235,54 @@
       <envs />
       <patterns />
     </configuration>
-    <configuration name="TestMyArrayList.strAddTest" type="JUnit" factoryName="JUnit" temporary="true" nameIsGenerated="true">
+    <configuration name="TestMyArrayList.removeTest" type="JUnit" factoryName="JUnit" temporary="true" nameIsGenerated="true">
       <extension name="coverage" enabled="false" merge="false" sample_coverage="true" runner="idea" />
       <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="TestMyArrayList" />
-      <option name="METHOD_NAME" value="strAddTest" />
+      <option name="METHOD_NAME" value="removeTest" />
+      <option name="TEST_OBJECT" value="method" />
+      <option name="VM_PARAMETERS" value="-ea" />
+      <option name="PARAMETERS" />
+      <option name="WORKING_DIRECTORY" value="%MODULE_WORKING_DIR%" />
+      <option name="ENV_VARIABLES" />
+      <option name="PASS_PARENT_ENVS" value="true" />
+      <option name="TEST_SEARCH_SCOPE">
+        <value defaultName="singleModule" />
+      </option>
+      <envs />
+      <patterns />
+    </configuration>
+    <configuration name="TestMyArrayList.stringRemoveTest" type="JUnit" factoryName="JUnit" temporary="true" nameIsGenerated="true">
+      <extension name="coverage" enabled="false" merge="false" sample_coverage="true" runner="idea" />
+      <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="TestMyArrayList" />
+      <option name="METHOD_NAME" value="stringRemoveTest" />
+      <option name="TEST_OBJECT" value="method" />
+      <option name="VM_PARAMETERS" value="-ea" />
+      <option name="PARAMETERS" />
+      <option name="WORKING_DIRECTORY" value="%MODULE_WORKING_DIR%" />
+      <option name="ENV_VARIABLES" />
+      <option name="PASS_PARENT_ENVS" value="true" />
+      <option name="TEST_SEARCH_SCOPE">
+        <value defaultName="singleModule" />
+      </option>
+      <envs />
+      <patterns />
+    </configuration>
+    <configuration name="TestMyArrayList.stringSetTest" type="JUnit" factoryName="JUnit" temporary="true" nameIsGenerated="true">
+      <extension name="coverage" enabled="false" merge="false" sample_coverage="true" runner="idea" />
+      <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="TestMyArrayList" />
+      <option name="METHOD_NAME" value="stringSetTest" />
       <option name="TEST_OBJECT" value="method" />
       <option name="VM_PARAMETERS" value="-ea" />
       <option name="PARAMETERS" />
@@ -314,16 +355,20 @@
       <option name="PROGRAM_PARAMETERS" />
       <predefined_log_file id="idea.log" enabled="true" />
     </configuration>
-    <list size="3">
-      <item index="0" class="java.lang.String" itemvalue="JUnit.TestMyArrayList.intAddTest" />
-      <item index="1" class="java.lang.String" itemvalue="JUnit.TestMyArrayList.strAddTest" />
+    <list size="5">
+      <item index="0" class="java.lang.String" itemvalue="JUnit.TestMyArrayList.removeTest" />
+      <item index="1" class="java.lang.String" itemvalue="JUnit.TestMyArrayList.stringRemoveTest" />
       <item index="2" class="java.lang.String" itemvalue="JUnit.TestMyArrayList" />
+      <item index="3" class="java.lang.String" itemvalue="JUnit.TestMyArrayList.integerSetTest" />
+      <item index="4" class="java.lang.String" itemvalue="JUnit.TestMyArrayList.stringSetTest" />
     </list>
     <recent_temporary>
-      <list size="3">
-        <item index="0" class="java.lang.String" itemvalue="JUnit.TestMyArrayList" />
-        <item index="1" class="java.lang.String" itemvalue="JUnit.TestMyArrayList.strAddTest" />
-        <item index="2" class="java.lang.String" itemvalue="JUnit.TestMyArrayList.intAddTest" />
+      <list size="5">
+        <item index="0" class="java.lang.String" itemvalue="JUnit.TestMyArrayList.stringSetTest" />
+        <item index="1" class="java.lang.String" itemvalue="JUnit.TestMyArrayList.integerSetTest" />
+        <item index="2" class="java.lang.String" itemvalue="JUnit.TestMyArrayList" />
+        <item index="3" class="java.lang.String" itemvalue="JUnit.TestMyArrayList.stringRemoveTest" />
+        <item index="4" class="java.lang.String" itemvalue="JUnit.TestMyArrayList.removeTest" />
       </list>
     </recent_temporary>
   </component>
@@ -340,44 +385,44 @@
       <option name="number" value="Default" />
       <option name="presentableId" value="Default" />
       <updated>1520609608789</updated>
-      <workItem from="1520609611988" duration="7811000" />
+      <workItem from="1520609611988" duration="10208000" />
     </task>
     <servers />
   </component>
   <component name="TestHistory">
-    <history-entry file="TestMyArrayList - 2018.03.09 at 14h 16m 27s.xml">
+    <history-entry file="TestMyArrayList - 2018.03.09 at 15h 50m 34s.xml">
       <configuration name="TestMyArrayList" configurationId="JUnit" />
     </history-entry>
-    <history-entry file="TestMyArrayList_intAddTest - 2018.03.09 at 13h 25m 35s.xml">
-      <configuration name="TestMyArrayList.intAddTest" configurationId="JUnit" />
+    <history-entry file="TestMyArrayList_getTest - 2018.03.09 at 15h 32m 20s.xml">
+      <configuration name="TestMyArrayList.getTest" configurationId="JUnit" />
     </history-entry>
-    <history-entry file="TestMyArrayList_intAddTest - 2018.03.09 at 13h 28m 02s.xml">
-      <configuration name="TestMyArrayList.intAddTest" configurationId="JUnit" />
+    <history-entry file="TestMyArrayList_integerGetTest - 2018.03.09 at 15h 36m 13s.xml">
+      <configuration name="TestMyArrayList.integerGetTest" configurationId="JUnit" />
     </history-entry>
-    <history-entry file="TestMyArrayList_intAddTest - 2018.03.09 at 13h 30m 50s.xml">
-      <configuration name="TestMyArrayList.intAddTest" configurationId="JUnit" />
+    <history-entry file="TestMyArrayList_integerSetTest - 2018.03.09 at 15h 57m 39s.xml">
+      <configuration name="TestMyArrayList.integerSetTest" configurationId="JUnit" />
     </history-entry>
-    <history-entry file="TestMyArrayList_intAddTest - 2018.03.09 at 13h 37m 10s.xml">
-      <configuration name="TestMyArrayList.intAddTest" configurationId="JUnit" />
+    <history-entry file="TestMyArrayList_removeTest - 2018.03.09 at 15h 44m 36s.xml">
+      <configuration name="TestMyArrayList.removeTest" configurationId="JUnit" />
     </history-entry>
-    <history-entry file="TestMyArrayList_intAddTest - 2018.03.09 at 13h 52m 45s.xml">
-      <configuration name="TestMyArrayList.intAddTest" configurationId="JUnit" />
+    <history-entry file="TestMyArrayList_removeTest - 2018.03.09 at 15h 45m 58s.xml">
+      <configuration name="TestMyArrayList.removeTest" configurationId="JUnit" />
     </history-entry>
-    <history-entry file="TestMyArrayList_intAddTest - 2018.03.09 at 13h 55m 54s.xml">
-      <configuration name="TestMyArrayList.intAddTest" configurationId="JUnit" />
+    <history-entry file="TestMyArrayList_removeTest - 2018.03.09 at 15h 48m 12s.xml">
+      <configuration name="TestMyArrayList.removeTest" configurationId="JUnit" />
     </history-entry>
-    <history-entry file="TestMyArrayList_intAddTest - 2018.03.09 at 14h 08m 49s.xml">
-      <configuration name="TestMyArrayList.intAddTest" configurationId="JUnit" />
+    <history-entry file="TestMyArrayList_stringGetTest - 2018.03.09 at 15h 36m 17s.xml">
+      <configuration name="TestMyArrayList.stringGetTest" configurationId="JUnit" />
     </history-entry>
-    <history-entry file="TestMyArrayList_intAddTest - 2018.03.09 at 14h 09m 46s.xml">
-      <configuration name="TestMyArrayList.intAddTest" configurationId="JUnit" />
+    <history-entry file="TestMyArrayList_stringRemoveTest - 2018.03.09 at 15h 49m 53s.xml">
+      <configuration name="TestMyArrayList.stringRemoveTest" configurationId="JUnit" />
     </history-entry>
-    <history-entry file="TestMyArrayList_strAddTest - 2018.03.09 at 14h 13m 46s.xml">
-      <configuration name="TestMyArrayList.strAddTest" configurationId="JUnit" />
+    <history-entry file="TestMyArrayList_stringSetTest - 2018.03.09 at 15h 59m 36s.xml">
+      <configuration name="TestMyArrayList.stringSetTest" configurationId="JUnit" />
     </history-entry>
   </component>
   <component name="TimeTrackingManager">
-    <option name="totallyTimeSpent" value="7811000" />
+    <option name="totallyTimeSpent" value="10208000" />
   </component>
   <component name="ToolWindowManager">
     <frame x="18" y="23" width="1422" height="838" extended-state="0" />
@@ -391,7 +436,7 @@
       <window_info id="Capture Analysis" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="-1" side_tool="false" content_ui="tabs" />
       <window_info id="Event Log" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="-1" side_tool="true" content_ui="tabs" />
       <window_info id="Maven Projects" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="-1" side_tool="false" content_ui="tabs" />
-      <window_info id="Run" active="true" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" show_stripe_button="true" weight="0.17885117" sideWeight="0.5" order="2" side_tool="false" content_ui="tabs" />
+      <window_info id="Run" active="true" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" show_stripe_button="true" weight="0.10052219" sideWeight="0.5" order="2" side_tool="false" content_ui="tabs" />
       <window_info id="Version Control" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="-1" side_tool="false" content_ui="tabs" />
       <window_info id="Terminal" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="-1" side_tool="false" content_ui="tabs" />
       <window_info id="Capture Tool" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="-1" side_tool="false" content_ui="tabs" />
@@ -419,31 +464,33 @@
     <option name="myLimit" value="2678400000" />
   </component>
   <component name="XDebuggerManager">
-    <breakpoint-manager />
+    <breakpoint-manager>
+      <option name="time" value="1" />
+    </breakpoint-manager>
     <watches-manager />
   </component>
   <component name="editorHistoryManager">
     <entry file="file://$PROJECT_DIR$/src/main/java/MyArrayList.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="118">
-          <caret line="24" column="25" lean-forward="true" selection-start-line="24" selection-start-column="25" selection-end-line="24" selection-end-column="25" />
+        <state relative-caret-position="325">
+          <caret line="46" column="23" lean-forward="false" selection-start-line="46" selection-start-column="23" selection-end-line="46" selection-end-column="23" />
           <folding>
-            <element signature="e#169#170#0" expanded="true" />
-            <element signature="e#210#211#0" expanded="true" />
-            <element signature="e#248#249#0" expanded="true" />
-            <element signature="e#295#296#0" expanded="true" />
-            <element signature="e#749#750#0" expanded="true" />
-            <element signature="e#777#778#0" expanded="true" />
-            <element signature="e#809#810#0" expanded="true" />
-            <element signature="e#837#838#0" expanded="true" />
+            <element signature="e#146#147#0" expanded="true" />
+            <element signature="e#187#188#0" expanded="true" />
+            <element signature="e#225#226#0" expanded="true" />
+            <element signature="e#272#273#0" expanded="true" />
+            <element signature="e#1076#1077#0" expanded="true" />
+            <element signature="e#1104#1105#0" expanded="true" />
+            <element signature="e#1136#1137#0" expanded="true" />
+            <element signature="e#1164#1165#0" expanded="true" />
           </folding>
         </state>
       </provider>
     </entry>
     <entry file="file://$PROJECT_DIR$/src/test/java/TestMyArrayList.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="316">
-          <caret line="42" column="0" lean-forward="true" selection-start-line="42" selection-start-column="0" selection-end-line="42" selection-end-column="0" />
+        <state relative-caret-position="344">
+          <caret line="138" column="0" lean-forward="true" selection-start-line="138" selection-start-column="0" selection-end-line="138" selection-end-column="0" />
           <folding>
             <element signature="imports" expanded="true" />
           </folding>
diff --git a/src/main/java/MyArrayList.java b/src/main/java/MyArrayList.java
index d816b2c..1bee12a 100644
--- a/src/main/java/MyArrayList.java
+++ b/src/main/java/MyArrayList.java
@@ -4,7 +4,7 @@ public class MyArrayList <T> {
 
     private T[] arr;
     private T value;
-    private T[] newArr;
+
 
     //Constructors
     public MyArrayList() {
@@ -19,11 +19,10 @@ public MyArrayList(int arrSize){
     //Methods
     public void add(T thing) {
 
-        Integer count = 0;
         T[] newArr = Arrays.copyOf(arr, arr.length + 1);
-            newArr[newArr.length-1] = thing;
-            arr = newArr;
-        }
+        newArr[newArr.length-1] = thing;
+        arr = newArr;
+    }
 
 
     public T get(Integer i){
@@ -31,11 +30,21 @@ public T get(Integer i){
         return this.value;
     }
 
-    public void remove(T thing){
-
+    public void remove(T thing) {
+        if ( arr.length > 0){
+            T[] newArr = Arrays.copyOf(arr, arr.length - 1);
+            for (int i = 0, j = 0; i < arr.length; i++) {
+                if (arr[i] != thing) {
+                    newArr[j] = arr[i];
+                    j++;
+                }
+            }
+            arr = newArr;
+        }
     }
-
-    public void set(T thing){
+    public void set(Integer i, T thing){
+        this.value = this.arr[i];
+        arr[i] = thing;
 
     }
 
diff --git a/src/test/java/TestMyArrayList.java b/src/test/java/TestMyArrayList.java
index 2ec5ab8..bfec8af 100644
--- a/src/test/java/TestMyArrayList.java
+++ b/src/test/java/TestMyArrayList.java
@@ -42,33 +42,99 @@ public void doubleAddTest(){
     }
 
     @Test
-    public void getTest(){
+    public void integerGetTest(){
         //given
-
+        Integer expected = 7;
+        MyArrayList<Integer>myArrayList = new MyArrayList<>();
+        myArrayList.add(10);
+        myArrayList.add(9);
+        myArrayList.add(8);
+        myArrayList.add(expected);
+        myArrayList.add(6);
         //when
-
+        Integer actual =  myArrayList.get(3);
         //then
-
+        Assert.assertEquals(expected, actual);
     }
 
     @Test
-    public void removeTest(){
+    public void stringGetTest(){
         //given
-
+        String expected = "Cat";
+        MyArrayList<String>myArrayList = new MyArrayList<>();
+        myArrayList.add("Horse");
+        myArrayList.add("Duck");
+        myArrayList.add("Dog");
+        myArrayList.add(expected);
+        myArrayList.add("Bunny");
         //when
-
+        String actual =  myArrayList.get(3);
         //then
-
+        Assert.assertEquals(expected, actual);
     }
 
     @Test
-    public void setTest(){
+    public void integerRemoveTest(){
         //given
+        MyArrayList<Integer> myArrayList = new MyArrayList<>();
+        myArrayList.add(10);
+        myArrayList.add(9);
+        myArrayList.add(8);
+        myArrayList.add(5);
+        Integer expected = 5;
+        //when
+        myArrayList.remove(8);
+        //then
+        Integer actual = myArrayList.get(2);
+        Assert.assertEquals(expected, actual);
+    }
 
+    @Test
+    public void stringRemoveTest(){
+        //given
+        MyArrayList<String> myArrayList = new MyArrayList<>();
+        myArrayList.add("Cat");
+        myArrayList.add("Dog");
+        myArrayList.add("Duck");
+        myArrayList.add("Horse");
+        String expected = "Horse";
         //when
+        myArrayList.remove("Duck");
+        //then
+        String actual = myArrayList.get(2);
+        Assert.assertEquals(expected, actual);
+    }
 
+    @Test
+    public void integerSetTest(){
+        //given
+        MyArrayList<Integer> myArrayList = new MyArrayList<>();
+        myArrayList.add(10);
+        myArrayList.add(9);
+        myArrayList.add(8);
+        myArrayList.add(5);
+        Integer expected = 25;
+        //when
+        myArrayList.set(2, expected);
         //then
+        Integer actual = myArrayList.get(2);
+        Assert.assertEquals(expected, actual);
+    }
 
+    @Test
+    public void stringSetTest(){
+        //given
+        MyArrayList<String> myArrayList = new MyArrayList<>();
+        myArrayList.add("Cat");
+        myArrayList.add("Horse");
+        myArrayList.add("fdgkjhdfgkjhdgkjhf");
+        myArrayList.add("Dog");
+        String expected = "Duck";
+        //when
+        myArrayList.set(2, expected);
+        //then
+        String actual = myArrayList.get(2);
+        Assert.assertEquals(expected, actual);
     }
 
     @Test

From 80e54540d6e0637c31f79eab51607c18e5b7b24a Mon Sep 17 00:00:00 2001
From: Keith Brinker <keithbrinker@zipcoders-MacBook-Pro-2.local>
Date: Fri, 9 Mar 2018 16:28:51 -0500
Subject: [PATCH 3/5] finished part one

---
 .idea/workspace.xml                | 138 ++++++++++++++---------------
 src/main/java/MyArrayList.java     |  13 ++-
 src/test/java/TestMyArrayList.java |  55 +++++++++---
 3 files changed, 120 insertions(+), 86 deletions(-)

diff --git a/.idea/workspace.xml b/.idea/workspace.xml
index 944b975..5b7e6d6 100644
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@@ -14,23 +14,21 @@
     <option name="LAST_RESOLUTION" value="IGNORE" />
   </component>
   <component name="FileEditorManager">
-    <splitter split-orientation="horizontal" split-proportion="0.40219954">
+    <splitter split-orientation="horizontal" split-proportion="0.5140496">
       <split-first>
         <leaf>
           <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="325">
-                  <caret line="46" column="23" lean-forward="false" selection-start-line="46" selection-start-column="23" selection-end-line="46" selection-end-column="23" />
+                <state relative-caret-position="385">
+                  <caret line="69" column="0" lean-forward="true" selection-start-line="69" selection-start-column="0" selection-end-line="69" selection-end-column="0" />
                   <folding>
                     <element signature="e#146#147#0" expanded="true" />
                     <element signature="e#187#188#0" expanded="true" />
                     <element signature="e#225#226#0" expanded="true" />
                     <element signature="e#272#273#0" expanded="true" />
-                    <element signature="e#1076#1077#0" expanded="true" />
-                    <element signature="e#1104#1105#0" expanded="true" />
-                    <element signature="e#1136#1137#0" expanded="true" />
-                    <element signature="e#1164#1165#0" expanded="true" />
+                    <element signature="e#1038#1039#0" expanded="true" />
+                    <element signature="e#1084#1085#0" expanded="true" />
                   </folding>
                 </state>
               </provider>
@@ -43,8 +41,8 @@
           <file leaf-file-name="TestMyArrayList.java" pinned="false" current-in-tab="true">
             <entry file="file://$PROJECT_DIR$/src/test/java/TestMyArrayList.java">
               <provider selected="true" editor-type-id="text-editor">
-                <state relative-caret-position="344">
-                  <caret line="138" column="0" lean-forward="true" selection-start-line="138" selection-start-column="0" selection-end-line="138" selection-end-column="0" />
+                <state relative-caret-position="2955">
+                  <caret line="197" column="32" lean-forward="true" selection-start-line="197" selection-start-column="32" selection-end-line="197" selection-end-column="32" />
                   <folding>
                     <element signature="imports" expanded="true" />
                   </folding>
@@ -173,7 +171,7 @@
       </list>
     </option>
   </component>
-  <component name="RunManager" selected="JUnit.TestMyArrayList.stringSetTest">
+  <component name="RunManager" selected="JUnit.TestMyArrayList.containsTestTWO">
     <configuration default="true" type="Applet" factoryName="Applet">
       <option name="HTML_USED" value="false" />
       <option name="WIDTH" value="400" />
@@ -195,15 +193,15 @@
       <module name="" />
       <envs />
     </configuration>
-    <configuration name="TestMyArrayList" type="JUnit" factoryName="JUnit" temporary="true" nameIsGenerated="true">
+    <configuration name="TestMyArrayList.clearTest" type="JUnit" factoryName="JUnit" temporary="true" nameIsGenerated="true">
       <extension name="coverage" enabled="false" merge="false" sample_coverage="true" runner="idea" />
       <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="TestMyArrayList" />
-      <option name="METHOD_NAME" />
-      <option name="TEST_OBJECT" value="class" />
+      <option name="METHOD_NAME" value="clearTest" />
+      <option name="TEST_OBJECT" value="method" />
       <option name="VM_PARAMETERS" value="-ea" />
       <option name="PARAMETERS" />
       <option name="WORKING_DIRECTORY" value="%MODULE_WORKING_DIR%" />
@@ -215,14 +213,14 @@
       <envs />
       <patterns />
     </configuration>
-    <configuration name="TestMyArrayList.integerSetTest" type="JUnit" factoryName="JUnit" temporary="true" nameIsGenerated="true">
+    <configuration name="TestMyArrayList.containsTest" type="JUnit" factoryName="JUnit" temporary="true" nameIsGenerated="true">
       <extension name="coverage" enabled="false" merge="false" sample_coverage="true" runner="idea" />
       <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="TestMyArrayList" />
-      <option name="METHOD_NAME" value="integerSetTest" />
+      <option name="METHOD_NAME" value="containsTest" />
       <option name="TEST_OBJECT" value="method" />
       <option name="VM_PARAMETERS" value="-ea" />
       <option name="PARAMETERS" />
@@ -235,14 +233,14 @@
       <envs />
       <patterns />
     </configuration>
-    <configuration name="TestMyArrayList.removeTest" type="JUnit" factoryName="JUnit" temporary="true" nameIsGenerated="true">
+    <configuration name="TestMyArrayList.containsTestTWO" type="JUnit" factoryName="JUnit" temporary="true" nameIsGenerated="true">
       <extension name="coverage" enabled="false" merge="false" sample_coverage="true" runner="idea" />
       <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="TestMyArrayList" />
-      <option name="METHOD_NAME" value="removeTest" />
+      <option name="METHOD_NAME" value="containsTestTWO" />
       <option name="TEST_OBJECT" value="method" />
       <option name="VM_PARAMETERS" value="-ea" />
       <option name="PARAMETERS" />
@@ -255,14 +253,14 @@
       <envs />
       <patterns />
     </configuration>
-    <configuration name="TestMyArrayList.stringRemoveTest" type="JUnit" factoryName="JUnit" temporary="true" nameIsGenerated="true">
+    <configuration name="TestMyArrayList.isEmptyTest" type="JUnit" factoryName="JUnit" temporary="true" nameIsGenerated="true">
       <extension name="coverage" enabled="false" merge="false" sample_coverage="true" runner="idea" />
       <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="TestMyArrayList" />
-      <option name="METHOD_NAME" value="stringRemoveTest" />
+      <option name="METHOD_NAME" value="isEmptyTest" />
       <option name="TEST_OBJECT" value="method" />
       <option name="VM_PARAMETERS" value="-ea" />
       <option name="PARAMETERS" />
@@ -275,14 +273,14 @@
       <envs />
       <patterns />
     </configuration>
-    <configuration name="TestMyArrayList.stringSetTest" type="JUnit" factoryName="JUnit" temporary="true" nameIsGenerated="true">
+    <configuration name="TestMyArrayList.isEmptyTestTWO" type="JUnit" factoryName="JUnit" temporary="true" nameIsGenerated="true">
       <extension name="coverage" enabled="false" merge="false" sample_coverage="true" runner="idea" />
       <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="TestMyArrayList" />
-      <option name="METHOD_NAME" value="stringSetTest" />
+      <option name="METHOD_NAME" value="isEmptyTestTWO" />
       <option name="TEST_OBJECT" value="method" />
       <option name="VM_PARAMETERS" value="-ea" />
       <option name="PARAMETERS" />
@@ -356,19 +354,19 @@
       <predefined_log_file id="idea.log" enabled="true" />
     </configuration>
     <list size="5">
-      <item index="0" class="java.lang.String" itemvalue="JUnit.TestMyArrayList.removeTest" />
-      <item index="1" class="java.lang.String" itemvalue="JUnit.TestMyArrayList.stringRemoveTest" />
-      <item index="2" class="java.lang.String" itemvalue="JUnit.TestMyArrayList" />
-      <item index="3" class="java.lang.String" itemvalue="JUnit.TestMyArrayList.integerSetTest" />
-      <item index="4" class="java.lang.String" itemvalue="JUnit.TestMyArrayList.stringSetTest" />
+      <item index="0" class="java.lang.String" itemvalue="JUnit.TestMyArrayList.clearTest" />
+      <item index="1" class="java.lang.String" itemvalue="JUnit.TestMyArrayList.isEmptyTest" />
+      <item index="2" class="java.lang.String" itemvalue="JUnit.TestMyArrayList.isEmptyTestTWO" />
+      <item index="3" class="java.lang.String" itemvalue="JUnit.TestMyArrayList.containsTest" />
+      <item index="4" class="java.lang.String" itemvalue="JUnit.TestMyArrayList.containsTestTWO" />
     </list>
     <recent_temporary>
       <list size="5">
-        <item index="0" class="java.lang.String" itemvalue="JUnit.TestMyArrayList.stringSetTest" />
-        <item index="1" class="java.lang.String" itemvalue="JUnit.TestMyArrayList.integerSetTest" />
-        <item index="2" class="java.lang.String" itemvalue="JUnit.TestMyArrayList" />
-        <item index="3" class="java.lang.String" itemvalue="JUnit.TestMyArrayList.stringRemoveTest" />
-        <item index="4" class="java.lang.String" itemvalue="JUnit.TestMyArrayList.removeTest" />
+        <item index="0" class="java.lang.String" itemvalue="JUnit.TestMyArrayList.containsTestTWO" />
+        <item index="1" class="java.lang.String" itemvalue="JUnit.TestMyArrayList.containsTest" />
+        <item index="2" class="java.lang.String" itemvalue="JUnit.TestMyArrayList.isEmptyTestTWO" />
+        <item index="3" class="java.lang.String" itemvalue="JUnit.TestMyArrayList.isEmptyTest" />
+        <item index="4" class="java.lang.String" itemvalue="JUnit.TestMyArrayList.clearTest" />
       </list>
     </recent_temporary>
   </component>
@@ -385,44 +383,44 @@
       <option name="number" value="Default" />
       <option name="presentableId" value="Default" />
       <updated>1520609608789</updated>
-      <workItem from="1520609611988" duration="10208000" />
+      <workItem from="1520609611988" duration="11894000" />
     </task>
     <servers />
   </component>
   <component name="TestHistory">
-    <history-entry file="TestMyArrayList - 2018.03.09 at 15h 50m 34s.xml">
-      <configuration name="TestMyArrayList" configurationId="JUnit" />
+    <history-entry file="TestMyArrayList_containsTest - 2018.03.09 at 16h 26m 44s.xml">
+      <configuration name="TestMyArrayList.containsTest" configurationId="JUnit" />
     </history-entry>
-    <history-entry file="TestMyArrayList_getTest - 2018.03.09 at 15h 32m 20s.xml">
-      <configuration name="TestMyArrayList.getTest" configurationId="JUnit" />
+    <history-entry file="TestMyArrayList_containsTest - 2018.03.09 at 16h 26m 58s.xml">
+      <configuration name="TestMyArrayList.containsTest" configurationId="JUnit" />
     </history-entry>
-    <history-entry file="TestMyArrayList_integerGetTest - 2018.03.09 at 15h 36m 13s.xml">
-      <configuration name="TestMyArrayList.integerGetTest" configurationId="JUnit" />
+    <history-entry file="TestMyArrayList_containsTest - 2018.03.09 at 16h 27m 11s.xml">
+      <configuration name="TestMyArrayList.containsTest" configurationId="JUnit" />
     </history-entry>
-    <history-entry file="TestMyArrayList_integerSetTest - 2018.03.09 at 15h 57m 39s.xml">
-      <configuration name="TestMyArrayList.integerSetTest" configurationId="JUnit" />
+    <history-entry file="TestMyArrayList_containsTestTWO - 2018.03.09 at 16h 27m 55s.xml">
+      <configuration name="TestMyArrayList.containsTestTWO" configurationId="JUnit" />
     </history-entry>
-    <history-entry file="TestMyArrayList_removeTest - 2018.03.09 at 15h 44m 36s.xml">
-      <configuration name="TestMyArrayList.removeTest" configurationId="JUnit" />
+    <history-entry file="TestMyArrayList_containsTestTWO - 2018.03.09 at 16h 28m 07s.xml">
+      <configuration name="TestMyArrayList.containsTestTWO" configurationId="JUnit" />
     </history-entry>
-    <history-entry file="TestMyArrayList_removeTest - 2018.03.09 at 15h 45m 58s.xml">
-      <configuration name="TestMyArrayList.removeTest" configurationId="JUnit" />
+    <history-entry file="TestMyArrayList_isEmptyTest - 2018.03.09 at 16h 23m 53s.xml">
+      <configuration name="TestMyArrayList.isEmptyTest" configurationId="JUnit" />
     </history-entry>
-    <history-entry file="TestMyArrayList_removeTest - 2018.03.09 at 15h 48m 12s.xml">
-      <configuration name="TestMyArrayList.removeTest" configurationId="JUnit" />
+    <history-entry file="TestMyArrayList_isEmptyTest - 2018.03.09 at 16h 24m 06s.xml">
+      <configuration name="TestMyArrayList.isEmptyTest" configurationId="JUnit" />
     </history-entry>
-    <history-entry file="TestMyArrayList_stringGetTest - 2018.03.09 at 15h 36m 17s.xml">
-      <configuration name="TestMyArrayList.stringGetTest" configurationId="JUnit" />
+    <history-entry file="TestMyArrayList_isEmptyTestTWO - 2018.03.09 at 16h 23m 01s.xml">
+      <configuration name="TestMyArrayList.isEmptyTestTWO" configurationId="JUnit" />
     </history-entry>
-    <history-entry file="TestMyArrayList_stringRemoveTest - 2018.03.09 at 15h 49m 53s.xml">
-      <configuration name="TestMyArrayList.stringRemoveTest" configurationId="JUnit" />
+    <history-entry file="TestMyArrayList_isEmptyTestTWO - 2018.03.09 at 16h 23m 26s.xml">
+      <configuration name="TestMyArrayList.isEmptyTestTWO" configurationId="JUnit" />
     </history-entry>
-    <history-entry file="TestMyArrayList_stringSetTest - 2018.03.09 at 15h 59m 36s.xml">
-      <configuration name="TestMyArrayList.stringSetTest" configurationId="JUnit" />
+    <history-entry file="TestMyArrayList_isEmptyTestTWO - 2018.03.09 at 16h 24m 08s.xml">
+      <configuration name="TestMyArrayList.isEmptyTestTWO" configurationId="JUnit" />
     </history-entry>
   </component>
   <component name="TimeTrackingManager">
-    <option name="totallyTimeSpent" value="10208000" />
+    <option name="totallyTimeSpent" value="11894000" />
   </component>
   <component name="ToolWindowManager">
     <frame x="18" y="23" width="1422" height="838" extended-state="0" />
@@ -436,12 +434,12 @@
       <window_info id="Capture Analysis" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="-1" side_tool="false" content_ui="tabs" />
       <window_info id="Event Log" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="-1" side_tool="true" content_ui="tabs" />
       <window_info id="Maven Projects" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="-1" side_tool="false" content_ui="tabs" />
-      <window_info id="Run" active="true" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" show_stripe_button="true" weight="0.10052219" sideWeight="0.5" order="2" side_tool="false" content_ui="tabs" />
+      <window_info id="Run" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" show_stripe_button="true" weight="0.27937338" sideWeight="0.5" order="2" side_tool="false" content_ui="tabs" />
       <window_info id="Version Control" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="-1" side_tool="false" content_ui="tabs" />
       <window_info id="Terminal" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="-1" side_tool="false" content_ui="tabs" />
       <window_info id="Capture Tool" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="-1" side_tool="false" content_ui="tabs" />
       <window_info id="Designer" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="-1" side_tool="false" content_ui="tabs" />
-      <window_info id="Project" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" show_stripe_button="true" weight="0.104782" sideWeight="0.5" order="0" side_tool="false" content_ui="combo" />
+      <window_info id="Project" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" show_stripe_button="true" weight="0.14908579" sideWeight="0.5" order="0" side_tool="false" content_ui="combo" />
       <window_info id="Database" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="-1" side_tool="false" content_ui="tabs" />
       <window_info id="Structure" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.25" sideWeight="0.5" order="1" side_tool="false" content_ui="tabs" />
       <window_info id="Ant Build" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.25" sideWeight="0.5" order="1" side_tool="false" content_ui="tabs" />
@@ -465,34 +463,32 @@
   </component>
   <component name="XDebuggerManager">
     <breakpoint-manager>
-      <option name="time" value="1" />
+      <option name="time" value="3" />
     </breakpoint-manager>
     <watches-manager />
   </component>
   <component name="editorHistoryManager">
-    <entry file="file://$PROJECT_DIR$/src/main/java/MyArrayList.java">
+    <entry file="file://$PROJECT_DIR$/src/test/java/TestMyArrayList.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="325">
-          <caret line="46" column="23" lean-forward="false" selection-start-line="46" selection-start-column="23" selection-end-line="46" selection-end-column="23" />
+        <state relative-caret-position="2955">
+          <caret line="197" column="32" lean-forward="true" selection-start-line="197" selection-start-column="32" selection-end-line="197" selection-end-column="32" />
           <folding>
-            <element signature="e#146#147#0" expanded="true" />
-            <element signature="e#187#188#0" expanded="true" />
-            <element signature="e#225#226#0" expanded="true" />
-            <element signature="e#272#273#0" expanded="true" />
-            <element signature="e#1076#1077#0" expanded="true" />
-            <element signature="e#1104#1105#0" expanded="true" />
-            <element signature="e#1136#1137#0" expanded="true" />
-            <element signature="e#1164#1165#0" expanded="true" />
+            <element signature="imports" expanded="true" />
           </folding>
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/test/java/TestMyArrayList.java">
+    <entry file="file://$PROJECT_DIR$/src/main/java/MyArrayList.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="344">
-          <caret line="138" column="0" lean-forward="true" selection-start-line="138" selection-start-column="0" selection-end-line="138" selection-end-column="0" />
+        <state relative-caret-position="385">
+          <caret line="69" column="0" lean-forward="true" selection-start-line="69" selection-start-column="0" selection-end-line="69" selection-end-column="0" />
           <folding>
-            <element signature="imports" expanded="true" />
+            <element signature="e#146#147#0" expanded="true" />
+            <element signature="e#187#188#0" expanded="true" />
+            <element signature="e#225#226#0" expanded="true" />
+            <element signature="e#272#273#0" expanded="true" />
+            <element signature="e#1038#1039#0" expanded="true" />
+            <element signature="e#1084#1085#0" expanded="true" />
           </folding>
         </state>
       </provider>
diff --git a/src/main/java/MyArrayList.java b/src/main/java/MyArrayList.java
index 1bee12a..dbfa8fc 100644
--- a/src/main/java/MyArrayList.java
+++ b/src/main/java/MyArrayList.java
@@ -49,14 +49,21 @@ public void set(Integer i, T thing){
     }
 
     public void clear(){
-
+        this.arr = (T[]) new Object[0];
     }
 
     public boolean isEmpty(){
-        return false;
+       if (arr.length == 0)
+           return true;
+       else return false;
     }
 
-    public boolean contains(){
+    public boolean contains(T valueToCheck){
+        for (int i = 0; i < arr.length; i++){
+            if (arr[i] == valueToCheck){
+                return true;
+            }
+        }
         return false;
     }
 
diff --git a/src/test/java/TestMyArrayList.java b/src/test/java/TestMyArrayList.java
index bfec8af..9e12750 100644
--- a/src/test/java/TestMyArrayList.java
+++ b/src/test/java/TestMyArrayList.java
@@ -42,7 +42,7 @@ public void doubleAddTest(){
     }
 
     @Test
-    public void integerGetTest(){
+    public void intGetTest(){
         //given
         Integer expected = 7;
         MyArrayList<Integer>myArrayList = new MyArrayList<>();
@@ -58,7 +58,7 @@ public void integerGetTest(){
     }
 
     @Test
-    public void stringGetTest(){
+    public void strGetTest(){
         //given
         String expected = "Cat";
         MyArrayList<String>myArrayList = new MyArrayList<>();
@@ -74,7 +74,7 @@ public void stringGetTest(){
     }
 
     @Test
-    public void integerRemoveTest(){
+    public void intRemoveTest(){
         //given
         MyArrayList<Integer> myArrayList = new MyArrayList<>();
         myArrayList.add(10);
@@ -90,7 +90,7 @@ public void integerRemoveTest(){
     }
 
     @Test
-    public void stringRemoveTest(){
+    public void strRemoveTest(){
         //given
         MyArrayList<String> myArrayList = new MyArrayList<>();
         myArrayList.add("Cat");
@@ -106,7 +106,7 @@ public void stringRemoveTest(){
     }
 
     @Test
-    public void integerSetTest(){
+    public void intSetTest(){
         //given
         MyArrayList<Integer> myArrayList = new MyArrayList<>();
         myArrayList.add(10);
@@ -122,7 +122,7 @@ public void integerSetTest(){
     }
 
     @Test
-    public void stringSetTest(){
+    public void strSetTest(){
         //given
         MyArrayList<String> myArrayList = new MyArrayList<>();
         myArrayList.add("Cat");
@@ -140,31 +140,62 @@ public void stringSetTest(){
     @Test
     public void clearTest(){
         //given
+        MyArrayList<String> myArrayList = new MyArrayList<>();
+        myArrayList.add("Cat");
+        myArrayList.add("Horse");
+        myArrayList.add("Bird");
+        myArrayList.add("Dog");
 
         //when
-
+        myArrayList.clear();
+        boolean expected = true;
         //then
-
+        boolean actual = myArrayList.isEmpty();
+        Assert.assertEquals(expected, actual);
     }
 
     @Test
     public void isEmptyTest(){
         //given
-
+        MyArrayList<String> myArrayList = new MyArrayList<>();
         //when
-
+        myArrayList.isEmpty();
         //then
+        Assert.assertTrue(myArrayList.isEmpty());
+    }
 
+    @Test
+    public void isEmptyTestTWO(){
+        //given
+        MyArrayList<String> myArrayList = new MyArrayList<>();
+        myArrayList.add("Ducky");
+        //when
+        myArrayList.isEmpty();
+        //then
+        Assert.assertFalse(myArrayList.isEmpty());
     }
 
     @Test
     public void containsTest(){
         //given
-
+        MyArrayList<String> myArrayList = new MyArrayList<>();
+        myArrayList.add("Ducky");
         //when
-
+        myArrayList.contains("Dog");
         //then
+        Assert.assertFalse(false);
+    }
 
+    @Test
+    public void containsTestTWO(){
+        //given
+        MyArrayList<String> myArrayList = new MyArrayList<>();
+        myArrayList.add("Ducky");
+        myArrayList.add("Dog");
+        //when
+        myArrayList.contains("Dog");
+        //then
+        Assert.assertTrue(true);
     }
 
 

From 3224ba030c5422ccdf7b7ffe239ac39207df4938 Mon Sep 17 00:00:00 2001
From: Keith Brinker <keithbrinker@zipcoders-MacBook-Pro-2.local>
Date: Fri, 9 Mar 2018 18:01:35 -0500
Subject: [PATCH 4/5] Part 2

---
 .idea/workspace.xml          | 154 +++++++++++++++++---------
 src/main/java/MySet.java     |  84 +++++++++++++++
 src/test/java/TestMySet.java | 202 +++++++++++++++++++++++++++++++++++
 3 files changed, 391 insertions(+), 49 deletions(-)
 create mode 100644 src/main/java/MySet.java
 create mode 100644 src/test/java/TestMySet.java

diff --git a/.idea/workspace.xml b/.idea/workspace.xml
index 5b7e6d6..b608877 100644
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@@ -2,8 +2,8 @@
 <project version="4">
   <component name="ChangeListManager">
     <list default="true" id="4517e1b3-e1e9-441b-9625-074d954a9ea9" name="Default" comment="">
-      <change beforePath="$PROJECT_DIR$/src/main/java/MyArrayList.java" afterPath="$PROJECT_DIR$/src/main/java/MyArrayList.java" />
-      <change beforePath="$PROJECT_DIR$/src/test/java/TestMyArrayList.java" afterPath="$PROJECT_DIR$/src/test/java/TestMyArrayList.java" />
+      <change beforePath="" afterPath="$PROJECT_DIR$/src/main/java/MySet.java" />
+      <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" afterPath="$PROJECT_DIR$/.idea/workspace.xml" />
     </list>
     <ignored path="$PROJECT_DIR$/target/" />
     <option name="EXCLUDED_CONVERTED_TO_IGNORED" value="true" />
@@ -14,14 +14,14 @@
     <option name="LAST_RESOLUTION" value="IGNORE" />
   </component>
   <component name="FileEditorManager">
-    <splitter split-orientation="horizontal" split-proportion="0.5140496">
+    <splitter split-orientation="horizontal" split-proportion="0.5235556">
       <split-first>
         <leaf>
           <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="385">
-                  <caret line="69" column="0" lean-forward="true" selection-start-line="69" selection-start-column="0" selection-end-line="69" selection-end-column="0" />
+                <state relative-caret-position="1020">
+                  <caret line="68" column="0" lean-forward="true" selection-start-line="68" selection-start-column="0" selection-end-line="68" selection-end-column="0" />
                   <folding>
                     <element signature="e#146#147#0" expanded="true" />
                     <element signature="e#187#188#0" expanded="true" />
@@ -34,15 +34,44 @@
               </provider>
             </entry>
           </file>
+          <file leaf-file-name="MySet.java" 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="75">
+                  <caret line="5" column="0" lean-forward="true" selection-start-line="5" selection-start-column="0" selection-end-line="5" selection-end-column="0" />
+                  <folding>
+                    <element signature="e#131#132#0" expanded="true" />
+                    <element signature="e#172#173#0" expanded="true" />
+                    <element signature="e#204#205#0" expanded="true" />
+                    <element signature="e#251#252#0" expanded="true" />
+                    <element signature="e#1016#1017#0" expanded="true" />
+                    <element signature="e#1062#1063#0" expanded="true" />
+                  </folding>
+                </state>
+              </provider>
+            </entry>
+          </file>
         </leaf>
       </split-first>
       <split-second>
         <leaf>
-          <file leaf-file-name="TestMyArrayList.java" pinned="false" current-in-tab="true">
+          <file leaf-file-name="TestMyArrayList.java" pinned="false" current-in-tab="false">
             <entry file="file://$PROJECT_DIR$/src/test/java/TestMyArrayList.java">
               <provider selected="true" editor-type-id="text-editor">
-                <state relative-caret-position="2955">
-                  <caret line="197" column="32" lean-forward="true" selection-start-line="197" selection-start-column="32" selection-end-line="197" selection-end-column="32" />
+                <state relative-caret-position="472">
+                  <caret line="202" column="0" lean-forward="true" selection-start-line="0" selection-start-column="0" selection-end-line="202" selection-end-column="0" />
+                  <folding>
+                    <element signature="imports" expanded="true" />
+                  </folding>
+                </state>
+              </provider>
+            </entry>
+          </file>
+          <file leaf-file-name="TestMySet.java" pinned="false" current-in-tab="true">
+            <entry file="file://$PROJECT_DIR$/src/test/java/TestMySet.java">
+              <provider selected="true" editor-type-id="text-editor">
+                <state relative-caret-position="3030">
+                  <caret line="202" column="0" lean-forward="true" selection-start-line="202" selection-start-column="0" selection-end-line="202" selection-end-column="0" />
                   <folding>
                     <element signature="imports" expanded="true" />
                   </folding>
@@ -74,6 +103,8 @@
       <list>
         <option value="$PROJECT_DIR$/src/main/java/MyArrayList.java" />
         <option value="$PROJECT_DIR$/src/test/java/TestMyArrayList.java" />
+        <option value="$PROJECT_DIR$/src/main/java/MySet.java" />
+        <option value="$PROJECT_DIR$/src/test/java/TestMySet.java" />
       </list>
     </option>
   </component>
@@ -171,7 +202,7 @@
       </list>
     </option>
   </component>
-  <component name="RunManager" selected="JUnit.TestMyArrayList.containsTestTWO">
+  <component name="RunManager" selected="JUnit.TestMySet">
     <configuration default="true" type="Applet" factoryName="Applet">
       <option name="HTML_USED" value="false" />
       <option name="WIDTH" value="400" />
@@ -193,14 +224,14 @@
       <module name="" />
       <envs />
     </configuration>
-    <configuration name="TestMyArrayList.clearTest" type="JUnit" factoryName="JUnit" temporary="true" nameIsGenerated="true">
+    <configuration name="TestMyArrayList.containsTest" type="JUnit" factoryName="JUnit" temporary="true" nameIsGenerated="true">
       <extension name="coverage" enabled="false" merge="false" sample_coverage="true" runner="idea" />
       <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="TestMyArrayList" />
-      <option name="METHOD_NAME" value="clearTest" />
+      <option name="METHOD_NAME" value="containsTest" />
       <option name="TEST_OBJECT" value="method" />
       <option name="VM_PARAMETERS" value="-ea" />
       <option name="PARAMETERS" />
@@ -213,14 +244,14 @@
       <envs />
       <patterns />
     </configuration>
-    <configuration name="TestMyArrayList.containsTest" type="JUnit" factoryName="JUnit" temporary="true" nameIsGenerated="true">
+    <configuration name="TestMyArrayList.containsTestTWO" type="JUnit" factoryName="JUnit" temporary="true" nameIsGenerated="true">
       <extension name="coverage" enabled="false" merge="false" sample_coverage="true" runner="idea" />
       <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="TestMyArrayList" />
-      <option name="METHOD_NAME" value="containsTest" />
+      <option name="METHOD_NAME" value="containsTestTWO" />
       <option name="TEST_OBJECT" value="method" />
       <option name="VM_PARAMETERS" value="-ea" />
       <option name="PARAMETERS" />
@@ -233,14 +264,14 @@
       <envs />
       <patterns />
     </configuration>
-    <configuration name="TestMyArrayList.containsTestTWO" type="JUnit" factoryName="JUnit" temporary="true" nameIsGenerated="true">
+    <configuration name="TestMyArrayList.isEmptyTest" type="JUnit" factoryName="JUnit" temporary="true" nameIsGenerated="true">
       <extension name="coverage" enabled="false" merge="false" sample_coverage="true" runner="idea" />
       <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="TestMyArrayList" />
-      <option name="METHOD_NAME" value="containsTestTWO" />
+      <option name="METHOD_NAME" value="isEmptyTest" />
       <option name="TEST_OBJECT" value="method" />
       <option name="VM_PARAMETERS" value="-ea" />
       <option name="PARAMETERS" />
@@ -253,14 +284,14 @@
       <envs />
       <patterns />
     </configuration>
-    <configuration name="TestMyArrayList.isEmptyTest" type="JUnit" factoryName="JUnit" temporary="true" nameIsGenerated="true">
+    <configuration name="TestMyArrayList.isEmptyTestTWO" type="JUnit" factoryName="JUnit" temporary="true" nameIsGenerated="true">
       <extension name="coverage" enabled="false" merge="false" sample_coverage="true" runner="idea" />
       <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="TestMyArrayList" />
-      <option name="METHOD_NAME" value="isEmptyTest" />
+      <option name="METHOD_NAME" value="isEmptyTestTWO" />
       <option name="TEST_OBJECT" value="method" />
       <option name="VM_PARAMETERS" value="-ea" />
       <option name="PARAMETERS" />
@@ -273,15 +304,15 @@
       <envs />
       <patterns />
     </configuration>
-    <configuration name="TestMyArrayList.isEmptyTestTWO" type="JUnit" factoryName="JUnit" temporary="true" nameIsGenerated="true">
+    <configuration name="TestMySet" type="JUnit" factoryName="JUnit" temporary="true" nameIsGenerated="true">
       <extension name="coverage" enabled="false" merge="false" sample_coverage="true" runner="idea" />
       <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="TestMyArrayList" />
-      <option name="METHOD_NAME" value="isEmptyTestTWO" />
-      <option name="TEST_OBJECT" value="method" />
+      <option name="MAIN_CLASS_NAME" value="TestMySet" />
+      <option name="METHOD_NAME" />
+      <option name="TEST_OBJECT" value="class" />
       <option name="VM_PARAMETERS" value="-ea" />
       <option name="PARAMETERS" />
       <option name="WORKING_DIRECTORY" value="%MODULE_WORKING_DIR%" />
@@ -354,19 +385,19 @@
       <predefined_log_file id="idea.log" enabled="true" />
     </configuration>
     <list size="5">
-      <item index="0" class="java.lang.String" itemvalue="JUnit.TestMyArrayList.clearTest" />
-      <item index="1" class="java.lang.String" itemvalue="JUnit.TestMyArrayList.isEmptyTest" />
-      <item index="2" class="java.lang.String" itemvalue="JUnit.TestMyArrayList.isEmptyTestTWO" />
-      <item index="3" class="java.lang.String" itemvalue="JUnit.TestMyArrayList.containsTest" />
-      <item index="4" class="java.lang.String" itemvalue="JUnit.TestMyArrayList.containsTestTWO" />
+      <item index="0" class="java.lang.String" itemvalue="JUnit.TestMyArrayList.isEmptyTest" />
+      <item index="1" class="java.lang.String" itemvalue="JUnit.TestMyArrayList.isEmptyTestTWO" />
+      <item index="2" class="java.lang.String" itemvalue="JUnit.TestMyArrayList.containsTest" />
+      <item index="3" class="java.lang.String" itemvalue="JUnit.TestMyArrayList.containsTestTWO" />
+      <item index="4" class="java.lang.String" itemvalue="JUnit.TestMySet" />
     </list>
     <recent_temporary>
       <list size="5">
-        <item index="0" class="java.lang.String" itemvalue="JUnit.TestMyArrayList.containsTestTWO" />
-        <item index="1" class="java.lang.String" itemvalue="JUnit.TestMyArrayList.containsTest" />
-        <item index="2" class="java.lang.String" itemvalue="JUnit.TestMyArrayList.isEmptyTestTWO" />
-        <item index="3" class="java.lang.String" itemvalue="JUnit.TestMyArrayList.isEmptyTest" />
-        <item index="4" class="java.lang.String" itemvalue="JUnit.TestMyArrayList.clearTest" />
+        <item index="0" class="java.lang.String" itemvalue="JUnit.TestMySet" />
+        <item index="1" class="java.lang.String" itemvalue="JUnit.TestMyArrayList.containsTestTWO" />
+        <item index="2" class="java.lang.String" itemvalue="JUnit.TestMyArrayList.containsTest" />
+        <item index="3" class="java.lang.String" itemvalue="JUnit.TestMyArrayList.isEmptyTestTWO" />
+        <item index="4" class="java.lang.String" itemvalue="JUnit.TestMyArrayList.isEmptyTest" />
       </list>
     </recent_temporary>
   </component>
@@ -383,7 +414,7 @@
       <option name="number" value="Default" />
       <option name="presentableId" value="Default" />
       <updated>1520609608789</updated>
-      <workItem from="1520609611988" duration="11894000" />
+      <workItem from="1520609611988" duration="15239000" />
     </task>
     <servers />
   </component>
@@ -409,18 +440,18 @@
     <history-entry file="TestMyArrayList_isEmptyTest - 2018.03.09 at 16h 24m 06s.xml">
       <configuration name="TestMyArrayList.isEmptyTest" configurationId="JUnit" />
     </history-entry>
-    <history-entry file="TestMyArrayList_isEmptyTestTWO - 2018.03.09 at 16h 23m 01s.xml">
-      <configuration name="TestMyArrayList.isEmptyTestTWO" configurationId="JUnit" />
-    </history-entry>
     <history-entry file="TestMyArrayList_isEmptyTestTWO - 2018.03.09 at 16h 23m 26s.xml">
       <configuration name="TestMyArrayList.isEmptyTestTWO" configurationId="JUnit" />
     </history-entry>
     <history-entry file="TestMyArrayList_isEmptyTestTWO - 2018.03.09 at 16h 24m 08s.xml">
       <configuration name="TestMyArrayList.isEmptyTestTWO" configurationId="JUnit" />
     </history-entry>
+    <history-entry file="TestMySet - 2018.03.09 at 18h 00m 37s.xml">
+      <configuration name="TestMySet" configurationId="JUnit" />
+    </history-entry>
   </component>
   <component name="TimeTrackingManager">
-    <option name="totallyTimeSpent" value="11894000" />
+    <option name="totallyTimeSpent" value="15239000" />
   </component>
   <component name="ToolWindowManager">
     <frame x="18" y="23" width="1422" height="838" extended-state="0" />
@@ -434,12 +465,12 @@
       <window_info id="Capture Analysis" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="-1" side_tool="false" content_ui="tabs" />
       <window_info id="Event Log" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="-1" side_tool="true" content_ui="tabs" />
       <window_info id="Maven Projects" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="-1" side_tool="false" content_ui="tabs" />
-      <window_info id="Run" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" show_stripe_button="true" weight="0.27937338" sideWeight="0.5" order="2" side_tool="false" content_ui="tabs" />
+      <window_info id="Run" active="true" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" show_stripe_button="true" weight="0.27937338" sideWeight="0.5" order="2" side_tool="false" content_ui="tabs" />
       <window_info id="Version Control" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="-1" side_tool="false" content_ui="tabs" />
       <window_info id="Terminal" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="-1" side_tool="false" content_ui="tabs" />
       <window_info id="Capture Tool" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="-1" side_tool="false" content_ui="tabs" />
       <window_info id="Designer" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="-1" side_tool="false" content_ui="tabs" />
-      <window_info id="Project" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" show_stripe_button="true" weight="0.14908579" sideWeight="0.5" order="0" side_tool="false" content_ui="combo" />
+      <window_info id="Project" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" show_stripe_button="true" weight="0.20886075" sideWeight="0.5" order="0" side_tool="false" content_ui="combo" />
       <window_info id="Database" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="-1" side_tool="false" content_ui="tabs" />
       <window_info id="Structure" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.25" sideWeight="0.5" order="1" side_tool="false" content_ui="tabs" />
       <window_info id="Ant Build" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.25" sideWeight="0.5" order="1" side_tool="false" content_ui="tabs" />
@@ -468,27 +499,52 @@
     <watches-manager />
   </component>
   <component name="editorHistoryManager">
+    <entry file="file://$PROJECT_DIR$/src/main/java/MyArrayList.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="1020">
+          <caret line="68" column="0" lean-forward="true" selection-start-line="68" selection-start-column="0" selection-end-line="68" selection-end-column="0" />
+          <folding>
+            <element signature="e#146#147#0" expanded="true" />
+            <element signature="e#187#188#0" expanded="true" />
+            <element signature="e#225#226#0" expanded="true" />
+            <element signature="e#272#273#0" expanded="true" />
+            <element signature="e#1038#1039#0" expanded="true" />
+            <element signature="e#1084#1085#0" expanded="true" />
+          </folding>
+        </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="75">
+          <caret line="5" column="0" lean-forward="true" selection-start-line="5" selection-start-column="0" selection-end-line="5" selection-end-column="0" />
+          <folding>
+            <element signature="e#131#132#0" expanded="true" />
+            <element signature="e#172#173#0" expanded="true" />
+            <element signature="e#204#205#0" expanded="true" />
+            <element signature="e#251#252#0" expanded="true" />
+            <element signature="e#1016#1017#0" expanded="true" />
+            <element signature="e#1062#1063#0" expanded="true" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
     <entry file="file://$PROJECT_DIR$/src/test/java/TestMyArrayList.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="2955">
-          <caret line="197" column="32" lean-forward="true" selection-start-line="197" selection-start-column="32" selection-end-line="197" selection-end-column="32" />
+        <state relative-caret-position="472">
+          <caret line="202" column="0" lean-forward="true" selection-start-line="0" selection-start-column="0" selection-end-line="202" selection-end-column="0" />
           <folding>
             <element signature="imports" expanded="true" />
           </folding>
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/MyArrayList.java">
+    <entry file="file://$PROJECT_DIR$/src/test/java/TestMySet.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="385">
-          <caret line="69" column="0" lean-forward="true" selection-start-line="69" selection-start-column="0" selection-end-line="69" selection-end-column="0" />
+        <state relative-caret-position="3030">
+          <caret line="202" column="0" lean-forward="true" selection-start-line="202" selection-start-column="0" selection-end-line="202" selection-end-column="0" />
           <folding>
-            <element signature="e#146#147#0" expanded="true" />
-            <element signature="e#187#188#0" expanded="true" />
-            <element signature="e#225#226#0" expanded="true" />
-            <element signature="e#272#273#0" expanded="true" />
-            <element signature="e#1038#1039#0" expanded="true" />
-            <element signature="e#1084#1085#0" expanded="true" />
+            <element signature="imports" expanded="true" />
           </folding>
         </state>
       </provider>
diff --git a/src/main/java/MySet.java b/src/main/java/MySet.java
new file mode 100644
index 0000000..6208e71
--- /dev/null
+++ b/src/main/java/MySet.java
@@ -0,0 +1,84 @@
+import java.util.Arrays;
+
+public class MySet<E> {
+    private E[] set;
+    private E value;
+
+    //Constructors
+    public MySet() {
+        set = (E[]) new Object[0];
+    }
+
+    public MySet(int setSize){
+        set = (E[]) new Object[setSize];
+    }
+
+    //Methods
+    public void add(E thing) {
+
+        E[] newSet = Arrays.copyOf(set, set.length + 1);
+        newSet[newSet.length-1] = thing;
+        set = newSet;
+    }
+
+
+    public E get(Integer i){
+        this.value = this.set[i];
+        return this.value;
+    }
+
+    public void remove(E thing) {
+        if ( set.length > 0){
+            E[] newSet = Arrays.copyOf(set, set.length - 1);
+            for (int i = 0, j = 0; i < set.length; i++) {
+                if (set[i] != thing) {
+                    newSet[j] = set[i];
+                    j++;
+                }
+            }
+            set = newSet;
+        }
+    }
+    public void set(Integer i, E thing){
+        this.value = this.set[i];
+        set[i] = thing;
+
+    }
+
+    public void clear(){
+        this.set = (E[]) new Object[0];
+    }
+
+    public boolean isEmpty(){
+        if (set.length == 0)
+            return true;
+        else return false;
+    }
+
+    public boolean contains(E valueToCheck){
+        for (int i = 0; i < set.length; i++){
+            if (set[i] == valueToCheck){
+                return true;
+            }
+        }
+        return false;
+    }
+
+}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/src/test/java/TestMySet.java b/src/test/java/TestMySet.java
new file mode 100644
index 0000000..7774752
--- /dev/null
+++ b/src/test/java/TestMySet.java
@@ -0,0 +1,202 @@
+import org.junit.Assert;
+import org.junit.Test;
+
+public class TestMySet {
+
+    @Test
+    public void intAddTest(){
+        //given
+        MySet<Integer> mySet = new MySet<>();
+        Integer expected = 5;
+        //when
+        mySet.add(expected);
+        //then
+        Integer actual = mySet.get(0);
+        Assert.assertEquals(expected, actual);
+    }
+
+
+    @Test
+    public void strAddTest(){
+        //given
+        MySet<String> mySet = new MySet<>();
+        String expected = "Cat";
+        //when
+        mySet.add(expected);
+        //then
+        String actual = mySet.get(0);
+        Assert.assertEquals(expected, actual);
+
+    }
+
+    @Test
+    public void doubleAddTest(){
+        //given
+        MySet<Double> mySet = new MySet<>();
+        Double expected = 1234.000;
+        //when
+        mySet.add(expected);
+        //then
+        Double actual = mySet.get(0);
+        Assert.assertEquals(expected, actual);
+    }
+
+    @Test
+    public void intGetTest(){
+        //given
+        Integer expected = 7;
+        MySet<Integer>mySet = new MySet<>();
+        mySet.add(10);
+        mySet.add(9);
+        mySet.add(8);
+        mySet.add(expected);
+        mySet.add(6);
+        //when
+        Integer actual =  mySet.get(3);
+        //then
+        Assert.assertEquals(expected, actual);
+    }
+
+    @Test
+    public void strGetTest(){
+        //given
+        String expected = "Cat";
+        MySet<String>mySet = new MySet<>();
+        mySet.add("Horse");
+        mySet.add("Duck");
+        mySet.add("Dog");
+        mySet.add(expected);
+        mySet.add("Bunny");
+        //when
+        String actual =  mySet.get(3);
+        //then
+        Assert.assertEquals(expected, actual);
+    }
+
+    @Test
+    public void intRemoveTest(){
+        //given
+        MySet<Integer> mySet = new MySet<>();
+        mySet.add(10);
+        mySet.add(9);
+        mySet.add(8);
+        mySet.add(5);
+        Integer expected = 5;
+        //when
+        mySet.remove(8);
+        //then
+        Integer actual = mySet.get(2);
+        Assert.assertEquals(expected, actual);
+    }
+
+    @Test
+    public void strRemoveTest(){
+        //given
+        MySet<String> mySet = new MySet<>();
+        mySet.add("Cat");
+        mySet.add("Dog");
+        mySet.add("Duck");
+        mySet.add("Horse");
+        String expected = "Horse";
+        //when
+        mySet.remove("Duck");
+        //then
+        String actual = mySet.get(2);
+        Assert.assertEquals(expected, actual);
+    }
+
+    @Test
+    public void intSetTest(){
+        //given
+        MySet<Integer> mySet = new MySet<>();
+        mySet.add(10);
+        mySet.add(9);
+        mySet.add(8);
+        mySet.add(5);
+        Integer expected = 25;
+        //when
+        mySet.set(2, expected);
+        //then
+        Integer actual = mySet.get(2);
+        Assert.assertEquals(expected, actual);
+    }
+
+    @Test
+    public void strSetterTest(){
+        //given
+        MySet<String> mySet = new MySet<>();
+        mySet.add("Cat");
+        mySet.add("Horse");
+        mySet.add("fdgkjhdfgkjhdgkjhf");
+        mySet.add("Dog");
+        String expected = "Duck";
+        //when
+        mySet.set(2, expected);
+        //then
+        String actual = mySet.get(2);
+        Assert.assertEquals(expected, actual);
+    }
+
+    @Test
+    public void clearTest(){
+        //given
+        MySet<String> mySet = new MySet<>();
+        mySet.add("Cat");
+        mySet.add("Horse");
+        mySet.add("Bird");
+        mySet.add("Dog");
+
+        //when
+        mySet.clear();
+        boolean expected = true;
+        //then
+        boolean actual = mySet.isEmpty();
+        Assert.assertEquals(expected, actual);
+    }
+
+    @Test
+    public void isEmptyTest(){
+        //given
+        MySet<String> mySet = new MySet<>();
+        //when
+        mySet.isEmpty();
+        //then
+        Assert.assertTrue(mySet.isEmpty());
+    }
+
+    @Test
+    public void isEmptyTestTWO(){
+        //given
+        MySet<String> mySet = new MySet<>();
+        mySet.add("Ducky");
+        //when
+        mySet.isEmpty();
+        //then
+        Assert.assertFalse(mySet.isEmpty());
+    }
+
+    @Test
+    public void containsTest(){
+        //given
+        MySet<String> mySet = new MySet<>();
+        mySet.add("Ducky");
+        //when
+        mySet.contains("Dog");
+        //then
+        Assert.assertFalse(false);
+    }
+
+    @Test
+    public void containsTestTWO(){
+        //given
+        MySet<String> mySet = new MySet<>();
+        mySet.add("Ducky");
+        mySet.add("Dog");
+        //when
+        mySet.contains("Dog");
+        //then
+        Assert.assertTrue(true);
+    }
+
+
+}

From dac37befadc5cf87cad9b4882cb8d8b48a148b02 Mon Sep 17 00:00:00 2001
From: Keith Brinker <keithbrinker@zipcoders-MacBook-Pro-2.local>
Date: Fri, 9 Mar 2018 19:11:37 -0500
Subject: [PATCH 5/5] Finished Part 2

---
 .idea/workspace.xml          | 169 ++++++++++++++++++-----------------
 src/main/java/MySet.java     |  16 +++-
 src/test/java/TestMySet.java |  13 +++
 3 files changed, 110 insertions(+), 88 deletions(-)

diff --git a/.idea/workspace.xml b/.idea/workspace.xml
index b608877..6a8266f 100644
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@@ -2,8 +2,9 @@
 <project version="4">
   <component name="ChangeListManager">
     <list default="true" id="4517e1b3-e1e9-441b-9625-074d954a9ea9" name="Default" comment="">
-      <change beforePath="" afterPath="$PROJECT_DIR$/src/main/java/MySet.java" />
       <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" afterPath="$PROJECT_DIR$/.idea/workspace.xml" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/MySet.java" afterPath="$PROJECT_DIR$/src/main/java/MySet.java" />
+      <change beforePath="$PROJECT_DIR$/src/test/java/TestMySet.java" afterPath="$PROJECT_DIR$/src/test/java/TestMySet.java" />
     </list>
     <ignored path="$PROJECT_DIR$/target/" />
     <option name="EXCLUDED_CONVERTED_TO_IGNORED" value="true" />
@@ -14,14 +15,14 @@
     <option name="LAST_RESOLUTION" value="IGNORE" />
   </component>
   <component name="FileEditorManager">
-    <splitter split-orientation="horizontal" split-proportion="0.5235556">
+    <splitter split-orientation="horizontal" split-proportion="0.42875">
       <split-first>
         <leaf>
-          <file leaf-file-name="MyArrayList.java" pinned="false" current-in-tab="true">
+          <file leaf-file-name="MyArrayList.java" 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="1020">
-                  <caret line="68" column="0" lean-forward="true" selection-start-line="68" selection-start-column="0" selection-end-line="68" selection-end-column="0" />
+                <state relative-caret-position="300">
+                  <caret line="20" column="0" lean-forward="false" selection-start-line="20" selection-start-column="0" selection-end-line="20" selection-end-column="0" />
                   <folding>
                     <element signature="e#146#147#0" expanded="true" />
                     <element signature="e#187#188#0" expanded="true" />
@@ -34,18 +35,18 @@
               </provider>
             </entry>
           </file>
-          <file leaf-file-name="MySet.java" pinned="false" current-in-tab="false">
+          <file leaf-file-name="MySet.java" pinned="false" current-in-tab="true">
             <entry file="file://$PROJECT_DIR$/src/main/java/MySet.java">
               <provider selected="true" editor-type-id="text-editor">
-                <state relative-caret-position="75">
-                  <caret line="5" column="0" lean-forward="true" selection-start-line="5" selection-start-column="0" selection-end-line="5" selection-end-column="0" />
+                <state relative-caret-position="420">
+                  <caret line="28" column="74" lean-forward="false" selection-start-line="28" selection-start-column="36" selection-end-line="28" selection-end-column="74" />
                   <folding>
                     <element signature="e#131#132#0" expanded="true" />
                     <element signature="e#172#173#0" expanded="true" />
                     <element signature="e#204#205#0" expanded="true" />
                     <element signature="e#251#252#0" expanded="true" />
-                    <element signature="e#1016#1017#0" expanded="true" />
-                    <element signature="e#1062#1063#0" expanded="true" />
+                    <element signature="e#1316#1317#0" expanded="true" />
+                    <element signature="e#1362#1363#0" expanded="true" />
                   </folding>
                 </state>
               </provider>
@@ -58,8 +59,8 @@
           <file leaf-file-name="TestMyArrayList.java" pinned="false" current-in-tab="false">
             <entry file="file://$PROJECT_DIR$/src/test/java/TestMyArrayList.java">
               <provider selected="true" editor-type-id="text-editor">
-                <state relative-caret-position="472">
-                  <caret line="202" column="0" lean-forward="true" selection-start-line="0" selection-start-column="0" selection-end-line="202" selection-end-column="0" />
+                <state relative-caret-position="30">
+                  <caret line="2" column="0" lean-forward="true" selection-start-line="2" selection-start-column="0" selection-end-line="2" selection-end-column="0" />
                   <folding>
                     <element signature="imports" expanded="true" />
                   </folding>
@@ -70,8 +71,8 @@
           <file leaf-file-name="TestMySet.java" pinned="false" current-in-tab="true">
             <entry file="file://$PROJECT_DIR$/src/test/java/TestMySet.java">
               <provider selected="true" editor-type-id="text-editor">
-                <state relative-caret-position="3030">
-                  <caret line="202" column="0" lean-forward="true" selection-start-line="202" selection-start-column="0" selection-end-line="202" selection-end-column="0" />
+                <state relative-caret-position="449">
+                  <caret line="41" column="55" lean-forward="false" selection-start-line="41" selection-start-column="55" selection-end-line="41" selection-end-column="55" />
                   <folding>
                     <element signature="imports" expanded="true" />
                   </folding>
@@ -101,8 +102,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/TestMyArrayList.java" />
+        <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/TestMySet.java" />
       </list>
@@ -115,10 +116,10 @@
     <sorting>DEFINITION_ORDER</sorting>
   </component>
   <component name="ProjectFrameBounds">
-    <option name="x" value="18" />
-    <option name="y" value="23" />
-    <option name="width" value="1422" />
-    <option name="height" value="838" />
+    <option name="x" value="-253" />
+    <option name="y" value="-1019" />
+    <option name="width" value="1897" />
+    <option name="height" value="967" />
   </component>
   <component name="ProjectLevelVcsManager" settingsEditedManually="true" />
   <component name="ProjectView">
@@ -224,15 +225,15 @@
       <module name="" />
       <envs />
     </configuration>
-    <configuration name="TestMyArrayList.containsTest" type="JUnit" factoryName="JUnit" temporary="true" nameIsGenerated="true">
+    <configuration name="TestMyArrayList" type="JUnit" factoryName="JUnit" temporary="true" nameIsGenerated="true">
       <extension name="coverage" enabled="false" merge="false" sample_coverage="true" runner="idea" />
       <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="TestMyArrayList" />
-      <option name="METHOD_NAME" value="containsTest" />
-      <option name="TEST_OBJECT" value="method" />
+      <option name="METHOD_NAME" />
+      <option name="TEST_OBJECT" value="class" />
       <option name="VM_PARAMETERS" value="-ea" />
       <option name="PARAMETERS" />
       <option name="WORKING_DIRECTORY" value="%MODULE_WORKING_DIR%" />
@@ -244,14 +245,14 @@
       <envs />
       <patterns />
     </configuration>
-    <configuration name="TestMyArrayList.containsTestTWO" type="JUnit" factoryName="JUnit" temporary="true" nameIsGenerated="true">
+    <configuration name="TestMyArrayList.containsTest" type="JUnit" factoryName="JUnit" temporary="true" nameIsGenerated="true">
       <extension name="coverage" enabled="false" merge="false" sample_coverage="true" runner="idea" />
       <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="TestMyArrayList" />
-      <option name="METHOD_NAME" value="containsTestTWO" />
+      <option name="METHOD_NAME" value="containsTest" />
       <option name="TEST_OBJECT" value="method" />
       <option name="VM_PARAMETERS" value="-ea" />
       <option name="PARAMETERS" />
@@ -264,14 +265,14 @@
       <envs />
       <patterns />
     </configuration>
-    <configuration name="TestMyArrayList.isEmptyTest" type="JUnit" factoryName="JUnit" temporary="true" nameIsGenerated="true">
+    <configuration name="TestMyArrayList.containsTestTWO" type="JUnit" factoryName="JUnit" temporary="true" nameIsGenerated="true">
       <extension name="coverage" enabled="false" merge="false" sample_coverage="true" runner="idea" />
       <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="TestMyArrayList" />
-      <option name="METHOD_NAME" value="isEmptyTest" />
+      <option name="METHOD_NAME" value="containsTestTWO" />
       <option name="TEST_OBJECT" value="method" />
       <option name="VM_PARAMETERS" value="-ea" />
       <option name="PARAMETERS" />
@@ -284,15 +285,15 @@
       <envs />
       <patterns />
     </configuration>
-    <configuration name="TestMyArrayList.isEmptyTestTWO" type="JUnit" factoryName="JUnit" temporary="true" nameIsGenerated="true">
+    <configuration name="TestMySet" type="JUnit" factoryName="JUnit" temporary="true" nameIsGenerated="true">
       <extension name="coverage" enabled="false" merge="false" sample_coverage="true" runner="idea" />
       <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="TestMyArrayList" />
-      <option name="METHOD_NAME" value="isEmptyTestTWO" />
-      <option name="TEST_OBJECT" value="method" />
+      <option name="MAIN_CLASS_NAME" value="TestMySet" />
+      <option name="METHOD_NAME" />
+      <option name="TEST_OBJECT" value="class" />
       <option name="VM_PARAMETERS" value="-ea" />
       <option name="PARAMETERS" />
       <option name="WORKING_DIRECTORY" value="%MODULE_WORKING_DIR%" />
@@ -304,15 +305,15 @@
       <envs />
       <patterns />
     </configuration>
-    <configuration name="TestMySet" type="JUnit" factoryName="JUnit" temporary="true" nameIsGenerated="true">
+    <configuration name="TestMySet.strAddTest" type="JUnit" factoryName="JUnit" temporary="true" nameIsGenerated="true">
       <extension name="coverage" enabled="false" merge="false" sample_coverage="true" runner="idea" />
       <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="TestMySet" />
-      <option name="METHOD_NAME" />
-      <option name="TEST_OBJECT" value="class" />
+      <option name="METHOD_NAME" value="strAddTest" />
+      <option name="TEST_OBJECT" value="method" />
       <option name="VM_PARAMETERS" value="-ea" />
       <option name="PARAMETERS" />
       <option name="WORKING_DIRECTORY" value="%MODULE_WORKING_DIR%" />
@@ -385,19 +386,19 @@
       <predefined_log_file id="idea.log" enabled="true" />
     </configuration>
     <list size="5">
-      <item index="0" class="java.lang.String" itemvalue="JUnit.TestMyArrayList.isEmptyTest" />
-      <item index="1" class="java.lang.String" itemvalue="JUnit.TestMyArrayList.isEmptyTestTWO" />
-      <item index="2" class="java.lang.String" itemvalue="JUnit.TestMyArrayList.containsTest" />
-      <item index="3" class="java.lang.String" itemvalue="JUnit.TestMyArrayList.containsTestTWO" />
-      <item index="4" class="java.lang.String" itemvalue="JUnit.TestMySet" />
+      <item index="0" class="java.lang.String" itemvalue="JUnit.TestMyArrayList.containsTest" />
+      <item index="1" class="java.lang.String" itemvalue="JUnit.TestMyArrayList.containsTestTWO" />
+      <item index="2" class="java.lang.String" itemvalue="JUnit.TestMySet" />
+      <item index="3" class="java.lang.String" itemvalue="JUnit.TestMyArrayList" />
+      <item index="4" class="java.lang.String" itemvalue="JUnit.TestMySet.strAddTest" />
     </list>
     <recent_temporary>
       <list size="5">
         <item index="0" class="java.lang.String" itemvalue="JUnit.TestMySet" />
-        <item index="1" class="java.lang.String" itemvalue="JUnit.TestMyArrayList.containsTestTWO" />
-        <item index="2" class="java.lang.String" itemvalue="JUnit.TestMyArrayList.containsTest" />
-        <item index="3" class="java.lang.String" itemvalue="JUnit.TestMyArrayList.isEmptyTestTWO" />
-        <item index="4" class="java.lang.String" itemvalue="JUnit.TestMyArrayList.isEmptyTest" />
+        <item index="1" class="java.lang.String" itemvalue="JUnit.TestMySet.strAddTest" />
+        <item index="2" class="java.lang.String" itemvalue="JUnit.TestMyArrayList" />
+        <item index="3" class="java.lang.String" itemvalue="JUnit.TestMyArrayList.containsTestTWO" />
+        <item index="4" class="java.lang.String" itemvalue="JUnit.TestMyArrayList.containsTest" />
       </list>
     </recent_temporary>
   </component>
@@ -414,47 +415,47 @@
       <option name="number" value="Default" />
       <option name="presentableId" value="Default" />
       <updated>1520609608789</updated>
-      <workItem from="1520609611988" duration="15239000" />
+      <workItem from="1520609611988" duration="17108000" />
     </task>
     <servers />
   </component>
   <component name="TestHistory">
-    <history-entry file="TestMyArrayList_containsTest - 2018.03.09 at 16h 26m 44s.xml">
-      <configuration name="TestMyArrayList.containsTest" configurationId="JUnit" />
+    <history-entry file="TestMyArrayList - 2018.03.09 at 18h 51m 18s.xml">
+      <configuration name="TestMyArrayList" configurationId="JUnit" />
     </history-entry>
-    <history-entry file="TestMyArrayList_containsTest - 2018.03.09 at 16h 26m 58s.xml">
-      <configuration name="TestMyArrayList.containsTest" configurationId="JUnit" />
+    <history-entry file="TestMySet - 2018.03.09 at 19h 10m 54s.xml">
+      <configuration name="TestMySet" configurationId="JUnit" />
     </history-entry>
-    <history-entry file="TestMyArrayList_containsTest - 2018.03.09 at 16h 27m 11s.xml">
-      <configuration name="TestMyArrayList.containsTest" configurationId="JUnit" />
+    <history-entry file="TestMySet_strAddTest - 2018.03.09 at 18h 59m 18s.xml">
+      <configuration name="TestMySet.strAddTest" configurationId="JUnit" />
     </history-entry>
-    <history-entry file="TestMyArrayList_containsTestTWO - 2018.03.09 at 16h 27m 55s.xml">
-      <configuration name="TestMyArrayList.containsTestTWO" configurationId="JUnit" />
+    <history-entry file="TestMySet_strAddTest - 2018.03.09 at 19h 00m 00s.xml">
+      <configuration name="TestMySet.strAddTest" configurationId="JUnit" />
     </history-entry>
-    <history-entry file="TestMyArrayList_containsTestTWO - 2018.03.09 at 16h 28m 07s.xml">
-      <configuration name="TestMyArrayList.containsTestTWO" configurationId="JUnit" />
+    <history-entry file="TestMySet_strAddTest - 2018.03.09 at 19h 00m 39s.xml">
+      <configuration name="TestMySet.strAddTest" configurationId="JUnit" />
     </history-entry>
-    <history-entry file="TestMyArrayList_isEmptyTest - 2018.03.09 at 16h 23m 53s.xml">
-      <configuration name="TestMyArrayList.isEmptyTest" configurationId="JUnit" />
+    <history-entry file="TestMySet_strAddTest - 2018.03.09 at 19h 01m 00s.xml">
+      <configuration name="TestMySet.strAddTest" configurationId="JUnit" />
     </history-entry>
-    <history-entry file="TestMyArrayList_isEmptyTest - 2018.03.09 at 16h 24m 06s.xml">
-      <configuration name="TestMyArrayList.isEmptyTest" configurationId="JUnit" />
+    <history-entry file="TestMySet_strAddTest - 2018.03.09 at 19h 02m 08s.xml">
+      <configuration name="TestMySet.strAddTest" configurationId="JUnit" />
     </history-entry>
-    <history-entry file="TestMyArrayList_isEmptyTestTWO - 2018.03.09 at 16h 23m 26s.xml">
-      <configuration name="TestMyArrayList.isEmptyTestTWO" configurationId="JUnit" />
+    <history-entry file="TestMySet_strAddTest - 2018.03.09 at 19h 02m 22s.xml">
+      <configuration name="TestMySet.strAddTest" configurationId="JUnit" />
     </history-entry>
-    <history-entry file="TestMyArrayList_isEmptyTestTWO - 2018.03.09 at 16h 24m 08s.xml">
-      <configuration name="TestMyArrayList.isEmptyTestTWO" configurationId="JUnit" />
+    <history-entry file="TestMySet_strAddTest - 2018.03.09 at 19h 02m 56s.xml">
+      <configuration name="TestMySet.strAddTest" configurationId="JUnit" />
     </history-entry>
-    <history-entry file="TestMySet - 2018.03.09 at 18h 00m 37s.xml">
-      <configuration name="TestMySet" configurationId="JUnit" />
+    <history-entry file="TestMySet_strAddTest - 2018.03.09 at 19h 03m 28s.xml">
+      <configuration name="TestMySet.strAddTest" configurationId="JUnit" />
     </history-entry>
   </component>
   <component name="TimeTrackingManager">
-    <option name="totallyTimeSpent" value="15239000" />
+    <option name="totallyTimeSpent" value="17108000" />
   </component>
   <component name="ToolWindowManager">
-    <frame x="18" y="23" width="1422" height="838" extended-state="0" />
+    <frame x="-253" y="-1019" width="1897" height="967" extended-state="0" />
     <editor active="true" />
     <layout>
       <window_info id="Palette" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="-1" side_tool="false" content_ui="tabs" />
@@ -465,12 +466,12 @@
       <window_info id="Capture Analysis" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="-1" side_tool="false" content_ui="tabs" />
       <window_info id="Event Log" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="-1" side_tool="true" content_ui="tabs" />
       <window_info id="Maven Projects" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="-1" side_tool="false" content_ui="tabs" />
-      <window_info id="Run" active="true" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" show_stripe_button="true" weight="0.27937338" sideWeight="0.5" order="2" side_tool="false" content_ui="tabs" />
+      <window_info id="Run" active="true" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" show_stripe_button="true" weight="0.23910615" sideWeight="0.5" order="2" side_tool="false" content_ui="tabs" />
       <window_info id="Version Control" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="-1" side_tool="false" content_ui="tabs" />
       <window_info id="Terminal" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="-1" side_tool="false" content_ui="tabs" />
       <window_info id="Capture Tool" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="-1" side_tool="false" content_ui="tabs" />
       <window_info id="Designer" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="-1" side_tool="false" content_ui="tabs" />
-      <window_info id="Project" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" show_stripe_button="true" weight="0.20886075" sideWeight="0.5" order="0" side_tool="false" content_ui="combo" />
+      <window_info id="Project" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" show_stripe_button="true" weight="0.156563" sideWeight="0.5" order="0" side_tool="false" content_ui="combo" />
       <window_info id="Database" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="-1" side_tool="false" content_ui="tabs" />
       <window_info id="Structure" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.25" sideWeight="0.5" order="1" side_tool="false" content_ui="tabs" />
       <window_info id="Ant Build" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.25" sideWeight="0.5" order="1" side_tool="false" content_ui="tabs" />
@@ -501,8 +502,8 @@
   <component name="editorHistoryManager">
     <entry file="file://$PROJECT_DIR$/src/main/java/MyArrayList.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="1020">
-          <caret line="68" column="0" lean-forward="true" selection-start-line="68" selection-start-column="0" selection-end-line="68" selection-end-column="0" />
+        <state relative-caret-position="300">
+          <caret line="20" column="0" lean-forward="false" selection-start-line="20" selection-start-column="0" selection-end-line="20" selection-end-column="0" />
           <folding>
             <element signature="e#146#147#0" expanded="true" />
             <element signature="e#187#188#0" expanded="true" />
@@ -514,35 +515,35 @@
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/MySet.java">
+    <entry file="file://$PROJECT_DIR$/src/test/java/TestMyArrayList.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="75">
-          <caret line="5" column="0" lean-forward="true" selection-start-line="5" selection-start-column="0" selection-end-line="5" selection-end-column="0" />
+        <state relative-caret-position="30">
+          <caret line="2" column="0" lean-forward="true" selection-start-line="2" selection-start-column="0" selection-end-line="2" selection-end-column="0" />
           <folding>
-            <element signature="e#131#132#0" expanded="true" />
-            <element signature="e#172#173#0" expanded="true" />
-            <element signature="e#204#205#0" expanded="true" />
-            <element signature="e#251#252#0" expanded="true" />
-            <element signature="e#1016#1017#0" expanded="true" />
-            <element signature="e#1062#1063#0" expanded="true" />
+            <element signature="imports" expanded="true" />
           </folding>
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/test/java/TestMyArrayList.java">
+    <entry file="file://$PROJECT_DIR$/src/main/java/MySet.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="472">
-          <caret line="202" column="0" lean-forward="true" selection-start-line="0" selection-start-column="0" selection-end-line="202" selection-end-column="0" />
+        <state relative-caret-position="420">
+          <caret line="28" column="74" lean-forward="false" selection-start-line="28" selection-start-column="36" selection-end-line="28" selection-end-column="74" />
           <folding>
-            <element signature="imports" expanded="true" />
+            <element signature="e#131#132#0" expanded="true" />
+            <element signature="e#172#173#0" expanded="true" />
+            <element signature="e#204#205#0" expanded="true" />
+            <element signature="e#251#252#0" expanded="true" />
+            <element signature="e#1316#1317#0" expanded="true" />
+            <element signature="e#1362#1363#0" expanded="true" />
           </folding>
         </state>
       </provider>
     </entry>
     <entry file="file://$PROJECT_DIR$/src/test/java/TestMySet.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="3030">
-          <caret line="202" column="0" lean-forward="true" selection-start-line="202" selection-start-column="0" selection-end-line="202" selection-end-column="0" />
+        <state relative-caret-position="449">
+          <caret line="41" column="55" lean-forward="false" selection-start-line="41" selection-start-column="55" selection-end-line="41" selection-end-column="55" />
           <folding>
             <element signature="imports" expanded="true" />
           </folding>
diff --git a/src/main/java/MySet.java b/src/main/java/MySet.java
index 6208e71..155ca4c 100644
--- a/src/main/java/MySet.java
+++ b/src/main/java/MySet.java
@@ -15,10 +15,18 @@ public MySet(int setSize){
 
     //Methods
     public void add(E thing) {
-
-        E[] newSet = Arrays.copyOf(set, set.length + 1);
-        newSet[newSet.length-1] = thing;
-        set = newSet;
+        int count = 0;
+        for (int i = 0; i < set.length; i++) {
+            if (set[i] == thing) {
+                count++;
+            }
+        }
+            if (count == 0) {
+                E[] newSet = Arrays.copyOf(set, set.length + 1);
+                newSet[newSet.length - 1] = thing;
+                set = newSet;
+            }
+            else System.out.println("This value already exists in the Set");
     }
 
 
diff --git a/src/test/java/TestMySet.java b/src/test/java/TestMySet.java
index 7774752..3089a8e 100644
--- a/src/test/java/TestMySet.java
+++ b/src/test/java/TestMySet.java
@@ -26,7 +26,20 @@ public void strAddTest(){
         //then
         String actual = mySet.get(0);
         Assert.assertEquals(expected, actual);
+    }
 
+    @Test
+    public void strAddTestTwo(){
+        //given
+        MySet<String> mySet = new MySet<>();
+        mySet.add("Cat");
+        String expected = "Cat";
+        //when
+        mySet.add(expected);
+        //then
+        String actual = mySet.get(0);
+        Assert.assertEquals(expected, actual);
+        //Prints "This value already exists in the set"
     }
 
     @Test