Skip to content

Commit 3e8fbdd

Browse files
author
jmhofer
committed
Removed some unused code, fixed some (Eclipse) warnings
1 parent 236f59d commit 3e8fbdd

File tree

5 files changed

+9
-13
lines changed

5 files changed

+9
-13
lines changed

rxjava-core/src/main/java/rx/concurrency/SleepingAction.java

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,8 +15,6 @@
1515
*/
1616
package rx.concurrency;
1717

18-
import java.util.concurrent.TimeUnit;
19-
2018
import rx.Scheduler;
2119
import rx.Subscription;
2220
import rx.util.functions.Func2;

rxjava-core/src/main/java/rx/operators/OperationFinally.java

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,6 @@
1515
*/
1616
package rx.operators;
1717

18-
import static org.junit.Assert.*;
1918
import static org.mockito.Mockito.*;
2019

2120
import org.junit.Before;
@@ -24,7 +23,6 @@
2423
import rx.Observable;
2524
import rx.Observer;
2625
import rx.Subscription;
27-
import rx.util.AtomicObservableSubscription;
2826
import rx.util.functions.Action0;
2927
import rx.util.functions.Func1;
3028

@@ -103,19 +101,24 @@ public void onNext(T args) {
103101
public static class UnitTest {
104102
private Action0 aAction0;
105103
private Observer<String> aObserver;
104+
105+
@SuppressWarnings("unchecked") // mocking has to be unchecked, unfortunately
106106
@Before
107107
public void before() {
108108
aAction0 = mock(Action0.class);
109109
aObserver = mock(Observer.class);
110110
}
111+
111112
private void checkActionCalled(Observable<String> input) {
112113
Observable.create(finallyDo(input, aAction0)).subscribe(aObserver);
113114
verify(aAction0, times(1)).call();
114115
}
116+
115117
@Test
116118
public void testFinallyCalledOnComplete() {
117119
checkActionCalled(Observable.toObservable(new String[] {"1", "2", "3"}));
118120
}
121+
119122
@Test
120123
public void testFinallyCalledOnError() {
121124
checkActionCalled(Observable.<String>error(new RuntimeException("expected")));

rxjava-core/src/main/java/rx/operators/OperationMulticast.java

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -98,6 +98,7 @@ public void testMulticast() {
9898
ConnectableObservable<String> multicasted = OperationMulticast.multicast(source,
9999
PublishSubject.<String>create());
100100

101+
@SuppressWarnings("unchecked")
101102
Observer<String> observer = mock(Observer.class);
102103
multicasted.subscribe(observer);
103104

@@ -125,6 +126,7 @@ public void testMulticastConnectTwice() {
125126
ConnectableObservable<String> multicasted = OperationMulticast.multicast(source,
126127
PublishSubject.<String>create());
127128

129+
@SuppressWarnings("unchecked")
128130
Observer<String> observer = mock(Observer.class);
129131
multicasted.subscribe(observer);
130132

@@ -149,6 +151,7 @@ public void testMulticastDisconnect() {
149151
ConnectableObservable<String> multicasted = OperationMulticast.multicast(source,
150152
PublishSubject.<String>create());
151153

154+
@SuppressWarnings("unchecked")
152155
Observer<String> observer = mock(Observer.class);
153156
multicasted.subscribe(observer);
154157

@@ -226,11 +229,6 @@ public void sendOnNext(String value) {
226229
observer.onNext(value);
227230
}
228231

229-
/* used to simulate subscription */
230-
public void sendOnError(Exception e) {
231-
observer.onError(e);
232-
}
233-
234232
@Override
235233
public Subscription subscribe(final Observer<String> observer) {
236234
this.observer = observer;

rxjava-core/src/main/java/rx/operators/OperationToObservableList.java

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -104,6 +104,7 @@ public void testListMultipleObservers() {
104104
Observer<List<String>> o1 = mock(Observer.class);
105105
observable.subscribe(o1);
106106

107+
@SuppressWarnings("unchecked")
107108
Observer<List<String>> o2 = mock(Observer.class);
108109
observable.subscribe(o2);
109110

rxjava-core/src/test/java/rx/concurrency/TestSchedulers.java

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,6 @@
1616
package rx.concurrency;
1717

1818
import static org.junit.Assert.*;
19-
import static org.mockito.Mockito.*;
2019

2120
import java.util.Date;
2221
import java.util.concurrent.CountDownLatch;
@@ -321,9 +320,6 @@ public Subscription call(Scheduler scheduler, BooleanSubscription cancel) {
321320
}
322321
});
323322

324-
@SuppressWarnings("unchecked")
325-
Observer<Integer> o = mock(Observer.class);
326-
327323
final AtomicInteger count = new AtomicInteger();
328324
final AtomicBoolean completed = new AtomicBoolean(false);
329325
Subscription subscribe = obs.subscribe(new Observer<Integer>() {

0 commit comments

Comments
 (0)