git://wamblee.org
/
utils
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
updated coding rules.
[utils]
/
support
/
general
/
src
/
test
/
java
/
org
/
wamblee
/
observer
/
ObservableTest.java
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 8a060e8948a7f8620c9c2684e0dd8da49b8aa9b4..e26571a40d57708975e963b2640fed05373abfd3 100644
(file)
--- 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 static final String UPDATE = "send";
- private Integer
_
observed;
- private Observable<Integer, String>
_
observable;
+ private Integer observed;
+ private Observable<Integer, String> observable;
/*
* (non-Javadoc)
/*
* (non-Javadoc)
@@
-47,8
+47,8
@@
public class ObservableTest extends TestCase {
@Override
protected void setUp() throws Exception {
super.setUp();
@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());
}
new DefaultObserverNotifier());
}
@@
-59,20
+59,20
@@
public class ObservableTest extends TestCase {
final Observer mockObserver = mock(Observer.class);
InOrder order = inOrder(mockObserver);
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";
final String message = "hallo";
-
_
observable.send(message);
+ observable.send(message);
- order.verify(mockObserver).send(
_
observed, message);
+ order.verify(mockObserver).send(observed, message);
verifyNoMoreInteractions(mockObserver);
verifyNoMoreInteractions(mockObserver);
-
_
observable.unsubscribe(subscription);
- assertEquals(0,
_
observable.getObserverCount());
+ observable.unsubscribe(subscription);
+ assertEquals(0, observable.getObserverCount());
-
_
observable.send(message);
+ observable.send(message);
verifyNoMoreInteractions(mockObserver);
}
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]);
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));
}
assertTrue(subscriptions.add(subscription));
}
- assertEquals(nsubscribers,
_
observable.getObserverCount());
+ assertEquals(nsubscribers, observable.getObserverCount());
final String message = "hallo";
final String message = "hallo";
-
_
observable.send(message);
+ observable.send(message);
for (int i = 0; i < nsubscribers; i++) {
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++) {
}
for (int i = nsubscribers / 2; i < nsubscribers; i++) {
-
_
observable.unsubscribe(subscriptions.get(i));
+ observable.unsubscribe(subscriptions.get(i));
}
assertEquals(nsubscribers - (nsubscribers - nsubscribers / 2),
}
assertEquals(nsubscribers - (nsubscribers - nsubscribers / 2),
-
_
observable.getObserverCount());
+ observable.getObserverCount());
final String message2 = "blabla";
final String message2 = "blabla";
-
_
observable.send(message2);
+ observable.send(message2);
for (int i = 0; i < nsubscribers / 2; i++) {
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]);
}
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);
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 {
try {
-
_
observable.unsubscribe(subscription + 1);
+ observable.unsubscribe(subscription + 1);
} catch (IllegalArgumentException e) {
return; // ok
}
} catch (IllegalArgumentException e) {
return; // ok
}