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 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ 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 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
\ 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 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
\ 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 @@
+
+
+
+
+
+
+
+
+
\ 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 @@
+
+
+
+
+
+
+
+
\ 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 @@
+
+
+
+
+
+
\ No newline at end of file
diff --git a/.idea/workspace.xml b/.idea/workspace.xml
new file mode 100644
index 0000000..7b6cadd
--- /dev/null
+++ b/.idea/workspace.xml
@@ -0,0 +1,552 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ true
+ DEFINITION_ORDER
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 1520638366384
+
+
+ 1520638366384
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ 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 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/src/main/java/.deleteme b/src/main/java/.deleteme
deleted file mode 100644
index e69de29..0000000
diff --git a/src/main/java/MyArrayList.java b/src/main/java/MyArrayList.java
new file mode 100644
index 0000000..bd7a663
--- /dev/null
+++ b/src/main/java/MyArrayList.java
@@ -0,0 +1,127 @@
+import java.util.Arrays;
+
+
+public class MyArrayList {
+
+ private T[] myArray;
+ private int counter = 0;
+
+ public MyArrayList(){
+ this.myArray = (T[]) new Object[0];
+ }
+
+ public MyArrayList(int size){
+ this.myArray = (T[]) new Object[size];
+ }
+
+ public T[] toArray(T[] newArray){
+ return (T[]) Arrays.copyOf(this.myArray, this.myArray.length, newArray.getClass());
+ }
+
+ public void set(int index, T element){
+ this.myArray[index] = element;
+ }
+
+ public T get(int index){
+ return this.myArray[index];
+ }
+
+ public Integer size(){
+ return this.counter;
+ }
+
+ public void add(T element){
+ T[] addArray = Arrays.copyOf(this.myArray, this.myArray.length + 1);
+ addArray[addArray.length - 1] = element;
+ counter++;
+ this.myArray = addArray;
+ }
+
+ public void add(int index, T element){
+
+ this.myArray = Arrays.copyOf(this.myArray, this.myArray.length + 1);
+
+ for (int i = this.myArray.length - 1; i > index; i--){
+ this.myArray[i] = this.myArray[i-1];
+ }
+ this.myArray[index]= element;
+ counter++;
+
+ }
+
+ public void addAll(T[] array){
+ T[] addAllArray = Arrays.copyOf(this.myArray, this.myArray.length + array.length);
+ System.arraycopy(array, 0, addAllArray, this.myArray.length, array.length);
+ this.myArray = addAllArray;
+ this.counter += array.length;
+ }
+
+ public void remove(int index){
+
+ for (int i = index; i < this.myArray.length - 1; i++){
+ this.myArray[i] = this.myArray[i + 1] ;
+ }
+ this.myArray = Arrays.copyOf(this.myArray, this.myArray.length - 1);
+ this.counter--;
+ }
+
+ public boolean removeObject(T object){
+ int count = 0;
+ int remove = 0;
+ if(!contains(object)){
+ return false;
+ }
+ for (int i = 0; i < this.myArray.length; i++) {
+ if (this.myArray[i] == object) {
+ count++;
+ }
+ }
+ T[] newArray = Arrays.copyOf(this.myArray, this.myArray.length - count);
+ for (int j = 0; j < this.myArray.length; j++) {
+ if (this.myArray[j] != object) {
+ newArray[remove] = this.myArray[j];
+ remove++;
+ }
+ }
+ this.myArray = newArray;
+ this.counter--;
+ return true;
+ }
+
+ public void clear(){
+ this.counter = 0;
+ this.myArray = (T[]) new Object[0];
+ }
+
+ public boolean isEmpty(){
+ return (this.myArray.length == 0);
+ }
+
+ public boolean contains(T value) {
+ for (int i = 0; i < this.myArray.length; i++) {
+ if (value.equals(this.myArray[i])) {
+ return true;
+ }
+ }
+ return false;
+ }
+
+ public int indexOf(T value){
+ for(int i = 0; i < this.myArray.length; i++){
+ if(this.myArray[i].equals(value)){
+ return i;
+ }
+ }
+ return -1;
+ }
+
+ public int lastIndexOf(T value){
+ for(int i = this.myArray.length - 1; i > 0; i--){
+ if(this.myArray[i].equals(value)){
+ return i;
+ }
+ }
+ return -1;
+ }
+
+}
diff --git a/src/main/java/MyMap.java b/src/main/java/MyMap.java
new file mode 100644
index 0000000..0f8798b
--- /dev/null
+++ b/src/main/java/MyMap.java
@@ -0,0 +1,78 @@
+public class MyMap {
+
+ private MyArrayList entries;
+
+ public MyMap(){
+ this.entries = new MyArrayList<>();
+ }
+
+ public void put(K key, V value){
+ for(int i = 0; i < entries.size(); i++){
+ if (entries.get(i).getKey().equals(key)){
+ entries.set(i , new Entry<>(key, value));
+ break;
+ }
+ }
+ entries.add(new Entry<>(key, value));
+ }
+
+ public Object get(K key){
+ for(int i = 0; i < entries.size(); i++){
+ if(entries.get(i).getKey().equals(key)){
+ return entries.get(i).getValue();
+ }
+ }
+ return null;
+ }
+
+ public void remove(K key){
+ for(int i = 0; i < entries.size(); i++){
+ if(entries.get(i).getKey().equals(key)){
+ entries.remove(i);
+ break;
+ }
+ }
+ }
+
+ public boolean containsKey(K key){
+ for(int i = 0; i < entries.size(); i++){
+ if(entries.get(i).getKey().equals(key)){
+ return true;
+ }
+ }
+ return false;
+ }
+
+ public boolean containsValue(V value){
+ for(int i = 0; i < entries.size(); i++){
+ if(entries.get(i).getValue().equals(value)){
+ return true;
+ }
+ }
+ return false;
+ }
+
+ public void clear(){
+ this.entries.clear();
+ }
+
+ private class Entry {
+
+ private K key;
+ private V value;
+
+ public Entry(K key, V value) {
+ this.key = key;
+ this.value = value;
+ }
+
+ public K getKey() {
+ return key;
+ }
+
+ public V getValue() {
+
+ return value;
+ }
+ }
+}
diff --git a/src/main/java/MySet.java b/src/main/java/MySet.java
new file mode 100644
index 0000000..418c476
--- /dev/null
+++ b/src/main/java/MySet.java
@@ -0,0 +1,44 @@
+public class MySet {
+
+ private MyArrayList myArrayList;
+
+ public MySet(){
+ this.myArrayList = new MyArrayList<>();
+ }
+
+ public void add(T value) {
+ if(!myArrayList.contains(value)){
+ myArrayList.add(value);
+ }
+ }
+
+ public void addAll(T[] array){
+ for(int i = 0; i < array.length; i++){
+ if(!myArrayList.contains(array[i])){
+ myArrayList.add(array[i]);
+ }
+ }
+ }
+
+ public int size(){
+ return this.myArrayList.size();
+ }
+
+ public void clear() {
+ myArrayList.clear();
+ }
+
+ public T[] toArray(T[] newArray){
+ return (T[]) this.myArrayList.toArray(newArray);
+ }
+
+ public boolean contains(T element){
+ return myArrayList.contains(element);
+ }
+
+ public boolean isEmpty(){
+ return myArrayList.isEmpty();
+ }
+
+
+}
diff --git a/src/test/java/.deleteme b/src/test/java/.deleteme
deleted file mode 100644
index e69de29..0000000
diff --git a/src/test/java/MyArrayListTest.java b/src/test/java/MyArrayListTest.java
new file mode 100644
index 0000000..c6073ad
--- /dev/null
+++ b/src/test/java/MyArrayListTest.java
@@ -0,0 +1,280 @@
+import org.junit.Assert;
+import org.junit.Test;
+
+import java.util.Arrays;
+
+public class MyArrayListTest {
+
+
+ @Test
+ public void sizeTest() {
+ //Given
+ MyArrayList listTest = new MyArrayList(5);
+ listTest.add(1);
+
+ //When
+ int expected = 1;
+ int actual = listTest.size();
+
+ //Then
+ Assert.assertEquals(expected, actual);
+ }
+
+ @Test
+ public void sizeTest2() {
+ //Given
+ MyArrayList listTest = new MyArrayList(5);
+
+ //When
+ int expected = 0;
+ int actual = listTest.size();
+
+ //Then
+ Assert.assertEquals(expected, actual);
+ }
+
+ @Test
+ public void setTest() {
+ //Given
+ MyArrayList listTest = new MyArrayList();
+ listTest.add(1);
+ listTest.add(2);
+ listTest.add(3);
+ listTest.add(4);
+ listTest.set(2, 5);
+
+ //When
+ Integer[] expected = {1, 2, 5, 4};
+ System.out.println(Arrays.toString(expected));
+ Integer[] actual = listTest.toArray(new Integer[0]);
+ System.out.println(Arrays.toString(actual));
+
+ //Then
+ Assert.assertArrayEquals(expected, actual);
+ }
+
+ @Test
+ public void addTest() {
+ //Given
+ MyArrayList listTest = new MyArrayList();
+ listTest.add(5);
+
+ //When
+ Integer[] expected = {5};
+ Integer[] actual = listTest.toArray(new Integer[0]);
+
+ //Then
+ Assert.assertArrayEquals(expected, actual);
+ }
+
+ @Test
+ public void addIndex() {
+ //Given
+ MyArrayList listTest = new MyArrayList();
+ listTest.add(1);
+ listTest.add(2);
+ listTest.add(3);
+ listTest.add(4);
+ listTest.add(2, 5);
+
+ //When
+ Integer[] expected = {1, 2, 5, 3, 4};
+ System.out.println(Arrays.toString(expected));
+ Integer[] actual = listTest.toArray(new Integer[0]);
+ System.out.println(Arrays.toString(actual));
+
+ //Then
+ Assert.assertArrayEquals(expected, actual);
+ }
+
+ @Test
+ public void toArray() {
+ //Given
+ MyArrayList listTest = new MyArrayList();
+ listTest.add(1);
+ listTest.add(2);
+ listTest.add(3);
+ listTest.add(4);
+
+ //When
+ Integer[] expected = {1, 2, 3, 4};
+ System.out.println(Arrays.toString(expected));
+ Integer[] actual = listTest.toArray(new Integer[0]);
+ System.out.println(Arrays.toString(actual));
+
+ //Then
+ Assert.assertArrayEquals(expected, actual);
+ }
+
+ @Test
+ public void getIndexTest() {
+ //Given
+ MyArrayList listTest = new MyArrayList();
+ listTest.add(1);
+ listTest.add(2);
+ listTest.add(3);
+ listTest.add(4);
+
+ Integer expected = 2;
+ Integer actual = listTest.get(1);
+
+ Assert.assertEquals(expected, actual);
+
+ }
+
+
+ @Test
+ public void addAllTest(){
+ //Given
+ MyArrayList listTest = new MyArrayList();
+ listTest.add(5);
+ Integer[] addArray = {1,2,3,4,5};
+
+ listTest.addAll(addArray);
+
+ //When
+ Integer[] expected = {5, 1, 2, 3, 4, 5};
+ Integer[] actual = listTest.toArray(new Integer[0]);
+
+ //Then
+ Assert.assertEquals(expected, actual);
+ }
+
+
+
+ @Test
+ public void removeTest(){
+ //Given
+ MyArrayList listTest = new MyArrayList();
+ listTest.add(1);
+ listTest.add(2);
+ listTest.add(3);
+ listTest.add(4);
+
+ listTest.remove(0);
+
+ //When
+ Integer[] expected = {2, 3, 4};
+ System.out.println(Arrays.toString(expected));
+ Integer[] actual = listTest.toArray(new Integer[0]);
+ System.out.println(Arrays.toString(actual));
+
+ //Then
+ Assert.assertArrayEquals(expected, actual);
+ }
+
+ @Test
+ public void removeByObjectTest(){
+ //Given
+ MyArrayList listTest = new MyArrayList();
+ listTest.add(1);
+ listTest.add(2);
+ listTest.add(3);
+ listTest.add(2);
+ listTest.add(4);
+
+ int object = 2;
+ listTest.removeObject(object);
+
+ //When
+ Integer[] expected = {1, 3, 4};
+ System.out.println(Arrays.toString(expected));
+ Integer[] actual = listTest.toArray(new Integer[0]);
+ System.out.println(Arrays.toString(actual));
+
+ //Then
+ Assert.assertArrayEquals(expected, actual);
+ }
+
+ @Test
+ public void clearTest(){
+ //Given
+ MyArrayList listTest = new MyArrayList();
+ listTest.add(1);
+ listTest.add(2);
+ listTest.add(3);
+ listTest.add(4);
+
+ listTest.clear();
+
+ //When
+ int expected = 0;
+ int actual = listTest.size();
+
+ //Then
+ Assert.assertEquals(expected, actual);
+ }
+
+ @Test
+ public void isEmptyTest() {
+ //Given
+ MyArrayList listTest = new MyArrayList();
+
+ listTest.add(1);
+
+ //When
+ boolean expected = false;
+ boolean actual = listTest.isEmpty();
+
+ //Then
+ Assert.assertEquals(expected, actual);
+ }
+
+ @Test
+ public void containsTest(){
+ //Given
+ MyArrayList listTest = new MyArrayList();
+ listTest.add(1);
+ listTest.add(2);
+ listTest.add(3);
+ listTest.add(4);
+
+ //When
+ boolean expected = true;
+ boolean actual = listTest.contains(4);
+
+ //Then
+ Assert.assertEquals(expected, actual);
+ }
+
+ @Test
+ public void indexOfTest(){
+ //Given
+ MyArrayList listTest = new MyArrayList();
+ listTest.add(1);
+ listTest.add(2);
+ listTest.add(3);
+ listTest.add(4);
+
+ //listTest.indexOf(2);
+
+ //When
+ int expected = 1;
+ int actual = listTest.indexOf(2);
+
+ //Then
+ Assert.assertEquals(expected, actual);
+ }
+
+ @Test
+ public void lastIndexOfTest(){
+ //Given
+ MyArrayList listTest = new MyArrayList();
+ listTest.add(1);
+ listTest.add(4);
+ listTest.add(3);
+ listTest.add(1);
+ listTest.add(4);
+ listTest.add(2);
+
+ //listTest.indexOf(2);
+
+ //When
+ int expected = 3;
+ int actual = listTest.lastIndexOf(1);
+
+ //Then
+ Assert.assertEquals(expected, actual);
+ }
+
+}
diff --git a/src/test/java/MyMapTest.java b/src/test/java/MyMapTest.java
new file mode 100644
index 0000000..d1eec61
--- /dev/null
+++ b/src/test/java/MyMapTest.java
@@ -0,0 +1,96 @@
+
+
+import org.junit.Assert;
+import org.junit.Test;
+
+import static org.junit.Assert.*;
+
+public class MyMapTest {
+
+ @Test
+ public void getTest(){
+ //Given
+ MyMap myMapTest = new MyMap<>();
+
+ //When
+ Object expected = null;
+ Object actual = myMapTest.get("Bridget");
+
+ //Then
+ Assert.assertEquals(expected, actual);
+ }
+
+ @Test
+ public void putTest(){
+ //Given
+ MyMap myMapTest = new MyMap<>();
+ myMapTest.put("Gary", 8);
+
+ //When
+ Object expected = 8;
+ Object actual = myMapTest.get("Gary");
+
+ //Then
+ Assert.assertEquals(expected, actual);
+ }
+
+ @Test
+ public void removeTest(){
+ //Given
+ MyMap myMapTest = new MyMap<>();
+ myMapTest.put("Elvis", 10);
+ myMapTest.remove("Elvis");
+
+ //When
+ Object expected = null;
+ Object actual = myMapTest.get("Elvis");
+
+ //Then
+ Assert.assertEquals(expected, actual);
+ }
+
+ @Test
+ public void containsKeyTest(){
+ //Given
+ MyMap myMapTest = new MyMap<>();
+ myMapTest.put("Roger", 22);
+
+ //When
+ boolean expected = true;
+ boolean actual = myMapTest.containsKey("Roger");
+
+ //Then
+ Assert.assertEquals(expected, actual);
+ }
+
+ @Test
+ public void containsValueTest(){
+ //Given
+ MyMap myMapTest = new MyMap<>();
+ myMapTest.put("Roger", 22);
+
+ //When
+ boolean expected = true;
+ boolean actual = myMapTest.containsValue(22);
+
+ //Then
+ Assert.assertEquals(expected, actual);
+ }
+
+ @Test
+ public void clear(){
+ //Given
+ MyMap myMapTest = new MyMap<>();
+ myMapTest.put("George", 88);
+ myMapTest.put("Alex", 28);
+
+ myMapTest.clear();
+
+ //When
+ Object expected = null;
+ Object actual = myMapTest.get("George");
+
+ //Then
+ Assert.assertEquals(expected, actual);
+ }
+}
\ No newline at end of file
diff --git a/src/test/java/MySetTest.java b/src/test/java/MySetTest.java
new file mode 100644
index 0000000..dd1ae1e
--- /dev/null
+++ b/src/test/java/MySetTest.java
@@ -0,0 +1,126 @@
+import org.junit.Assert;
+import org.junit.Test;
+import java.util.Arrays;
+
+public class MySetTest {
+
+ @Test
+ public void addTestTest(){
+ //Given
+ MySet setTest = new MySet();
+ setTest.add(1);
+ setTest.add(2);
+ setTest.add(3);
+ setTest.add(2);
+
+ //When
+ Integer[] expected = {1, 2, 3};
+ Integer[] actual = setTest.toArray(new Integer[0]);
+ System.out.println(Arrays.toString(actual));
+
+ //Then
+ Assert.assertArrayEquals(expected, actual);
+ }
+
+ @Test
+ public void clearTest(){
+ //Given
+ MySet setTest = new MySet();
+ setTest.add(1);
+ setTest.add(2);
+ setTest.add(3);
+
+ setTest.clear();
+
+ //When
+ int expected = 0;
+ int actual = setTest.toArray(new Integer[0]).length;
+
+ //Then
+ Assert.assertEquals(expected, actual);
+ }
+
+ @Test
+ public void toArrayTest() {
+ //Given
+ MySet setTest = new MySet();
+ setTest.add(1);
+ setTest.add(2);
+ setTest.add(3);
+ setTest.add(4);
+
+ //When
+ Integer[] expected = {1, 2, 3, 4};
+ System.out.println(Arrays.toString(expected));
+ Integer[] actual = setTest.toArray(new Integer[0]);
+ System.out.println(Arrays.toString(actual));
+
+ //Then
+ Assert.assertArrayEquals(expected, actual);
+ }
+
+ @Test
+ public void addAllTest(){
+ //Given
+ MySet setTest = new MySet();
+ setTest.add(5);
+ Integer[] addArray = {1,2,3,4,5};
+
+ setTest.addAll(addArray);
+
+ //When
+ Integer[] expected = {5, 1, 2, 3, 4};
+ Integer[] actual = setTest.toArray(new Integer[0]);
+
+ //Then
+ Assert.assertEquals(expected, actual);
+ }
+
+ @Test
+ public void containsTest(){
+ //Given
+ MySet setTest = new MySet();
+ setTest.add(1);
+ setTest.add(2);
+ setTest.add(3);
+ setTest.add(4);
+
+ //When
+ boolean expected = true;
+ boolean actual = setTest.contains(4);
+
+ //Then
+ Assert.assertEquals(expected, actual);
+ }
+
+ @Test
+ public void isEmptyTest() {
+ //Given
+ MySet setTest = new MySet();
+
+ setTest.add(1);
+
+ //When
+ boolean expected = false;
+ boolean actual = setTest.isEmpty();
+
+ //Then
+ Assert.assertEquals(expected, actual);
+ }
+
+ @Test
+ public void sizeTest(){
+ //Given
+ MySet setTest = new MySet<>();
+ setTest.add("Bobby");
+ setTest.add("Peter");
+ setTest.add("Judy");
+
+ //When
+ int expected = 3;
+ int actual = setTest.size();
+
+ //Then
+ Assert.assertEquals(expected, actual);
+ }
+}
\ No newline at end of file