wxruby3 1.6.1 → 1.7.0

data/samples/dialogs/tip.xpm

@@ -0,0 +1,157 @@
+/* XPM */
+static const char *const tip_xpm[] = {
+/* columns rows colors chars-per-pixel */
+"32 32 119 2",
+"   c #141414",
+".  c #1B1B1B",
+"X  c #1F2527",
+"o  c #242525",
+"O  c #242728",
+"+  c #262A2B",
+"@  c #2B2B2B",
+"#  c #2A2E30",
+"$  c #2C3233",
+"%  c #2C3639",
+"&  c #2F3A3D",
+"*  c #313131",
+"=  c #303C3F",
+"-  c #2D3E42",
+";  c #323F42",
+":  c #33454A",
+">  c #34494F",
+",  c #324A50",
+"<  c #3B4E52",
+"1  c #2F5058",
+"2  c #325157",
+"3  c #3D545A",
+"4  c #3A5A62",
+"5  c #34606A",
+"6  c #3F616A",
+"7  c #464646",
+"8  c #4B4B4B",
+"9  c #41585E",
+"0  c gray33",
+"q  c #5D5D5D",
+"w  c #425B62",
+"e  c #456067",
+"r  c #46646B",
+"t  c #456972",
+"y  c #4B6972",
+"u  c #416F7A",
+"i  c #646464",
+"p  c gray42",
+"a  c #696F71",
+"s  c #767676",
+"d  c #787777",
+"f  c gray49",
+"g  c #3E7582",
+"h  c #3E7D8A",
+"j  c #417A86",
+"k  c #417F8E",
+"l  c #3E8494",
+"z  c #418595",
+"x  c #4D8995",
+"c  c #468D9E",
+"v  c #6B848A",
+"b  c #4795A7",
+"n  c #4F92A1",
+"m  c #4D9AAA",
+"M  c #5695A4",
+"N  c #55A2B3",
+"B  c #5FAABA",
+"V  c #7BA6AF",
+"C  c #4FAFC5",
+"Z  c #5DB7CA",
+"A  c #52BAD1",
+"S  c #58BDD4",
+"D  c #62C2D5",
+"F  c #64C3DA",
+"G  c #73C8DA",
+"H  c #7ECBDD",
+"J  c #868686",
+"K  c gray55",
+"L  c #9FA0A0",
+"P  c #98A8AB",
+"I  c #ADADAC",
+"U  c #AAB1B2",
+"Y  c #A8B9BD",
+"T  c gray70",
+"R  c #90C3CF",
+"E  c #87C8D7",
+"W  c #82CADA",
+"Q  c #91C8D4",
+"!  c #93CFDC",
+"~  c #98CEDB",
+"^  c #93D1DF",
+"/  c #9AD1DC",
+"(  c #A4CCD7",
+")  c #A3CFDA",
+"_  c #A1D0DB",
+"`  c #ACD1DA",
+"'  c #B2D6DE",
+"]  c #BCD7DD",
+"[  c #89D2E2",
+"{  c #9BD5E1",
+"}  c #A9DEE9",
+"|  c #BFE1E7",
+" . c #BDE3EB",
+".. c #C5C5C5",
+"X. c #CACACA",
+"o. c #C2D5D9",
+"O. c #C2D8DD",
+"+. c #CCD9DD",
+"@. c #D4DBDD",
+"#. c #DBDDDE",
+"$. c #E0DFDF",
+"%. c #CCDDE1",
+"&. c #D2DFE1",
+"*. c #CCE5EB",
+"=. c #D6E2E4",
+"-. c #DCE3E5",
+";. c #D4E6E9",
+":. c #DBE6E8",
+">. c #E2E4E4",
+",. c #E6E9E9",
+"<. c #ECECEC",
+"1. c #F1EFEF",
+"2. c #E1EDF0",
+"3. c #E9EFF0",
+"4. c #EEF3F3",
+"5. c #F5F5F4",
+"6. c #F8F7F7",
+"7. c #FBFBFA",
+"8. c None",
+/* pixels */
+"8.8.8.8.8.8.8.8.8.8.8.8.8.8.8.8.8.8.8.8.8.8.8.8.8.8.8.8.8.8.8.8.",
+"8.8.8.8.8.8.8.8.8.8.8.o o o o @ @ o o o o 8.8.8.8.8.8.8.8.8.8.8.",
+"8.8.8.8.8.8.8.8.o o @ * * q q f J i q 7 * @ o o 8.8.8.8.8.8.8.8.",
+"8.8.8.8.8.8.o O @ 7 K X.7.7.7.7.7.7.7.7.>.I i * @ o 8.8.8.8.8.8.",
+"8.8.8.8.8.o @ 8 T 6.7.7.7.7.7.7.7.7.7.7.7.7.7.#.s @ o o 8.8.8.8.",
+"8.8.8.o O * K 5.7.7.7.7.7.7.7.7.7.7.7.7.7.7.7.7.7...8 O o 8.8.8.",
+"8.8.o O * I 7.7.7.7.7.7.7.7.7.7.7.7.7.7.7.7.7.7.7.7.>.0 O o 8.8.",
+"8.8.o @ I 7.7.7.7.7.7.7.7.7.7.7.7.7.7.7.7.7.7.7.7.7.7.<.7 O 8.8.",
+"8.o @ d 7.7.7.7.7.7.7.7.7.7.7.7.7.7.7.7.7.7.7.7.7.7.7.7.X.@ o 8.",
+"8.O @ $.7.7.7.7.7.7.7.7.7.7.7.7.7.7.7.7.7.7.7.7.7.7.7.7.6.a O 8.",
+"o @ p 6.6.6.6.6.6.6.6.6.6.6.6.6.6.6.6.6.6.6.6.6.6.6.6.6.6.Y @ o ",
+"o @ L 6.6.6.6.6.6.6.6.6.6.6.6.6.6.6.6.6.6.6.6.6.6.6.6.6.6.*.$ o ",
+"o O U 6.6.6.6.6.6.6.6.6.6.6.6.6.6.6.6.6.6.6.6.6.6.6.6.6.5. .; o ",
+"O $ P 5.6.6.6.6.6.6.6.6.6.6.6.6.6.6.6.6.6.6.6.6.6.6.6.6.4.} % o ",
+"o < v 3.5.5.5.5.5.5.5.5.5.5.5.5.5.5.5.5.5.5.5.5.5.5.5.5.2.W O o ",
+"o w < *.5.5.5.5.5.5.5.5.5.5.5.5.5.5.5.5.5.5.5.5.5.5.5.5.| x # o ",
+"8.$ < V :.5.5.5.5.5.5.5.5.5.5.5.5.5.5.5.5.5.5.5.5.5.5.;.[ , ;   ",
+"8.o y : ( -.<.1.1.1.1.1.1.1.1.1.1.1.1.1.1.1.1.1.1.<.=.{ j 3 o 8.",
+"8.8.+ w 4 ` =.<.<.<.<.<.<.<.<.<.<.<.<.<.<.<.<.<.<.%.^ m > % . 8.",
+"8.8.o & 3 2 Q O.-.<.<.<.<.<.<.<.<.<.<.<.<.<.,.=.' H z : : . 8.8.",
+"8.8.8.o % w - M / ] &.-.,.,.<.<.<.<.<.<.<.>.O.! Z 5 < ; . 8.8.8.",
+"8.8.8.8.o O e : 1 n W ~ ` ] O.%.%.+.@.>.,.+.! z : w @ . 8.8.8.8.",
+"8.8.8.8.8.8.o % r 3 > 5 h N B G G R o.#.>.` D : ; .   8.8.8.8.8.",
+"8.8.8.8.8.8.8.8.o + : w y w 3 3 - X ` @.%.W l w . 8.8.8.8.8.8.8.",
+"8.8.8.8.8.8.8.8.8.8.. o o o o O + - ( +._ S 6 O   8.8.8.8.8.8.8.",
+"8.8.8.8.8.8.8.8.8.8.8.8.8.8.8.8.o 4 ( ) F g = . 8.8.8.8.8.8.8.8.",
+"8.8.8.8.8.8.8.8.8.8.8.8.8.8.8.8.O u E F z < . 8.8.8.8.8.8.8.8.8.",
+"8.8.8.8.8.8.8.8.8.8.8.8.8.8.8.o 3 C A k > . 8.8.8.8.8.8.8.8.8.8.",
+"8.8.8.8.8.8.8.8.8.8.8.8.8.8.8.9 c b t + . 8.8.8.8.8.8.8.8.8.8.8.",
+"8.8.8.8.8.8.8.8.8.8.8.8.8.8.8.: % o .   8.8.8.8.8.8.8.8.8.8.8.8.",
+"8.8.8.8.8.8.8.8.8.8.8.8.8.8.8.8.. 8.8.8.8.8.8.8.8.8.8.8.8.8.8.8.",
+"8.8.8.8.8.8.8.8.8.8.8.8.8.8.8.8.8.8.8.8.8.8.8.8.8.8.8.8.8.8.8.8."
+};

data/samples/drawing/maths_images.rb

@@ -227,7 +227,7 @@ class MathsPanel < Panel
 
   # Display a dialog to save the image to a file
   def on_save
-    SaveImageDialog(parent) do |dlg|
+    MathImages::SaveImageDialog(parent) do |dlg|
       if dlg.show_modal == Wx::ID_OK
         if dlg.image_type == Wx::BITMAP_TYPE_PNG
           # test writing to IO

data/samples/event/event.rb

@@ -175,7 +175,7 @@ module Event
 
       Wx::MessageDialog(self, msg, 'About Event Handling',
                         Wx::OK | Wx::ICON_INFORMATION) do |about_dlg|
-        about_dlg.ok_label = Wx::ButtonLabel.new('Close')
+        about_dlg.ok_label = 'Close'
         about_dlg.show_modal
       end
     end

data/samples/printing/printing2.rb

@@ -172,7 +172,7 @@ module Printing2
       msg = <<~__STR
         Print framework sample application
   
-        Using wxRuby #{Wx::version()}
+        Using wxRuby #{Wx::WXRUBY_VERSION}
       __STR
 
       Wx::message_box(msg,'About')

data/samples/sampler.rb

@@ -79,14 +79,32 @@ module WxRuby
       evt_menu(ID::TB_CLOSE) { @frame.close }
     end
 
-    def create_popup_menu
-      # Called by the base class when it needs to popup the menu
-      #  (the default evt_right_down event).  Create and return
-      #  the menu to display.
-      menu = Wx::Menu.new
-      menu.append(ID::TB_RESTORE, "Restore wxRuby Sampler")
-      menu.append(ID::TB_CLOSE, "Close wxRuby Sampler")
-      return menu
+    if ::Wx::WXWIDGETS_VERSION >= '3.1.5'
+
+      def get_popup_menu
+        # Called by the base class when it needs to popup the menu
+        #  (the default evt_right_down event).  Create once and return
+        #  the menu to display.
+        unless @popup_menu
+          @popup_menu = Wx::Menu.new
+          @popup_menu.append(ID::TB_RESTORE, "Restore wxRuby Sampler")
+          @popup_menu.append(ID::TB_CLOSE, "Close wxRuby Sampler")
+        end
+        @popup_menu
+      end
+
+    else
+
+      def create_popup_menu
+        # Called by the base class when it needs to popup the menu
+        #  (the default evt_right_down event).  Create and return
+        #  the menu to display.
+        menu = Wx::Menu.new
+        menu.append(ID::TB_RESTORE, "Restore wxRuby Sampler")
+        menu.append(ID::TB_CLOSE, "Close wxRuby Sampler")
+        menu
+      end
+
     end
 
     def make_icon(imgname)

data/samples/text/textctrl.rb

@@ -45,8 +45,8 @@ module TextCtrl
   end
 
   class TextCtrlFrame < Wx::Frame
-    def initialize(*args)
-      super(nil, *args)
+    def initialize(*args, **kwargs)
+      super(nil, *args, **kwargs)
 
       self.icon = Wx.Icon(:sample, Wx::BITMAP_TYPE_XPM, art_path: File.join(__dir__, '..'))
 

data/samples/treectrl/treectrl.rb

@@ -89,8 +89,8 @@ module TreeCtrl
     TreeCtrlIcon_FolderOpened = 0, 1, 2, 3, 4
 
   class MyTreeCtrl < Wx::TreeCtrl
-    def initialize(parent, *args)
-      super(parent, *args)
+    def initialize(parent, *args, **kwargs)
+      super(parent, *args, **kwargs)
 
       @alternate_images = false
       @alternate_states = false

data/tests/lib/leaked_process_event_exception_test.rb

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

data/tests/lib/leaked_queued_event_exception_test.rb

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

data/tests/lib/wxapp_runner.rb

@@ -2,8 +2,7 @@
 #
 # This software is released under the MIT license.
 
-require 'test/unit'
-require 'test/unit/ui/console/testrunner'
+require_relative './wxrb_test'
 require 'wx'
 
 module WxRuby
@@ -11,33 +10,42 @@ module WxRuby
   module Test
 
     class App < Wx::App
-      def initialize(test_runner, start_mtd)
+      def initialize(test_runner, start_mtd, *args, **kwargs)
         super()
         @test_runner = test_runner
         @start_mtd = start_mtd
+        @args = args
+        @kwargs = kwargs
+      end
+
+      protected def run_all_tests
+        @start_mtd.bind(@test_runner).call(*@args, **@kwargs)
       end
 
       def on_init
-        @result = @start_mtd.bind(@test_runner).call
+        @result = run_all_tests
         false
       end
 
       attr_reader :result
     end
 
-    if defined? ::IntelliJ
-      require 'test/unit/ui/teamcity/testrunner'
-      BaseRunner = ::Test::Unit::UI::TeamCity::TestRunner
-    else
-      BaseRunner = ::Test::Unit::UI::Console::TestRunner
-    end
+    class Unit < Minitest::Test
 
-    class Runner < BaseRunner
+      def self.is_ci_build?
+        (ENV['GITHUB_ACTION'] || ENV['CI'])
+      end
+
+      def is_ci_build?
+        Unit.is_ci_build?
+      end
+
+      def self.uses_wayland?
+        Wx.has_feature?('HAVE_WAYLAND_CLIENT')
+      end
 
-      org_start_mtd = instance_method :start
-      define_method :start do
-        (app = WxRuby::Test::App.new(self, org_start_mtd)).run
-        app.result
+      def uses_wayland?
+        Unit.uses_wayland?
       end
 
     end
@@ -46,34 +54,16 @@ module WxRuby
 
 end
 
-module Test
-  module Unit
-    AutoRunner.register_runner(:wxapp) do |auto_runner|
-      WxRuby::Test::Runner
-    end
-    AutoRunner.default_runner = :wxapp
-    if defined? ::IntelliJ
-      class AutoRunner
-        alias :wx_initialize :initialize
-        private :wx_initialize
-
-        def initialize(*args)
-          wx_initialize(*args)
-          @runner = AutoRunner.default_runner
-        end
-      end
-    end
+module Minitest
 
-    class TestCase
-
-      def self.is_ci_build?
-        (ENV['GITHUB_ACTION'] || ENV['CI'])
-      end
-
-      def is_ci_build?
-        TestCase.is_ci_build?
-      end
+  RUN_ALL_METHOD = VERSION >= '6.0.0' ? :run_all_suites : :__run
 
+  class << self
+    org_run_all_suites_mtd = instance_method RUN_ALL_METHOD
+    define_method RUN_ALL_METHOD do |*args, **kwargs|
+      (app = WxRuby::Test::App.new(self, org_run_all_suites_mtd, *args, **kwargs)).run
+      app.result
     end
   end
+
 end

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}")