wxruby3 1.6.0 → 1.7.0

data/tests/lib/wxframe_runner.rb

@@ -36,11 +36,13 @@ module WxRuby
         @frame.show
       end
 
-      def on_idle(_evt)
-        done = @tests_have_run
-        @tests_have_run = true
-        @result = @start_mtd.bind(@test_runner).call unless done
-        self.exit_main_loop
+      def on_idle(evt)
+        unless @tests_have_run
+          @tests_have_run = true
+          @result = run_all_tests
+          self.exit_main_loop
+        end
+        evt.skip
       end
 
       attr_reader :frame
@@ -70,15 +72,13 @@ module WxRuby
       end
     end
 
-    class GUITests < ::Test::Unit::TestCase
+    class GUITests < Test::Unit
 
-      setup
-      def base_setup
+      def after_setup
         10.times { Wx.get_app.yield }
       end
 
-      cleanup
-      def base_cleanup
+      def after_teardown
         10.times { Wx.get_app.yield }
         GC.start
       end
@@ -172,8 +172,20 @@ module WxRuby
 
       end
 
+      def self.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 yield_for_a_while(msec)
+        GUITests.yield_for_a_while(msec)
+      end
+
       def self.has_ui_simulator?
-        Wx.has_feature?(:USE_UIACTIONSIMULATOR) && (Wx::PLATFORM != 'WXOSX' || Wx::WXWIDGETS_VERSION >= '3.3')
+        Wx.has_feature?(:USE_UIACTIONSIMULATOR) && (Wx::PLATFORM != 'WXGTK' || !uses_wayland?) && (Wx::PLATFORM != 'WXOSX' || Wx::WXWIDGETS_VERSION >= '3.3')
       end
 
       def has_ui_simulator?

data/tests/lib/wxrb_test.rb

@@ -0,0 +1,58 @@
+# Copyright (c) 2023 M.J.N. Corino, The Netherlands
+#
+# This software is released under the MIT license.
+
+require 'minitest'
+require 'minitest/autorun'
+
+module Minitest
+
+  module Assertions
+
+    alias :assert_block :assert
+
+    alias :assert_raise :assert_raises
+
+    def assert_nothing_raised(&block)
+      yield
+    end
+
+    def assert_true(test, msg = nil)
+      assert(test == true, msg || "Expected #{mu_pp test} to be true.")
+    end
+
+    def assert_false(test, msg = nil)
+      assert(test == false, msg || "Expected #{mu_pp test} to be false.")
+    end
+
+    def assert_not_nil(test, msg = nil)
+      assert(!test.nil?, msg || "Expected #{mu_pp test} to be not nil.")
+    end
+
+    def assert_all?(enum, msg = nil)
+      assert(enum.all? { |e| yield(e) }, msg)
+    end
+
+    def assert_not_empty(obj, msg = nil)
+      assert_respond_to obj, :empty?, include_all:true
+      assert(!obj.empty?, msg || "Expected #{mu_pp obj} to be not empty.")
+    end
+
+    def assert_not_equal(exp, act, msg = nil)
+      assert(!(exp == act), msg || "Expected #{mu_pp act} to be not equal to #{mu_pp exp}.")
+    end
+
+    def assert_not_kind_of(cls, obj, msg = nil)
+      msg = message(msg) {
+        "Expected #{mu_pp obj} to not be a kind of #{cls}"
+      }
+      assert !obj.kind_of?(cls), msg
+    end
+
+    def assert_boolean(val, msg = nil)
+      assert(val==true || val==false, msg || "Expected #{mu_pp val} to be true or false.")
+    end
+
+  end
+
+end

data/tests/test_app_event_filter.rb

@@ -4,7 +4,7 @@
 
 require_relative './lib/wxapp_runner'
 
-class AppEventFilterTests < Test::Unit::TestCase
+class AppEventFilterTests < WxRuby::Test::Unit
 
   class TestEvent < Wx::Event
     EVT_TEST_EVENT = Wx::EvtHandler.register_class(self, nil, 'evt_test_event', 0)

data/tests/test_app_exit_exception.rb

@@ -2,10 +2,10 @@
 #
 # This software is released under the MIT license.
 
-require 'test/unit'
+require_relative './lib/wxrb_test'
 require 'wx'
 
-class TestApp < Test::Unit::TestCase
+class TestApp < Minitest::Test
 
   class TestFrame < Wx::Frame
     def initialize
@@ -30,7 +30,7 @@ class TestApp < Test::Unit::TestCase
   end
 
   def test_self_closing_frame
-    assert_raise_kind_of(RuntimeError) { TestApp.run }
+    assert_raises(RuntimeError) { TestApp.run }
   end
 
 end

data/tests/test_app_init_exception.rb

@@ -2,10 +2,10 @@
 #
 # This software is released under the MIT license.
 
-require 'test/unit'
+require_relative './lib/wxrb_test'
 require 'wx'
 
-class AppInitExitExceptions < Test::Unit::TestCase
+class AppInitExitExceptions < Minitest::Test
 
   class TestApp < Wx::App
     def on_init
@@ -14,7 +14,7 @@ class AppInitExitExceptions < Test::Unit::TestCase
   end
 
   def test_on_init_exception
-    assert_raise_kind_of(RuntimeError) { TestApp.run }
+    assert_raises(RuntimeError) { TestApp.run }
   end
 
 end

data/tests/test_app_traits.rb

@@ -4,30 +4,33 @@
 
 require_relative './lib/wxapp_runner'
 
-class AppTraitsTests < Test::Unit::TestCase
+class AppTraitsTests < WxRuby::Test::Unit
 
   def test_traits
-    traits = Wx.get_app.get_traits
-    assert_not_nil(traits)
-    assert_kind_of(Wx::AppTraits, traits)
-    port_id, ver_major, ver_minor, ver_micro = traits.get_toolkit_version
-    port = case port_id
-           when Wx::PortId::PORT_GTK; 'WXGTK'
-           when Wx::PortId::PORT_MAC; 'WXOSX'
-           when Wx::PortId::PORT_MSW; 'WXMSW'
-           else
-             nil
-           end
-    assert_equal(Wx::PLATFORM, port)
-    assert_true(Wx::PlatformInfo.instance.check_toolkit_version(ver_major, ver_minor, ver_micro))
+    10.times do
+      traits = Wx.get_app.get_traits
+      assert_not_nil(traits)
+      assert_kind_of(Wx::AppTraits, traits)
+      port_id, ver_major, ver_minor, ver_micro = traits.get_toolkit_version
+      port = case port_id
+             when Wx::PortId::PORT_GTK; 'WXGTK'
+             when Wx::PortId::PORT_MAC; 'WXOSX'
+             when Wx::PortId::PORT_MSW; 'WXMSW'
+             else
+               nil
+             end
+      assert_equal(Wx::PLATFORM, port)
+      assert_true(Wx::PlatformInfo.instance.check_toolkit_version(ver_major, ver_minor, ver_micro))
 
-    std_paths = traits.get_standard_paths
-    assert_not_nil(std_paths)
-    assert_kind_of(Wx::StandardPaths, std_paths)
-    assert_not_empty(std_paths.config_dir)
-    assert_not_empty(std_paths.data_dir)
-    assert_not_empty(std_paths.documents_dir)
-    assert_not_empty(std_paths.app_documents_dir)
+      std_paths = traits.get_standard_paths
+      assert_not_nil(std_paths)
+      assert_kind_of(Wx::StandardPaths, std_paths)
+      assert_not_empty(std_paths.config_dir)
+      assert_not_empty(std_paths.data_dir)
+      assert_not_empty(std_paths.documents_dir)
+      assert_not_empty(std_paths.app_documents_dir)
+      GC.start
+    end
   end
 
 end

data/tests/test_art.rb

@@ -4,7 +4,7 @@
 
 require_relative './lib/wxapp_runner'
 
-class TestArt < Test::Unit::TestCase
+class TestArt < WxRuby::Test::Unit
 
   def test_icons
     icons = []
@@ -67,7 +67,7 @@ class TestArt < Test::Unit::TestCase
       cursor = Wx.Cursor(:wxruby)
     end
     assert_instance_of(Wx::Cursor, cursor)
-    assert { cursor.ok? }
+    assert(cursor.ok?)
   end
 
   end
@@ -107,16 +107,16 @@ class TestArt < Test::Unit::TestCase
       art = Wx::ArtLocator.find_art(:sample, art_section: 'my_art')
     end
     assert_not_nil(art)
-    assert { File.exist?(art) }
+    assert(File.exist?(art))
     assert_equal('sample', File.basename(art, '.*'))
     img = Wx::Image.new(art)
-    assert { img.ok? }
+    assert(img.ok?)
     img = Wx.Image(:sample, art_section: 'my_art')
-    assert { img.ok? }
+    assert(img.ok?)
     bmp = Wx.Bitmap(:sample, art_section: 'my_art')
-    assert { bmp.ok? }
+    assert(bmp.ok?)
     icon = Wx.Icon(:sample, art_section: 'my_art')
-    assert { icon.ok? }
+    assert(icon.ok?)
   end
 
 end

data/tests/test_art_provider.rb

@@ -4,7 +4,7 @@
 
 require_relative './lib/wxapp_runner'
 
-class TestArtProvider < Test::Unit::TestCase
+class TestArtProvider < WxRuby::Test::Unit
 
   class MyArtProvider < Wx::ArtProvider
 

data/tests/test_basic.rb

@@ -2,10 +2,10 @@
 #
 # This software is released under the MIT license.
 
-require 'test/unit'
+require_relative './lib/wxrb_test'
 require 'wx'
 
-class BasicTests < Test::Unit::TestCase
+class BasicTests < Minitest::Test
 
   def test_versions
     assert_equal(Wx::WXRUBY_VERSION, "#{Wx::WXRUBY_MAJOR}.#{Wx::WXRUBY_MINOR}.#{Wx::WXRUBY_RELEASE}#{Wx::WXRUBY_RELEASE_TYPE.empty? ? '' : '-'+Wx::WXRUBY_RELEASE_TYPE}")

data/tests/test_book_controls.rb

@@ -11,7 +11,7 @@ class BookCtrlTests < WxRuby::Test::GUITests
     @book = Wx::Choicebook.new(frame_win, name: 'ChoiceBook')
   end
 
-  def cleanup
+  def teardown
     @book.destroy
     super
     GC.start

data/tests/test_box_sizer.rb

@@ -14,7 +14,7 @@ class BoxSizerTests < WxRuby::Test::GUITests
     @win.sizer = @sizer
   end
 
-  def cleanup
+  def teardown
     frame_win.destroy_children
     @win = nil
     @sizer = nil

data/tests/test_clipboard.rb

@@ -4,7 +4,7 @@
 
 require_relative './lib/wxapp_runner'
 
-class TestTextData < Test::Unit::TestCase
+class TestTextData < WxRuby::Test::Unit
   # Using an in-built class
   def test_text_data
     td = Wx::TextDataObject.new('WXRUBY')
@@ -38,7 +38,7 @@ class TestTextData < Test::Unit::TestCase
 end
 
 if Wx.has_feature?(:USE_HTML) && Wx::WXWIDGETS_VERSION >= '3.3'
-  class TestHtmlData < Test::Unit::TestCase
+  class TestHtmlData < WxRuby::Test::Unit
     # Using an in-built class
     def test_text_data
       td = Wx::HTMLDataObject.new('<html><body><h1>Header</h1></body></html>')
@@ -73,7 +73,7 @@ if Wx.has_feature?(:USE_HTML) && Wx::WXWIDGETS_VERSION >= '3.3'
   end
 end
 
-class TestBitmapData < Test::Unit::TestCase
+class TestBitmapData < WxRuby::Test::Unit
   def test_bitmap_data
     bmp = Wx::Bitmap.new(File.join(__dir__, '../samples/minimal/mondrian.png'))
     height = bmp.height
@@ -103,7 +103,7 @@ class TestBitmapData < Test::Unit::TestCase
   end
 end
 
-class TestDataObjectComposite < Test::Unit::TestCase
+class TestDataObjectComposite < WxRuby::Test::Unit
   MY_INT_ARRAY_FORMAT = Wx::DataFormat.new('application/int_array_format')
 
   class MySimpleIntArrayObject < Wx::DataObjectSimpleBase
@@ -241,7 +241,7 @@ class TestDataObjectComposite < Test::Unit::TestCase
   end
 end
 
-class TestDataObject < Test::Unit::TestCase
+class TestDataObject < WxRuby::Test::Unit
   MY_CUSTOM_FORMAT = Wx::DataFormat.new('text/custom_format')
   MY_CUSTOM_TEXT = Wx::DataFormat.new('text/custom_text')
 

data/tests/test_combo_ctrl.rb

@@ -83,7 +83,7 @@ class ComboCtrlCtrlTests < WxRuby::Test::GUITests
     @combo.set_popup_control(LVComboPopup.new)
   end
 
-  def cleanup
+  def teardown
     @combo.destroy
     super
   end
@@ -162,7 +162,7 @@ class OwnerDrawnCBTests < WxRuby::Test::GUITests
     @combo = TestODComboBox.new(frame_win, name: 'ODComboBox')
   end
 
-  def cleanup
+  def teardown
     @combo.destroy
     super
   end

data/tests/test_config.rb

@@ -4,7 +4,7 @@
 
 require_relative './lib/wxapp_runner'
 
-class TestConfig < Test::Unit::TestCase
+class TestConfig < WxRuby::Test::Unit
 
   DEMO_CONFIG = {
     'RootEntry1' => 'This is a string value',
@@ -313,6 +313,16 @@ class TestConfig < Test::Unit::TestCase
     assert_true(hlp_cfg.has_entry?('/htmlHelpCopy/hcY'))
     assert_true(hlp_cfg.has_entry?('/htmlHelpCopy/hcW'))
     assert_true(hlp_cfg.has_entry?('/htmlHelpCopy/hcH'))
+
+    if ::Wx::WXWIDGETS_VERSION >= '3.3.2'
+      # prevent problems with stale config instances when controller is GC-ed after
+      # another test alters the global config instance
+      hlp_ctrl.use_config(nil)
+    else # workaround for older wxw
+      # clean up; force GC of help controller before the used config get's deleted
+      hlp_ctrl = nil
+      GC.start
+    end
   end
 
 end

data/tests/test_dc.rb

@@ -4,7 +4,7 @@
 
 require_relative './lib/wxapp_runner'
 
-class TestDC < Test::Unit::TestCase
+class TestDC < WxRuby::Test::Unit
 
   def test_memory_dc
     bmp = Wx::Bitmap.new(100, 100)

data/tests/test_dialog.rb

@@ -4,7 +4,7 @@
 
 require_relative './lib/wxapp_runner'
 
-class DialogTests < Test::Unit::TestCase
+class DialogTests < WxRuby::Test::Unit
 
   class TestDialog < Wx::Dialog
     def initialize

data/tests/test_event_handling.rb

@@ -4,7 +4,7 @@
 
 require_relative './lib/wxapp_runner'
 
-class EventHandlingTests < Test::Unit::TestCase
+class EventHandlingTests < WxRuby::Test::Unit
 
   class TestEvent < Wx::Event
     EVT_TEST_EVENT = Wx::EvtHandler.register_class(self, nil, 'evt_test_event', 0)

data/tests/test_events.rb

@@ -4,7 +4,7 @@
 
 require_relative './lib/wxapp_runner'
 
-class EventTests < Test::Unit::TestCase
+class EventTests < WxRuby::Test::Unit
 
   def test_event
     evt = Wx::Event.new(100, 1)

data/tests/test_exceptions.rb

@@ -2,11 +2,11 @@
 #
 # This software is released under the MIT license.
 
-require 'test/unit'
+require_relative './lib/wxrb_test'
 require 'plat4m'
 require 'open3'
 
-class DirectorExceptionTests < Test::Unit::TestCase
+class DirectorExceptionTests < Minitest::Test
 
   # Path to the currently running Ruby program
   RUBY = ENV["RUBY"] || File.join(

data/tests/test_ext_controls.rb

@@ -14,7 +14,7 @@ class SearchCtrlTests < WxRuby::Test::GUITests
     @search = Wx::SearchCtrl.new(frame_win, name: 'SearchCtrl')
   end
 
-  def cleanup
+  def teardown
     @search.destroy
     super
   end
@@ -35,7 +35,7 @@ class CalendarCtrlTests < WxRuby::Test::GUITests
     @cal = Wx::CalendarCtrl.new(frame_win, name: 'Calendar')
   end
 
-  def cleanup
+  def teardown
     @cal.destroy
     super
   end
@@ -65,7 +65,7 @@ class HyperlinkCtrlTests < WxRuby::Test::GUITests
     @link = Wx::HyperlinkCtrl.new(frame_win, label: 'Hyperlink', url: 'https://mcorino.github.io/wxRuby3/Wx/HyperlinkCtrl.html', name: 'Hyperlink')
   end
 
-  def cleanup
+  def teardown
     @link.destroy
     super
   end
@@ -85,7 +85,7 @@ class BannerWindowTests < WxRuby::Test::GUITests
     @banner = Wx::BannerWindow.new(frame_win, dir: Wx::Direction::TOP)
   end
 
-  def cleanup
+  def teardown
     @banner.destroy
     super
   end
@@ -106,7 +106,7 @@ class InfoBarTests < WxRuby::Test::GUITests
     @info = Wx::InfoBar.new(frame_win)
   end
 
-  def cleanup
+  def teardown
     @info.destroy
     super
   end
@@ -130,7 +130,7 @@ class CommandLinkButtonTests < WxRuby::Test::GUITests
     @button = Wx::CommandLinkButton.new(frame_win, mainLabel: 'CommandLinkButton', note: 'Testing CommandLinkButton')
   end
 
-  def cleanup
+  def teardown
     @button.destroy
     super
   end
@@ -189,7 +189,7 @@ class SpinCtrlTests < WxRuby::Test::GUITests
     @spin = Wx::SpinCtrl.new(frame_win, name: 'SpinCtrl')
   end
 
-  def cleanup
+  def teardown
     @spin.destroy
     super
   end
@@ -230,7 +230,7 @@ class SpinCtrlDoubleTests < WxRuby::Test::GUITests
     @spin = Wx::SpinCtrlDouble.new(frame_win, name: 'SpinCtrlDouble')
   end
 
-  def cleanup
+  def teardown
     @spin.destroy
     super
   end
@@ -274,7 +274,7 @@ class RearrangeListTests < WxRuby::Test::GUITests
     @list = Wx::RearrangeList.new(frame_win, items: %w[first second third], order: [~1, ~2, 0])
   end
 
-  def cleanup
+  def teardown
     @list.destroy
     super
   end
@@ -299,7 +299,7 @@ class RearrangeCtrlTests < WxRuby::Test::GUITests
     @ra_ctrl = Wx::RearrangeCtrl.new(frame_win, items: %w[first second third], order: [~1, ~2, 0])
   end
 
-  def cleanup
+  def teardown
     @ra_ctrl.destroy
     super
   end

data/tests/test_file_dialog.rb

@@ -4,7 +4,7 @@
 
 require_relative './lib/wxapp_runner'
 
-class FileDialogTests < Test::Unit::TestCase
+class FileDialogTests < WxRuby::Test::Unit
 
   def dialog_tester(dlg, rc=Wx::ID_OK)
     if Wx::PLATFORM == 'WXGTK'

data/tests/test_font.rb

@@ -4,7 +4,7 @@
 
 require_relative './lib/wxapp_runner'
 
-class FontTests < Test::Unit::TestCase
+class FontTests < WxRuby::Test::Unit
 
   def get_test_fonts
     [

data/tests/test_gdi_object.rb

@@ -4,7 +4,7 @@
 
 require_relative './lib/wxapp_runner'
 
-class TestGDIObjects < Test::Unit::TestCase
+class TestGDIObjects < WxRuby::Test::Unit
 
   def test_icon
     ico = Wx::Icon(:sample3)

data/tests/test_geometry.rb

@@ -2,10 +2,10 @@
 #
 # This software is released under the MIT license.
 
-require 'test/unit'
+require_relative './lib/wxrb_test'
 require 'wx'
 
-class GeometryTests < Test::Unit::TestCase
+class GeometryTests < Minitest::Test
 
   def test_size
     sz = Wx::Size.new(10, 20)

data/tests/test_grid_sizer.rb

@@ -14,7 +14,7 @@ class GridSizerTests < WxRuby::Test::GUITests
     @win.set_sizer(@sizer)
   end
 
-  def cleanup
+  def teardown
     frame_win.destroy_children
     @win = nil
     @sizer = nil
@@ -55,7 +55,7 @@ class FlexGridSizerTests < WxRuby::Test::GUITests
     @win.set_sizer(@sizer)
   end
 
-  def cleanup
+  def teardown
     frame_win.destroy_children
     @win = nil
     @sizer = nil

data/tests/test_intl.rb

@@ -4,7 +4,7 @@
 
 require_relative './lib/wxapp_runner'
 
-class TestInternationalisation < Test::Unit::TestCase
+class TestInternationalisation < WxRuby::Test::Unit
   def test_encodings
     default = Wx::Font.get_default_encoding
     assert_kind_of(Wx::FontEncoding, default)