2.x: fix assertValueSequence reversed error message (#5594)

* 2.x: fix assertValueSequence reversed error message

* Fix variable naming instead

* Adjust according to the feedback

Author: akarnokd

src/main/java/io/reactivex/observers/BaseTestConsumer.java

@@ -567,20 +567,20 @@ public final U assertValueSet(Collection<? extends T> expected) {
     @SuppressWarnings("unchecked")
     public final U assertValueSequence(Iterable<? extends T> sequence) {
         int i = 0;
-        Iterator<T> vit = values.iterator();
-        Iterator<? extends T> it = sequence.iterator();
+        Iterator<T> actualIterator = values.iterator();
+        Iterator<? extends T> expectedIterator = sequence.iterator();
         boolean actualNext;
         boolean expectedNext;
         for (;;) {
-            actualNext = it.hasNext();
-            expectedNext = vit.hasNext();
+            expectedNext = expectedIterator.hasNext();
+            actualNext = actualIterator.hasNext();
 
             if (!actualNext || !expectedNext) {
                 break;
             }
 
-            T v = it.next();
-            T u = vit.next();
+            T u = expectedIterator.next();
+            T v = actualIterator.next();
 
             if (!ObjectHelper.equals(u, v)) {
                 throw fail("Values at position " + i + " differ; Expected: " + valueAndClass(u) + ", Actual: " + valueAndClass(v));

src/test/java/io/reactivex/observers/TestObserverTest.java

@@ -956,24 +956,24 @@ public void assertValueSequence() {
         try {
             ts.assertValueSequence(Collections.<Integer>emptyList());
             throw new RuntimeException("Should have thrown");
-        } catch (AssertionError ex) {
-            // expected
+        } catch (AssertionError expected) {
+            assertTrue(expected.getMessage(), expected.getMessage().startsWith("More values received than expected (0)"));
         }
 
         try {
             ts.assertValueSequence(Collections.singletonList(1));
             throw new RuntimeException("Should have thrown");
-        } catch (AssertionError ex) {
-            // expected
+        } catch (AssertionError expected) {
+            assertTrue(expected.getMessage(), expected.getMessage().startsWith("More values received than expected (1)"));
         }
 
         ts.assertValueSequence(Arrays.asList(1, 2));
 
         try {
             ts.assertValueSequence(Arrays.asList(1, 2, 3));
             throw new RuntimeException("Should have thrown");
-        } catch (AssertionError ex) {
-            // expected
+        } catch (AssertionError expected) {
+            assertTrue(expected.getMessage(), expected.getMessage().startsWith("Fewer values received than expected (2)"));
         }
     }