Pulled in changes from Samuel.

Fixed tests, all working without warnings

Author: AppliedDuality

gradlew

@@ -12,6 +12,8 @@ DEFAULT_JVM_OPTS=""
 APP_NAME="Gradle"
 APP_BASE_NAME=`basename "$0"`
 
+JAVA_HOME="/Library/Java/JavaVirtualMachines/jdk1.7.0_40.jdk/Contents/Home"
+
 # Use the maximum available, or set MAX_FD != -1 to use that value.
 MAX_FD="maximum"
 

language-adaptors/rxjava-scala/src/test/scala/rx/lang/scala/subjects/SubjectTests.scala

@@ -0,0 +1,57 @@
+import org.junit.Assert._
+import org.junit.Test
+import rx.lang.scala.subjects._
+import org.mockito.InOrder
+import rx.lang.scala._
+import org.mockito.Matchers._;
+import org.mockito.Mockito._;
+
+import org.junit.Assert._
+import org.junit.Test
+import org.scalatest.junit.JUnitSuite
+
+class SubjectTests extends JUnitSuite {
+
+//  @Test def PublishSubjectIsAChannel() {
+//
+//    val channel: BehaviorSubject[Integer] = BehaviorSubject(2013)
+//    val observerA: Observer[Integer]  = mock(classOf[Observer[Integer]])
+//    val observerB: Observer[Integer] = mock(classOf[Observer[Integer]])
+//    val observerC: Observer[Integer] = mock(classOf[Observer[Integer]])
+//
+//    val x = inOrder(observerA, observerB, observerC)
+//
+//    val a = channel.subscribe(observerA)
+//    val b = channel.subscribe(observerB)
+//
+//    x.verify(observerA).onNext(2013)
+//    x.verify(observerB).onNext(2013)
+//
+//    channel.onNext(42)
+//
+//    x.verify(observerA).onNext(42)
+//    x.verify(observerB).onNext(42)
+//
+//    a.unsubscribe()
+//
+//    channel.onNext(4711)
+//
+//    x.verify(observerA, never()).onNext(any())
+//    x.verify(observerB).onNext(4711)
+//
+//    channel.onCompleted()
+//
+//    x.verify(observerA, never()).onCompleted()
+//    x.verify(observerB).onCompleted()
+//
+//    val c = channel.subscribe(observerC)
+//
+//    x.verify(observerC).onCompleted()
+//
+//    channel.onNext(13)
+//
+//    x.verifyNoMoreInteractions()
+//
+//  }
+
+}

language-adaptors/rxjava-scala/src/test/scala/rx/lang/scala/subscriptions/SubscriptionTests.scala

@@ -3,8 +3,9 @@ package rx.lang.scala.subscriptions
 import org.junit.Assert._
 import org.junit.Test
 import org.scalatest.junit.JUnitSuite
+import rx.lang.scala._
+
 
-import rx.lang.scala.Subscription
 
 class SubscriptionTests extends JUnitSuite {
 
@@ -46,7 +47,7 @@ class SubscriptionTests extends JUnitSuite {
     val s0 = BooleanSubscription{ u0 = true }
 
     var u1 = false
-    val s1 = Subscription{ u1 = true }
+    val s1 = rx.lang.scala.Subscription{ u1 = true }
 
     val composite = CompositeSubscription()