Merge branch 'develop'

src/linkedlists/AddIntegers.java

@@ -4,6 +4,12 @@
 
 public class AddIntegers {
 
+    /*
+    Write a program which takes two singly linked lists of digits,
+    and returns the list corresponding to the sum of the integers
+    they represent. The least significant digit comes first.
+     */
+
     public static ListNode<Integer> addIntegers(ListNode<Integer> a, ListNode<Integer> b) {
 
         return new ListNode<>(null);

test/linkedlists/AddIntegersTest.java

@@ -24,18 +24,18 @@ void addIntegers1() {
 
     @Test
     void addIntegers2() {
-        sum = createLinkedList(1, 0, 0);
-        a = createLinkedList(1, 0, 0);
-        b = createLinkedList(0);
+        sum = createLinkedList(4, 2, 0, 1);
+        a = createLinkedList(2, 1, 5);
+        b = createLinkedList(2, 1, 5);
 
         test(sum, a, b);
     }
 
     @Test
     void addIntegers3() {
-        sum = createLinkedList(1, 0, 2, 4);
-        a = createLinkedList(5, 1, 2);
-        b = createLinkedList(5 ,1, 2);
+        sum = createLinkedList(1, 0, 0, 1);
+        a = createLinkedList(1, 0, 0, 0);
+        b = createLinkedList(0, 0, 0, 1);
 
         test(sum, a, b);
     }

test/linkedlists/FindOverlappingWithCyclesTest.java

@@ -26,9 +26,7 @@ void testOverlappingWithCycles1() {
     void testOverlappingWithCycles2() {
         list1 = createLinkedList(1, 2);
         list2 = createLinkedList(1, 2, 3, 4, 5);
-        list1.get(2).next = list2.get(3);
-        overlap = createLinkedList(2, 3);
-
+        overlap = list1.get(2).next = list2.get(3);
 
         test(overlap, list1, list2);
     }
@@ -39,7 +37,6 @@ void testOverlappingWithCycles3() {
         list2 = createLinkedList(2, 3, 4, 5);
         overlap = list1.get(2).next = list2.get(2);
 
-
         test(overlap, list1, list2);
     }
 
@@ -51,27 +48,30 @@ void testOverlappingWithCycles4() {
         list2.get(5).next = list2.get(1);
         overlap = createLinkedList(2, 3);
 
-
         test(overlap, list1, list2);
     }
 
     @Test
     void testOverlappingWithCycles5() {
-        list1 = createLinkedList(3, 4);
+        list1 = createLinkedList(1, 2, 3, 4, 5);
+        list1.get(5).next = list1.get(1);
         list2 = createLinkedList(1, 2, 3, 4, 5);
-        list1.get(2).next = list2.get(5);
         list2.get(5).next = list2.get(1);
-        overlap = createLinkedList(4, 5);
-
+        overlap = null;
 
         test(overlap, list1, list2);
     }
 
     private void test(ListNode<Integer> overlap, ListNode<Integer> list1, ListNode<Integer> list2) {
         ListNode<Integer> result = testOverlappingWithCycles(list1, list2);
-        assertEquals(overlap.data, result.data);
-        if (overlap.next != null)
+        if (overlap == null)
+            assertNull(result);
+        else if (overlap.next != null) {
+            assertNotNull(result);
+            assertEquals(overlap.data, result.data);
             assertEquals(overlap.next.data, result.next.data);
+        }
+
     }
 
 }

test/linkedlists/ListPivotTest.java

@@ -24,18 +24,18 @@ void pivot1() {
 
     @Test
     void pivot2() {
-        expected = createLinkedList(3, 3, 3, 2, 2, 2, 1, 1, 1);
-        input = createLinkedList(2, 2, 3, 3, 3, 2, 1, 1, 1);
-        k = 4;
+        expected = createLinkedList(1, 1, 1, 3, 3, 3, 2, 2, 2);
+        input = createLinkedList(3, 3, 3, 2, 2, 2, 1, 1, 1);
+        k = 1;
 
         test(expected, input, k);
     }
 
     @Test
     void pivot3() {
-        expected = createLinkedList(3, 3, 3, 2, 2, 2, 1, 1, 1);
-        input = createLinkedList(1, 1, 1, 2, 2, 2, 3, 3, 3);
-        k = 8;
+        expected = createLinkedList(1, 1, 1, 2, 2, 2, 3, 3, 3);
+        input = createLinkedList(3, 3, 3, 2, 2, 2, 1, 1, 1);
+        k = 2;
 
         test(expected, input, k);
     }