Changeset 28886 for lang/ruby/ruwin/test/ruwin/test_window.rb

Timestamp:

01/23/09 11:36:05 (4 years ago)

Author:

isaisstillalive

Message:

• 初期化時に呼ばれるparent_resizedがウィンドウ領域サイズだったので、クライアント領域サイズに変更。
  

Files:

• lang/ruby/ruwin/test/ruwin/test_window.rb (modified) (4 diffs)

lang/ruby/ruwin/test/ruwin/test_window.rb

@@ -73 +73 @@
   end
   
-  def test_new_created_event
+  def test_new_call_created_event
     klass = Class.new(Ruwin::Window)
     
@@ -104 +104 @@
   end
   
+  def test_new_call_controls_parent_resized
+    klass = Class.new(Ruwin::Window)
+    klass.class_eval <<-'END'
+      width  200
+      height 300
+      add_control(Button, "button1") do
+        def parent_resized *args
+          @parent_resized = args
+        end
+      end
+      add_control(Button, "button2") do
+        def parent_resized *args
+          @parent_resized = args
+        end
+      end
+    END
+    
+    instance = klass.new
+    
+    excepted = instance.clientrect[2, 2]
+    
+    assert_equal excepted, instance.button1.instance_variable_get(:@parent_resized)
+    assert_equal excepted, instance.button2.instance_variable_get(:@parent_resized)
+  end
+  
   DummyMSG = Struct.new(:hWnd, :msg, :wParam, :lParam)
   
@@ -214 +239 @@
     instance = klass.new
     
-    msg = DummyMSG.new nil, WM_COMMAND, WM_SIZE, 100|200<<16
+    msg = DummyMSG.new nil, WM_COMMAND, WM_SIZE, 200|300<<16
     instance.wm_size msg
-    assert_equal [100, 200], instance.wm_size_called
-  end
-  
-  def test_new_call_children_parent_resized
-    klass = Class.new(Ruwin::Window)
-    klass.class_eval <<-'END'
-      width  100
-      height 200
-      add_control(Button, "button1") do
-        def parent_resized *args
-          @parent_resized = args
-        end
-      end
-      add_control(Button, "button2") do
-        def parent_resized *args
-          @parent_resized = args
-        end
-      end
-    END
-    
-    instance = klass.new
-    
-    assert_equal [100, 200], instance.button1.instance_variable_get(:@parent_resized)
-    assert_equal [100, 200], instance.button2.instance_variable_get(:@parent_resized)
+    assert_equal [200, 300], instance.wm_size_called
   end
   
@@ -257 +259 @@
     end
     
-    msg = DummyMSG.new nil, WM_COMMAND, WM_SIZE, 100|200<<16
+    msg = DummyMSG.new nil, WM_COMMAND, WM_SIZE, 200|300<<16
     instance.wm_size msg
     
-    assert_equal [100, 200], instance.button1.instance_variable_get(:@parent_resized)
-    assert_equal [100, 200], instance.button2.instance_variable_get(:@parent_resized)
+    assert_equal [200, 300], instance.button1.instance_variable_get(:@parent_resized)
+    assert_equal [200, 300], instance.button2.instance_variable_get(:@parent_resized)
   end
 end