adapted RxImplicits tests againt zip to new generics order, renamed two more reduceFunctions to zipFunction

Author: jmhofer

language-adaptors/rxjava-scala/src/main/scala/rx/lang/scala/RxImplicits.scala

@@ -280,7 +280,7 @@ class UnitTestSuite extends JUnitSuite {
 
         val cheetara = Character("green", "cheetara")
         val panthro = Character("blue", "panthro")
-        val characters = Observable.zip[Character, String, String](colors, names, Character.apply _)
+        val characters = Observable.zip[String, String, Character](colors, names, Character.apply _)
         assertSubscribeReceives(characters)(cheetara, panthro)
     }
 
@@ -295,7 +295,7 @@ class UnitTestSuite extends JUnitSuite {
         val cheetara = Character(2, "green", "cheetara")
         val panthro = Character(3, "blue", "panthro")
 
-        val characters = Observable.zip[Character, Int, String, String](numbers, colors, names, Character.apply _)
+        val characters = Observable.zip[Int, String, String, Character](numbers, colors, names, Character.apply _)
         assertSubscribeReceives(characters)(liono, cheetara, panthro)
     }
 
@@ -311,7 +311,7 @@ class UnitTestSuite extends JUnitSuite {
         val cheetara = Character(2, "green", "cheetara", false)
         val panthro = Character(3, "blue", "panthro", false)
 
-        val characters = Observable.zip[Character, Int, String, String, Boolean](numbers, colors, names, isLeader, Character.apply _)
+        val characters = Observable.zip[Int, String, String, Boolean, Character](numbers, colors, names, isLeader, Character.apply _)
         assertSubscribeReceives(characters)(liono, cheetara, panthro)
     }
 

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

@@ -1471,16 +1471,16 @@ public Observable<List<T>> buffer(long timespan, long timeshift, TimeUnit unit,
      * 
      * @param ws
      *            An Observable of source Observables
-     * @param reduceFunction
+     * @param zipFunction
      *            a function that, when applied to an item emitted by each of the source
      *            Observables, results in an item that will be emitted by the resulting Observable
      * @return an Observable that emits the zipped results
      */
-    public static <R> Observable<R> zip(Observable<Observable<?>> ws, final FuncN<? extends R> reduceFunction) {
+    public static <R> Observable<R> zip(Observable<Observable<?>> ws, final FuncN<? extends R> zipFunction) {
         return ws.toList().mapMany(new Func1<List<Observable<?>>, Observable<R>>() {
             @Override
             public Observable<R> call(List<Observable<?>> wsList) {
-                return create(OperationZip.zip(wsList, reduceFunction));
+                return create(OperationZip.zip(wsList, zipFunction));
             }
         });
     }
@@ -1505,8 +1505,8 @@ public Observable<R> call(List<Observable<?>> wsList) {
      *            Observables, results in an item that will be emitted by the resulting Observable
      * @return an Observable that emits the zipped results
      */
-    public static <R> Observable<R> zip(Collection<Observable<?>> ws, FuncN<? extends R> reduceFunction) {
-        return create(OperationZip.zip(ws, reduceFunction));
+    public static <R> Observable<R> zip(Collection<Observable<?>> ws, FuncN<? extends R> zipFunction) {
+        return create(OperationZip.zip(ws, zipFunction));
     }
 
     /**