From 00e6dc5ae53a7f6662f85059e89eed1728e5128c Mon Sep 17 00:00:00 2001 From: Ben Christensen Date: Mon, 9 Sep 2013 15:07:42 -0700 Subject: [PATCH] Observable.from: refactor varargs to overloads https://github.com/Netflix/RxJava/issues/359 Varargs cause compiler warnings --- .../src/test/scala/rx/lang/scala/RxImplicitsTests.scala | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/language-adaptors/rxjava-scala/src/test/scala/rx/lang/scala/RxImplicitsTests.scala b/language-adaptors/rxjava-scala/src/test/scala/rx/lang/scala/RxImplicitsTests.scala index c59e9b6d..7e10bee7 100644 --- a/language-adaptors/rxjava-scala/src/test/scala/rx/lang/scala/RxImplicitsTests.scala +++ b/language-adaptors/rxjava-scala/src/test/scala/rx/lang/scala/RxImplicitsTests.scala @@ -75,7 +75,7 @@ class UnitTestSuite extends JUnitSuite { } @Test def testSingleOrDefault { - assertEquals(0, Observable.from[Int]().toBlockingObservable.singleOrDefault(0)) + assertEquals(0, Observable.empty[Int]().toBlockingObservable.singleOrDefault(0)) assertEquals(1, Observable.from(1).toBlockingObservable.singleOrDefault(0)) try { Observable.from(1, 2, 3).toBlockingObservable.singleOrDefault(0) @@ -232,13 +232,13 @@ class UnitTestSuite extends JUnitSuite { @Test def testLastOrDefault { val observable = Observable.from(1, 2, 3, 4) assertEquals(4, observable.toBlockingObservable.lastOrDefault(5)) - assertEquals(5, Observable.from[Int]().toBlockingObservable.lastOrDefault(5)) + assertEquals(5, Observable.empty[Int]().toBlockingObservable.lastOrDefault(5)) } @Test def testLastOrDefaultPredicate { val observable = Observable.from(1, 2, 3, 4) assertEquals(3, observable.toBlockingObservable.lastOrDefault(5, isOdd)) - assertEquals(5, Observable.from[Int]().toBlockingObservable.lastOrDefault(5, isOdd)) + assertEquals(5, Observable.empty[Int]().toBlockingObservable.lastOrDefault(5, isOdd)) } @Test def testMap {