rx 0.0.2 → 0.0.3

data/test/{rx_ruby → rx}/concurrency/test_async_lock.rb

@@ -4,7 +4,7 @@ require 'test_helper'
 
 class TestAsyncLock < Minitest::Test
   def setup
-    @lock = RxRuby::AsyncLock.new
+    @lock = Rx::AsyncLock.new
   end
 
   def test_simple_wait

data/test/{rx_ruby → rx}/concurrency/test_current_thread_scheduler.rb

@@ -1,18 +1,18 @@
 # Copyright (c) Microsoft Open Technologies, Inc. All rights reserved. See License.txt in the project root for license information.
 
 require 'test_helper'
-require 'rx_ruby/concurrency/helpers/immediate_local_scheduler_helper'
+require 'rx/concurrency/helpers/immediate_local_scheduler_helper'
 
 
 class TestCurrentThreadScheduler < Minitest::Test
   include ImmediateLocalSchedulerTestHelper
 
   def setup
-    @scheduler = RxRuby::CurrentThreadScheduler.instance
+    @scheduler = Rx::CurrentThreadScheduler.instance
   end
 
   def test_schedule_required
-    assert_equal(true, RxRuby::CurrentThreadScheduler.schedule_required?)
+    assert_equal(true, Rx::CurrentThreadScheduler.schedule_required?)
   end
 
   def test_schedule

data/test/{rx_ruby → rx}/concurrency/test_default_scheduler.rb

@@ -8,7 +8,7 @@ require 'test_helper'
 class TestDefaultScheduler < Minitest::Test
 
   def setup
-    @scheduler = RxRuby::DefaultScheduler.instance
+    @scheduler = Rx::DefaultScheduler.instance
   end
 
   def test_schedule_with_state

data/test/{rx_ruby → rx}/concurrency/test_historical_scheduler.rb

@@ -1,18 +1,18 @@
 # Copyright (c) Microsoft Open Technologies, Inc. All rights reserved. See License.txt in the project root for license information.
 
 require 'test_helper'
-require 'rx_ruby/concurrency/helpers/historical_virtual_scheduler_helper'
+require 'rx/concurrency/helpers/historical_virtual_scheduler_helper'
 
 class TestHistoricalScheduler < Minitest::Test
   include HistoricalVirtualSchedulerTestHelper
 
   def setup
     @start     = Time.at(1000)
-    @scheduler = RxRuby::HistoricalScheduler.new(@start)
+    @scheduler = Rx::HistoricalScheduler.new(@start)
   end
 
   def test_initialization
     assert_equal(Time.at(1000), @scheduler.now)
-    assert_equal(Time.at(0), RxRuby::HistoricalScheduler.new.now)
+    assert_equal(Time.at(0), Rx::HistoricalScheduler.new.now)
   end
 end

data/test/{rx_ruby → rx}/concurrency/test_immediate_scheduler.rb

@@ -1,13 +1,13 @@
 # Copyright (c) Microsoft Open Technologies, Inc. All rights reserved. See License.txt in the project root for license information.
 
 require 'test_helper'
-require 'rx_ruby/concurrency/helpers/immediate_local_scheduler_helper'
+require 'rx/concurrency/helpers/immediate_local_scheduler_helper'
 
 class TestImmediateScheduler < Minitest::Test
   include ImmediateLocalSchedulerTestHelper
 
   def setup
-    @scheduler = RxRuby::ImmediateScheduler.instance
+    @scheduler = Rx::ImmediateScheduler.instance
   end
 
   def test_now

data/test/{rx_ruby → rx}/concurrency/test_local_scheduler.rb

@@ -1,12 +1,12 @@
 # Copyright (c) Microsoft Open Technologies, Inc. All rights reserved. See License.txt in the project root for license information.
 
 require 'test_helper'
-require 'rx_ruby/concurrency/helpers/immediate_local_scheduler_helper'
+require 'rx/concurrency/helpers/immediate_local_scheduler_helper'
 
 class TestLocalcheduler < Minitest::Test
   include ImmediateLocalSchedulerTestHelper
 
   def setup
-    @scheduler = RxRuby::LocalScheduler.new
+    @scheduler = Rx::LocalScheduler.new
   end
 end

data/test/{rx_ruby → rx}/concurrency/test_periodic_scheduler.rb

@@ -3,7 +3,7 @@
 require 'test_helper'
 
 class PeriodicTestClass
-  include RxRuby::PeriodicScheduler
+  include Rx::PeriodicScheduler
 end
 
 class TestPeriodicScheduler < Minitest::Test

data/test/{rx_ruby → rx}/concurrency/test_scheduled_item.rb

@@ -9,7 +9,7 @@ class TestScheduledItem < Minitest::Test
 
   def setup
     @state = []
-    @item  = RxRuby::ScheduledItem.new(DummyScheduler.new, @state, 5) do |_, state|
+    @item  = Rx::ScheduledItem.new(DummyScheduler.new, @state, 5) do |_, state|
       state << 1
     end
   end
@@ -21,9 +21,9 @@ class TestScheduledItem < Minitest::Test
   end
 
   def test_invocation
-    less = RxRuby::ScheduledItem.new(DummyScheduler.new, @state, 0)
-    more = RxRuby::ScheduledItem.new(DummyScheduler.new, @state, 10)
-    same = RxRuby::ScheduledItem.new(DummyScheduler.new, @state, 5)
+    less = Rx::ScheduledItem.new(DummyScheduler.new, @state, 0)
+    more = Rx::ScheduledItem.new(DummyScheduler.new, @state, 10)
+    same = Rx::ScheduledItem.new(DummyScheduler.new, @state, 5)
 
     assert(less < @item)
     assert(more > @item)

data/test/{rx_ruby → rx}/concurrency/test_scheduler.rb

@@ -4,7 +4,7 @@ require 'thread'
 require 'test_helper'
 
 class MyScheduler
-  include RxRuby::Scheduler
+  include Rx::Scheduler
 
   attr_reader :now
   attr_accessor :wait_cycles
@@ -41,7 +41,7 @@ class TestBaseScheduler < Minitest::Test
   end
 
   def test_now
-    assert_equal(Time.now.to_i, RxRuby::Scheduler.now.to_i)
+    assert_equal(Time.now.to_i, Rx::Scheduler.now.to_i)
   end
 
   def test_schedule_absolute

data/test/{rx_ruby → rx}/concurrency/test_virtual_time_scheduler.rb

@@ -1,7 +1,7 @@
 # Copyright (c) Microsoft Open Technologies, Inc. All rights reserved. See License.txt in the project root for license information.
 
 require 'test_helper'
-require 'rx_ruby/concurrency/helpers/historical_virtual_scheduler_helper'
+require 'rx/concurrency/helpers/historical_virtual_scheduler_helper'
 
 class TestVirtualTimeScheduler < Minitest::Test
 
@@ -9,6 +9,6 @@ class TestVirtualTimeScheduler < Minitest::Test
 
   def setup
     @start     = Time.now.to_i
-    @scheduler = RxRuby::VirtualTimeScheduler.new(@start)
+    @scheduler = Rx::VirtualTimeScheduler.new(@start)
   end
 end

data/test/{rx_ruby → rx}/core/test_notification.rb

@@ -3,23 +3,23 @@
 require 'test_helper'
 
 class TestNotification < Minitest::Test
-  include RxRuby::ReactiveTest
+  include Rx::ReactiveTest
 
   def test_to_observable_empty
-    scheduler = RxRuby::TestScheduler.new
+    scheduler = Rx::TestScheduler.new
 
     res = scheduler.configure do 
-      RxRuby::Notification.create_on_completed.to_observable(scheduler)
+      Rx::Notification.create_on_completed.to_observable(scheduler)
     end
 
     assert_messages [on_completed(201)], res.messages
   end
 
   def test_to_observable_just
-    scheduler = RxRuby::TestScheduler.new
+    scheduler = Rx::TestScheduler.new
 
     res = scheduler.configure do 
-      RxRuby::Notification.create_on_next(42).to_observable(scheduler)
+      Rx::Notification.create_on_next(42).to_observable(scheduler)
     end
 
     assert_messages [on_next(201, 42), on_completed(201)], res.messages
@@ -27,19 +27,19 @@ class TestNotification < Minitest::Test
 
   def test_to_observable_raise
     err = RuntimeError.new
-    scheduler = RxRuby::TestScheduler.new
+    scheduler = Rx::TestScheduler.new
 
     res = scheduler.configure do 
-      RxRuby::Notification.create_on_error(err).to_observable(scheduler)
+      Rx::Notification.create_on_error(err).to_observable(scheduler)
     end
 
     assert_messages [on_error(201, err)], res.messages
   end
 
   def test_notification_equality
-    n = RxRuby::Notification.create_on_next(42)
-    e = RxRuby::Notification.create_on_error(RuntimeError.new)
-    c = RxRuby::Notification.create_on_completed
+    n = Rx::Notification.create_on_next(42)
+    e = Rx::Notification.create_on_error(RuntimeError.new)
+    c = Rx::Notification.create_on_completed
 
     n1 = n
     n2 = n
@@ -58,7 +58,7 @@ class TestNotification < Minitest::Test
   end
 
   def test_on_next_initialize
-    n = RxRuby::Notification.create_on_next(42)
+    n = Rx::Notification.create_on_next(42)
 
     assert n.on_next?
     assert n.has_value?
@@ -66,10 +66,10 @@ class TestNotification < Minitest::Test
   end
 
   def test_on_next_equality
-    n1 = RxRuby::Notification.create_on_next(42)
-    n2 = RxRuby::Notification.create_on_next(42)
-    n3 = RxRuby::Notification.create_on_next(24)
-    n4 = RxRuby::Notification.create_on_completed
+    n1 = Rx::Notification.create_on_next(42)
+    n2 = Rx::Notification.create_on_next(42)
+    n3 = Rx::Notification.create_on_next(24)
+    n4 = Rx::Notification.create_on_completed
 
     assert(n1.eql? n1)
     assert(n1.eql? n2)
@@ -80,7 +80,7 @@ class TestNotification < Minitest::Test
   end
 
   def test_on_next_to_s
-    n = RxRuby::Notification.create_on_next(42)
+    n = Rx::Notification.create_on_next(42)
     s = n.to_s
 
     assert (s.include? '42')
@@ -88,10 +88,10 @@ class TestNotification < Minitest::Test
   end
 
   class AcceptObserver
-    include RxRuby::Observer
+    include Rx::Observer
 
     def initialize
-      @config = RxRuby::ObserverConfiguration.new
+      @config = Rx::ObserverConfiguration.new
       yield @config
     end
 
@@ -111,7 +111,7 @@ class TestNotification < Minitest::Test
   class CheckOnNextObserver
     attr_reader :value
 
-    include RxRuby::Observer
+    include Rx::Observer
 
     def on_next(value)
       @value = value
@@ -120,7 +120,7 @@ class TestNotification < Minitest::Test
 
   def test_on_next_accept
     con = CheckOnNextObserver.new
-    n1 = RxRuby::Notification.create_on_next(42)
+    n1 = Rx::Notification.create_on_next(42)
     n1.accept(con)
 
     assert_equal 42, con.value

data/test/{rx_ruby → rx}/core/test_observable_creation.rb

@@ -1,20 +1,20 @@
 # Copyright (c) Microsoft Open Technologies, Inc. All rights reserved. See License.txt in the project root for license information.
 
-require 'test_helper'
+require "#{File.dirname(__FILE__)}/../../test_helper"
 
 class TestObservableCreation < Minitest::Test
-  include RxRuby::ReactiveTest
+  include Rx::ReactiveTest
 
   # Create Methods
 
   def test_create_next
-    scheduler = RxRuby::TestScheduler.new
+    scheduler = Rx::TestScheduler.new
 
     res = scheduler.configure do 
-      RxRuby::Observable.create do |obs|
+      Rx::Observable.create do |obs|
         obs.on_next 1
         obs.on_next 2
-        RxRuby::Subscription.empty
+        Rx::Subscription.empty
       end
     end
 
@@ -22,10 +22,10 @@ class TestObservableCreation < Minitest::Test
   end
 
   def test_create_next_nil
-    scheduler = RxRuby::TestScheduler.new
+    scheduler = Rx::TestScheduler.new
 
     res = scheduler.configure do 
-      RxRuby::Observable.create do |obs|
+      Rx::Observable.create do |obs|
         obs.on_next 1
         obs.on_next 2
         nil
@@ -36,10 +36,10 @@ class TestObservableCreation < Minitest::Test
   end
 
   def test_create_completed
-    scheduler = RxRuby::TestScheduler.new
+    scheduler = Rx::TestScheduler.new
 
     res = scheduler.configure do 
-      RxRuby::Observable.create do |obs|
+      Rx::Observable.create do |obs|
         obs.on_completed
         obs.on_next 100
         obs.on_error RuntimeError.new
@@ -53,10 +53,10 @@ class TestObservableCreation < Minitest::Test
 
   def test_create_error
     err = RuntimeError.new
-    scheduler = RxRuby::TestScheduler.new
+    scheduler = Rx::TestScheduler.new
 
     res = scheduler.configure do 
-      RxRuby::Observable.create do |obs|
+      Rx::Observable.create do |obs|
         obs.on_error err
         obs.on_next 100
         obs.on_error RuntimeError.new
@@ -69,11 +69,10 @@ class TestObservableCreation < Minitest::Test
   end
 
   def test_create_unsubscribe
-    err = RuntimeError.new
-    scheduler = RxRuby::TestScheduler.new
+    scheduler = Rx::TestScheduler.new
 
     res = scheduler.configure do 
-      RxRuby::Observable.create do |obs|
+      Rx::Observable.create do |obs|
         stopped = false
         
         obs.on_next 1
@@ -95,7 +94,7 @@ class TestObservableCreation < Minitest::Test
           obs.on_next 6 unless stopped  
         })                
 
-        RxRuby::Subscription.create { stopped = true }
+        Rx::Subscription.create { stopped = true }
       end
     end
     
@@ -111,12 +110,12 @@ class TestObservableCreation < Minitest::Test
   def test_create_observer_raises
     assert_raises(RuntimeError) do 
 
-      observable = RxRuby::Observable.create do |obs|
+      observable = Rx::Observable.create do |obs|
         obs.on_next 1
         nil
       end
 
-      observer = RxRuby::Observer.configure do |o|
+      observer = Rx::Observer.configure do |o|
         o.on_next {|x| raise RuntimeError.new }
       end
 
@@ -125,12 +124,12 @@ class TestObservableCreation < Minitest::Test
 
     assert_raises(RuntimeError) do 
 
-      observable = RxRuby::Observable.create do |obs|
+      observable = Rx::Observable.create do |obs|
         obs.on_error RuntimeError.new
         nil
       end
 
-      observer = RxRuby::Observer.configure do |o|
+      observer = Rx::Observer.configure do |o|
         o.on_error {|err| raise RuntimeError.new }
       end
 
@@ -139,12 +138,12 @@ class TestObservableCreation < Minitest::Test
 
     assert_raises(RuntimeError) do 
 
-      observable = RxRuby::Observable.create do |obs|
+      observable = Rx::Observable.create do |obs|
         obs.on_completed
         nil
       end
 
-      observer = RxRuby::Observer.configure do |o|
+      observer = Rx::Observer.configure do |o|
         o.on_completed { raise RuntimeError.new }
       end
 
@@ -155,13 +154,13 @@ class TestObservableCreation < Minitest::Test
   # Defer Method tests
 
   def test_defer_complete
-    scheduler = RxRuby::TestScheduler.new 
+    scheduler = Rx::TestScheduler.new 
 
     invoked = 0
     xs = nil
 
     res = scheduler.configure do 
-      RxRuby::Observable.defer do
+      Rx::Observable.defer do
         invoked += 1
 
         xs = scheduler.create_cold_observable(
@@ -181,14 +180,14 @@ class TestObservableCreation < Minitest::Test
   end
 
   def test_defer_error
-    scheduler = RxRuby::TestScheduler.new 
+    scheduler = Rx::TestScheduler.new 
 
     invoked = 0
     xs = nil
     err = RuntimeError.new
 
     res = scheduler.configure do 
-      RxRuby::Observable.defer do
+      Rx::Observable.defer do
         invoked += 1
 
         xs = scheduler.create_cold_observable(
@@ -208,13 +207,13 @@ class TestObservableCreation < Minitest::Test
   end
 
   def test_defer_unsubscribe
-    scheduler = RxRuby::TestScheduler.new 
+    scheduler = Rx::TestScheduler.new 
 
     invoked = 0
     xs = nil
 
     res = scheduler.configure do 
-      RxRuby::Observable.defer do
+      Rx::Observable.defer do
         invoked += 1
 
         xs = scheduler.create_cold_observable(
@@ -235,13 +234,13 @@ class TestObservableCreation < Minitest::Test
   end
 
   def test_defer_raise
-    scheduler = RxRuby::TestScheduler.new 
+    scheduler = Rx::TestScheduler.new 
 
     invoked = 0
     err = RuntimeError.new
 
     res = scheduler.configure do 
-      RxRuby::Observable.defer do
+      Rx::Observable.defer do
         invoked += 1
         raise err
       end
@@ -256,10 +255,10 @@ class TestObservableCreation < Minitest::Test
   # Empty methods
 
   def test_empty_basic
-    scheduler = RxRuby::TestScheduler.new
+    scheduler = Rx::TestScheduler.new
 
     res = scheduler.configure do
-      RxRuby::Observable.empty(scheduler)
+      Rx::Observable.empty(scheduler)
     end
 
     msgs = [on_completed(201)]
@@ -267,10 +266,10 @@ class TestObservableCreation < Minitest::Test
   end
 
   def test_empty_disposed
-    scheduler = RxRuby::TestScheduler.new
+    scheduler = Rx::TestScheduler.new
 
     res = scheduler.configure({:disposed => 200}) do
-      RxRuby::Observable.empty(scheduler)
+      Rx::Observable.empty(scheduler)
     end
 
     msgs = []
@@ -278,11 +277,11 @@ class TestObservableCreation < Minitest::Test
   end
 
   def test_empty_observer_raises
-    scheduler = RxRuby::TestScheduler.new
+    scheduler = Rx::TestScheduler.new
 
-    xs = RxRuby::Observable.empty(scheduler)
+    xs = Rx::Observable.empty(scheduler)
 
-    observer = RxRuby::Observer.configure do |obs|
+    observer = Rx::Observer.configure do |obs|
       obs.on_completed { raise RuntimeError.new }
     end
 
@@ -294,10 +293,10 @@ class TestObservableCreation < Minitest::Test
   # Generate methods
 
   def test_generate_finite
-    scheduler = RxRuby::TestScheduler.new
+    scheduler = Rx::TestScheduler.new
 
     res = scheduler.configure do
-      RxRuby::Observable.generate(
+      Rx::Observable.generate(
         0,
         lambda { |x| return x <= 3 },
         lambda { |x| return x + 1 },
@@ -316,11 +315,11 @@ class TestObservableCreation < Minitest::Test
   end
 
   def test_generate_condition_raise
-    scheduler = RxRuby::TestScheduler.new
+    scheduler = Rx::TestScheduler.new
     err = RuntimeError.new
 
     res = scheduler.configure do
-      RxRuby::Observable.generate(
+      Rx::Observable.generate(
         0,
         lambda { |x| raise err },
         lambda { |x| return x + 1 },
@@ -335,11 +334,11 @@ class TestObservableCreation < Minitest::Test
   end
 
   def test_generate_raise_result_selector
-    scheduler = RxRuby::TestScheduler.new
+    scheduler = Rx::TestScheduler.new
     err = RuntimeError.new
 
     res = scheduler.configure do
-      RxRuby::Observable.generate(
+      Rx::Observable.generate(
         0,
         lambda { |x| return true },
         lambda { |x| return x + 1 },
@@ -354,11 +353,11 @@ class TestObservableCreation < Minitest::Test
   end
 
   def test_generate_raise_iterate
-    scheduler = RxRuby::TestScheduler.new
+    scheduler = Rx::TestScheduler.new
     err = RuntimeError.new
 
     res = scheduler.configure do
-      RxRuby::Observable.generate(
+      Rx::Observable.generate(
         0,
         lambda { |x| return true },
         lambda { |x| raise err },
@@ -374,10 +373,10 @@ class TestObservableCreation < Minitest::Test
   end
 
   def test_generate_dispose
-    scheduler = RxRuby::TestScheduler.new
+    scheduler = Rx::TestScheduler.new
 
     res = scheduler.configure(:disposed => 203) do
-      RxRuby::Observable.generate(
+      Rx::Observable.generate(
         0,
         lambda { |x| return x <= 3 },
         lambda { |x| return x + 1 },
@@ -395,10 +394,10 @@ class TestObservableCreation < Minitest::Test
   # Never methods
 
   def test_never_basic
-    scheduler = RxRuby::TestScheduler.new
+    scheduler = Rx::TestScheduler.new
 
     res = scheduler.configure do
-      RxRuby::Observable.never
+      Rx::Observable.never
     end
 
     msgs = []
@@ -408,10 +407,10 @@ class TestObservableCreation < Minitest::Test
   # Range methods
 
   def test_range_zero
-    scheduler = RxRuby::TestScheduler.new
+    scheduler = Rx::TestScheduler.new
 
     res = scheduler.configure do
-      RxRuby::Observable.range(0, 0, scheduler)
+      Rx::Observable.range(0, 0, scheduler)
     end
 
     msgs = [on_completed(201)]
@@ -419,10 +418,10 @@ class TestObservableCreation < Minitest::Test
   end
 
   def test_range_one
-    scheduler = RxRuby::TestScheduler.new
+    scheduler = Rx::TestScheduler.new
 
     res = scheduler.configure do
-      RxRuby::Observable.range(0, 1, scheduler)
+      Rx::Observable.range(0, 1, scheduler)
     end
 
     msgs = [on_next(201, 0), on_completed(202)]
@@ -430,10 +429,10 @@ class TestObservableCreation < Minitest::Test
   end
 
   def test_range_five
-    scheduler = RxRuby::TestScheduler.new
+    scheduler = Rx::TestScheduler.new
 
     res = scheduler.configure do
-      RxRuby::Observable.range(10, 5, scheduler)
+      Rx::Observable.range(10, 5, scheduler)
     end
 
     msgs = [
@@ -447,11 +446,11 @@ class TestObservableCreation < Minitest::Test
     assert_messages msgs, res.messages      
   end
 
-  def range_dispose
-    scheduler = RxRuby::TestScheduler.new
+  def test_range_dispose
+    scheduler = Rx::TestScheduler.new
 
-    res = scheduler.configure(:dispose => 204) do
-      RxRuby::Observable.range(-10, 5, scheduler)
+    res = scheduler.configure(:disposed => 204) do
+      Rx::Observable.range(-10, 5, scheduler)
     end
 
     msgs = [
@@ -463,21 +462,179 @@ class TestObservableCreation < Minitest::Test
   end
 
   # Repeat methods
-
 =begin
+# the clock is actually off, because of not using the `scheduler.schedule_recursive`
   def test_repeat_value_count_zero
-    scheduler = RxRuby::TestScheduler.new
+    scheduler = Rx::TestScheduler.new
 
-    res = scheduler.configure(:dispose => 204) do
-      RxRuby::Observable.repeat(42, 0, scheduler)
+    res = scheduler.configure do
+      Rx::Observable.repeat(42, 0, scheduler)
     end
 
     msgs = [
       on_completed(201)
     ]
-    assert_messages msgs, res.messages 
+    assert_messages msgs, res.messages
+  end
+
+  def test_repeat_value_once
+    scheduler = Rx::TestScheduler.new
+
+    res = scheduler.configure do
+      Rx::Observable.repeat(42, 1, scheduler)
+    end
+
+    msgs = [
+        on_next(201, 42),
+        on_completed(202)
+    ]
+    assert_messages msgs, res.messages
   end
 =end
 
+  def test_repeat_infinitely_dispose
+    scheduler = Rx::TestScheduler.new
+
+    res = scheduler.configure(:disposed => 203) do
+      Rx::Observable.repeat_infinitely({a: 1}, scheduler)
+    end
+
+    msgs = [
+        on_next(201, {a: 1}),
+        on_next(202, {a: 1})
+    ]
+    assert_messages msgs, res.messages
+  end
+
+  # of_enumerable/of_enumerator
+  def test_of_enumerable_empty
+    scheduler = Rx::TestScheduler.new
+
+    res = scheduler.configure do
+      Rx::Observable.of_enumerable([], scheduler)
+    end
+
+    msgs = [
+        on_completed(201)
+    ]
+    assert_messages msgs, res.messages
+  end
+
+  def test_of_enumerable_simple
+    scheduler = Rx::TestScheduler.new
+
+    res = scheduler.configure do
+      Rx::Observable.of_enumerable(%w(foo bar baz), scheduler)
+    end
+
+    msgs = [
+        on_next(201, 'foo'),
+        on_next(202, 'bar'),
+        on_next(203, 'baz'),
+        on_completed(204)
+    ]
+    assert_messages msgs, res.messages
+  end
+
+
+  def test_of_enumerator_empty
+    scheduler = Rx::TestScheduler.new
+
+    res = scheduler.configure do
+      Rx::Observable.of_enumerator([].to_enum, scheduler)
+    end
+
+    msgs = [
+        on_completed(201)
+    ]
+    assert_messages msgs, res.messages
+  end
+
+  def test_of_enumerator_error
+    scheduler = Rx::TestScheduler.new
+    err = RuntimeError.new
+    fibs = Enumerator.new do |x|
+      a = b = 1
+      6.times do
+        x << a
+        a, b = b, a + b
+      end
+      raise err
+    end
+    res = scheduler.configure do
+      Rx::Observable.of_enumerator(fibs, scheduler)
+    end
+
+    msgs = [
+        on_next(201, 1),
+        on_next(202, 1),
+        on_next(203, 2),
+        on_next(204, 3),
+        on_next(205, 5),
+        on_next(206, 8),
+        on_error(207, err)
+    ]
+    assert_messages msgs, res.messages
+  end
+
+  def test_of_enumerator_infinite_dispose
+    scheduler = Rx::TestScheduler.new
+
+    res = scheduler.configure(:disposed => 205) do
+      Rx::Observable.of_enumerator([42].cycle, scheduler)
+    end
+
+    msgs = [
+        on_next(201, 42),
+        on_next(202, 42),
+        on_next(203, 42),
+        on_next(204, 42)
+    ]
+    assert_messages msgs, res.messages
+  end
+
+  # from_array methods
+  def test_from_array_empty
+    scheduler = Rx::TestScheduler.new
 
+    res = scheduler.configure do
+      Rx::Observable.from_array([], scheduler)
+    end
+
+    msgs = [
+        on_completed(201)
+    ]
+    assert_messages msgs, res.messages
+  end
+
+  def test_from_array_simple
+    scheduler = Rx::TestScheduler.new
+
+    res = scheduler.configure do
+      Rx::Observable.from_array([1, 2, 3], scheduler)
+    end
+
+    msgs = [
+        on_next(201, 1),
+        on_next(202, 2),
+        on_next(203, 3),
+        on_completed(204)
+    ]
+    assert_messages msgs, res.messages
+  end
+
+  def test_from_array_complex_dispose
+    scheduler = Rx::TestScheduler.new
+
+    res = scheduler.configure(:disposed => 204) do
+      Rx::Observable.from_array([[], [[]], [[[]]], [[[[]]]]], scheduler)
+    end
+
+    msgs = [
+        on_next(201, []),
+        on_next(202, [[]]),
+        on_next(203, [[[]]])
+    ]
+    assert_messages msgs, res.messages
+  end
 end