Changeset 28066 for lang/ruby/starframe/test

Timestamp:

01/07/09 02:15:24 (4 years ago)

Author:

isaisstillalive

Message:

• r28062を戻し、initとquitは複数定義できるようにする。親クラスのイベントを呼ぶ際にわざわざsuperを記述しなければならないのは冗長。initは定義した順に、quitは逆順に実行される。
  

Files:

• lang/ruby/starframe/test/starframe/test_initializable.rb (modified) (3 diffs)

lang/ruby/starframe/test/starframe/test_initializable.rb

@@ -25 +25 @@
   end
   
-  def test_initializable_object_should_respond_to_init_event
-    assert_respond_to UnOverwriteInitializableObject.new, :_init
-  end
   def test_initializable_object_should_respond_to_init
     assert_respond_to UnOverwriteInitializableObject.new, :init
-  end
-  def test_quitializable_object_should_respond_to_quit_event
-    assert_respond_to UnOverwriteInitializableObject.new, :_quit
   end
   def test_quitializable_object_should_respond_to_quit
@@ -38 +32 @@
   end
   
-  def test_initializable_object_init_should_return_nil
+  def test_initializable_object_should_have_inits
+    actual = UnOverwriteInitializableObject.instance_variable_get(:@_initializable_methods)[:init]
+    assert_equal [], actual
+  end
+  def test_quitializable_object_should_have_quits
+    actual = UnOverwriteInitializableObject.instance_variable_get(:@_initializable_methods)[:quit]
+    assert_equal [], actual
+  end
+  
+  def test_initializable_object_init_should_return_self
     object = UnOverwriteInitializableObject.new
-    assert_nil object.init(1)
+    assert_equal object, object.init
   end
-  def test_quitializable_object_quit_should_return_nil
+  def test_quitializable_object_quit_should_return_self
     object = UnOverwriteInitializableObject.new
-    assert_nil object.quit
+    assert_equal object, object.quit
   end
   
@@ -50 +53 @@
   class InitializableObject
     include StarFrame::Initializable
+    attr_reader :called
+    def initialize
+      @called = []
+    end
     
     init do |*args|
-      :init
+      @called << [:init1, args]
+    end
+    quit do
+      @called << :quit1
     end
     
+    init do |*args|
+      @called << [:init2, args]
+    end
     quit do
-      :quit
+      @called << :quit2
     end
   end
   
-  def test_init_should_return_block
+  def test_call_init_should_call_method_chain
     object = InitializableObject.new
-    assert_equal :init, object.init(1)
+    object.init :arg1, :arg2
+    assert_equal [[:init1, [:arg1, :arg2]], [:init2, [:arg1, :arg2]]], object.called
   end
-  def test_quit_should_return_block
+  def test_call_quit_should_call_method_chain
     object = InitializableObject.new
-    assert_equal :quit, object.quit
+    object.quit
+    assert_equal [:quit2, :quit1], object.called
   end
 end