Katrice Williams-Dredden пре 6 година
родитељ
комит
159e6e3bb7
3 измењених фајлова са 93 додато и 51 уклоњено
  1. 2
    0
      src/main/java/Table/Entry.java
  2. 41
    1
      src/main/java/Table/Table.java
  3. 50
    50
      src/test/java/Table/TableTest.java

+ 2
- 0
src/main/java/Table/Entry.java Прегледај датотеку

@@ -10,10 +10,12 @@ public class Entry<K, V> {
10 10
     }
11 11
 
12 12
     public K getKey() {
13
+
13 14
         return key;
14 15
     }
15 16
 
16 17
     public V getValue() {
18
+
17 19
         return value;
18 20
     }
19 21
 

+ 41
- 1
src/main/java/Table/Table.java Прегледај датотеку

@@ -10,8 +10,48 @@ import java.util.ArrayList;
10 10
  * Void return on `remove`.
11 11
  */
12 12
 public class Table<K, V> {
13
-    private ArrayList entries;
13
+    private ArrayList<Entry> entries;
14 14
 
15 15
     public Table() {
16
+        this.entries = new ArrayList<>();
16 17
     }
18
+
19
+    public Object get(K key){
20
+        for(Entry e : entries){
21
+            if(e.getKey().equals(key)){
22
+                return e.getValue();
23
+            }
24
+        }
25
+        return null;
26
+    }
27
+
28
+    public void put(K key, V value){
29
+        //need to enter value and key into entry
30
+        int counter = 0;
31
+        for(Entry e : entries){
32
+            if(e.getKey().equals(key)){
33
+                entries.set(counter, new Entry<>(key, value));
34
+                return;
35
+            }
36
+        }
37
+        entries.add(new Entry<>(key, value));
38
+    }
39
+
40
+    public void remove(K key){
41
+        //needs to take a key, and if that key exists in the arraylist, remove the item
42
+        for(Entry e : entries){
43
+            if(e.getKey().equals(key)){
44
+                entries.remove(key);
45
+                return;
46
+            }
47
+        }
48
+
49
+
50
+    }
51
+
52
+
17 53
 }
54
+
55
+
56
+//Steps
57
+//made the ArrayList Manage the Entry entries

+ 50
- 50
src/test/java/Table/TableTest.java Прегледај датотеку

@@ -1,50 +1,50 @@
1
-//package Table;
2
-//
3
-//import org.junit.Assert;
4
-//import org.junit.Test;
5
-//
6
-//public class TableTest {
7
-//    @Test
8
-//    public void testGetWithoutAnItemReturnsNull() throws Exception {
9
-//        // Given an empty table
10
-//        Table<String, Integer> table = new Table<String, Integer>();
11
-//        // When we try and get an item then it returns null
12
-//        Assert.assertEquals(table.get("foo"), null);
13
-//    }
14
-//
15
-//    @Test
16
-//    public void testPutAnItemReturnsAndDoesNotDelete() throws Exception {
17
-//        //Given an empty table
18
-//        Table<String, Integer> table = new Table<String, Integer>();
19
-//        // When we put an item in it
20
-//        table.put("foo", 1);
21
-//        // Then we should be able to get it's value
22
-//        Assert.assertEquals(table.get("foo"), new Integer(1));
23
-//        // And then we should be able to get it again as it wasn't removed
24
-//        Assert.assertEquals(table.get("foo"), new Integer(1));
25
-//    }
26
-//
27
-//    @Test
28
-//    public void testOverwritingAnItem() throws Exception {
29
-//        //Given an empty table
30
-//        Table<String, Integer> table = new Table<String, Integer>();
31
-//        // When we put an item in it
32
-//        table.put("foo", 1);
33
-//        // And we put a new value with the same key
34
-//        table.put("foo", 2);
35
-//        // Then we should get back the new value
36
-//        Assert.assertEquals(table.get("foo"), new Integer(2));
37
-//    }
38
-//
39
-//    @Test
40
-//    public void testRemoveAnItem() throws Exception {
41
-//        //Given an empty table
42
-//        Table<String, Integer> table = new Table<String, Integer>();
43
-//        // When we put an item in it
44
-//        table.put("foo", 1);
45
-//        // And we remove that item
46
-//        table.remove("foo");
47
-//        // Then we should get back null for that balue
48
-//        Assert.assertEquals(table.get("foo"), null);
49
-//    }
50
-//}
1
+package Table;
2
+
3
+import org.junit.Assert;
4
+import org.junit.Test;
5
+
6
+public class TableTest {
7
+    @Test
8
+    public void testGetWithoutAnItemReturnsNull() throws Exception {
9
+        // Given an empty table
10
+        Table<String, Integer> table = new Table<String, Integer>();
11
+        // When we try and get an item then it returns null
12
+        Assert.assertEquals(table.get("foo"), null);
13
+    }
14
+
15
+    @Test
16
+    public void testPutAnItemReturnsAndDoesNotDelete() throws Exception {
17
+        //Given an empty table
18
+        Table<String, Integer> table = new Table<String, Integer>();
19
+        // When we put an item in it
20
+        table.put("foo", 1);
21
+        // Then we should be able to get it's value
22
+        Assert.assertEquals(table.get("foo"), new Integer(1));
23
+        // And then we should be able to get it again as it wasn't removed
24
+        Assert.assertEquals(table.get("foo"), new Integer(1));
25
+    }
26
+
27
+    @Test
28
+    public void testOverwritingAnItem() throws Exception {
29
+        //Given an empty table
30
+        Table<String, Integer> table = new Table<String, Integer>();
31
+        // When we put an item in it
32
+        table.put("foo", 1);
33
+        // And we put a new value with the same key
34
+        table.put("foo", 2);
35
+        // Then we should get back the new value
36
+        Assert.assertEquals(table.get("foo"), new Integer(2));
37
+    }
38
+
39
+    @Test
40
+    public void testRemoveAnItem() throws Exception {
41
+        //Given an empty table
42
+        Table<String, Integer> table = new Table<String, Integer>();
43
+        // When we put an item in it
44
+        table.put("foo", 1);
45
+        // And we remove that item
46
+        table.remove("foo");
47
+        // Then we should get back null for that balue
48
+        Assert.assertEquals(table.get("foo"), null);
49
+    }
50
+}