wxruby3 1.6.1 → 1.7.0

data/tests/test_propgrid.rb

@@ -6,14 +6,6 @@ require_relative './lib/wxframe_runner'
 
 class PropGridTests < WxRuby::Test::GUITests
 
-  def yield_for_a_while(msec)
-    timeout = msec / 1000.0 # sec float
-    start = ::Time.now
-    while (Time.now - start) < timeout
-      Wx.get_app.yield
-    end
-  end
-
   def populate_with_standard_items(pgman)
     pg = pgman.get_page("Standard Items")
 
@@ -525,8 +517,8 @@ class PropGridTests < WxRuby::Test::GUITests
     pg_manager.set_extra_style(extraStyle)
 
     # This is the default validation failure behaviour
-    pg_manager.set_validation_failure_behavior(Wx::PG::PGVFBFlags::MarkCell |
-                                              Wx::PG::PGVFBFlags::ShowMessageBox)
+    pg_manager.set_validation_failure_behavior(Wx::PG::PG_VFB_MARK_CELL |
+                                              Wx::PG::PG_VFB_SHOW_MESSAGE)
 
     pg = pg_manager.get_grid
     # Set somewhat different unspecified value appearance
@@ -555,7 +547,7 @@ class PropGridTests < WxRuby::Test::GUITests
     @pg_manager = create_grid(-1, -1)
   end
 
-  def cleanup
+  def teardown
     @pg_manager.destroy
     super
   end
@@ -563,17 +555,17 @@ class PropGridTests < WxRuby::Test::GUITests
   def test_iterate
     @pg_manager.each_property(Wx::PG::PG_ITERATE_PROPERTIES) do |prop|
       assert_false(prop.is_category, "'#{prop.get_label}' is a category (non-private child property expected)")
-      assert_false(prop.get_parent.has_flag(Wx::PG::PGFlags::Aggregate), "'#{prop.get_label}' is a private child (non-private child property expected)")
+      assert_false(prop.get_parent.has_flag(Wx::PG::PG_PROP_AGGREGATE), "'#{prop.get_label}' is a private child (non-private child property expected)")
     end
     @pg_manager.each_property(Wx::PG::PG_ITERATE_CATEGORIES) do |prop|
       assert_true(prop.is_category, "'#{prop.get_label}' is not a category (only categories expected)")
     end
     @pg_manager.each_property(Wx::PG::PG_ITERATE_PROPERTIES|Wx::PG::PG_ITERATE_CATEGORIES) do |prop|
-      assert_false(prop.get_parent.has_flag(Wx::PG::PGFlags::Aggregate), "'#{prop.get_label}' is a private child (non-private child property or category expected)")
+      assert_false(prop.get_parent.has_flag(Wx::PG::PG_PROP_AGGREGATE), "'#{prop.get_label}' is a private child (non-private child property or category expected)")
     end
     @pg_manager.each_property(Wx::PG::PG_ITERATE_VISIBLE) do |prop|
       assert_true(prop.parent == @pg_manager.grid.root || prop.parent.expanded?, "'#{prop.get_label}' had collapsed parent (only visible properties expected)")
-      assert_false(prop.has_flag(Wx::PG::PGFlags::Hidden), "'#{prop.get_label}' was hidden (only visible properties expected)")
+      assert_false(prop.has_flag(Wx::PG::PG_PROP_HIDDEN), "'#{prop.get_label}' was hidden (only visible properties expected)")
     end
   end
 
@@ -595,7 +587,13 @@ class PropGridTests < WxRuby::Test::GUITests
     properties_page_last = pageLast.each_property(Wx::PG::PG_ITERATOR_FLAGS_ALL | Wx::PG.PG_IT_CHILDREN(Wx::PG::PG_ITERATOR_FLAGS_ALL)).collect { |prop| prop.get_name }
     assert_equal(properties_page_last_init, properties_page_last)
 
-    countAllProperties = @pg_manager.each_property(Wx::PG::PG_ITERATOR_FLAGS_ALL | Wx::PG.PG_IT_CHILDREN(Wx::PG::PG_ITERATOR_FLAGS_ALL)).count
+    if ::Wx::WXWIDGETS_VERSION >= '3.3.0'
+      countAllProperties = @pg_manager.each_property(Wx::PG::PG_ITERATOR_FLAGS_ALL | Wx::PG.PG_IT_CHILDREN(Wx::PG::PG_ITERATOR_FLAGS_ALL)).count
+    else
+      # wxWidgets < 3.3.0 has a bug in the iteration implementation for PropertyGridManager
+      countAllProperties = pageFirst.each_property(Wx::PG::PG_ITERATOR_FLAGS_ALL | Wx::PG.PG_IT_CHILDREN(Wx::PG::PG_ITERATOR_FLAGS_ALL)).count +
+                           pageLast.each_property(Wx::PG::PG_ITERATOR_FLAGS_ALL | Wx::PG.PG_IT_CHILDREN(Wx::PG::PG_ITERATOR_FLAGS_ALL)).count
+    end
     assert_equal(countAllPropertiesInit-properties_page_first_init.size, countAllProperties)
 
     # Delete all properties from last page
@@ -605,7 +603,13 @@ class PropGridTests < WxRuby::Test::GUITests
 
     assert_true(pageLast.each_property(Wx::PG::PG_ITERATOR_FLAGS_ALL | Wx::PG.PG_IT_CHILDREN(Wx::PG::PG_ITERATOR_FLAGS_ALL)).count == 0)
 
-    countAllProperties = @pg_manager.each_property(Wx::PG::PG_ITERATOR_FLAGS_ALL | Wx::PG.PG_IT_CHILDREN(Wx::PG::PG_ITERATOR_FLAGS_ALL)).count
+    if ::Wx::WXWIDGETS_VERSION >= '3.3.0'
+      countAllProperties = @pg_manager.each_property(Wx::PG::PG_ITERATOR_FLAGS_ALL | Wx::PG.PG_IT_CHILDREN(Wx::PG::PG_ITERATOR_FLAGS_ALL)).count
+    else
+      # wxWidgets < 3.3.0 has a bug in the iteration implementation for PropertyGridManager
+      countAllProperties = pageFirst.each_property(Wx::PG::PG_ITERATOR_FLAGS_ALL | Wx::PG.PG_IT_CHILDREN(Wx::PG::PG_ITERATOR_FLAGS_ALL)).count +
+                           pageLast.each_property(Wx::PG::PG_ITERATOR_FLAGS_ALL | Wx::PG.PG_IT_CHILDREN(Wx::PG::PG_ITERATOR_FLAGS_ALL)).count
+    end
     assert_equal(countAllPropertiesInit-properties_page_first_init.size-properties_page_last_init.size, countAllProperties)
   end
 
@@ -641,31 +645,27 @@ class PropGridTests < WxRuby::Test::GUITests
     assert_equal(countAllPropertiesInit-properties_page_first_init.size-properties_page_last_init.size, countAllProperties)
   end
 
-  unless is_ci_build?
+  def test_select_property
+    # Test that setting focus to properties does not crash things
+    @pg_manager.page_count.times do |pc|
+      page = @pg_manager.page(pc)
+      @pg_manager.select_page(page)
 
-    def test_select_property
-      # Test that setting focus to properties does not crash things
-      @pg_manager.page_count.times do |pc|
-        page = @pg_manager.page(pc)
-        @pg_manager.select_page(page)
-
-        page.each_property(Wx::PG::PG_ITERATE_VISIBLE) do |prop|
-          @pg_manager.grid.select_property(prop, true)
-          sleep(0.150)
-          frame_win.update
-        end
+      page.each_property(Wx::PG::PG_ITERATE_VISIBLE) do |prop|
+        @pg_manager.grid.select_property(prop, true)
+        sleep(0.150)
+        frame_win.update
       end
     end
-
   end
 
   def test_delete_property
     # delete everything in reverse order
 
-    array = @pg_manager.each_property(Wx::PG::PG_ITERATE_ALL & ~(Wx::PG.PG_IT_CHILDREN(Wx::PG::PGFlags::Aggregate))).to_a
+    array = @pg_manager.each_property(Wx::PG::PG_ITERATE_ALL & ~(Wx::PG.PG_IT_CHILDREN(Wx::PG::PG_PROP_AGGREGATE))).to_a
     array.reverse_each { |prop| @pg_manager.delete_property(prop) }
 
-    assert_true(@pg_manager.each_property(Wx::PG::PG_ITERATE_ALL & ~(Wx::PG.PG_IT_CHILDREN(Wx::PG::PGFlags::Aggregate))).count == 0, "Not all properties are deleted")
+    assert_true(@pg_manager.each_property(Wx::PG::PG_ITERATE_ALL & ~(Wx::PG.PG_IT_CHILDREN(Wx::PG::PG_PROP_AGGREGATE))).count == 0, "Not all properties are deleted")
 
     @pg_manager.refresh
     @pg_manager.update

data/tests/test_richtext.rb

@@ -11,7 +11,7 @@ class RichTextCtrlTextTests < WxRuby::Test::GUITests
     @richtext = Wx::RTC::RichTextCtrl.new(frame_win, name: 'RichText')
   end
 
-  def cleanup
+  def teardown
     @richtext.destroy
     super
   end
@@ -49,7 +49,7 @@ class RichTextCtrlWriteTests < WxRuby::Test::GUITests
     @richtext = Wx::RTC::RichTextCtrl.new(frame_win, name: 'RichText')
   end
 
-  def cleanup
+  def teardown
     @richtext.destroy
     super
   end
@@ -195,39 +195,24 @@ class RichTextCtrlFieldTypeTests < WxRuby::Test::GUITests
 
   end
 
-  class << self
-
-    def startup
-      @ft_test = RichTextFieldTypeTest.new('TEST', 'test')
-      Wx::RTC::RichTextBuffer.add_field_type(@ft_test)
-    end
-
-    def cleanup
-      Wx::RTC::RichTextBuffer.remove_field_type(@ft_test)
-      @ft_test = nil
-      GC.start
-    end
-
-    attr_reader :ft_test
-
-  end
-
   def setup
     super
+    @ft_test = RichTextFieldTypeTest.new('TEST', 'test')
+    Wx::RTC::RichTextBuffer.add_field_type(@ft_test)
     @richtext = Wx::RTC::RichTextCtrl.new(frame_win, name: 'RichText', size: [400,300])
   end
 
-  def cleanup
+  def teardown
     @richtext.destroy
+    Wx::RTC::RichTextBuffer.remove_field_type('TEST')
+    @ft_test = nil
+    GC.start
     super
   end
 
   attr_reader :richtext
 
-  def ft_test
-    self.class.ft_test
-  end
-  private :ft_test
+  attr_reader :ft_test
 
   def check_is_drawn
     frame_win.refresh
@@ -239,6 +224,7 @@ class RichTextCtrlFieldTypeTests < WxRuby::Test::GUITests
   def test_write_custom_field
     rt_field = richtext.write_field('TEST', Wx::RTC::RichTextProperties.new)
     assert_kind_of(Wx::RTC::RichTextField, rt_field)
+    yield_for_a_while(200)
     # the timing of the RichTextCtrl update is too unreliable
     # to use this in CI builds
     unless is_ci_build?

data/tests/test_secret_store.rb

@@ -6,7 +6,7 @@ require_relative './lib/wxapp_runner'
 
 require 'digest'
 
-class TestSecretStore < Test::Unit::TestCase
+class TestSecretStore < WxRuby::Test::Unit
 
   unless is_ci_build?
 

data/tests/test_sizer.rb

@@ -11,7 +11,7 @@ class SizerTests < WxRuby::Test::GUITests
     frame_win.set_sizer(Wx::VBoxSizer.new)
   end
 
-  def cleanup
+  def teardown
     super
     GC.start
   end

data/tests/test_std_controls.rb

@@ -13,7 +13,7 @@ class ButtonTests < WxRuby::Test::GUITests
     @button = Wx::Button.new(frame_win, label: 'Button')
   end
 
-  def cleanup
+  def teardown
     @button.destroy
     super
   end
@@ -99,7 +99,7 @@ class TextCtrlTests < WxRuby::Test::GUITests
     @text = Wx::TextCtrl.new(frame_win, name: 'Text')
   end
 
-  def cleanup
+  def teardown
     @text.destroy
     super
   end
@@ -196,7 +196,7 @@ class ComboBoxTests < WxRuby::Test::GUITests
     @combo.value = '' # don't use #clear as that also clears the choices
   end
 
-  def cleanup
+  def teardown
     @combo.destroy
     super
   end
@@ -230,7 +230,7 @@ class CheckBoxTests < WxRuby::Test::GUITests
     @check = Wx::CheckBox.new(frame_win, label: 'Check Box')
   end
 
-  def cleanup
+  def teardown
     @check.destroy
     super
   end
@@ -319,7 +319,7 @@ class RadioBoxTests < WxRuby::Test::GUITests
     @radiobox = Wx::RadioBox.new(frame_win, label: 'Radio Box', choices: ['item 0', 'item 1', 'item 2'])
   end
 
-  def cleanup
+  def teardown
     @radiobox.destroy
     super
   end
@@ -409,7 +409,7 @@ class ChoiceTests < WxRuby::Test::GUITests
     @choice = Wx::Choice.new(frame_win, name: 'Choice')
   end
 
-  def cleanup
+  def teardown
     @choice.destroy
     super
   end
@@ -430,7 +430,7 @@ class GaugeTests < WxRuby::Test::GUITests
     @gauge = Wx::Gauge.new(frame_win, range: 100)
   end
 
-  def cleanup
+  def teardown
     frame_win.destroy_children
     super
   end
@@ -488,7 +488,7 @@ class StaticBoxTests < WxRuby::Test::GUITests
     @box = nil
   end
 
-  def cleanup
+  def teardown
     @box.destroy if @box
     super
   end

data/tests/test_styled_text_ctrl.rb

@@ -11,7 +11,7 @@ class StyledTextCtrlTests < WxRuby::Test::GUITests
     @text = Wx::STC::StyledTextCtrl.new(frame_win, name: 'StyledText')
   end
 
-  def cleanup
+  def teardown
     @text.destroy
     super
   end

data/tests/test_timer.rb

@@ -4,7 +4,7 @@
 
 require_relative './lib/wxapp_runner'
 
-class TimerTests < Test::Unit::TestCase
+class TimerTests < WxRuby::Test::Unit
 
   class TimerCounterHandler < Wx::EvtHandler
 

data/tests/test_tree_ctrl.rb

@@ -11,7 +11,7 @@ class TreeCtrlTests < WxRuby::Test::GUITests
     @tree = Wx::TreeCtrl.new(frame_win, name: 'TreeCtrl')
   end
 
-  def cleanup
+  def teardown
     @tree.destroy
     super
   end

data/tests/test_validators.rb

@@ -11,12 +11,6 @@ class ValidatorTests  < WxRuby::Test::GUITests
     @text = Wx::TextCtrl.new(frame_win, name: 'Text')
   end
 
-  def cleanup
-    @text.destroy if @text
-    @text = nil
-    super
-  end
-
   def teardown
     @text.destroy if @text
     @text = nil
@@ -78,12 +72,6 @@ class TextValidatorTests < WxRuby::Test::GUITests
     @text = nil
   end
 
-  def cleanup
-    @text.destroy if @text
-    @text = nil
-    super
-  end
-
   def teardown
     @text.destroy if @text
     @text = nil
@@ -300,12 +288,6 @@ class IntegerValidatorTests < WxRuby::Test::GUITests
     @text = Wx::TextCtrl.new(frame_win, name: 'Text')
   end
 
-  def cleanup
-    @text.destroy if @text
-    @text = nil
-    super
-  end
-
   def teardown
     @text.destroy if @text
     @text = nil
@@ -408,12 +390,6 @@ class UnsignedValidatorTests < WxRuby::Test::GUITests
     @text = Wx::TextCtrl.new(frame_win, name: 'Text')
   end
 
-  def cleanup
-    @text.destroy if @text
-    @text = nil
-    super
-  end
-
   def teardown
     @text.destroy if @text
     @text = nil
@@ -519,12 +495,6 @@ class FloatValidatorTests < WxRuby::Test::GUITests
     @text = Wx::TextCtrl.new(frame_win, name: 'Text')
   end
 
-  def cleanup
-    @text.destroy if @text
-    @text = nil
-    super
-  end
-
   def teardown
     @text.destroy if @text
     @text = nil
@@ -638,12 +608,6 @@ class GenericValidatorTests  < WxRuby::Test::GUITests
     @control = nil
   end
 
-  def cleanup
-    @control.destroy if @control
-    @control = nil
-    super
-  end
-
   def teardown
     @control.destroy if @control
     @control = nil
@@ -717,6 +681,36 @@ class GenericValidatorTests  < WxRuby::Test::GUITests
     assert_equal(75, integer_store)
   end
 
+  def test_toggle_ctrl
+    self.control = Wx::ToggleButton.new(frame_win, label: 'Button', validator: Wx::GenericValidator.new)
+
+    assert_false(control.value)
+    assert_nil(control.validator.value)
+
+    control.validator.value = true
+    assert_true(control.transfer_data_to_window)
+    assert_true(control.value)
+
+    control.set_value(false)
+    assert_true(control.transfer_data_from_window)
+    assert_false(control.validator.value)
+  end
+
+  def test_bitmap_toggle_ctrl
+    self.control = Wx::BitmapToggleButton.new(frame_win, label: Wx::ArtProvider.get_bitmap(Wx::ART_BUTTON), validator: Wx::GenericValidator.new)
+
+    assert_false(control.value)
+    assert_nil(control.validator.value)
+
+    control.validator.value = true
+    assert_true(control.transfer_data_to_window)
+    assert_true(control.value)
+
+    control.set_value(false)
+    assert_true(control.transfer_data_from_window)
+    assert_false(control.validator.value)
+  end
+
   def test_single_list_ctrl
     self.control = Wx::ListBox.new(frame_win, choices: %w[First Second Third Fourth Fifth], name: 'List', validator: Wx::GenericValidator.new)
 
@@ -749,6 +743,55 @@ class GenericValidatorTests  < WxRuby::Test::GUITests
     assert_equal([0, 2, 4], control.validator.value)
   end
 
+  def test_checklist_ctrl
+    self.control = Wx::CheckListBox.new(frame_win, choices: %w[First Second Third Fourth Fifth], style: Wx::LB_MULTIPLE, name: 'List', validator: Wx::GenericValidator.new)
+
+    assert_equal(0, control.checked_items.size)
+    assert_nil(control.validator.value)
+
+    control.validator.value = [1, 3]
+    assert_true(control.transfer_data_to_window)
+    assert_equal([1,3], control.checked_items)
+
+    control.count.times { |i| control.check(i, false) }
+    [0, 2, 4].each { |i| control.check(i, true) }
+    assert_true(control.transfer_data_from_window)
+    assert_equal([0, 2, 4], control.validator.value)
+  end
+
+  class MyCheckListBox < Wx::CheckListBox; end
+
+  def test_my_checklist_ctrl
+    self.control = MyCheckListBox.new(frame_win, choices: %w[First Second Third Fourth Fifth], style: Wx::LB_MULTIPLE, name: 'List', validator: Wx::GenericValidator.new)
+
+    assert_equal(0, control.checked_items.size)
+    assert_nil(control.validator.value)
+
+    control.validator.value = [1, 3]
+    assert_true(control.transfer_data_to_window)
+    assert_equal([1,3], control.checked_items)
+
+    control.count.times { |i| control.check(i, false) }
+    [0, 2, 4].each { |i| control.check(i, true) }
+    assert_true(control.transfer_data_from_window)
+    assert_equal([0, 2, 4], control.validator.value)
+  end
+
+  def test_colour_picker_ctrl
+    self.control = Wx::ColourPickerCtrl.new(frame_win, colour: Wx::RED, validator: Wx::GenericValidator.new)
+
+    assert_equal('RED', control.colour.as_string(Wx::C2S_NAME).upcase)
+    assert_nil(control.validator.value)
+
+    control.validator.value = Wx::BLACK
+    assert_true(control.transfer_data_to_window)
+    assert_equal('BLACK', control.colour.as_string(Wx::C2S_NAME).upcase)
+
+    control.set_colour(Wx::BLUE)
+    assert_true(control.transfer_data_from_window)
+    assert_equal('BLUE', control.validator.value.as_string(Wx::C2S_NAME).upcase)
+  end
+
   class Model
 
     def initialize

data/tests/test_variant.rb

@@ -4,7 +4,7 @@
 
 require_relative './lib/wxapp_runner'
 
-class TestVariant < Test::Unit::TestCase
+class TestVariant < WxRuby::Test::Unit
 
   def test_basics
     var = Wx::Variant.new('text variant')

data/tests/test_window.rb

@@ -11,7 +11,7 @@ class WindowTests < WxRuby::Test::GUITests
     @window = Wx::Window.new(frame_win)
   end
 
-  def cleanup
+  def teardown
     frame_win.destroy_children
     @window = nil
     super
@@ -112,7 +112,7 @@ class WindowTests < WxRuby::Test::GUITests
       caret = nil
   
       # Try creating the caret in two different, but normally equivalent, ways.
-      assert_nothing_raised("Caret 1-step") do
+      assert_nothing_raised do
         caret = Wx::Caret.new(window, [16, 16])
 
         window.set_caret(caret)
@@ -120,7 +120,7 @@ class WindowTests < WxRuby::Test::GUITests
         assert(window.get_caret.ok?)
       end
   
-      assert_nothing_raised("Caret 2-step") do
+      assert_nothing_raised do
         caret = Wx::Caret.new
         caret.create(window, [16, 16])
 
@@ -192,20 +192,20 @@ class WindowTests < WxRuby::Test::GUITests
   end
 
   def test_parent
-    assert_equal(nil, window.get_grand_parent)
+    assert_nil(window.get_grand_parent)
     assert_equal(frame_win, window.get_parent)
   end
 
   def test_sibling
-    assert_equal(nil, window.get_next_sibling)
-    assert_equal(nil, window.get_prev_sibling)
+    assert_nil(window.get_next_sibling)
+    assert_nil(window.get_prev_sibling)
 
     newwin = Wx::Window.new(frame_win, Wx::ID_ANY)
 
     assert_equal(newwin, window.get_next_sibling)
-    assert_equal(nil, window.get_prev_sibling)
+    assert_nil(window.get_prev_sibling)
 
-    assert_equal(nil, newwin.get_next_sibling)
+    assert_nil(newwin.get_next_sibling)
     assert_equal(window, newwin.get_prev_sibling)
   end
 
@@ -347,8 +347,8 @@ class WindowTests < WxRuby::Test::GUITests
     assert_equal(window, Wx::Window.find_window_by_name("name"))
     assert_equal(window, Wx::Window.find_window_by_label("label"))
 
-    assert_equal(nil, Wx::Window.find_window_by_id(Wx::ID_HIGHEST + 3))
-    assert_equal(nil, Wx::Window.find_window_by_name("noname"))
-    assert_equal(nil, Wx::Window.find_window_by_label("nolabel"))
+    assert_nil(Wx::Window.find_window_by_id(Wx::ID_HIGHEST + 3))
+    assert_nil(Wx::Window.find_window_by_name("noname"))
+    assert_nil(Wx::Window.find_window_by_label("nolabel"))
   end
 end

data/tests/testapp.rb

@@ -2,7 +2,7 @@
 #
 # This software is released under the MIT license.
 
-require 'test/unit'
+require_relative './lib/wxrb_test'
 require 'wx'
 
 class TestingFrame < Wx::Frame
@@ -30,7 +30,7 @@ class AppWithSimpleFrame < Wx::App
     end
 end
 
-class TestApp < Test::Unit::TestCase
+class TestApp < Minitest::Test
   def test_self_closing_frame
     o = AppWithSimpleFrame.new
     o.run

data/tests/testapp_noframe.rb

@@ -2,7 +2,7 @@
 #
 # This software is released under the MIT license.
 
-require 'test/unit'
+require_relative './lib/wxrb_test'
 require 'wx'
 
 class AppReturnsFalseFromInit < Wx::App
@@ -16,7 +16,7 @@ class AppReturnsFalseFromInit < Wx::App
     
 end
 
-class TestApp < Test::Unit::TestCase
+class TestApp < Minitest::Test
   def test_return_false_from_init
     o = AppReturnsFalseFromInit.new
     o.run