Separating unit tests out and update the comments

Author: zsxwing

rxjava-core/src/main/java/rx/Observable.java

@@ -19,6 +19,7 @@
 
 import java.util.ArrayList;
 import java.util.Arrays;
+import java.util.Comparator;
 import java.util.List;
 import java.util.concurrent.ConcurrentHashMap;
 import java.util.concurrent.Future;
@@ -3635,11 +3636,13 @@ public static Observable<Double> averageDoubles(Observable<Double> source) {
 
     /**
      * Returns the minimum element in an observable sequence.
-     * For an empty source, it causes an {@link UnsupportedOperationException}.
+     * For an empty source, it causes an {@link IllegalArgumentException}.
      *
      * @param source
      *            an observable sequence to determine the minimum element of.
      * @return an observable emitting the minimum element.
+     * @throws IllegalArgumentException
+     *            if the source is empty
      * @see <a href="http://msdn.microsoft.com/en-us/library/hh229715(v=vs.103).aspx">MSDN: Observable.Min</a>
      */
     public static <T extends Comparable<T>> Observable<T> min(Observable<T> source) {
@@ -3648,11 +3651,13 @@ public static <T extends Comparable<T>> Observable<T> min(Observable<T> source)
 
     /**
      * Returns the minimum element in an observable sequence according to the specified comparator.
-     * For an empty source, it causes an {@link UnsupportedOperationException}.
+     * For an empty source, it causes an {@link IllegalArgumentException}.
      *
      * @param comparator
      *            the comparer used to compare elements.
      * @return an observable emitting the minimum value according to the specified comparator.
+     * @throws IllegalArgumentException
+     *            if the source is empty
      * @see <a href="http://msdn.microsoft.com/en-us/library/hh229095(v=vs.103).aspx">MSDN: Observable.Min</a>
      */
     public Observable<T> min(Comparator<T> comparator) {
@@ -3689,11 +3694,13 @@ public <R> Observable<List<T>> minBy(Func1<T, R> selector, Comparator<R> compara
 
     /**
      * Returns the maximum element in an observable sequence.
-     * For an empty source, it causes an {@link UnsupportedOperationException}.
+     * For an empty source, it causes an {@link IllegalArgumentException}.
      *
      * @param source
      *            an observable sequence to determine the maximum element of.
      * @return an observable emitting the maximum element.
+     * @throws IllegalArgumentException
+     *            if the source is empty.
      * @see <a href="http://msdn.microsoft.com/en-us/library/hh211837(v=vs.103).aspx">MSDN: Observable.Max</a>
      */
     public static <T extends Comparable<T>> Observable<T> max(Observable<T> source) {
@@ -3702,11 +3709,13 @@ public static <T extends Comparable<T>> Observable<T> max(Observable<T> source)
 
     /**
      * Returns the maximum element in an observable sequence according to the specified comparator.
-     * For an empty source, it causes an {@link UnsupportedOperationException}.
+     * For an empty source, it causes an {@link IllegalArgumentException}.
      *
      * @param comparator
      *            the comparer used to compare elements.
      * @return an observable emitting the maximum value according to the specified comparator.
+     * @throws IllegalArgumentException
+     *            if the source is empty.
      * @see <a href="http://msdn.microsoft.com/en-us/library/hh211635(v=vs.103).aspx">MSDN: Observable.Max</a>
      */
     public Observable<T> max(Comparator<T> comparator) {

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

@@ -15,21 +15,11 @@
  */
 package rx.operators;
 
-import static org.mockito.Matchers.any;
-import static org.mockito.Mockito.inOrder;
-import static org.mockito.Mockito.mock;
-import static org.mockito.Mockito.times;
-
 import java.util.ArrayList;
-import java.util.Arrays;
 import java.util.Comparator;
 import java.util.List;
 
-import org.junit.Test;
-import org.mockito.InOrder;
-
 import rx.Observable;
-import rx.Observer;
 import rx.util.functions.Func1;
 import rx.util.functions.Func2;
 
@@ -113,171 +103,4 @@ public List<T> call(List<T> acc, T value) {
                 });
     }
 
-    public static class UnitTest {
-
-        @Test
-        public void testMax() {
-            Observable<Integer> observable = OperationMax.max(Observable.from(
-                    2, 3, 1, 4));
-
-            @SuppressWarnings("unchecked")
-            Observer<Integer> observer = (Observer<Integer>) mock(Observer.class);
-
-            observable.subscribe(observer);
-            InOrder inOrder = inOrder(observer);
-            inOrder.verify(observer, times(1)).onNext(4);
-            inOrder.verify(observer, times(1)).onCompleted();
-            inOrder.verifyNoMoreInteractions();
-        }
-
-        @Test
-        public void testMaxWithEmpty() {
-            Observable<Integer> observable = OperationMax.max(Observable
-                    .<Integer> empty());
-
-            @SuppressWarnings("unchecked")
-            Observer<Integer> observer = (Observer<Integer>) mock(Observer.class);
-
-            observable.subscribe(observer);
-            InOrder inOrder = inOrder(observer);
-            inOrder.verify(observer, times(1)).onError(
-                    any(UnsupportedOperationException.class));
-            inOrder.verifyNoMoreInteractions();
-        }
-
-        @Test
-        public void testMaxWithComparator() {
-            Observable<Integer> observable = OperationMax.max(
-                    Observable.from(2, 3, 1, 4), new Comparator<Integer>() {
-                        @Override
-                        public int compare(Integer o1, Integer o2) {
-                            return o2 - o1;
-                        }
-                    });
-
-            @SuppressWarnings("unchecked")
-            Observer<Integer> observer = (Observer<Integer>) mock(Observer.class);
-
-            observable.subscribe(observer);
-            InOrder inOrder = inOrder(observer);
-            inOrder.verify(observer, times(1)).onNext(1);
-            inOrder.verify(observer, times(1)).onCompleted();
-            inOrder.verifyNoMoreInteractions();
-        }
-
-        @Test
-        public void testMaxWithComparatorAndEmpty() {
-            Observable<Integer> observable = OperationMax.max(
-                    Observable.<Integer> empty(), new Comparator<Integer>() {
-                        @Override
-                        public int compare(Integer o1, Integer o2) {
-                            return o2 - o1;
-                        }
-                    });
-
-            @SuppressWarnings("unchecked")
-            Observer<Integer> observer = (Observer<Integer>) mock(Observer.class);
-
-            observable.subscribe(observer);
-            InOrder inOrder = inOrder(observer);
-            inOrder.verify(observer, times(1)).onError(
-                    any(UnsupportedOperationException.class));
-            inOrder.verifyNoMoreInteractions();
-        }
-
-        @Test
-        public void testMaxBy() {
-            Observable<List<String>> observable = OperationMax.maxBy(
-                    Observable.from("1", "2", "3", "4", "5", "6"),
-                    new Func1<String, Integer>() {
-                        @Override
-                        public Integer call(String t1) {
-                            return Integer.parseInt(t1) % 2;
-                        }
-                    });
-
-            @SuppressWarnings("unchecked")
-            Observer<List<String>> observer = (Observer<List<String>>) mock(Observer.class);
-
-            observable.subscribe(observer);
-            InOrder inOrder = inOrder(observer);
-            inOrder.verify(observer, times(1)).onNext(
-                    Arrays.asList("1", "3", "5"));
-            inOrder.verify(observer, times(1)).onCompleted();
-            inOrder.verifyNoMoreInteractions();
-        }
-
-        @Test
-        public void testMaxByWithEmpty() {
-            Observable<List<String>> observable = OperationMax.maxBy(
-                    Observable.<String> empty(), new Func1<String, Integer>() {
-                        @Override
-                        public Integer call(String t1) {
-                            return Integer.parseInt(t1) % 2;
-                        }
-                    });
-
-            @SuppressWarnings("unchecked")
-            Observer<List<String>> observer = (Observer<List<String>>) mock(Observer.class);
-
-            observable.subscribe(observer);
-            InOrder inOrder = inOrder(observer);
-            inOrder.verify(observer, times(1)).onNext(new ArrayList<String>());
-            inOrder.verify(observer, times(1)).onCompleted();
-            inOrder.verifyNoMoreInteractions();
-        }
-
-        @Test
-        public void testMaxByWithComparator() {
-            Observable<List<String>> observable = OperationMax.maxBy(
-                    Observable.from("1", "2", "3", "4", "5", "6"),
-                    new Func1<String, Integer>() {
-                        @Override
-                        public Integer call(String t1) {
-                            return Integer.parseInt(t1) % 2;
-                        }
-                    }, new Comparator<Integer>() {
-                        @Override
-                        public int compare(Integer o1, Integer o2) {
-                            return o2 - o1;
-                        }
-                    });
-
-            @SuppressWarnings("unchecked")
-            Observer<List<String>> observer = (Observer<List<String>>) mock(Observer.class);
-
-            observable.subscribe(observer);
-            InOrder inOrder = inOrder(observer);
-            inOrder.verify(observer, times(1)).onNext(
-                    Arrays.asList("2", "4", "6"));
-            inOrder.verify(observer, times(1)).onCompleted();
-            inOrder.verifyNoMoreInteractions();
-        }
-
-        @Test
-        public void testMaxByWithComparatorAndEmpty() {
-            Observable<List<String>> observable = OperationMax.maxBy(
-                    Observable.<String> empty(), new Func1<String, Integer>() {
-                        @Override
-                        public Integer call(String t1) {
-                            return Integer.parseInt(t1) % 2;
-                        }
-                    }, new Comparator<Integer>() {
-                        @Override
-                        public int compare(Integer o1, Integer o2) {
-                            return o2 - o1;
-                        }
-                    });
-
-            @SuppressWarnings("unchecked")
-            Observer<List<String>> observer = (Observer<List<String>>) mock(Observer.class);
-
-            observable.subscribe(observer);
-            InOrder inOrder = inOrder(observer);
-            inOrder.verify(observer, times(1)).onNext(new ArrayList<String>());
-            inOrder.verify(observer, times(1)).onCompleted();
-            inOrder.verifyNoMoreInteractions();
-        }
-    }
-
 }