replace Assert.assertXxx by assertXxx

Author: samuelgruetter

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

@@ -1,6 +1,7 @@
 package rx.lang.scala
 
-import org.junit.{ Ignore, Assert, Test }
+import org.junit.Assert._
+import org.junit.{ Ignore, Test }
 import org.scalatest.junit.JUnitSuite
 
 class ObservableTests extends JUnitSuite {
@@ -29,30 +30,30 @@ class ObservableTests extends JUnitSuite {
     // correctly rejected:
     //val wrongDemat = Observable("hello").dematerialize
 
-    Assert.assertEquals(demat.toBlockingObservable.toIterable.toList, List(1, 2, 3))
+    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)
+    assertEquals(1, rx.Observable.from(1, 2).firstOrDefault(10).toBlockingObservable().single)
+    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)
+    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)
+    assertEquals("hello", Observable("hello").firstOrElse(mustNotBeCalled).toBlockingObservable.single)
+    assertEquals("this is the default value", Observable().firstOrElse(mustBeCalled).toBlockingObservable.single)
   }
 
   @Test def testFirstOrElseWithError() {
@@ -63,7 +64,7 @@ class ObservableTests extends JUnitSuite {
     } catch {
       case e: Exception => receivedMsg = e.getCause().getMessage()
     }
-    Assert.assertEquals(receivedMsg, msg)
+    assertEquals(receivedMsg, msg)
   }
 
   /*
@@ -80,7 +81,7 @@ class ObservableTests extends JUnitSuite {
 
   @Test def testTest() = {
     val a: Observable[Int] = Observable()
-    Assert.assertEquals(4, Observable(1, 2, 3, 4).toBlockingObservable.toIterable.last)
+    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/subscriptions/SubscriptionTests.scala

@@ -1,23 +1,24 @@
 package rx.lang.scala.subscriptions
 
-import org.junit.{Assert, Test}
+import org.junit.Assert._
+import org.junit.Test
 import org.scalatest.junit.JUnitSuite
 
 class SubscriptionTests extends JUnitSuite {
 
   @Test
   def anonymousSubscriptionCreate() {
     val subscription = Subscription{}
-    Assert.assertNotNull(subscription)
+    assertNotNull(subscription)
   }
 
   @Test
   def anonymousSubscriptionDispose() {
     var unsubscribed = false
     val subscription = Subscription{ unsubscribed = true }
-    Assert.assertFalse(unsubscribed)
+    assertFalse(unsubscribed)
     subscription.unsubscribe()
-    Assert.assertTrue(unsubscribed)
+    assertTrue(unsubscribed)
   }
 
   @Test
@@ -29,11 +30,11 @@ class SubscriptionTests extends JUnitSuite {
   @Test
   def booleanSubscription() {
     val subscription = BooleanSubscription()
-    Assert.assertFalse(subscription.isUnsubscribed)
+    assertFalse(subscription.isUnsubscribed)
     subscription.unsubscribe()
-    Assert.assertTrue(subscription.isUnsubscribed)
+    assertTrue(subscription.isUnsubscribed)
     subscription.unsubscribe()
-    Assert.assertTrue(subscription.isUnsubscribed)
+    assertTrue(subscription.isUnsubscribed)
   }
 
   @Test
@@ -47,22 +48,22 @@ class SubscriptionTests extends JUnitSuite {
 
     val composite = CompositeSubscription()
 
-    Assert.assertFalse(composite.isUnsubscribed)
+    assertFalse(composite.isUnsubscribed)
 
     composite += s0
     composite += s1
 
     composite.unsubscribe()
 
-    Assert.assertTrue(composite.isUnsubscribed)
-    Assert.assertTrue(s0.isUnsubscribed)
-    Assert.assertTrue(u0)
-    Assert.assertTrue(u1)
+    assertTrue(composite.isUnsubscribed)
+    assertTrue(s0.isUnsubscribed)
+    assertTrue(u0)
+    assertTrue(u1)
 
     val s2 = BooleanSubscription()
-    Assert.assertFalse(s2.isUnsubscribed)
+    assertFalse(s2.isUnsubscribed)
     composite += s2
-    Assert.assertTrue(s2.isUnsubscribed)
+    assertTrue(s2.isUnsubscribed)
 
   }
 
@@ -73,13 +74,13 @@ class SubscriptionTests extends JUnitSuite {
     val composite = CompositeSubscription()
 
     composite += s0
-    Assert.assertFalse(s0.isUnsubscribed)
+    assertFalse(s0.isUnsubscribed)
     composite -= s0
-    Assert.assertTrue(s0.isUnsubscribed)
+    assertTrue(s0.isUnsubscribed)
 
     composite.unsubscribe()
 
-    Assert.assertTrue(composite.isUnsubscribed)
+    assertTrue(composite.isUnsubscribed)
   }
 
   @Test
@@ -89,27 +90,27 @@ class SubscriptionTests extends JUnitSuite {
       val s1 = BooleanSubscription()
       val multiple = MultipleAssignmentSubscription()
 
-      Assert.assertFalse(multiple.isUnsubscribed)
+      assertFalse(multiple.isUnsubscribed)
 
       multiple.subscription = s0
-      Assert.assertEquals(s0.asJavaSubscription, multiple.subscription.asJavaSubscription)
+      assertEquals(s0.asJavaSubscription, multiple.subscription.asJavaSubscription)
 
       multiple.subscription = s1
-      Assert.assertEquals(s1.asJavaSubscription, multiple.subscription.asJavaSubscription)
+      assertEquals(s1.asJavaSubscription, multiple.subscription.asJavaSubscription)
 
-      Assert.assertFalse(s0.isUnsubscribed)
-      Assert.assertFalse(s1.isUnsubscribed)
+      assertFalse(s0.isUnsubscribed)
+      assertFalse(s1.isUnsubscribed)
 
       multiple.unsubscribe()
 
-      Assert.assertTrue(multiple.isUnsubscribed)
-      Assert.assertFalse(s0.isUnsubscribed)
-      Assert.assertTrue(s1.isUnsubscribed)
+      assertTrue(multiple.isUnsubscribed)
+      assertFalse(s0.isUnsubscribed)
+      assertTrue(s1.isUnsubscribed)
 
       val s2 = BooleanSubscription()
-      Assert.assertFalse(s2.isUnsubscribed)
+      assertFalse(s2.isUnsubscribed)
       multiple.subscription = s2
-      Assert.assertTrue(s2.isUnsubscribed)
+      assertTrue(s2.isUnsubscribed)
   }
 
 }