cw 0.2.4 → 0.3.0

data/test/test_params.rb

@@ -0,0 +1,28 @@
+require 'simplecov'
+$VERBOSE = nil #FIXME
+SimpleCov.start
+
+require 'minitest/autorun'
+require 'minitest/pride'
+
+require_relative '../lib/cw'
+
+class TestStr < MiniTest::Test
+
+  ROOT = File.expand_path File.dirname(__FILE__) + '/../'
+
+  def setup
+    @str = CWG::Str.new
+  end
+
+  def test_stringify
+    assert_equal('a, b', @str.stringify(['a','b']))
+  end
+
+#  def test_beginning_str
+#    cw = CW.new {
+#      no_run
+#      assert_equal '', @str.beginning_str
+#    }
+#  end
+end

data/test/test_play.rb

@@ -0,0 +1,51 @@
+$VERBOSE = nil #FIXME
+
+require 'minitest/autorun'
+require 'minitest/pride'
+require_relative '../lib/cw'
+
+class TestPlay < MiniTest::Test
+
+  ROOT = File.expand_path File.dirname(__FILE__) + '/../'
+
+  def setup
+    @p = CWG::Play.new('words')
+  end
+
+  def teardown
+    @cw = nil
+  end
+
+  def test_play_object_takes_a_word_parameter
+    play = CWG::Play.new('words object')
+    assert_equal 'words object', play.instance_variable_get('@words')
+  end
+
+  def test_audio_instantiates_AudioPlayer_object
+    assert_equal CWG::AudioPlayer, @p.audio.class
+  end
+
+  def test_init_play_words_timeout_sets_start_play_time
+    @p.init_play_words_timeout
+    assert((Time.now - @p.instance_variable_get('@start_play_time')) < 1)
+  end
+
+  def test_init_play_words_timeout_sets_delay_play_time
+    @p.init_play_words_timeout
+    assert_equal 2.0, @p.instance_variable_get('@delay_play_time')
+  end
+
+  def test_start_sync
+    refute @p.start_sync?
+    @p.start_sync
+    assert @p.start_sync?
+  end
+
+  def test_add_space
+    words = CWG::Words.new
+    words.assign ['some','words']
+
+    assert_equal 'some words ',  @p.add_space(words)
+  end
+
+end

data/test/test_stream.rb

@@ -143,7 +143,7 @@ require_relative '../lib/cw/cw_stream'
 class TestCwStream < MiniTest::Test
 
   def setup
-    @stream = CwStream.new
+    @stream = CWG::CwStream.new
   end
 
   def teardown
@@ -154,31 +154,31 @@ class TestCwStream < MiniTest::Test
     assert true
   end
 
-  def test_add_word_adds_to_the_stream
-    @stream.add_word 'a'
+  def test_push_adds_to_the_stream
+    @stream.push 'a'
     assert_equal({0 => 'a'}, @stream.stream)
-    @stream.add_word 'tree'
+    @stream.push 'tree'
     assert_equal({0 => 'a', 1 => 'tree'}, @stream.stream)
   end
 
   def test_count
-    @stream.add_word 'a'
+    @stream.push 'a'
     assert_equal 1, @stream.count
-    @stream.add_word 'tree'
+    @stream.push 'tree'
     assert_equal 2, @stream.count
     assert_equal({0 => 'a', 1 => 'tree'}, @stream.stream)
   end
 
   def test_stream_element_can_be_marked_a_success
-    @stream.add_word 'a'
+    @stream.push 'a'
     @stream.mark_success(0)
     assert_equal({0 => true}, @stream.instance_variable_get(:@success))
   end
 
   def test_stream_element_can_be_marked_a_fail
-    @stream.add_word 'a'
+    @stream.push 'a'
     @stream.mark_success(0)
-    @stream.add_word 'b'
+    @stream.push 'b'
     @stream.mark_fail(1)
     assert_equal({0 => true, 1 => false}, @stream.instance_variable_get(:@success))
   end
@@ -189,20 +189,20 @@ class TestCwStream < MiniTest::Test
   end
 
   def test_mark_inactive_region_fail_fails_unmarked_inactive_elements
-    @stream.add_word 'a'
-    @stream.add_word 'b'
-    @stream.add_word 'c'
-    @stream.add_word 'd'
+    @stream.push 'a'
+    @stream.push 'b'
+    @stream.push 'c'
+    @stream.push 'd'
     @stream.active_region = 2
     @stream.fail_unmarked_inactive_elements
     assert_equal({0 => false, 1 => false, 2 => nil, 3 => nil}, @stream.instance_variable_get(:@success))
   end
 
   def test_mark_inactive_region_fail_doesnt_fail_successes
-    @stream.add_word 'a'
-    @stream.add_word 'b'
-    @stream.add_word 'c'
-    @stream.add_word 'd'
+    @stream.push 'a'
+    @stream.push 'b'
+    @stream.push 'c'
+    @stream.push 'd'
     @stream.instance_variable_set(:@success, {0 => true, 1 => false})
     @stream.active_region = 2
     @stream.fail_unmarked_inactive_elements
@@ -215,60 +215,60 @@ class TestCwStream < MiniTest::Test
   end
 
   def test_first_returns_first_element_in_stream
-    @stream.add_word 'a'
-    @stream.add_word 'b'
-    @stream.add_word 'c'
-    @stream.add_word 'd'
+    @stream.push 'a'
+    @stream.push 'b'
+    @stream.push 'c'
+    @stream.push 'd'
     assert_equal 'a', @stream.first
   end
 
   def test_pop_returns_first_element_in_stream_and_removes_element
-    @stream.add_word 'a'
-    @stream.add_word 'b'
-    @stream.add_word 'c'
-    @stream.add_word 'd'
+    @stream.push 'a'
+    @stream.push 'b'
+    @stream.push 'c'
+    @stream.push 'd'
     assert_equal({:value => 'a', :success => false}, @stream.pop)
     refute(@stream.pop[:success])
     assert_equal({2 => 'c', 3 => 'd'}, @stream.stream)
 
     @stream.empty
-    @stream.add_word 'a'
+    @stream.push 'a'
     refute(@stream.pop[:success])
-    @stream.add_word 'b'
+    @stream.push 'b'
     refute(@stream.pop[:success])
-    @stream.add_word 'c'
+    @stream.push 'c'
     refute(@stream.pop[:success])
-    @stream.add_word 'd'
+    @stream.push 'd'
     refute(@stream.pop[:success])
     assert_nil @stream.pop
     assert_equal({}, @stream.stream)
   end
 
   def test_match_last_active_element_marks_correct_element
-    @stream.add_word 'a'
-    @stream.add_word 'b'
-    @stream.add_word 'c'
-    @stream.add_word 'd'
+    @stream.push 'a'
+    @stream.push 'b'
+    @stream.push 'c'
+    @stream.push 'd'
     @stream.match_last_active_element('c')
     assert_equal({0 => false, 1 => false, 2 => true, 3 => nil}, @stream.instance_variable_get(:@success))
   end
 
   def test_match_last_active_element_doesnt_unmark_correct_element
     @stream.active_region = 2
-    @stream.add_word 'a'
-    @stream.add_word 'b'
-    @stream.add_word 'c'
-    @stream.add_word 'd'
+    @stream.push 'a'
+    @stream.push 'b'
+    @stream.push 'c'
+    @stream.push 'd'
     @stream.match_last_active_element('c')
     @stream.match_last_active_element('d')
     assert_equal({0 => nil, 1 => false, 2 => true, 3 => true}, @stream.instance_variable_get(:@success))
   end
 
   def test_match_last_active_element_doesnt_unmark_failed_element
-    @stream.add_word 'a'
-    @stream.add_word 'b'
-    @stream.add_word 'c'
-    @stream.add_word 'd'
+    @stream.push 'a'
+    @stream.push 'b'
+    @stream.push 'c'
+    @stream.push 'd'
     @stream.match_last_active_element('d')
     @stream.match_last_active_element('c')
     assert_equal({0 => false, 1 => false, 2 => true, 3 => true}, @stream.instance_variable_get(:@success))
@@ -280,30 +280,30 @@ class TestCwStream < MiniTest::Test
   #    end
   #
   #    def test_pop_marked_returns_up_to_marked_first_element
-  #      @stream.add_word 'a'
-  #      @stream.add_word 'b'
-  #      @stream.add_word 'c'
-  #      @stream.add_word 'd'
+  #      @stream.push 'a'
+  #      @stream.push 'b'
+  #      @stream.push 'c'
+  #      @stream.push 'd'
   #      @stream.match_last_active_element('a')
   #      assert_equal({0 => {'a' => true}}, @stream.pop_marked)
   #      assert_equal(nil, @stream.pop_marked)
   #    end
   #
   #    def test_pop_marked_returns_up_to_marked_second_element
-  #      @stream.add_word 'a'
-  #      @stream.add_word 'b'
-  #      @stream.add_word 'c'
-  #      @stream.add_word 'd'
+  #      @stream.push 'a'
+  #      @stream.push 'b'
+  #      @stream.push 'c'
+  #      @stream.push 'd'
   #      @stream.match_last_active_element('b')
   #      assert_equal({0 => {'a' => false}, 1 => {'b' => true}}, @stream.pop_marked)
   #      assert_equal(nil, @stream.pop_marked)
   #    end
   #
   #    def test_pop_marked_returns_up_to_marked_first_and_third_element
-  #      @stream.add_word 'a'
-  #      @stream.add_word 'b'
-  #      @stream.add_word 'c'
-  #      @stream.add_word 'd'
+  #      @stream.push 'a'
+  #      @stream.push 'b'
+  #      @stream.push 'c'
+  #      @stream.push 'd'
   #      @stream.match_last_active_element('a')
   #      @stream.match_last_active_element('c')
   #      assert_equal({0 => {'a' => true}, 1 => {'b' => false}, 2 => {'c' => true}}, @stream.pop_marked)
@@ -313,10 +313,10 @@ class TestCwStream < MiniTest::Test
   #    end
   #
   #    def test_pop_marked_returns_inactive_unmarked_elements
-  #      @stream.add_word 'a'
-  #      @stream.add_word 'b'
-  #      @stream.add_word 'c'
-  #      @stream.add_word 'd'
+  #      @stream.push 'a'
+  #      @stream.push 'b'
+  #      @stream.push 'c'
+  #      @stream.push 'd'
   #      @stream.active_region = 2
   #      assert_equal({0 => {'a' => false}, 1 => {'b' => false}}, @stream.pop_marked)
   #      assert_equal(nil, @stream.pop_marked)
@@ -326,20 +326,20 @@ class TestCwStream < MiniTest::Test
   #
   #    def test_pop_marked_returns_mix_of_active_and_inactive
   #      @stream.active_region = 2
-  #      @stream.add_word 'a'
-  #      @stream.add_word 'b'
-  #      @stream.add_word 'c'
-  #      @stream.add_word 'd'
+  #      @stream.push 'a'
+  #      @stream.push 'b'
+  #      @stream.push 'c'
+  #      @stream.push 'd'
   #      @stream.match_last_active_element('d')
   #      assert_equal({0 => {'a' => false}, 1 => {'b' => false}, 2 => {'c' => false}, 3 => {'d' => true}}, @stream.pop_marked)
   #      assert_equal(nil, @stream.pop_marked)
   #    end
 
   def test_pop_next_marked_returns_correct_elements_where_last_only_matched
-    @stream.add_word 'a'
-    @stream.add_word 'b'
-    @stream.add_word 'c'
-    @stream.add_word 'd'
+    @stream.push 'a'
+    @stream.push 'b'
+    @stream.push 'c'
+    @stream.push 'd'
     @stream.match_last_active_element('d')
     refute(@stream.pop_next_marked[:success])
     refute(@stream.pop_next_marked[:success])
@@ -349,10 +349,10 @@ class TestCwStream < MiniTest::Test
   end
 
   def test_pop_next_marked_returns_correct_elements_where_penultimate_element_matched
-    @stream.add_word 'a'
-    @stream.add_word 'b'
-    @stream.add_word 'c'
-    @stream.add_word 'd'
+    @stream.push 'a'
+    @stream.push 'b'
+    @stream.push 'c'
+    @stream.push 'd'
     @stream.match_last_active_element('c')
     assert_equal({:value => 'a', :success => false}, @stream.pop_next_marked)
     assert_equal({:value => 'b', :success => false}, @stream.pop_next_marked)
@@ -364,10 +364,10 @@ class TestCwStream < MiniTest::Test
   def test_pop_next_marked_considers_active_region
 
     @stream.active_region = 2
-    @stream.add_word 'a'
-    @stream.add_word 'b'
-    @stream.add_word 'c'
-    @stream.add_word 'd'
+    @stream.push 'a'
+    @stream.push 'b'
+    @stream.push 'c'
+    @stream.push 'd'
     assert_equal({:value => 'a', :success => false}, @stream.pop_next_marked)
     assert_equal({:value => 'b', :success => false}, @stream.pop_next_marked)
     assert_equal(nil, @stream.pop_next_marked)
@@ -375,10 +375,10 @@ class TestCwStream < MiniTest::Test
 
     @stream.empty
     @stream.active_region = 1
-    @stream.add_word 'a'
-    @stream.add_word 'b'
-    @stream.add_word 'c'
-    @stream.add_word 'd'
+    @stream.push 'a'
+    @stream.push 'b'
+    @stream.push 'c'
+    @stream.push 'd'
     assert_equal({:value => 'a', :success => false}, @stream.pop_next_marked)
     assert_equal({:value => 'b', :success => false}, @stream.pop_next_marked)
     assert_equal({:value => 'c', :success => false}, @stream.pop_next_marked)
@@ -387,17 +387,17 @@ class TestCwStream < MiniTest::Test
 
     @stream.empty
     @stream.active_region = 2
-    @stream.add_word 'a'
-    @stream.add_word 'b'
-    @stream.add_word 'c'
-    @stream.add_word 'd'
+    @stream.push 'a'
+    @stream.push 'b'
+    @stream.push 'c'
+    @stream.push 'd'
     @stream.match_last_active_element('c')
     assert_equal({:value => 'a', :success => false}, @stream.pop_next_marked)
     assert_equal({:value => 'b', :success => false}, @stream.pop_next_marked)
     assert_equal({:value => 'c', :success => true}, @stream.pop_next_marked)
     assert_equal(nil, @stream.pop_next_marked)
-    @stream.add_word 'e'
-    @stream.add_word 'f'
+    @stream.push 'e'
+    @stream.push 'f'
     @stream.match_last_active_element('e')
     assert_equal({:value => 'd', :success => false}, @stream.pop_next_marked)
     assert_equal({:value => 'e', :success => true}, @stream.pop_next_marked)

data/test/test_tester.rb

@@ -6,19 +6,15 @@ require_relative '../lib/cw'
 
 class TestTester < MiniTest::Test
 
-#  include Tester
-
   ROOT = File.expand_path File.dirname(__FILE__) + '/../'
 
   def setup
-    @object = Object.new
-    @object.extend(Tester)
-#''end    @cw = CW.new
-#    @cw.pause
+    @object = CWG::Tester.new
+
   end
 
   def teardown
-    @cw = nil
+    @object = nil
   end
 
   def test_whatever
@@ -26,37 +22,23 @@ class TestTester < MiniTest::Test
   end
 #
   def test_quit?
-    @object.instance_eval('@quit = :quit')
-    assert_equal :quit, @object.quit?
+    @object.quit
+    assert_equal true, @object.quit?
   end
 
   def test_quit
-    assert_nil @object.quit?
+    CWG::Cfg.config.params["quit"] = false
+    refute @object.quit?
     @object.quit
     assert @object.quit?
   end
 
-  def test_global_quit?
-    @object.instance_eval('@global_quit = :quit')
-    assert_equal :quit, @object.global_quit?
-  end
-
-  def test_global_quit
-    assert_nil @object.global_quit?
-    @object.global_quit
-    assert @object.global_quit?
-  end
-
   def test_print_instantiates_Print_object
-    assert_equal Print, @object.print.class
+    assert_equal CWG::Print, @object.print.class
   end
 
   def test_timing_instantiates_Timing_object
-    assert_equal Timing, @object.timing.class
-  end
-
-  def test_audio_instantiates_AudioPlayer_object
-    assert_equal AudioPlayer, @object.audio.class
+    assert_equal CWG::Timing, @object.timing.class
   end
 
 end