examples to examples, tests to tests

Author: samuelgruetter

language-adaptors/rxjava-scala/src/test/scala/rx/lang/scala/examples/RxJavaDemos.scala renamed to language-adaptors/rxjava-scala/src/examples/scala/rx/lang/scala/examples/RxScalaDemo.scala

@@ -15,18 +15,23 @@
  */
 package rx.lang.scala.examples
 
-import org.scalatest.junit.JUnitSuite
-import rx.lang.scala._
-import scala.concurrent.duration._
+import java.io.IOException
+
+import scala.concurrent.duration.Duration
+import scala.concurrent.duration.DurationInt
+import scala.concurrent.duration.DurationLong
+import scala.language.postfixOps
+
+import org.junit.Assert.assertEquals
+import org.junit.Assert.assertTrue
+import org.junit.Ignore
 import org.junit.Test
-import org.junit.Assert._
+import org.scalatest.junit.JUnitSuite
+
+import rx.lang.scala.Notification
+import rx.lang.scala.Observable
+import rx.lang.scala.observable
 import rx.lang.scala.concurrency.Schedulers
-import java.io.IOException
-import rx.lang.scala.examples.Olympics
-import rx.lang.scala.Notification.OnCompleted
-import rx.lang.scala.Notification.OnError
-import rx.lang.scala.Notification.OnNext
-import org.scalatest.Ignore
 
 @Ignore // Since this doesn't do automatic testing, don't increase build time unnecessarily
 class RxScalaDemo extends JUnitSuite {

language-adaptors/rxjava-scala/src/test/scala/rx/lang/scala/ObservableTest.scala

@@ -0,0 +1,87 @@
+package rx.lang.scala
+
+import org.junit.{ Ignore, Assert, Test }
+import org.scalatest.junit.JUnitSuite
+
+class ObservableTests extends JUnitSuite {
+
+  // Tests which needn't be run:
+
+  @Ignore
+  def testCovariance = {
+    //println("hey, you shouldn't run this test")
+
+    val o1: Observable[Nothing] = Observable()
+    val o2: Observable[Int] = o1
+    val o3: Observable[App] = o1
+    val o4: Observable[Any] = o2
+    val o5: Observable[Any] = o3
+  }
+
+  // Tests which have to be run:
+
+  @Test
+  def testDematerialize() {
+    val o = Observable(1, 2, 3)
+    val mat = o.materialize
+    val demat = mat.dematerialize
+
+    // correctly rejected:
+    //val wrongDemat = Observable("hello").dematerialize
+
+    Assert.assertEquals(demat.toBlockingObservable.toIterable.toList, List(1, 2, 3))
+  }
+
+  // Test that Java's firstOrDefault propagates errors.
+  // If this changes (i.e. it suppresses errors and returns default) then Scala's firstOrElse
+  // should be changed accordingly.
+  @Test def testJavaFirstOrDefault() {
+    Assert.assertEquals(1, rx.Observable.from(1, 2).firstOrDefault(10).toBlockingObservable().single)
+    Assert.assertEquals(10, rx.Observable.empty().firstOrDefault(10).toBlockingObservable().single)
+    val msg = "msg6251"
+    var receivedMsg = "none"
+    try {
+      rx.Observable.error(new Exception(msg)).firstOrDefault(10).toBlockingObservable().single
+    } catch {
+      case e: Exception => receivedMsg = e.getCause().getMessage()
+    }
+    Assert.assertEquals(receivedMsg, msg)
+  }
+
+  @Test def testFirstOrElse() {
+    def mustNotBeCalled: String = sys.error("this method should not be called")
+    def mustBeCalled: String = "this is the default value"
+    Assert.assertEquals("hello", Observable("hello").firstOrElse(mustNotBeCalled).toBlockingObservable.single)
+    Assert.assertEquals("this is the default value", Observable().firstOrElse(mustBeCalled).toBlockingObservable.single)
+  }
+
+  @Test def testFirstOrElseWithError() {
+    val msg = "msg6251"
+    var receivedMsg = "none"
+    try {
+      Observable[Int](new Exception(msg)).firstOrElse(10).toBlockingObservable.single
+    } catch {
+      case e: Exception => receivedMsg = e.getCause().getMessage()
+    }
+    Assert.assertEquals(receivedMsg, msg)
+  }
+
+  /*
+ @Test def testHead() {
+   val observer = mock(classOf[Observer[Int]])
+   val o = Observable().head
+   val sub = o.subscribe(observer)
+
+   verify(observer, never).onNext(any(classOf[Int]))
+   verify(observer, never).onCompleted()
+   verify(observer, times(1)).onError(any(classOf[NoSuchElementException]))
+ }
+ */
+
+  @Test def testTest() = {
+    val a: Observable[Int] = Observable()
+    Assert.assertEquals(4, Observable(1, 2, 3, 4).toBlockingObservable.toIterable.last)
+    //println("This UnitTestSuite.testTest() for rx.lang.scala.Observable")
+  }
+
+}

language-adaptors/rxjava-scala/src/test/scala/rx/lang/scala/examples/UnitTestSuite.scala

@@ -1,8 +1,7 @@
-package rx.lang.scala.examples
+package rx.lang.scala.subscriptions
 
 import org.junit.{Assert, Test}
 import org.scalatest.junit.JUnitSuite
-import rx.lang.scala.subscriptions.{MultipleAssignmentSubscription, CompositeSubscription, BooleanSubscription, Subscription}
 
 class SubscriptionTests extends JUnitSuite {