From 92faafebf67214851ff0327efef1360c0bf24217 Mon Sep 17 00:00:00 2001
From: Tamas Szabo4 <tamas_szabo4@epam.com>
Date: Fri, 25 Nov 2016 09:51:24 +0100
Subject: [PATCH] Fixed assertEquals() due to issue:
 https://github.com/jhusain/learnrxjava/pull/12/commits/597d3b21a6ec8cb066f962315ce3f2b43f11ca43,
 some variable names changed for better understanding (imo)

---
 .../ComposableListExercisesTest.java          | 102 +++++++++---------
 .../learnrxjava/ObservableSolutionsTest.java  |   8 +-
 2 files changed, 55 insertions(+), 55 deletions(-)

diff --git a/src/test/java/learnrxjava/ComposableListExercisesTest.java b/src/test/java/learnrxjava/ComposableListExercisesTest.java
index d22762a..6d28ef5 100644
--- a/src/test/java/learnrxjava/ComposableListExercisesTest.java
+++ b/src/test/java/learnrxjava/ComposableListExercisesTest.java
@@ -29,9 +29,9 @@ public void testExercise2() {
     @Test
     public void testExercise3() {
         System.out.println("----------- testExercise3 ----------------");
-        ComposableList<JSON> e = ComposableListExercises.exercise3();
-        ComposableList<JSON> s = ComposableListSolutions.exercise3();
-        assertMatch(e, s);
+        ComposableList<JSON> exerciseResult = ComposableListExercises.exercise3();
+        ComposableList<JSON> solutionResult = ComposableListSolutions.exercise3();
+        assertMatch(exerciseResult, solutionResult);
     }
 
     @Test
@@ -45,17 +45,17 @@ public void testExercise4map() {
     @Test
     public void testExercise5() {
         System.out.println("----------- testExercise5 ----------------");
-        ComposableList<JSON> e = ComposableListExercises.exercise5();
-        ComposableList<JSON> s = ComposableListSolutions.exercise5();
-        assertMatch(e, s);
+        ComposableList<JSON> exerciseResult = ComposableListExercises.exercise5();
+        ComposableList<JSON> solutionResult = ComposableListSolutions.exercise5();
+        assertMatch(exerciseResult, solutionResult);
     }
 
     @Test
     public void testExercise6() {
         System.out.println("----------- testExercise6 ----------------");
-        ComposableList<Video> e = ComposableListExercises.exercise6();
-        ComposableList<Video> s = ComposableListSolutions.exercise6();
-        assertMatch(e, s);
+        ComposableList<Video> exerciseResult = ComposableListExercises.exercise6();
+        ComposableList<Video> solutionResult = ComposableListSolutions.exercise6();
+        assertMatch(exerciseResult, solutionResult);
     }
 
     @Test
@@ -69,17 +69,17 @@ public void testExercise7filter() {
     @Test
     public void testExercise8() {
         System.out.println("----------- testExercise8 ----------------");
-        ComposableList<Integer> e = ComposableListExercises.exercise8();
-        ComposableList<Integer> s = ComposableListSolutions.exercise8();
-        assertMatch(e, s);
+        ComposableList<Integer> exerciseResult = ComposableListExercises.exercise8();
+        ComposableList<Integer> solutionResult = ComposableListSolutions.exercise8();
+        assertMatch(exerciseResult, solutionResult);
     }
 
     @Test
     public void testExercise9() {
         System.out.println("----------- testExercise9 ----------------");
-        ComposableList<Integer> e = ComposableListExercises.exercise9();
-        ComposableList<Integer> s = ComposableListSolutions.exercise9();
-        assertMatch(e, s);
+        ComposableList<Integer> exerciseResult = ComposableListExercises.exercise9();
+        ComposableList<Integer> solutionResult = ComposableListSolutions.exercise9();
+        assertMatch(exerciseResult, solutionResult);
     }
 
     @Test
@@ -93,17 +93,17 @@ public void testExercise10() {
     @Test
     public void testExercise11() {
         System.out.println("----------- testExercise11 ----------------");
-        ComposableList<Integer> e = ComposableListExercises.exercise11();
-        ComposableList<Integer> s = ComposableListSolutions.exercise11();
-        assertMatch(e, s);
+        ComposableList<Integer> exerciseResult = ComposableListExercises.exercise11();
+        ComposableList<Integer> solutionResult = ComposableListSolutions.exercise11();
+        assertMatch(exerciseResult, solutionResult);
     }
 
     @Test
     public void testExercise12() {
         System.out.println("----------- testExercise12 ----------------");
-        ComposableList<JSON> e = ComposableListExercises.exercise12();
-        ComposableList<JSON> s = ComposableListSolutions.exercise12();
-        assertMatch(e, s);
+        ComposableList<JSON> exerciseResult = ComposableListExercises.exercise12();
+        ComposableList<JSON> solutionResult = ComposableListSolutions.exercise12();
+        assertMatch(exerciseResult, solutionResult);
 
         //   {"id": 675465,"title": "Fracture","boxart":"http://cdn-0.nflximg.com/images/2891/Fracture150.jpg" },
         //   {"id": 65432445,"title": "The Chamber","boxart":"http://cdn-0.nflximg.com/images/2891/TheChamber150.jpg" },
@@ -115,15 +115,15 @@ public void testExercise12() {
     @Test
     public void testExercise13() {
         System.out.println("----------- testExercise13 ----------------");
-        BoxArt e = ComposableListExercises.exercise13();
-        BoxArt s = ComposableListSolutions.exercise13();
-        assertEquals(e, s);
+        BoxArt exerciseResult = ComposableListExercises.exercise13();
+        BoxArt solutionResult = ComposableListSolutions.exercise13();
+        assertEquals(exerciseResult, solutionResult);
     }
 
     @Test
     public void testExercise14reduce() {
         System.out.println("----------- testExercise14 reduce ----------------");
-        ComposableList<Integer> slr = ComposableListExercises.of(1, 2, 3).reduce((s, i) -> s + i);
+        ComposableList<Integer> slr = ComposableListExercises.of(1, 2, 3).reduce((solutionResult, i) -> solutionResult + i);
         slr.forEach(System.out::println);
         assertEquals(Arrays.asList(6), slr);
     }
@@ -131,7 +131,7 @@ public void testExercise14reduce() {
     @Test
     public void testExercise15reduce() {
         System.out.println("----------- testExercise15 reduce ----------------");
-        ComposableList<Integer> slr = ComposableListExercises.of(1, 2, 3).reduce(1, (s, i) -> s + i);
+        ComposableList<Integer> slr = ComposableListExercises.of(1, 2, 3).reduce(1, (solutionResult, i) -> solutionResult + i);
         slr.forEach(System.out::println);
         assertEquals(Arrays.asList(7), slr);
     }
@@ -139,41 +139,41 @@ public void testExercise15reduce() {
     @Test
     public void testExercise16() {
         System.out.println("----------- testExercise16 ----------------");
-        ComposableList<Integer> e = ComposableListExercises.exercise16();
-        ComposableList<Integer> s = ComposableListSolutions.exercise16();
-        assertMatch(e, s);
+        ComposableList<Integer> exerciseResult = ComposableListExercises.exercise16();
+        ComposableList<Integer> solutionResult = ComposableListSolutions.exercise16();
+        assertMatch(exerciseResult, solutionResult);
     }
 
     @Test
     public void testExercise17() {
         System.out.println("----------- testExercise17 ----------------");
-        ComposableList<String> e = ComposableListExercises.exercise17();
-        ComposableList<String> s = ComposableListSolutions.exercise17();
-        assertMatch(e, s);
+        ComposableList<String> exerciseResult = ComposableListExercises.exercise17();
+        ComposableList<String> solutionResult = ComposableListSolutions.exercise17();
+        assertMatch(exerciseResult, solutionResult);
     }
 
     @Test
     public void testExercise18() {
         System.out.println("----------- testExercise18 ----------------");
-        ComposableList<Map<Integer, String>> e = ComposableListExercises.exercise18();
-        ComposableList<Map<Integer, String>> s = ComposableListSolutions.exercise18();
-        assertMatch(e, s);
+        ComposableList<Map<Integer, String>> exerciseResult = ComposableListExercises.exercise18();
+        ComposableList<Map<Integer, String>> solutionResult = ComposableListSolutions.exercise18();
+        assertMatch(exerciseResult, solutionResult);
     }
 
     @Test
     public void testExercise19() {
         System.out.println("----------- testExercise19 ----------------");
-        ComposableList<JSON> e = ComposableListExercises.exercise19();
-        ComposableList<JSON> s = ComposableListSolutions.exercise19();
-        assertMatch(e, s);
+        ComposableList<JSON> exerciseResult = ComposableListExercises.exercise19();
+        ComposableList<JSON> solutionResult = ComposableListSolutions.exercise19();
+        assertMatch(exerciseResult, solutionResult);
     }
 
     @Test
     public void testExercise20() {
         System.out.println("----------- testExercise20 ----------------");
-        ComposableList<JSON> e = ComposableListExercises.exercise20();
-        ComposableList<JSON> s = ComposableListSolutions.exercise20();
-        assertMatch(e, s);
+        ComposableList<JSON> exerciseResult = ComposableListExercises.exercise20();
+        ComposableList<JSON> solutionResult = ComposableListSolutions.exercise20();
+        assertMatch(exerciseResult, solutionResult);
     }
 
     @Test
@@ -187,25 +187,25 @@ public void testExercise21zip() {
     @Test
     public void testExercise22() {
         System.out.println("----------- testExercise22 ----------------");
-        ComposableList<JSON> e = ComposableListExercises.exercise22();
-        ComposableList<JSON> s = ComposableListSolutions.exercise22();
-        assertMatch(e, s);
+        ComposableList<JSON> exerciseResult = ComposableListExercises.exercise22();
+        ComposableList<JSON> solutionResult = ComposableListSolutions.exercise22();
+        assertMatch(exerciseResult, solutionResult);
     }
 
     @Test
     public void testExercise23() {
         System.out.println("----------- testExercise23 ----------------");
-        ComposableList<JSON> e = ComposableListExercises.exercise23();
-        ComposableList<JSON> s = ComposableListSolutions.exercise23();
-        assertMatch(e, s);
+        ComposableList<JSON> exerciseResult = ComposableListExercises.exercise23();
+        ComposableList<JSON> solutionResult = ComposableListSolutions.exercise23();
+        assertMatch(exerciseResult, solutionResult);
     }
 
-    private void assertMatch(ComposableList<? extends Object> e, ComposableList<? extends Object> s) {
-        if (e.size() != s.size()) {
+    private void assertMatch(ComposableList<? extends Object> exerciseResult, ComposableList<? extends Object> solutionResult) {
+        if (exerciseResult.size() != solutionResult.size()) {
             throw new RuntimeException("Count Doesn't Match");
         }
-        for (int i = 0; i < e.size(); i++) {
-            if (!e.get(i).equals(s.get(i))) {
+        for (int i = 0; i < exerciseResult.size(); i++) {
+            if (!exerciseResult.get(i).equals(solutionResult.get(i))) {
                 throw new RuntimeException("Item does not match at index: " + i);
             }
         }
diff --git a/src/test/java/learnrxjava/ObservableSolutionsTest.java b/src/test/java/learnrxjava/ObservableSolutionsTest.java
index a7e2fa7..3733ebd 100644
--- a/src/test/java/learnrxjava/ObservableSolutionsTest.java
+++ b/src/test/java/learnrxjava/ObservableSolutionsTest.java
@@ -168,13 +168,13 @@ public void exerciseMovie() {
         Map<Integer, JSON> map = getImpl().exerciseMovie(movies).toMap(i -> (int) i.get("id")).toBlocking().single();
         System.out.println(map);
         assertTrue(map.containsKey(70111470));
-        assertEquals(map.get(70111470).toString(), "{boxart=http://cdn-0.nflximg.com/images/2891/DieHard150.jpg, id=70111470, title=Die Hard}");
+        assertEquals("{boxart=http://cdn-0.nflximg.com/images/2891/DieHard150.jpg, id=70111470, title=Die Hard}", map.get(70111470).toString());
         assertTrue(map.containsKey(654356453));
-        assertEquals(map.get(654356453).toString(), "{boxart=http://cdn-0.nflximg.com/images/2891/BadBoys140.jpg, id=654356453, title=Bad Boys}");
+        assertEquals("{boxart=http://cdn-0.nflximg.com/images/2891/BadBoys140.jpg, id=654356453, title=Bad Boys}", map.get(654356453).toString());
         assertTrue(map.containsKey(65432445));
-        assertEquals(map.get(65432445).toString(), "{boxart=http://cdn-0.nflximg.com/images/2891/TheChamber130.jpg, id=65432445, title=The Chamber}");
+        assertEquals("{boxart=http://cdn-0.nflximg.com/images/2891/TheChamber130.jpg, id=65432445, title=The Chamber}", map.get(65432445).toString());
         assertTrue(map.containsKey(675465));
-        assertEquals(map.get(675465).toString(), "{boxart=http://cdn-0.nflximg.com/images/2891/Fracture120.jpg, id=675465, title=Fracture}");
+        assertEquals("{boxart=http://cdn-0.nflximg.com/images/2891/Fracture120.jpg, id=675465, title=Fracture}", map.get(675465).toString());
     }
 
     @Test