1.x: TestSubscriber::assertValuesAndClear should reset valueCount

Author: Matt Laux

src/main/java/rx/observers/TestSubscriber.java

@@ -703,5 +703,6 @@ public final void assertValuesAndClear(T expectedFirstValue, T... expectedRestVa
             assertItem(expectedRestValues[i], i + 1);
         }
         values.clear();
+        valueCount = 0;
     }
 }

src/test/java/rx/observers/AssertableSubscriberTest.java

@@ -151,7 +151,7 @@ public void testSingle() {
        assertEquals(Thread.currentThread().getName(), ts.getLastSeenThread().getName());
        assertTrue(ts.getOnErrorEvents().isEmpty());
        assertTrue(ts.getOnNextEvents().isEmpty());
-       assertEquals(1, ts.getValueCount());
+       assertEquals(0, ts.getValueCount());
     }
 
     @Test

src/test/java/rx/observers/TestSubscriberTest.java

@@ -815,4 +815,15 @@ public void assertAndConsume() {
 
         ts.assertNoValues();
     }
+
+    @Test
+    public void assertAndClearResetsValueCount() {
+        TestSubscriber<Integer> ts = TestSubscriber.create();
+
+        ts.onNext(1);
+        ts.assertValuesAndClear(1);
+
+        ts.assertNoValues();
+        Assert.assertEquals(0, ts.getValueCount());
+    }
 }