wxruby3 1.7.0 → 1.8.1

data/tests/test_media_ctrl.rb

@@ -13,7 +13,9 @@ class MediaCtrlTests < WxRuby::Test::GUITests
 
   def setup
     super
+    @media_loaded = false
     @media = Wx::MediaCtrl.new(frame_win)
+    frame_win.evt_media_loaded(@media) {|_| @media_loaded = true }
   end
 
   def teardown
@@ -22,15 +24,21 @@ class MediaCtrlTests < WxRuby::Test::GUITests
   end
 
   attr_reader :media
+  attr_accessor :media_loaded
 
   def test_uri
-    # just checking if Ruby URI is properly mapped
-    # it doesn't seem the mediactrl returns a very consistent result whether the resource is not a media file
-    # or if it is a non-existing file so only check whether it is a boolean return.
+    self.media_loaded = false
     uri = URI("file://#{File.join(__dir__, 'media/beep_lo.wav')}")
-    assert_boolean(media.load(uri))
-    uri = URI("file://#{File.join(__dir__, 'art/test_art/image/wxruby.png')}")
-    assert_boolean(media.load(uri))
+    assert_true(media.load(uri))
+    yield_and_wait_for_test(5000) { self.media_loaded }
+    assert_true(self.media_loaded) unless is_msw?
+    unless is_macos? || is_msw?
+      self.media_loaded = false
+      uri = URI("file://#{File.join(__dir__, 'art/test_art/image/wxruby.png')}")
+      assert_true(media.load(uri))
+      yield_and_wait_for_test(5000) { self.media_loaded }
+      assert_true(self.media_loaded)
+    end
   end
 
 end

data/tests/test_menu.rb

@@ -4,92 +4,98 @@
 
 require_relative './lib/wxframe_runner'
 
-# 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 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')
+    submenu = Wx::Menu.new
+    submenu.append_radio_item(Wx::ID_HIGHEST+8, 'Circle', 'Circle')
+    submenu.append_radio_item(Wx::ID_HIGHEST+9, 'Rectangle', 'Rectangle')
+    submenu.append_radio_item(Wx::ID_HIGHEST+10, 'Square', 'Square')
+    mi = Wx::MenuItem.new(@menu, Wx::ID_HIGHEST+7, 'Submenu', 'Open submenu', Wx::ITEM_NORMAL, submenu)
+    @menu.append(mi)
+    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(9, 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
 
@@ -127,9 +133,11 @@ class UnattachedMenuTests < WxRuby::Test::GUITests
     yield_for_a_while(200)
     GC.start
     @menu_bar.append(@menu, "&Test")
+    @menu = nil
     yield_for_a_while(200)
     GC.start
     frame_win.menu_bar = @menu_bar
+    @menu_bar = nil
     yield_for_a_while(200)
     GC.start
     frame_win.menu_bar = nil

data/tests/test_persistence.rb

@@ -53,7 +53,7 @@ class TopLevelPersistenceTests < WxRuby::Test::GUITests
   end
 
   # default registry based config does not seem to do well in CI build env
-  unless is_ci_build? && Wx::PLATFORM == 'WXMSW'
+  unless is_ci_build? && is_msw?
 
   def test_frame_props_default_config
     # force creation of default C++ config instance

data/tests/test_proof_check.rb

@@ -27,9 +27,9 @@ class MultilineProofCheckTests < WxRuby::Test::GUITests
       Wx.get_app.yield
       proof_opts = text.get_proof_check_options
       assert_instance_of(Wx::TextProofOptions, proof_opts)
-      assert_true(proof_opts.is_spell_check_enabled) unless Wx::PLATFORM == 'WXGTK'
+      assert_true(proof_opts.is_spell_check_enabled) unless is_gtk?
       assert_false(proof_opts.is_grammar_check_enabled)
-      if Wx::PLATFORM != 'WXMSW' || Wx::WXWIDGETS_VERSION >= '3.3'
+      if !is_msw? || Wx::WXWIDGETS_VERSION >= '3.3'
         assert_true(text.enable_proof_check(Wx::TextProofOptions.disable))
       else
         assert_false(text.enable_proof_check(Wx::TextProofOptions.disable)) # incorrect return value for WXMSW
@@ -37,13 +37,13 @@ class MultilineProofCheckTests < WxRuby::Test::GUITests
       Wx.get_app.yield
       proof_opts = text.get_proof_check_options
       assert_instance_of(Wx::TextProofOptions, proof_opts)
-      assert_false(proof_opts.is_spell_check_enabled) unless Wx::PLATFORM == 'WXGTK'
+      assert_false(proof_opts.is_spell_check_enabled) unless is_gtk?
       assert_false(proof_opts.is_grammar_check_enabled)
       assert_true(text.enable_proof_check(Wx::TextProofOptions.default.grammar_check(true)))
       Wx.get_app.yield
       proof_opts = text.get_proof_check_options
-      assert_true(proof_opts.is_spell_check_enabled) unless Wx::PLATFORM == 'WXGTK'
-      assert_true(proof_opts.is_grammar_check_enabled) if Wx::PLATFORM == 'WXOSX'
+      assert_true(proof_opts.is_spell_check_enabled) unless is_gtk?
+      assert_true(proof_opts.is_grammar_check_enabled) if is_macos?
 
     end
 

data/tests/test_propgrid.rb

@@ -180,7 +180,7 @@ class PropGridTests < WxRuby::Test::GUITests
     prop.set_attribute(Wx::PG::PG_DIALOG_TITLE,"Custom File Dialog Title")
     prop.set_attribute(Wx::PG::PG_FILE_SHOW_FULL_PATH,false)
 
-    if Wx::PLATFORM == 'WXMSW'
+    if is_msw?
       prop.set_attribute(Wx::PG::PG_FILE_SHOW_RELATIVE_PATH,"C:\\Windows")
       pg.set_property_value(prop,"C:\\Windows\\System32\\msvcrt71.dll")
     end

data/tests/test_shared_event_handler.rb

@@ -0,0 +1,141 @@
+# Copyright (c) 2023 M.J.N. Corino, The Netherlands
+#
+# This software is released under the MIT license.
+
+require_relative './lib/wxframe_runner'
+
+class TestEvent < Wx::RT::ThreadEvent
+  EVT_TEST_EVENT = Wx::EvtHandler.register_class(TestEvent, nil, 'evt_test_event', 0)
+
+  def initialize(id=0)
+    super(EVT_TEST_EVENT, id)
+  end
+end
+
+
+class WindowTests < WxRuby::Test::GUITests
+
+  def test_shared_handler
+    seh = frame_win.make_shared
+    assert_kind_of(Wx::RT::SharedEvtHandler, seh)
+    assert_true(Ractor.shareable?(seh))
+    seh2 = Ractor.make_shareable(seh)
+    assert_true(Ractor.shareable?(seh2))
+    assert_equal(seh, seh2)
+    seh3 = seh2.clone
+    assert_true(Ractor.shareable?(seh3))
+    assert_kind_of(Wx::RT::SharedEvtHandler, seh3)
+    assert_not_equal(seh, seh3)
+  end
+
+  def test_ractor_shareable
+    # unfortunately even in Ruby 4.0 Ractor is not 100% reliable on Windows
+    # and the CI builds block here from time to time so exclude this there
+    unless is_msw? && is_ci_build?
+      if RUBY_VERSION >= '4.0.0'
+        pin = Ractor::Port.new
+        pmon = Ractor::Port.new
+        seh = frame_win.make_shared
+        r = Ractor.new(seh, pin) do |seh_, pout|
+          pout.send(seh_.class)
+          pout.send(Ractor.shareable?(seh_))
+        end
+        r.monitor(pmon)
+        assert_equal(Wx::RT::SharedEvtHandler, pin.receive)
+        assert_true(pin.receive)
+        assert_equal(:exited, pmon.receive)
+      else
+        seh = frame_win.make_shared
+        r = Ractor.new(seh) do |seh_|
+          Ractor.yield(seh_.class)
+          Ractor.yield(Ractor.shareable?(seh_))
+          :exited
+        end
+        assert_equal(Wx::RT::SharedEvtHandler, r.take)
+        assert_true(r.take)
+        assert_equal(:exited, r.take)
+      end
+    end
+  end
+
+  def test_ractor_thread_event
+    if RUBY_VERSION >= '4.0.0'
+      pin = Ractor::Port.new
+      pmon = Ractor::Port.new
+      seh = frame_win.make_shared
+      data_sent = nil
+      frame_win.evt_thread(Wx::ID_ANY) { |evt| data_sent = evt.get_int }
+      r = Ractor.new(seh, pin) do |seh_, pout|
+        sleep rand(100) / 50.0
+        pout.send(1)
+        evt = Wx::RT::ThreadEvent.new
+        evt.set_int(1)
+        seh_.queue_event(evt)
+      end
+      r.monitor(pmon)
+
+      yield_and_wait_for_test(3000) { data_sent }
+      assert_not_nil(data_sent)
+      assert_equal(data_sent, pin.receive)
+      assert_equal(:exited, pmon.receive)
+    else
+      seh = frame_win.make_shared
+      data_sent = nil
+      frame_win.evt_thread(Wx::ID_ANY) { |evt| data_sent = evt.get_int }
+      r = Ractor.new(seh) do |seh_|
+        sleep rand(100) / 50.0
+        evt = Wx::RT::ThreadEvent.new
+        evt.set_int(1)
+        seh_.queue_event(evt)
+        Ractor.yield(1)
+        :exited
+      end
+      yield_and_wait_for_test(10000) { data_sent }
+      r.close_outgoing if data_sent.nil? # prevent blocking on yield if we're not going to take
+      assert_not_nil(data_sent)
+      assert_equal(data_sent, r.take)
+      assert_equal(:exited, r.take)
+    end
+  end
+
+  def test_ractor_derived_thread_event
+    if RUBY_VERSION >= '4.0.0'
+      pin = Ractor::Port.new
+      pmon = Ractor::Port.new
+      seh = frame_win.make_shared
+      data_sent = nil
+      frame_win.evt_test_event { |evt| data_sent = evt.get_int }
+      r = Ractor.new(seh, pin) do |seh_, pout|
+        sleep rand(100) / 50.0
+        pout.send(1)
+        evt = TestEvent.new
+        evt.set_int(1)
+        seh_.queue_event(evt)
+      end
+      r.monitor(pmon)
+
+      yield_and_wait_for_test(3000) { data_sent }
+      assert_not_nil(data_sent)
+      assert_equal(data_sent, pin.receive)
+      assert_equal(:exited, pmon.receive)
+    else
+      seh = frame_win.make_shared
+      data_sent = nil
+      frame_win.evt_test_event { |evt| data_sent = evt.get_int }
+      r = Ractor.new(seh) do |seh_|
+        sleep rand(100) / 50.0
+        evt = TestEvent.new
+        evt.set_int(1)
+        seh_.queue_event(evt)
+        Ractor.yield(1)
+        :exited
+      end
+      yield_and_wait_for_test(10000) { data_sent }
+      r.close_outgoing if data_sent.nil? # prevent blocking on yield if we're not going to take
+      assert_not_nil(data_sent)
+      assert_equal(data_sent, r.take)
+      assert_equal(:exited, r.take)
+    end
+  end
+
+end

data/tests/test_std_controls.rb

@@ -34,7 +34,7 @@ class ButtonTests < WxRuby::Test::GUITests
 
     # This test occasionally fails in MSW/OSX CI builds but rarely
     # in local builds
-    unless Wx::PLATFORM != 'WXGTK' && is_ci_build?
+    unless !is_gtk? && is_ci_build?
       assert_equal(1, count)
     end
   end
@@ -153,7 +153,7 @@ class TextCtrlTests < WxRuby::Test::GUITests
 
         # This test occasionally fails in MSW/OSX CI builds but rarely
         # in local builds
-        unless Wx::PLATFORM != 'WXGTK' && is_ci_build?
+        unless !is_gtk? && is_ci_build?
           assert_equal('Hello', text_entry.get_value)
           assert_equal(5, c_upd.count)
         end
@@ -163,7 +163,7 @@ class TextCtrlTests < WxRuby::Test::GUITests
 
         # This test occasionally fails in MSW/OSX CI builds but rarely
         # in local builds
-        unless Wx::PLATFORM != 'WXGTK' && is_ci_build?
+        unless !is_gtk? && is_ci_build?
           assert_equal('HelloWorld', text_entry.get_value)
           assert_equal(10, c_upd.count)
           assert_equal(0, c_maxlen.count)
@@ -173,7 +173,7 @@ class TextCtrlTests < WxRuby::Test::GUITests
 
         # This test occasionally fails in MSW/OSX CI builds but rarely
         # in local builds
-        unless Wx::PLATFORM != 'WXGTK' && is_ci_build?
+        unless !is_gtk? && is_ci_build?
           assert_equal('HelloWorld', text_entry.get_value)
           assert_equal(10, c_upd.count)
           assert_equal(1, c_maxlen.count)
@@ -502,7 +502,7 @@ class StaticBoxTests < WxRuby::Test::GUITests
     assert_equal(box, txt.parent)
   end
 
-  unless Wx::PLATFORM == 'WXOSX'
+  unless is_macos?
 
   def test_label_window
     check = Wx::CheckBox.new(frame_win, Wx::ID_ANY, 'Enable')