Added the ArrayListCombiner microlab.

README.md

@@ -14,4 +14,7 @@ Implement Table<K,V> so that it manages an ArrayList of Entry<K,V>.  You must im
     * `remove` which takes a key and removes it from the ArrayList if it's in there.  It's a void method; no return type.
 4. TableNested -- Take the previous microlab, and make Entry a nested class.  Think about if it'll need to be generic
 or not.
-5. Swap -- Get the test to pass.  Look at the specific values being passed in to help you figure it out.
+5. Swap -- Get the test to pass.  Look at the specific values being passed in to help you figure it out.
+6. ArrayListCombiner -- Write two methods, `superCombiner` and `extendCombiner`, which each take two arraylists and append
+all of the items from the second to the first.  `superCombiner` should use `? super E` and `extendCombiner` should use 
+`? extends E`.

src/main/java/ArrayListCombiner/ArrayListCombiner.java

@@ -0,0 +1,12 @@
+package ArrayListCombiner;
+
+import java.util.ArrayList;
+
+/**
+ * Create two generic methods that take two arraylists.  The methods should both append the second ArrayList's items,
+ * to the first.  Use a wildcard for one of the type arguments in each method.
+ * The first method should be called extendCombiner and should use ? extends E
+ * The second method should be called superCombiner and should use ? super E
+ */
+public class ArrayListCombiner {
+}

src/main/java/Employee/Employee.java

@@ -0,0 +1,25 @@
+package Employee;
+
+public class Employee {
+    private String name;
+    private double salary;
+
+    public Employee(String name, double salary) {
+        this.name = name;
+        this.salary = salary;
+    }
+
+    public void raiseSalary(double byPercent) {
+        double raise = salary * byPercent / 100;
+        salary += raise;
+    }
+
+    public final String getName() {
+        return name;
+    }
+
+    public double getSalary() {
+        return salary;
+    }
+}
+

src/main/java/Employee/Manager.java

@@ -0,0 +1,18 @@
+package Employee;
+
+public class Manager extends Employee {
+    private double bonus;
+
+    public Manager(String name, double salary) {
+        super(name, salary);
+        bonus = 0;
+    }
+
+    public void setBonus(double bonus) {
+        this.bonus = bonus;
+    }
+
+    public double getSalary() { // Overrides superclass method
+        return super.getSalary() + bonus;
+    }
+}

src/test/java/ArrayListCombiner/ArrayListCombinerTest.java

@@ -0,0 +1,48 @@
+package ArrayListCombiner;
+
+import Employee.Employee;
+import Employee.Manager;
+import org.junit.Test;
+
+import org.junit.Assert;
+
+import java.util.ArrayList;
+
+public class ArrayListCombinerTest {
+//    Employee foo = new Employee("FOO", 100);
+//    Manager bar = new Manager("BAR", 100);
+//    @Test
+//    public void testExtendCombiner() throws Exception {
+//        // Given an array list with employees
+//        ArrayList<Employee> first = new ArrayList<>();
+//        first.add(foo);
+//        // An an array list with managers
+//        ArrayList<Manager> second = new ArrayList<>();
+//        second.add(bar);
+//        // When  I combine them
+//        ArrayListCombiner.extendCombiner(first, second);
+//        // Then I should get an arrayList with both
+//        ArrayList<Employee> expected = new ArrayList<>();
+//        expected.add(foo);
+//        expected.add(bar);
+//        Assert.assertEquals(expected, first);
+//    }
+//
+//    @Test
+//    public void testSuperCombiner() throws Exception {
+//        // Given an array list with employees
+//        ArrayList<Employee> first = new ArrayList<>();
+//        first.add(foo);
+//        // An an array list with managers
+//        ArrayList<Manager> second = new ArrayList<>();
+//        second.add(bar);
+//        // When  I combine them
+//        ArrayListCombiner.superCombiner(first, second);
+//        // Then I should get an arrayList with both
+//        ArrayList<Employee> expected = new ArrayList<>();
+//        expected.add(foo);
+//        expected.add(bar);
+//        Assert.assertEquals(expected, first);
+//    }
+
+}