Skip to content

Commit c980e6e

Browse files
Upgrade to RxJava 1.0
1 parent 0d218e3 commit c980e6e

File tree

5 files changed

+36
-4
lines changed

5 files changed

+36
-4
lines changed

Diff for: gradle.properties

-1
This file was deleted.

Diff for: src/test/java/rx/util/async/operators/OperatorDeferFutureTest.java

-1
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,6 @@
3434

3535
import rx.Observable;
3636
import rx.Observer;
37-
import rx.exceptions.TestException;
3837
import rx.functions.Func0;
3938
import rx.schedulers.Schedulers;
4039
import rx.util.async.Async;

Diff for: src/test/java/rx/util/async/operators/OperatorForEachFutureTest.java

-1
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,6 @@
4444
import org.junit.Test;
4545

4646
import rx.Observable;
47-
import rx.exceptions.TestException;
4847
import rx.functions.Action1;
4948
import rx.schedulers.Schedulers;
5049
import rx.util.async.Async;

Diff for: src/test/java/rx/util/async/operators/OperatorStartFutureTest.java

-1
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,6 @@
3434

3535
import rx.Observable;
3636
import rx.Observer;
37-
import rx.exceptions.TestException;
3837
import rx.functions.Func0;
3938
import rx.schedulers.Schedulers;
4039
import rx.util.async.Async;
+36
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,36 @@
1+
/**
2+
* Copyright 2014 Netflix, Inc.
3+
*
4+
* Licensed under the Apache License, Version 2.0 (the "License");
5+
* you may not use this file except in compliance with the License.
6+
* You may obtain a copy of the License at
7+
*
8+
* http://www.apache.org/licenses/LICENSE-2.0
9+
*
10+
* Unless required by applicable law or agreed to in writing, software
11+
* distributed under the License is distributed on an "AS IS" BASIS,
12+
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
13+
* See the License for the specific language governing permissions and
14+
* limitations under the License.
15+
*/
16+
package rx.util.async.operators;
17+
18+
/**
19+
* Custom exception for operator testing; makes sure an unwanted exception is
20+
* not mixed up with a wanted exception.
21+
*/
22+
public final class TestException extends RuntimeException {
23+
/** */
24+
private static final long serialVersionUID = -1138830497957801910L;
25+
/** Create the test exception without any message. */
26+
public TestException() {
27+
super();
28+
}
29+
/**
30+
* Create the test exception with the provided message.
31+
* @param message the mesage to use
32+
*/
33+
public TestException(String message) {
34+
super(message);
35+
}
36+
}

0 commit comments

Comments
 (0)