Changeset 27670

Timestamp:

12/31/08 15:09:24 (4 years ago)

Author:

isaisstillalive

Message:

• 各種メソッドの戻り値に、内部でのみ使用する配列が返ってしまっていたので、すべてselfで隠蔽。
  

Location:

lang/ruby/starframe

Files:

• lib/starframe/sprite/collection.rb (modified) (5 diffs)
• test/starframe/sprite/test_collection.rb (modified) (5 diffs)

lang/ruby/starframe/lib/starframe/sprite/collection.rb

@@ -55 +55 @@
         @sprites << sprite
         sprite.instance_variable_set :@collection, self
+        self
       end
       alias << add
@@ -62 +63 @@
         @sprites.delete sprite
         sprite.instance_variable_set :@collection, nil
+        self
       end
       
@@ -67 +69 @@
       def each &block
         @sprites.each &block
+        self
       end
       
@@ -77 +80 @@
       def update
         @sprites.each &:call_update
+        self
       end
       # 所属している全てのスプライトの更新時イベントをコールする。
       def render
         @sprites.each &:call_render
+        self
       end
       
@@ -86 +91 @@
       def render_to texture
         @sprites.each{ |sprite| sprite.render_to texture }
+        self
       end
     end

lang/ruby/starframe/test/starframe/sprite/test_collection.rb

@@ -36 +36 @@
     assert_equal @collection, @sprite.collection
   end
+  def test_collection_add_should_return_self
+    assert_equal @collection, @collection.add(@sprite)
+  end
   def test_collection_add_do_not_duplication
     @collection.add @sprite
+    @collection.add @sprite
+    assert_equal 1, @collection.size
+    assert_equal @collection, @sprite.collection
+  end
+  def test_collection_add
     @collection.add @sprite
     assert_equal 1, @collection.size
@@ -54 +62 @@
     assert_nil @sprite.collection
   end
+  def test_collection_delete_should_return_self
+    @collection.add @sprite
+    assert_equal @collection, @collection.delete(@sprite)
+  end
   
   def test_collection_each
@@ -62 +74 @@
     end
     assert_equal [@sprite], @sprites
+  end
+  def test_collection_each_should_return_self
+    assert_equal @collection, @collection.each{}
   end
   
@@ -88 +103 @@
   end
   
+  def test_collection_update_should_return_self
+    assert_equal @collection, @collection.update
+  end
+  def test_collection_render_should_return_self
+    assert_equal @collection, @collection.render
+  end
+  
   def test_collection_render_to
     @collection.add @sprite
@@ -95 +117 @@
     
     assert_equal [:render_to, texture],  @sprite.called_methods.last
+  end
+  def test_collection_render_to_should_return_self
+    assert_equal @collection, @collection.render_to(nil)
   end