still working

src/main/java/StackArray/ObjectStack.java

@@ -9,8 +9,27 @@ import java.util.Arrays;
  */
 public class ObjectStack<E> {
     private Object[] elements;
-
+    Integer actualSize = 0;
     public ObjectStack() {
+        this.elements =  new Object[2];
+    }
+
+
+    public void push(E element) {
+        Object[] newArr = Arrays.copyOf(this.elements, this.elements.length + 1);
+        newArr[actualSize++] = element;
+        this.elements = newArr;
+
+    }
+
+    public boolean isEmpty() {
+        return actualSize == 0;
+    }
 
+    public Object pop() {
+        Object element = this.elements[actualSize - 1];
+        this.elements[actualSize - 1] = null;
+        actualSize--;
+        return element;
     }
 }

src/main/java/Table/Entry.java

@@ -17,4 +17,12 @@ public class Entry<K, V> {
         return value;
     }
 
+    public void setKey(K key){
+        this.key = key;
+    }
+
+    public void setValue(V value){
+        this.value = value;
+    }
+
 }

src/main/java/Table/Table.java

@@ -2,16 +2,46 @@ package Table;
 
 import java.util.ArrayList;
 
-/**
- * This class needs to manage an ArrayList of Entry objects.  It needs a get method that takes a key and returns
- * its corresponding value, or null of the key is not in the arraylist.  It needs a put method that takes a key and value
- * and makes an entry with key, value.  NOTE: There cannot be two entries with the same key.
- * It also needs a remove method which takes a key and, if that key exists in the arraylist, removes that item.
- * Void return on `remove`.
- */
-public class Table<K, V> {
-    private ArrayList entries;
+    /**
+     * This class needs to manage an ArrayList of Entry objects.  It needs a get method that takes a key and returns
+     * its corresponding value, or null of the key is not in the arraylist.  It needs a put method that takes a key and value
+     * and makes an entry with key, value.  NOTE: There cannot be two entries with the same key.
+     * It also needs a remove method which takes a key and, if that key exists in the arraylist, removes that item.
+     * Void return on `remove`.
+     */
+    public class Table<K, V> {
+        private ArrayList<Entry> entries;
 
-    public Table() {
+        public Table() {
+            this.entries = new ArrayList<Entry>();
+        }
+
+    public V get(K key) {
+            for (int i = 0; i < entries.size(); i++){
+                if (entries.get(i).getKey().equals(key)){
+                    return (V)entries.get(i).getValue();
+                }
+
+            }
+            return null;
+    }
+
+    public void put(K key, V value) {
+    for (int i =0; i < entries.size(); i++){
+       if (entries.get(i).getKey().equals(key)){
+           System.out.println("Error, already exists");
+       }
+       entries.get(i).setKey(key);
+       entries.get(i).setValue(value);
+    }
+    entries.add(new Entry(key, value));
+    }
+
+    public void remove(K key) {
+    for (int i = 0; i < entries.size(); i++){
+        if (entries.get(i).getKey().equals(key)){
+            entries.remove(i);
+        }
+    }
     }
 }

src/test/java/StackArray/ObjectStackTest.java

@@ -1,39 +1,39 @@
-//package StackArray;
-//
-//import org.junit.Assert;
-//import org.junit.Test;
-//
-//public class ObjectStackTest {
-//    @Test
-//    public void testPushingGrowsTheStack() throws Exception {
-//        // Given an empty stack
-//        ObjectStack<String> stack = new ObjectStack<>();
-//        // Assert that it is empty.
-//        Assert.assertEquals(true, stack.isEmpty());
-//        // When we push something onto the stack
-//        stack.push("foobar");
-//        // Then it shouldn't be empty
-//        Assert.assertEquals(false, stack.isEmpty());
-//    }
-//
-//    @Test
-//    public void testPushingAndPoppingOrder() throws Exception {
-//        // Given an empty stack
-//        ObjectStack<String> stack = new ObjectStack<>();
-//        // When we push two elements on it
-//        stack.push("foo");
-//        stack.push("bar");
-//        // Then we should see them returned in the correct order
-//        Assert.assertEquals("bar", stack.pop());
-//        Assert.assertEquals("foo", stack.pop());
-//    }
-//
-//    @Test(expected = IndexOutOfBoundsException.class)
-//    public void testPopFirst() throws Exception {
-//        // Given an empty stack
-//        ObjectStack<String> stack = new ObjectStack<>();
-//        // When it's popped
-//        stack.pop();
-//        // Then we should get an exception
-//    }
-//}
+package StackArray;
+
+import org.junit.Assert;
+import org.junit.Test;
+
+public class ObjectStackTest {
+    @Test
+    public void testPushingGrowsTheStack() throws Exception {
+        // Given an empty stack
+        ObjectStack<String> stack = new ObjectStack<>();
+        // Assert that it is empty.
+        Assert.assertEquals(true, stack.isEmpty());
+        // When we push something onto the stack
+        stack.push("foobar");
+        // Then it shouldn't be empty
+        Assert.assertEquals(false, stack.isEmpty());
+    }
+
+    @Test
+    public void testPushingAndPoppingOrder() throws Exception {
+        // Given an empty stack
+        ObjectStack<String> stack = new ObjectStack<>();
+        // When we push two elements on it
+        stack.push("foo");
+        stack.push("bar");
+        // Then we should see them returned in the correct order
+        Assert.assertEquals("bar", stack.pop());
+        Assert.assertEquals("foo", stack.pop());
+    }
+
+    @Test(expected = IndexOutOfBoundsException.class)
+    public void testPopFirst() throws Exception {
+        // Given an empty stack
+        ObjectStack<String> stack = new ObjectStack<>();
+        // When it's popped
+        stack.pop();
+        // Then we should get an exception
+    }
+}

src/test/java/Swap/SwapTest.java

@@ -1,16 +1,16 @@
 package Swap;
-//
-//import org.junit.Assert;
-//import org.junit.Test;
-//
-///**
-// * Get the tests passing.
-// */
-//public class SwapTest {
-//    @Test
-//    public void testSwap() throws Exception {
-//        Double[] result = Swap.swap(0,1, 1.5, 2,3);
-//        Double[] expected = {2.0, 1.5, 3.0};
-//        Assert.assertArrayEquals(expected, result);
-//    }
-//}
+
+import org.junit.Assert;
+import org.junit.Test;
+
+/**
+ * Get the tests passing.
+ */
+public class SwapTest {
+    @Test
+    public void testSwap() throws Exception {
+        Double[] result = Swap.swap(0,1, 1.5, 2.0,3.0);
+        Double[] expected = {2.0, 1.5, 3.0};
+        Assert.assertArrayEquals(expected, result);
+    }
+}

src/test/java/Table/TableTest.java

@@ -1,50 +1,50 @@
-//package Table;
-//
-//import org.junit.Assert;
-//import org.junit.Test;
-//
-//public class TableTest {
-//    @Test
-//    public void testGetWithoutAnItemReturnsNull() throws Exception {
-//        // Given an empty table
-//        Table<String, Integer> table = new Table<String, Integer>();
-//        // When we try and get an item then it returns null
-//        Assert.assertEquals(table.get("foo"), null);
-//    }
-//
-//    @Test
-//    public void testPutAnItemReturnsAndDoesNotDelete() throws Exception {
-//        //Given an empty table
-//        Table<String, Integer> table = new Table<String, Integer>();
-//        // When we put an item in it
-//        table.put("foo", 1);
-//        // Then we should be able to get it's value
-//        Assert.assertEquals(table.get("foo"), new Integer(1));
-//        // And then we should be able to get it again as it wasn't removed
-//        Assert.assertEquals(table.get("foo"), new Integer(1));
-//    }
-//
-//    @Test
-//    public void testOverwritingAnItem() throws Exception {
-//        //Given an empty table
-//        Table<String, Integer> table = new Table<String, Integer>();
-//        // When we put an item in it
-//        table.put("foo", 1);
-//        // And we put a new value with the same key
-//        table.put("foo", 2);
-//        // Then we should get back the new value
-//        Assert.assertEquals(table.get("foo"), new Integer(2));
-//    }
-//
-//    @Test
-//    public void testRemoveAnItem() throws Exception {
-//        //Given an empty table
-//        Table<String, Integer> table = new Table<String, Integer>();
-//        // When we put an item in it
-//        table.put("foo", 1);
-//        // And we remove that item
-//        table.remove("foo");
-//        // Then we should get back null for that balue
-//        Assert.assertEquals(table.get("foo"), null);
-//    }
-//}
+package Table;
+
+import org.junit.Assert;
+import org.junit.Test;
+
+public class TableTest {
+    @Test
+    public void testGetWithoutAnItemReturnsNull() throws Exception {
+        // Given an empty table
+        Table<String, Integer> table = new Table<String, Integer>();
+        // When we try and get an item then it returns null
+        Assert.assertEquals(table.get("foo"), null);
+    }
+
+    @Test
+    public void testPutAnItemReturnsAndDoesNotDelete() throws Exception {
+        //Given an empty table
+        Table<String, Integer> table = new Table<String, Integer>();
+        // When we put an item in it
+        table.put("foo", 1);
+        // Then we should be able to get it's value
+        Assert.assertEquals(table.get("foo"), new Integer(1));
+        // And then we should be able to get it again as it wasn't removed
+        Assert.assertEquals(table.get("foo"), new Integer(1));
+    }
+
+    @Test
+    public void testOverwritingAnItem() throws Exception {
+        //Given an empty table
+        Table<String, Integer> table = new Table<String, Integer>();
+        // When we put an item in it
+        table.put("foo", 1);
+        // And we put a new value with the same key
+        table.put("foo", 2);
+        // Then we should get back the new value
+        Assert.assertEquals(table.get("foo"), new Integer(2));
+    }
+
+    @Test
+    public void testRemoveAnItem() throws Exception {
+        //Given an empty table
+        Table<String, Integer> table = new Table<String, Integer>();
+        // When we put an item in it
+        table.put("foo", 1);
+        // And we remove that item
+        table.remove("foo");
+        // Then we should get back null for that balue
+        Assert.assertEquals(table.get("foo"), null);
+    }
+}