Eliminate sorted-list variants and cleanup sort tests

Author: daveray

language-adaptors/rxjava-clojure/src/main/clojure/rx/lang/clojure/core.clj

@@ -681,36 +681,7 @@
        (filter identity)
        first))
 
-(defn sorted-list
-  "Returns an observable that emits a *single value* which is a sorted List
-  of the items in coll, where the sort order is determined by comparing
-  items.  If no comparator is supplied, uses compare. comparator must
-  implement java.util.Comparator.
-
-  Use sort if you don't want the sequence squashed down to a List.
-
-  See:
-    rx.Observable/toSortedList
-    sort
-  "
-  ([coll] (sorted-list clojure.core/compare coll))
-  ([comp ^Observable coll]
-   (.toSortedList coll (iop/fn [a b]
-                         ; force to int so rxjava doesn't have a fit
-                         (int (comp a b))))))
-
-(defn sorted-list-by
-  "Returns an observable that emits a *single value* which is a sorted List
-  of the items in coll, where the sort order is determined by comparing
-  (keyfn item).  If no comparator is supplied, uses compare. comparator must
-  implement java.util.Comparator.
-
-  Use sort-by if you don't want the sequence squashed down to a List.
-
-  See:
-    rx.Observable/toSortedList
-    sort-by
-  "
+(defn ^:private sorted-list-by
   ([keyfn coll] (sorted-list-by keyfn clojure.core/compare coll))
   ([keyfn comp ^Observable coll]
    (.toSortedList coll (iop/fn [a b]
@@ -723,16 +694,13 @@
   comparator must implement java.util.Comparator.
 
   See:
-    sorted-list
     clojure.core/sort
   "
   ([xs]
-   (->> xs
-        (sorted-list)
-        (mapcat seq->o)))
+   (sort clojure.core/compare xs))
   ([comp xs]
    (->> xs
-        (sorted-list comp)
+        (sorted-list-by identity comp)
         (mapcat seq->o))))
 
 (defn sort-by
@@ -744,8 +712,7 @@
     clojure.core/sort-by
   "
   ([keyfn xs]
-   (->> (sorted-list-by keyfn xs)
-        (mapcat seq->o)))
+   (sort-by keyfn clojure.core/compare xs))
   ([keyfn comp ^Observable xs]
    (->> xs
         (sorted-list-by keyfn comp)

language-adaptors/rxjava-clojure/src/test/clojure/rx/lang/clojure/core_test.clj

@@ -480,33 +480,37 @@
   (is (= [:r] (b/into [] (rx/some #{:r :s :t} (rx/seq->o [:q :v :r])))))
   (is (= [] (b/into [] (rx/some #{:r :s :t} (rx/seq->o [:q :v]))))))
 
-(deftest test-sorted-list
-  (is (= [[]] (b/into [] (rx/sorted-list (rx/empty)))))
-  (is (= [[1 2 3]]
-         (b/into [] (rx/sorted-list (rx/seq->o [3 1 2])))))
-  (is (= [[3 2 1]]
-         (b/into [] (rx/sorted-list (fn [a b] (- (compare a b))) (rx/seq->o [2 1 3]))))))
-
-(deftest test-sorted-list-by
-  (is (= [[]] (b/into [] (rx/sorted-list-by :foo (rx/empty)))))
-  (is (= [[{:foo 1} {:foo 2} {:foo 3}]]
-         (b/into [] (rx/sorted-list-by :foo (rx/seq->o [{:foo 2}{:foo 1}{:foo 3}])))))
-  (is (= [[{:foo 3} {:foo 2} {:foo 1}]]
-         (b/into [] (rx/sorted-list-by :foo (fn [a b] (- (compare a b))) (rx/seq->o [{:foo 2}{:foo 1}{:foo 3}]))))))
-
 (deftest test-sort
-  (is (= [] (b/into [] (rx/sort (rx/empty)))))
-  (is (= [1 2 3]
-         (b/into [] (rx/sort (rx/seq->o [3 1 2])))))
-  (is (= [3 2 1]
-         (b/into [] (rx/sort (fn [a b] (- (compare a b))) (rx/seq->o [2 1 3]))))))
+  (are [in cmp] (= (if cmp
+                     (sort cmp in)
+                     (sort in))
+                   (->> in
+                        (rx/seq->o)
+                        (#(if cmp (rx/sort cmp %) (rx/sort %)))
+                        (b/into [])))
+       []      nil
+       []      (comp - compare)
+       [3 1 2] nil
+       [1 2 3] nil
+       [1 2 3] (comp - compare)
+       [2 1 3] (comp - compare)))
 
 (deftest test-sort-by
-  (is (= [] (b/into [] (rx/sort-by :foo (rx/empty)))))
-  (is (= [{:foo 1} {:foo 2} {:foo 3}]
-         (b/into [] (rx/sort-by :foo (rx/seq->o [{:foo 2}{:foo 1}{:foo 3}])))))
-  (is (= [{:foo 3} {:foo 2} {:foo 1}]
-         (b/into [] (rx/sort-by :foo (fn [a b] (- (compare a b))) (rx/seq->o [{:foo 2}{:foo 1}{:foo 3}]))))))
+  (are [rin cmp] (let [in (map #(hash-map :foo %) rin)]
+                   (= (if cmp
+                        (sort-by :foo cmp in)
+                        (sort-by :foo in))
+                      (->> in
+                           (rx/seq->o)
+                           (#(if cmp (rx/sort-by :foo cmp %) (rx/sort-by :foo %)))
+                           (b/into []))))
+       []      nil
+       []      (comp - compare)
+       [3 1 2] nil
+       [1 2 3] nil
+       [1 2 3] (comp - compare)
+       [2 1 3] (comp - compare)))
+
 
 (deftest test-split-with
   (is (= (split-with (partial >= 3) (range 6))