X-Git-Url: http://wamblee.org/gitweb/?a=blobdiff_plain;f=support%2Fgeneral%2Fsrc%2Ftest%2Fjava%2Forg%2Fwamblee%2Fobserver%2FObservableTest.java;h=e26571a40d57708975e963b2640fed05373abfd3;hb=0d8d8f24656e585ee75558cfd6a4c661f8f14985;hp=8a060e8948a7f8620c9c2684e0dd8da49b8aa9b4;hpb=da48a523c81e59fe0eac34e43d12937396161f25;p=utils

diff --git a/support/general/src/test/java/org/wamblee/observer/ObservableTest.java b/support/general/src/test/java/org/wamblee/observer/ObservableTest.java
index 8a060e89..e26571a4 100644
--- a/support/general/src/test/java/org/wamblee/observer/ObservableTest.java
+++ b/support/general/src/test/java/org/wamblee/observer/ObservableTest.java
@@ -36,8 +36,8 @@ public class ObservableTest extends TestCase {
 
 	private static final String UPDATE = "send";
 
-	private Integer _observed;
-	private Observable<Integer, String> _observable;
+	private Integer observed;
+	private Observable<Integer, String> observable;
 
 	/*
 	 * (non-Javadoc)
@@ -47,8 +47,8 @@ public class ObservableTest extends TestCase {
 	@Override
 	protected void setUp() throws Exception {
 		super.setUp();
-		_observed = new Integer(1);
-		_observable = new Observable<Integer, String>(_observed,
+		observed = new Integer(1);
+		observable = new Observable<Integer, String>(observed,
 				new DefaultObserverNotifier());
 	}
 
@@ -59,20 +59,20 @@ public class ObservableTest extends TestCase {
 		final Observer mockObserver = mock(Observer.class);
 		InOrder order = inOrder(mockObserver);
 		
-		long subscription = _observable.subscribe(mockObserver);
+		long subscription = observable.subscribe(mockObserver);
 
-		assertEquals(1, _observable.getObserverCount());
+		assertEquals(1, observable.getObserverCount());
 
 		final String message = "hallo";
-		_observable.send(message);
+		observable.send(message);
 		
-		order.verify(mockObserver).send(_observed, message);
+		order.verify(mockObserver).send(observed, message);
 		verifyNoMoreInteractions(mockObserver);
 		
-		_observable.unsubscribe(subscription);
-		assertEquals(0, _observable.getObserverCount());
+		observable.unsubscribe(subscription);
+		assertEquals(0, observable.getObserverCount());
 
-		_observable.send(message);
+		observable.send(message);
 		verifyNoMoreInteractions(mockObserver);
 	}
 
@@ -90,30 +90,30 @@ public class ObservableTest extends TestCase {
 		for (int i = 0; i < nsubscribers; i++) {
 			mocks[i] = mock(Observer.class);
 			order[i] = inOrder(mocks[i]);
-			long subscription = _observable.subscribe(mocks[i]);
+			long subscription = observable.subscribe(mocks[i]);
 			assertTrue(subscriptions.add(subscription));
 		}
 
-		assertEquals(nsubscribers, _observable.getObserverCount());
+		assertEquals(nsubscribers, observable.getObserverCount());
 
 		final String message = "hallo";
 
-		_observable.send(message);
+		observable.send(message);
 		for (int i = 0; i < nsubscribers; i++) {
-			order[i].verify(mocks[i]).send(_observed, message);
+			order[i].verify(mocks[i]).send(observed, message);
 		}
 
 		for (int i = nsubscribers / 2; i < nsubscribers; i++) {
-			_observable.unsubscribe(subscriptions.get(i));
+			observable.unsubscribe(subscriptions.get(i));
 		}
 		assertEquals(nsubscribers - (nsubscribers - nsubscribers / 2),
-				_observable.getObserverCount());
+				observable.getObserverCount());
 
 		final String message2 = "blabla";
 
-		_observable.send(message2);
+		observable.send(message2);
 		for (int i = 0; i < nsubscribers / 2; i++) {
-			order[i].verify(mocks[i]).send(_observed, message2);
+			order[i].verify(mocks[i]).send(observed, message2);
 		}		
 		for (int i = nsubscribers/2; i < nsubscribers; i++) {
 			verifyNoMoreInteractions(mocks[i]);
@@ -129,12 +129,12 @@ public class ObservableTest extends TestCase {
 	public void testUnsubscribeWithWrongSubscription() {
 		Observer<Integer, String> observer = mock(Observer.class);
 	
-		long subscription = _observable.subscribe(observer);
+		long subscription = observable.subscribe(observer);
 
-		assertEquals(1, _observable.getObserverCount());
+		assertEquals(1, observable.getObserverCount());
 
 		try {
-			_observable.unsubscribe(subscription + 1);
+			observable.unsubscribe(subscription + 1);
 		} catch (IllegalArgumentException e) {
 			return; // ok
 		}