Clarify names during testing

Author: benjchristensen

rxjava-core/src/main/java/rx/observers/SerializedObserver.java renamed to rxjava-core/src/main/java/rx/observers/SerializedObserverViaQueueAndCounter.java

@@ -5,7 +5,7 @@
 
 import rx.Observer;
 
-public class SerializedObserver<T> implements Observer<T> {
+public class SerializedObserverViaQueueAndCounter<T> implements Observer<T> {
     private final Observer<? super T> actual;
     private final AtomicInteger count = new AtomicInteger();
     private final ConcurrentLinkedQueue<Object> queue = new ConcurrentLinkedQueue<Object>();
@@ -25,7 +25,7 @@ private static class ErrorSentinel extends Sentinel {
         }
     }
 
-    public SerializedObserver(Observer<? super T> s) {
+    public SerializedObserverViaQueueAndCounter(Observer<? super T> s) {
         this.actual = s;
     }
 

rxjava-core/src/test/java/rx/observers/SerializedObserverTest.java renamed to rxjava-core/src/test/java/rx/observers/SerializedObserverViaQueueAndCounterTest.java

@@ -37,7 +37,7 @@
 import rx.Subscriber;
 import rx.Subscription;
 
-public class SerializedObserverTest {
+public class SerializedObserverViaQueueAndCounterTest {
 
     @Mock
     Subscriber<String> observer;
@@ -53,7 +53,7 @@ public void testSingleThreadedBasic() {
         TestSingleThreadedObservable onSubscribe = new TestSingleThreadedObservable(s, "one", "two", "three");
         Observable<String> w = Observable.create(onSubscribe);
 
-        SerializedObserver<String> aw = new SerializedObserver<String>(observer);
+        SerializedObserverViaQueueAndCounter<String> aw = new SerializedObserverViaQueueAndCounter<String>(observer);
 
         w.subscribe(aw);
         onSubscribe.waitToFinish();
@@ -75,7 +75,7 @@ public void testMultiThreadedBasic() {
         Observable<String> w = Observable.create(onSubscribe);
 
         BusyObserver busyObserver = new BusyObserver();
-        SerializedObserver<String> aw = new SerializedObserver<String>(busyObserver);
+        SerializedObserverViaQueueAndCounter<String> aw = new SerializedObserverViaQueueAndCounter<String>(busyObserver);
 
         w.subscribe(aw);
         onSubscribe.waitToFinish();
@@ -100,7 +100,7 @@ public void testMultiThreadedWithNPE() throws InterruptedException {
         Observable<String> w = Observable.create(onSubscribe);
 
         BusyObserver busyObserver = new BusyObserver();
-        SerializedObserver<String> aw = new SerializedObserver<String>(busyObserver);
+        SerializedObserverViaQueueAndCounter<String> aw = new SerializedObserverViaQueueAndCounter<String>(busyObserver);
 
         w.subscribe(aw);
         onSubscribe.waitToFinish();
@@ -132,7 +132,7 @@ public void testMultiThreadedWithNPEinMiddle() {
         Observable<String> w = Observable.create(onSubscribe);
 
         BusyObserver busyObserver = new BusyObserver();
-        SerializedObserver<String> aw = new SerializedObserver<String>(busyObserver);
+        SerializedObserverViaQueueAndCounter<String> aw = new SerializedObserverViaQueueAndCounter<String>(busyObserver);
 
         w.subscribe(aw);
         onSubscribe.waitToFinish();
@@ -168,7 +168,7 @@ public void runOutOfOrderConcurrencyTest() {
         try {
             TestConcurrencyObserver tw = new TestConcurrencyObserver();
             // we need Synchronized + SafeSubscriber to handle synchronization plus life-cycle
-            SerializedObserver<String> w = new SerializedObserver<String>(new SafeSubscriber<String>(tw));
+            SerializedObserverViaQueueAndCounter<String> w = new SerializedObserverViaQueueAndCounter<String>(new SafeSubscriber<String>(tw));
 
             Future<?> f1 = tp.submit(new OnNextThread(w, 12000));
             Future<?> f2 = tp.submit(new OnNextThread(w, 5000));
@@ -223,7 +223,7 @@ public void runConcurrencyTest() {
         try {
             TestConcurrencyObserver tw = new TestConcurrencyObserver();
             // we need Synchronized + SafeSubscriber to handle synchronization plus life-cycle
-            SerializedObserver<String> w = new SerializedObserver<String>(new SafeSubscriber<String>(tw));
+            SerializedObserverViaQueueAndCounter<String> w = new SerializedObserverViaQueueAndCounter<String>(new SafeSubscriber<String>(tw));
 
             Future<?> f1 = tp.submit(new OnNextThread(w, 12000));
             Future<?> f2 = tp.submit(new OnNextThread(w, 5000));

rxjava-core/src/test/java/rx/observers/SerializedObserverViaStateMachineTest.java

@@ -1,5 +1,5 @@
 package rx.observers;
 
-public class SerializedObserverViaStateMachineTest extends SerializedObserverTest {
+public class SerializedObserverViaStateMachineTest extends SerializedObserverViaQueueAndCounterTest {
 
 }