wxruby3 0.9.1-x64-mingw-ucrt → 0.9.3-x64-mingw-ucrt

data/tests/test_sizer.rb

@@ -40,4 +40,63 @@ class SizerTests < WxRuby::Test::GUITests
     assert_not_nil(frame_win.get_sizer.prepend(szr))
   end
 
+  def test_children
+    frame_win.get_sizer.add(Wx::HBoxSizer.new)
+    frame_win.get_sizer.add_spacer(5)
+    frame_win.get_sizer.add(Wx::VBoxSizer.new)
+
+    assert_equal(3, frame_win.sizer.item_count)
+    children = frame_win.sizer.get_children
+    assert_equal(3, children.size)
+    assert_true(children[0].sizer?)
+    assert_true(children[1].spacer?)
+    assert_true(children[2].sizer?)
+    frame_win.sizer.each_child do |si|
+      assert_equal(children.shift.ptr_addr, si.ptr_addr)
+    end
+  end
+
+  def test_user_data
+    frame_win.get_sizer.add(Wx::HBoxSizer.new, 0, 0, 0, 'This is user data')
+    frame_win.get_sizer.add(5,5, 0,0,0, %w[This is user data])
+    frame_win.get_sizer.add(Wx::VBoxSizer.new, 0, 0, 0, {1 => 'This', 2 => 'is', 3 => 'user', 4 => 'data'})
+
+    GC.start
+
+    assert_equal(3, frame_win.sizer.item_count)
+    children = frame_win.sizer.get_children
+    assert_equal(3, children.size)
+    assert_kind_of(::String, children[0].user_data)
+    assert_equal('This is user data', children[0].user_data)
+    assert_kind_of(::Array, children[1].user_data)
+    assert_equal(%w[This is user data], children[1].user_data)
+    assert_kind_of(::Hash, children[2].user_data)
+    assert_equal({1 => 'This', 2 => 'is', 3 => 'user', 4 => 'data'}, children[2].user_data)
+
+    klass = Class.new do
+      def initialize
+        @unlinked = false
+      end
+      def client_data_unlinked
+        @unlinked = true
+      end
+      attr_reader :unlinked
+    end
+
+    frame_win.get_sizer.add(Wx::HBoxSizer.new, 0, 0, 0, klass.new)
+
+    GC.start
+
+    assert_equal(4, frame_win.sizer.item_count)
+    assert_kind_of(klass, frame_win.get_sizer.get_item(3).user_data)
+    user_data = frame_win.get_sizer.get_item(3).user_data
+    assert_false(user_data.unlinked)
+    frame_win.get_sizer.get_item(3).set_user_data(nil)
+
+    GC.start
+
+    assert_true(user_data.unlinked)
+    assert_nil(frame_win.get_sizer.get_item(3).user_data)
+  end
+
 end

data/tests/test_std_controls.rb

@@ -111,6 +111,34 @@ class TextCtrlTests < WxRuby::Test::GUITests
     assert_equal('', text.get_value)
   end
 
+  def test_stream_append
+    text << 'This is the number ' << 101 << '.'
+    assert_equal('This is the number 101.', text.get_value)
+  end
+
+  def test_enumerate_lines
+    text.destroy
+    @text = Wx::TextCtrl.new(frame_win, style: Wx::TE_MULTILINE, name: 'Text')
+    text << <<~__HEREDOC
+      This is line 1.
+      This is line 2.
+      This is line 3.
+      __HEREDOC
+    assert_equal(4, text.get_number_of_lines)
+    text.each_line.each_with_index do |txt, lnr|
+      if lnr < 3
+        assert("This is line #{lnr+1}.", txt)
+      else
+        assert('', txt)
+      end
+    end
+    txt = text.each_line { |l| break l if l.index('2')}
+    assert_equal('This is line 2.', txt)
+    line_enum = text.each_line
+    txt = line_enum.detect { |l| l.index('3') }
+    assert_equal('This is line 3.', txt)
+  end
+
   if has_ui_simulator?
   def test_max_length
     sim = get_ui_simulator
@@ -165,7 +193,7 @@ class ComboBoxTests < WxRuby::Test::GUITests
   def setup
     super
     @combo = Wx::ComboBox.new(frame_win, name: 'ComboBox', choices: %w[One Two Three])
-    @combo.clear
+    @combo.value = '' # don't use #clear as that also clears the choices
   end
 
   def cleanup
@@ -180,6 +208,19 @@ class ComboBoxTests < WxRuby::Test::GUITests
     assert_equal('', combo.get_value)
   end
 
+  def test_enumerate
+    strings = combo.get_strings
+    combo.each_string.each_with_index do |str, ix|
+      assert_equal(strings[ix], str)
+    end
+    combo.each_string { |s| assert_equal(strings.shift, s)}
+    str_enum = combo.each_string
+    assert_kind_of(::Enumerator, str_enum)
+    assert_true(str_enum.any? { |s| s == 'Three'})
+    assert_true(combo.each_string.none? { |s| s == 'Four'})
+    assert_equal('BREAK', combo.each_string { |_| break 'BREAK' })
+  end
+
 end
 
 class CheckBoxTests < WxRuby::Test::GUITests

data/tests/test_styled_text_ctrl.rb

@@ -0,0 +1,46 @@
+# Copyright (c) 2023 M.J.N. Corino, The Netherlands
+#
+# This software is released under the MIT license.
+
+require_relative './lib/wxframe_runner'
+
+class StyledTextCtrlTests < WxRuby::Test::GUITests
+
+  def setup
+    super
+    @text = Wx::STC::StyledTextCtrl.new(frame_win, name: 'StyledText')
+  end
+
+  def cleanup
+    @text.destroy
+    super
+  end
+
+  attr_reader :text
+
+  def test_text
+    assert_equal('', text.get_value)
+  end
+
+  def test_enumerate_lines
+    text.write_text <<~__HEREDOC
+      This is line 1.
+      This is line 2.
+      This is line 3.
+      __HEREDOC
+    assert_equal(4, text.get_number_of_lines)
+    text.each_line.each_with_index do |txt, lnr|
+      if lnr < 3
+        assert("This is line #{lnr+1}.", txt)
+      else
+        assert('', txt)
+      end
+    end
+    txt = text.each_line { |l| break l if l.index('2')}
+    assert_equal('This is line 2.', txt)
+    line_enum = text.each_line
+    txt = line_enum.detect { |l| l.index('3') }
+    assert_equal('This is line 3.', txt)
+  end
+
+end

data/tests/test_tree_ctrl.rb

@@ -0,0 +1,138 @@
+# Copyright (c) 2023 M.J.N. Corino, The Netherlands
+#
+# This software is released under the MIT license.
+
+require_relative './lib/wxframe_runner'
+
+class TreeCtrlTests < WxRuby::Test::GUITests
+
+  def setup
+    super
+    @tree = Wx::TreeCtrl.new(frame_win, name: 'TreeCtrl')
+  end
+
+  def cleanup
+    @tree.destroy
+    super
+  end
+
+  attr_reader :tree
+
+  def tog_style(flag)
+    style = tree.get_window_style ^ flag
+
+    if Wx.has_feature?(:WXMSW)
+      # treectrl styles can't be changed on the fly using the native
+      # control and the tree must be recreated
+      tree.destroy
+      @tree = Wx::TreeCtrl.new(frame_win, style: style, name: 'TreeCtrl')
+    else
+      tree.set_window_style(style)
+    end
+  end
+  private :tog_style
+
+  ITEMS = [
+     ['Cat1', [
+      'Item1.1',
+      'Item1.2',
+      'Item1.3'
+      ]
+     ],
+     ['Cat2', [
+       ['Cat2.1', %w[Item2.1.1 Item2.1.2] ],
+      'Item2.2',
+      'Item2.3'
+      ]
+     ],
+    'Item3',
+    'Item4'
+  ]
+
+  def add_tree_items(parent, items)
+    items.each do |itm|
+      if ::Array === itm
+        cat = tree.append_item(parent, itm.first.to_s)
+        add_tree_items(cat, itm.last)
+      else
+        tree.append_item(parent, itm.to_s)
+      end
+    end
+  end
+  private :add_tree_items
+
+  def build_tree
+    root = tree.add_root('root')
+    add_tree_items(root, ITEMS)
+  end
+  private :build_tree
+
+  def test_tree
+    build_tree
+
+    assert_equal(4, tree.get_item_children(tree.get_root_item).size)
+    cat1 = tree.get_item_children(tree.get_root_item)[0]
+    assert_equal(3, tree.get_item_children(cat1).size)
+    cat2 = tree.get_item_children(tree.get_root_item)[1]
+    assert_equal(3, tree.get_item_children(cat2).size)
+    cat21 = tree.get_item_children(cat2)[0]
+    assert_equal(2, tree.get_item_children(cat21).size)
+  end
+
+  def test_hidden_root
+    tog_style(Wx::TR_HIDE_ROOT)
+    build_tree
+
+    assert_equal(4, tree.get_root_items.size)
+    cat1 = tree.get_root_items[0]
+    assert_equal(3, tree.get_item_children(cat1).size)
+    cat2 = tree.get_root_items[1]
+    assert_equal(3, tree.get_item_children(cat2).size)
+    cat21 = tree.get_item_children(cat2)[0]
+    assert_equal(2, tree.get_item_children(cat21).size)
+  end
+
+  def test_enumerable
+    build_tree
+
+    item211 = tree.detect { |itmid| tree.item_text(itmid) == 'Item2.1.1'}
+    assert_not_nil(item211)
+    assert_true(item211.ok?)
+  end
+
+  def test_enumerate
+    build_tree
+
+    tree.each_item_child(tree.get_root_item) do |itmid|
+      if tree.item_text(itmid) == 'Cat2'
+        tree.each_item_child(itmid) do |sub_itmid|
+          if tree.item_text(sub_itmid) == 'Cat2.1'
+            new_itm = tree.append_item(sub_itmid, 'Another Item')
+            assert_not_nil(new_itm)
+            assert_true(new_itm.ok?)
+          end
+        end
+      end
+    end
+    assert_equal(4, tree.get_item_children(tree.get_root_item).size)
+    cat1 = tree.get_item_children(tree.get_root_item)[0]
+    assert_equal(3, tree.get_item_children(cat1).size)
+    cat2 = tree.get_item_children(tree.get_root_item)[1]
+    assert_equal(3, tree.get_item_children(cat2).size)
+    cat21 = tree.get_item_children(cat2)[0]
+    assert_equal(3, tree.get_item_children(cat21).size)
+  end
+
+  def test_enumerator
+    build_tree
+
+    root_enum = tree.each_item_child(tree.get_root_item)
+    assert_kind_of(::Enumerator, root_enum)
+    cat2 = root_enum.detect { |itmid| tree.item_text(itmid) == 'Cat2' }
+    assert_not_nil(cat2)
+    assert_true(cat2.ok?)
+    cat2_enum = tree.each_item_child(cat2)
+    assert_equal(3, cat2_enum.to_a.size)
+  end
+
+end