wxruby3 1.6.0 → 1.7.0

data/tests/test_item_data.rb

@@ -12,7 +12,7 @@ class CtrlContainerFrame < Wx::Frame
   end
 end
 
-class TestItemData < Test::Unit::TestCase
+class TestItemData < WxRuby::Test::Unit
   def assert_retrievable_data(ctrl, n, test_value)
     compare = Marshal.load( Marshal.dump(test_value) )
     ctrl.set_item_data(n, test_value)
@@ -35,7 +35,7 @@ class TestItemData < Test::Unit::TestCase
     f.control.append('integer')
     assert_equal(4, f.control.count)
     assert_equal('integer', f.control.get_string(3))
-    assert_equal(nil, f.control.get_item_data(3))
+    assert_nil(f.control.get_item_data(3))
 
     # single item append; with data
     f.control.append('array', 110)
@@ -46,8 +46,8 @@ class TestItemData < Test::Unit::TestCase
     # array item append; no data
     f.control.append(%w[set tree bag])
     assert_equal(8, f.control.count)
-    assert_equal(nil, f.control.get_item_data(5))
-    assert_equal(nil, f.control.get_item_data(7))
+    assert_nil(f.control.get_item_data(5))
+    assert_nil(f.control.get_item_data(7))
 
     # array item append; with data
     f.control.append(%w[object module class], ['O', 'M', 'C'])
@@ -61,7 +61,7 @@ class TestItemData < Test::Unit::TestCase
     f.control.insert('integer2', 3)
     assert_equal(12, f.control.count)
     assert_equal('integer2', f.control.get_string(3))
-    assert_equal(nil, f.control.get_item_data(3))
+    assert_nil(f.control.get_item_data(3))
 
     # single item insert; with data
     f.control.insert('array2', 4, 110)
@@ -72,8 +72,8 @@ class TestItemData < Test::Unit::TestCase
     # array item insert; no data
     f.control.insert(%w[set2 tree2 bag2], 5)
     assert_equal(16, f.control.count)
-    assert_equal(nil, f.control.get_item_data(5))
-    assert_equal(nil, f.control.get_item_data(7))
+    assert_nil(f.control.get_item_data(5))
+    assert_nil(f.control.get_item_data(7))
 
     # array item insert; with data
     f.control.insert(%w[object2 module2 class2], 8, ['O', 'M', 'C'])
@@ -171,12 +171,12 @@ class TestItemData < Test::Unit::TestCase
   def test_listctrl_itemdata
     f = CtrlContainerFrame.new(Wx::ListCtrl)
     lc = f.control
-    assert_equal(nil, lc.get_item_data(-7))
-    assert_equal(nil, lc.get_item_data(0))
-    assert_equal(nil, lc.get_item_data(118))
+    assert_nil(lc.get_item_data(-7))
+    assert_nil(lc.get_item_data(0))
+    assert_nil(lc.get_item_data(118))
 
     lc.insert_item(0, 'string')
-    assert_equal(nil, lc.get_item_data(0))
+    assert_nil(lc.get_item_data(0))
 
     lc.set_item_data(0, 'a string')
     assert_equal('a string', lc.get_item_data(0))
@@ -184,7 +184,7 @@ class TestItemData < Test::Unit::TestCase
     assert_equal('a string', lc.get_item_data(0))
 
     lc.insert_item(1, 'hash')
-    assert_equal(nil, lc.get_item_data(1))
+    assert_nil(lc.get_item_data(1))
 
     lc.set_item_data(1, { :a => 457 })
     assert_equal({ :a => 457 }, lc.get_item_data(1))

data/tests/test_list_ctrl.rb

@@ -13,7 +13,7 @@ class ListCtrlTests < WxRuby::Test::GUITests
     @list.set_size([400, 200])
   end
 
-  def cleanup
+  def teardown
     @list.destroy
     super
   end

data/tests/test_log.rb

@@ -4,7 +4,7 @@
 
 require_relative './lib/wxapp_runner'
 
-class LogTests < Test::Unit::TestCase
+class LogTests < WxRuby::Test::Unit
 
   class TestLogBase < Wx::Log
 
@@ -48,7 +48,7 @@ class LogTests < Test::Unit::TestCase
     @logWasEnabled = Wx::Log.enable_logging
   end
 
-  def cleanup
+  def teardown
     Wx::Log.set_active_target(@logOld)
     Wx::Log.enable_logging(@logWasEnabled)
     super

data/tests/test_media_ctrl.rb

@@ -16,7 +16,7 @@ class MediaCtrlTests < WxRuby::Test::GUITests
     @media = Wx::MediaCtrl.new(frame_win)
   end
 
-  def cleanup
+  def teardown
     @media.destroy
     super
   end

data/tests/test_menu.rb

@@ -4,7 +4,94 @@
 
 require_relative './lib/wxframe_runner'
 
-class MenuTests < WxRuby::Test::GUITests
+# class MenuTests < WxRuby::Test::GUITests
+#
+#   def setup
+#     super
+#     @menu = Wx::Menu.new
+#     @menu.append(Wx::ID_HIGHEST+1, 'Item 1', 'Test menuitem 1')
+#     @menu.append(Wx::ID_HIGHEST+2, 'Item 2', 'Test menuitem 2')
+#     @menu.append_separator
+#     @menu.append_check_item(Wx::ID_HIGHEST+3, 'Check 3', 'Test menuitem 3')
+#     @menu.append_separator
+#     @menu.append_radio_item(Wx::ID_HIGHEST+4, 'Radio 4', 'Test menuitem 4')
+#     @menu.append_radio_item(Wx::ID_HIGHEST+5, 'Radio 5', 'Test menuitem 5')
+#     @menu.append_radio_item(Wx::ID_HIGHEST+6, 'Radio 6', 'Test menuitem 6')
+#     frame_win.menu_bar = Wx::MenuBar.new
+#     frame_win.menu_bar.append(@menu, "&Test")
+#     GC.start
+#   end
+#
+#   def teardown
+#     frame_win.menu_bar = nil
+#     super
+#     GC.start
+#   end
+#
+#   attr_reader :menu
+#
+#   def test_basic
+#     assert_equal(8, menu.get_menu_item_count)
+#     check, pos = menu.find_child_item(Wx::ID_HIGHEST+3)
+#     assert_not_nil(check)
+#     assert_equal(3, pos)
+#     assert_equal('Check 3', check.item_label)
+#     assert_false(check.checked?)
+#     check.check
+#     assert_true(check.checked?)
+#     radio, pos = menu.find_child_item(Wx::ID_HIGHEST+5)
+#     assert_not_nil(radio)
+#     assert_equal(6, pos)
+#     assert_equal('Radio 5', radio.item_label)
+#     assert_false(radio.checked?)
+#     radio.check
+#     assert_true(radio.checked?)
+#     radio, pos = menu.find_child_item(Wx::ID_HIGHEST+4)
+#     assert_false(radio.checked?)
+#     radio, pos = menu.find_child_item(Wx::ID_HIGHEST+6)
+#     assert_false(radio.checked?)
+#     radio.check
+#     assert_true(radio.checked?)
+#     radio, pos = menu.find_child_item(Wx::ID_HIGHEST+5)
+#     assert_false(radio.checked?)
+#   end
+#
+#   def test_enumerate
+#     radio, pos = menu.find_child_item(Wx::ID_HIGHEST+4)
+#     assert_true(radio.checked?) # first by default checked
+#     menu.each_item do |mi|
+#       mi.check if mi.id == (Wx::ID_HIGHEST+5)
+#     end
+#     radio, pos = menu.find_child_item(Wx::ID_HIGHEST+4)
+#     assert_false(radio.checked?)
+#     radio = menu.each_item.detect { |mi| mi.id == (Wx::ID_HIGHEST+5) }
+#     assert_true(radio.checked?)
+#   end
+#
+#   def test_accelerators
+#     if Wx.has_feature?(:USE_ACCEL)
+#       10.times do
+#         accel_keys = { "Z" => Wx::ID_UNDO,
+#                        "Y" => Wx::ID_REDO,
+#                        "C" => Wx::ID_COPY,
+#                        "X" => Wx::ID_CUT,
+#                        "V" => Wx::ID_PASTE }
+#         accel_table = accel_keys.keys.map do | key |
+#           [ Wx::MOD_CMD, key, accel_keys[key] ]
+#         end
+#
+#         accel_table = Wx::AcceleratorTable[ *accel_table ]
+#         frame_win.accelerator_table = accel_table
+#         assert_true(accel_table.ok?)
+#         assert_true(frame_win.accelerator_table.ok?)
+#         GC.start
+#       end
+#     end
+#   end
+#
+# end
+
+class UnattachedMenuTests < WxRuby::Test::GUITests
 
   def setup
     super
@@ -17,53 +104,37 @@ class MenuTests < WxRuby::Test::GUITests
     @menu.append_radio_item(Wx::ID_HIGHEST+4, 'Radio 4', 'Test menuitem 4')
     @menu.append_radio_item(Wx::ID_HIGHEST+5, 'Radio 5', 'Test menuitem 5')
     @menu.append_radio_item(Wx::ID_HIGHEST+6, 'Radio 6', 'Test menuitem 6')
-    frame_win.menu_bar = Wx::MenuBar.new
-    frame_win.menu_bar.append(@menu, "&Test")
+    @menu_bar = Wx::MenuBar.new
+    @menu2 = Wx::Menu.new
+    @menu2.append(Wx::ID_HIGHEST+1, 'Item 1', 'Test menuitem 1')
+    @menu2.append(Wx::ID_HIGHEST+2, 'Item 2', 'Test menuitem 2')
+    @menu2.append_separator
+    @menu2.append_check_item(Wx::ID_HIGHEST+3, 'Check 3', 'Test menuitem 3')
+    @menu2.append_separator
+    @menu2.append_radio_item(Wx::ID_HIGHEST+4, 'Radio 4', 'Test menuitem 4')
+    @menu2.append_radio_item(Wx::ID_HIGHEST+5, 'Radio 5', 'Test menuitem 5')
+    @menu2.append_radio_item(Wx::ID_HIGHEST+6, 'Radio 6', 'Test menuitem 6')
+    @menu_bar2 = Wx::MenuBar.new
+    GC.start
   end
 
-  def cleanup
-    frame_win.menu_bar = nil
+  def teardown
     super
+    GC.start
   end
 
-  attr_reader :menu
-
-  def test_basic
-    assert_equal(8, menu.get_menu_item_count)
-    check, pos = menu.find_child_item(Wx::ID_HIGHEST+3)
-    assert_not_nil(check)
-    assert_equal(3, pos)
-    assert_equal('Check 3', check.item_label)
-    assert_false(check.checked?)
-    check.check
-    assert_true(check.checked?)
-    radio, pos = menu.find_child_item(Wx::ID_HIGHEST+5)
-    assert_not_nil(radio)
-    assert_equal(6, pos)
-    assert_equal('Radio 5', radio.item_label)
-    assert_false(radio.checked?)
-    radio.check
-    assert_true(radio.checked?)
-    radio, pos = menu.find_child_item(Wx::ID_HIGHEST+4)
-    assert_false(radio.checked?)
-    radio, pos = menu.find_child_item(Wx::ID_HIGHEST+6)
-    assert_false(radio.checked?)
-    radio.check
-    assert_true(radio.checked?)
-    radio, pos = menu.find_child_item(Wx::ID_HIGHEST+5)
-    assert_false(radio.checked?)
-  end
-
-  def test_enumerate
-    radio, pos = menu.find_child_item(Wx::ID_HIGHEST+4)
-    assert_true(radio.checked?) # first by default checked
-    menu.each_item do |mi|
-      mi.check if mi.id == (Wx::ID_HIGHEST+5)
-    end
-    radio, pos = menu.find_child_item(Wx::ID_HIGHEST+4)
-    assert_false(radio.checked?)
-    radio = menu.each_item.detect { |mi| mi.id == (Wx::ID_HIGHEST+5) }
-    assert_true(radio.checked?)
+  def test_menu_bar
+    yield_for_a_while(200)
+    GC.start
+    @menu_bar.append(@menu, "&Test")
+    yield_for_a_while(200)
+    GC.start
+    frame_win.menu_bar = @menu_bar
+    yield_for_a_while(200)
+    GC.start
+    frame_win.menu_bar = nil
+    yield_for_a_while(200)
+    GC.start
   end
 
 end

data/tests/test_proof_check.rb

@@ -11,7 +11,7 @@ class MultilineProofCheckTests < WxRuby::Test::GUITests
     @text = Wx::TextCtrl.new(frame_win, name: 'Text', style: Wx::TE_MULTILINE|Wx::TE_RICH|Wx::TE_RICH2)
   end
 
-  def cleanup
+  def teardown
     @text.destroy
     super
   end