wxruby3 0.9.0.pre.beta.10 → 0.9.0.pre.beta.13

data/tests/art/test_art/sample2.xpm

@@ -0,0 +1,251 @@
+/* XPM */
+static char * sample2_xpm[] = {
+"32 32 216 2",
+"  	c None",
+". 	c #872C2C",
+"+ 	c #A52827",
+"@ 	c #A42828",
+"# 	c #553131",
+"$ 	c #7D2D2D",
+"% 	c #3D3232",
+"& 	c #535331",
+"* 	c #AEAE26",
+"= 	c #85852C",
+"- 	c #ACAC26",
+"; 	c #88882C",
+"> 	c #9B2929",
+", 	c #A92626",
+"' 	c #F10D0C",
+") 	c #B32424",
+"! 	c #D91919",
+"~ 	c #A52727",
+"{ 	c #E51414",
+"] 	c #DC1817",
+"^ 	c #9F2828",
+"/ 	c #A5A527",
+"( 	c #F2F20B",
+"_ 	c #FFFF00",
+": 	c #F1F10C",
+"< 	c #AEAE25",
+"[ 	c #E7E712",
+"} 	c #BEBE22",
+"| 	c #999929",
+"1 	c #DE1716",
+"2 	c #A82626",
+"3 	c #EF0E0D",
+"4 	c #CA1E1E",
+"5 	c #C42020",
+"6 	c #EC1010",
+"7 	c #9E2828",
+"8 	c #B12525",
+"9 	c #E91211",
+"0 	c #922A2A",
+"a 	c #A8A827",
+"b 	c #EFEF0D",
+"c 	c #C5C520",
+"d 	c #FBFB03",
+"e 	c #A6A627",
+"f 	c #FAFA04",
+"g 	c #CACA1E",
+"h 	c #DDDD18",
+"i 	c #F8F806",
+"j 	c #B8B823",
+"k 	c #E3E315",
+"l 	c #9E2929",
+"m 	c #D01D1D",
+"n 	c #B72423",
+"o 	c #AD2625",
+"p 	c #DD1817",
+"q 	c #B22525",
+"r 	c #D71A1A",
+"s 	c #EBEB10",
+"t 	c #B0B025",
+"u 	c #C0C021",
+"v 	c #E6E613",
+"w 	c #97972A",
+"x 	c #A22828",
+"y 	c #BB2323",
+"z 	c #B82424",
+"A 	c #4A3232",
+"B 	c #842D2D",
+"C 	c #912B2B",
+"D 	c #5B3131",
+"E 	c #70702F",
+"F 	c #C6C620",
+"G 	c #8E8E2B",
+"H 	c #9A9A29",
+"I 	c #484832",
+"J 	c #A4A428",
+"K 	c #9D2828",
+"L 	c #E61211",
+"M 	c #E51212",
+"N 	c #DF1615",
+"O 	c #D21B1A",
+"P 	c #423232",
+"Q 	c #515131",
+"R 	c #E4E412",
+"S 	c #F3F307",
+"T 	c #E2E213",
+"U 	c #BEBE20",
+"V 	c #ECEC0C",
+"W 	c #B1B124",
+"X 	c #999928",
+"Y 	c #CF1D1D",
+"Z 	c #CD1E1D",
+"` 	c #D21C1C",
+" .	c #A42727",
+"..	c #ED0F0F",
+"+.	c #7E2D2D",
+"@.	c #92922B",
+"#.	c #FDFD01",
+"$.	c #D1D11C",
+"%.	c #E5E513",
+"&.	c #643030",
+"*.	c #E61313",
+"=.	c #EE0F0E",
+"-.	c #A92726",
+";.	c #C1C121",
+">.	c #ADAD25",
+",.	c #EEEE0E",
+"'.	c #5C5C31",
+").	c #F00D0C",
+"!.	c #AA2726",
+"~.	c #AF2525",
+"{.	c #EA1110",
+"].	c #32365A",
+"^.	c #333440",
+"/.	c #E2E215",
+"(.	c #F0F00D",
+"_.	c #C4C420",
+":.	c #F5F508",
+"<.	c #BCBC22",
+"[.	c #FCFC02",
+"}.	c #8C8C2B",
+"|.	c #B92323",
+"1.	c #E51413",
+"2.	c #633030",
+"3.	c #313A74",
+"4.	c #2D43AE",
+"5.	c #2E40A2",
+"6.	c #313975",
+"7.	c #77772E",
+"8.	c #F7F706",
+"9.	c #CBCB1E",
+"0.	c #BABA23",
+"a.	c #D81919",
+"b.	c #A62727",
+"c.	c #D41B1B",
+"d.	c #C91F1E",
+"e.	c #8F2B2B",
+"f.	c #323553",
+"g.	c #2C45BA",
+"h.	c #284CE0",
+"i.	c #2A4AD5",
+"j.	c #2C46C0",
+"k.	c #A3A328",
+"l.	c #DEDE17",
+"m.	c #772E2E",
+"n.	c #EC100F",
+"o.	c #AB2626",
+"p.	c #B12524",
+"q.	c #2B47C8",
+"r.	c #2D43AF",
+"s.	c #2453FF",
+"t.	c #2552FA",
+"u.	c #2D44B6",
+"v.	c #2C45BE",
+"w.	c #BEBE21",
+"x.	c #BFBF22",
+"y.	c #B2B224",
+"z.	c #6B2F2F",
+"A.	c #C6201F",
+"B.	c #2F409F",
+"C.	c #2551F8",
+"D.	c #2C44B9",
+"E.	c #2452FC",
+"F.	c #2F3E92",
+"G.	c #585831",
+"H.	c #8E8E2A",
+"I.	c #79792D",
+"J.	c #5C3030",
+"K.	c #333333",
+"L.	c #313971",
+"M.	c #2551F5",
+"N.	c #2A49D0",
+"O.	c #284EE6",
+"P.	c #294BD9",
+"Q.	c #294CDD",
+"R.	c #2650F1",
+"S.	c #323761",
+"T.	c #606030",
+"U.	c #294CDE",
+"V.	c #2D42AD",
+"W.	c #2D43B3",
+"X.	c #2A4AD6",
+"Y.	c #2C45BD",
+"Z.	c #303B7C",
+"`.	c #2650F0",
+" +	c #2650F3",
+".+	c #2B46C3",
+"++	c #284CDE",
+"@+	c #2A49D1",
+"#+	c #264FED",
+"$+	c #31396F",
+"%+	c #303D90",
+"&+	c #2B47C6",
+"*+	c #31386B",
+"=+	c #2E41A7",
+"-+	c #313A77",
+";+	c #303C86",
+">+	c #2551F7",
+",+	c #2D43B1",
+"'+	c #2E41A6",
+")+	c #2552FB",
+"!+	c #2552F9",
+"~+	c #2552F8",
+"{+	c #323765",
+"]+	c #2B48CB",
+"^+	c #2A49CF",
+"/+	c #274EE7",
+"(+	c #264FEE",
+"_+	c #2D42AE",
+":+	c #2650F2",
+"<+	c #294BDA",
+"[+	c #2C46C1",
+"}+	c #313A78",
+"|+	c #2D42AA",
+"1+	c #294BDC",
+"2+	c #2B48CA",
+"3+	c #2453FD",
+"                                                                ",
+"                                                                ",
+"                                                                ",
+"                                                                ",
+"                                                                ",
+"      . + + @ # $ + + + %             & * * * = & - * * ;       ",
+"    > , ' ' ) ! ~ { ' ] ^             / ( _ : < [ } _ _ < |     ",
+"    1 2 3 4 5 ' 6 7 3 8 9 0         a b c d e f _ g h i j k     ",
+"  l ' m n o ' ' ' p q ~ ' r         s _ < t b _ _ _ < u v _ w   ",
+"  x y z A z y y y y B C y y D     E F F G H F F F F } I c F J   ",
+"  K L L ^ M L L L L , N L O P     Q R S T U S S S S V W S S X   ",
+"    Y ' Z ` ' ' ' '  .' ..+.        @.#._ < _ _ _ _ $.%._ $.    ",
+"    &.*.=., ' ' ' ! 5 ' -.            } _ ;.( _ _ _ >._ ,.'.    ",
+"      C ).!.=.' ' ~.{.Z       ].^.      /.(._._ _ :.<.[.}.      ",
+"        |.` Z ' ' ~ 1.2.    3.4.5.6.    7.8.>._ _ 9.s 0.        ",
+"          a.b.' c.d.e.    f.g.h.i.j.      k.F ,._ < l.          ",
+"          m. .n.o.p.      q.r.s.t.u.v.      w.x.( y.E           ",
+"            z.A.$       B.C.D.s.s.r.E.F.    G.H._.I.            ",
+"              J.K.    L.M.N.O.s.s.P.Q.R.S.    K.T.              ",
+"              K.      U.s.V.s.s.s.E.W.s.X.                      ",
+"                    g.s.M.Y.s.s.s.s.W.E.s.V.                    ",
+"                  Z.`. +.+++ + + + +@+N. +#+$+                  ",
+"                  %+&+&+*+W.&+&+&+&+=+-+&+&+;+                  ",
+"                  6.E.>+,+'+)+s.s.!+=+r.E.~+{+                  ",
+"                    ]+^+/+(+,+s.s._+:+Q.<+[+                    ",
+"                    }+|+s.s.1+q.2+Q.s.3+=+{+                    ",
+"                      6._+_+_+$+$+_+_+_+*+                      ",
+"                                                                ",
+"                                                                ",
+"                                                                ",
+"                                                                ",
+"                                                                "};

data/tests/lib/wxapp_runner.rb

@@ -0,0 +1,64 @@
+
+require 'test/unit'
+require 'test/unit/ui/console/testrunner'
+require 'wx'
+
+module Wx::SF
+
+  module Test
+
+    class App < Wx::App
+      def initialize(test_runner, start_mtd)
+        super()
+        @test_runner = test_runner
+        @start_mtd = start_mtd
+      end
+
+      def on_init
+        @result = @start_mtd.bind(@test_runner).call
+        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 Runner < BaseRunner
+
+      org_start_mtd = instance_method :start
+      define_method :start do
+        (app = Wx::SF::Test::App.new(self, org_start_mtd)).run
+        app.result
+      end
+
+    end
+
+  end
+
+end
+
+module Test
+  module Unit
+    AutoRunner.register_runner(:wxapp) do |auto_runner|
+      Wx::SF::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
+  end
+end

data/tests/test_art.rb

@@ -0,0 +1,91 @@
+
+require_relative './lib/wxapp_runner'
+
+class TestArt < Test::Unit::TestCase
+
+  def test_icons
+    icons = []
+    assert_nothing_raised do
+      icons << Wx.Icon(:sample)
+      icons << Wx.Icon(:sample2)
+      icons << Wx.Icon(:sample3)
+    end
+    assert_all?(icons) { |ico| ico.instance_of?(Wx::Icon) }
+    assert_all?(icons) { |ico| ico.ok? }
+    icons.clear
+    assert_nothing_raised do
+      icons << Wx.Icon(:wxruby, Wx::BitmapType::BITMAP_TYPE_PNG)
+    end
+    assert_all?(icons) { |ico| ico.instance_of?(Wx::Icon) }
+    assert_all?(icons) { |ico| ico.ok? }
+    assert_raises(ArgumentError) do
+      Wx::Icon(:wxruby, Wx::BitmapType::BITMAP_TYPE_GIF)
+    end
+  end
+
+  def test_bitmap
+    bmps = []
+    assert_nothing_raised do
+      bmps << Wx.Bitmap(:wxruby)
+      bmps << Wx.Bitmap(:sample2)
+      bmps << Wx.Bitmap(:sample3)
+    end
+    assert_all?(bmps) { |bmp| bmp.instance_of?(Wx::Bitmap) }
+    assert_all?(bmps) { |bmp| bmp.ok? }
+    bmps.clear
+    assert_nothing_raised do
+      bmps << Wx.Bitmap(:wxruby, Wx::BitmapType::BITMAP_TYPE_PNG)
+    end
+    assert_all?(bmps) { |bmp| bmp.instance_of?(Wx::Bitmap) }
+    assert_all?(bmps) { |bmp| bmp.ok? }
+    assert_raises(ArgumentError) do
+      Wx::Bitmap(:wxruby, Wx::BitmapType::BITMAP_TYPE_GIF)
+    end
+  end
+
+  if Wx::PLATFORM == 'WXMSW'
+
+  def test_cursors
+    cursor = nil
+    assert_nothing_raised do
+      cursor = Wx.Cursor(:wxruby)
+    end
+    assert_instance_of(Wx::Cursor, cursor)
+    assert { cursor.ok? }
+  end
+
+  end
+
+  def test_image
+    imgs = []
+    assert_nothing_raised do
+      imgs << Wx.Image(:wxruby, Wx::BitmapType::BITMAP_TYPE_JPEG)
+      imgs << Wx.Image(:sample2)
+      imgs << Wx.Image(:sample3)
+    end
+    assert_all?(imgs) { |img| img.instance_of?(Wx::Image) }
+    assert_all?(imgs) { |img| img.ok? }
+    imgs.clear
+    assert_nothing_raised do
+      imgs << Wx.Image(:wxruby, Wx::BitmapType::BITMAP_TYPE_PNG)
+    end
+    assert_all?(imgs) { |img| img.instance_of?(Wx::Image) }
+    assert_all?(imgs) { |img| img.ok? }
+    assert_raises(ArgumentError) do
+      Wx::Image(:wxruby, Wx::BitmapType::BITMAP_TYPE_GIF)
+    end
+  end
+
+  def test_art
+    art = nil
+    assert_nothing_raised do
+      art = Wx::ArtLocator.find_art(:sample, art_section: 'my_art')
+    end
+    assert_not_nil(art)
+    assert { File.exist?(art) }
+    assert_equal('sample', File.basename(art, '.*'))
+    img = Wx::Image.new(art)
+    assert { img.ok? }
+  end
+
+end

data/tests/test_basic.rb

@@ -13,8 +13,3 @@ class BasicTests < Test::Unit::TestCase
   end
 
 end
-
-if $0 == __FILE__
-  require 'test/unit/ui/console/testrunner'
-  Test::Unit::UI::Console::TestRunner.run(BasicTests)
-end

data/tests/test_clipboard.rb

@@ -1,6 +1,5 @@
-require 'test/unit'
-require 'test/unit/ui/console/testrunner'
-require 'wx'
+
+require_relative './lib/wxapp_runner'
 
 class TestTextData < Test::Unit::TestCase
   # Using an in-built class
@@ -31,7 +30,42 @@ class TestTextData < Test::Unit::TestCase
     Wx::Clipboard.open do | clip |
       clip.fetch td_3
     end
-    assert_equal("", td_3.text)
+    assert_equal("", td_3.get_data_here)
+  end
+end
+
+if Wx.has_feature?(:USE_HTML) && Wx::WXWIDGETS_VERSION >= '3.3'
+  class TestHtmlData < Test::Unit::TestCase
+    # Using an in-built class
+    def test_text_data
+      td = Wx::HTMLDataObject.new('<html><body><h1>Header</h1></body></html>')
+      assert_equal('<html><body><h1>Header</h1></body></html>', td.html)
+
+      Wx::Clipboard.open do | clip |
+        assert clip.opened?
+        clip.clear
+        assert !clip.supported?(Wx::DF_BITMAP)
+        clip.place td
+        assert clip.supported?(Wx::DF_HTML)
+        assert !clip.supported?(Wx::DF_BITMAP)
+      end
+
+      td_2 = Wx::HTMLDataObject.new
+      Wx::Clipboard.open do | clip |
+        clip.fetch td_2
+      end
+      assert_equal('<html><body><h1>Header</h1></body></html>', td_2.html)
+
+      Wx::Clipboard.open do | clip |
+        clip.clear
+      end
+
+      td_3 = Wx::HTMLDataObject.new
+      Wx::Clipboard.open do | clip |
+        clip.fetch td_3
+      end
+      assert_equal('', td_3.get_data_here)
+    end
   end
 end
 
@@ -66,6 +100,37 @@ class TestBitmapData < Test::Unit::TestCase
 end
 
 class TestDataObjectComposite < Test::Unit::TestCase
+  MY_INT_ARRAY_FORMAT = Wx::DataFormat.new('application/int_array_format')
+
+  class MySimpleIntArrayObject < Wx::DataObjectSimpleBase
+    def initialize(arr = nil)
+      super(MY_INT_ARRAY_FORMAT)
+      self.array = arr
+    end
+
+    def array
+      @arr
+    end
+
+    def array=(arr)
+      @arr = (arr || []).collect { |e| e.to_i }
+    end
+
+    # The default will do in this case but otherwise something like this:
+    # def _get_data_size
+    #   @arr ? @arr.pack('i*').bytesize : 0
+    # end
+
+    def _get_data
+      @arr ? @arr.pack('i*') : nil
+    end
+
+    def _set_data(data)
+      @arr = data ? data.unpack('i*') : []
+      true
+    end
+  end
+
   def test_data_object_composite
     d_obj = Wx::DataObjectComposite.new
     d_txt = Wx::TextDataObject.new
@@ -80,6 +145,9 @@ class TestDataObjectComposite < Test::Unit::TestCase
       assert_equal( 2, d_txt.get_format_count(Wx::DataObject::Direction::Get) )
       assert_equal( 3, d_obj.get_format_count(Wx::DataObject::Direction::Get) )
     end
+    d_txt = nil
+
+    GC.start
 
     d_bmp = Wx::BitmapDataObject.new(bmp)
     Wx::Clipboard.open do | clip |
@@ -87,6 +155,8 @@ class TestDataObjectComposite < Test::Unit::TestCase
       clip.place d_bmp
     end
 
+    GC.start
+
     Wx::Clipboard.open do | clip |
       assert !clip.supported?( Wx::DF_TEXT )
       assert clip.supported?( Wx::DF_BITMAP )
@@ -94,6 +164,8 @@ class TestDataObjectComposite < Test::Unit::TestCase
       clip.fetch d_obj
     end
 
+    GC.start
+
     if Wx::PLATFORM == 'WXMSW'
       assert_equal d_obj.received_format.get_type, Wx::DF_DIB.get_type
       d_bmp = d_obj.get_object(Wx::DF_DIB)
@@ -112,6 +184,8 @@ class TestDataObjectComposite < Test::Unit::TestCase
       clip.place d_txt
     end
 
+    GC.start
+
     d_obj_2 = Wx::DataObjectComposite.new
     d_txt = Wx::TextDataObject.new
     d_obj_2.add d_txt
@@ -125,6 +199,8 @@ class TestDataObjectComposite < Test::Unit::TestCase
       clip.fetch d_obj_2
     end
 
+    GC.start
+
     assert_equal d_obj_2.received_format.get_type, d_txt.get_preferred_format(Wx::DataObject::Direction::Set).get_type
     if Wx::PLATFORM == 'WXMSW'
       d_txt = d_obj_2.get_object(Wx::DF_UNICODETEXT)
@@ -132,11 +208,58 @@ class TestDataObjectComposite < Test::Unit::TestCase
       d_txt = d_obj_2.get_object(Wx::DF_TEXT)
     end
     assert_equal d_txt.text, 'THE TEXT'
+
+    GC.start
+
+    d_obj_2 = Wx::DataObjectComposite.new
+    d_obj_2.add Wx::TextDataObject.new
+    d_obj_2.add MySimpleIntArrayObject.new([1,2,3,4,5])
+    if Wx::PLATFORM == 'WXMSW'
+      assert_equal( 2, d_obj_2.get_format_count(Wx::DataObject::Direction::Get) )
+    else
+      assert_equal( 3, d_obj_2.get_format_count(Wx::DataObject::Direction::Get) )
+    end
+
+    Wx::Clipboard.open do | clip |
+      clip.clear
+      clip.place d_obj_2
+    end
+
+    GC.start
+
+    d_iarr = MySimpleIntArrayObject.new
+    Wx::Clipboard.open do | clip |
+      assert clip.supported?(MY_INT_ARRAY_FORMAT)
+      clip.fetch d_iarr
+    end
+
+    assert_equal([1,2,3,4,5], d_iarr.array)
   end
 end
 
 class TestDataObject < Test::Unit::TestCase
   MY_CUSTOM_FORMAT = Wx::DataFormat.new('text/custom_format')
+  MY_CUSTOM_TEXT = Wx::DataFormat.new('text/custom_text')
+
+  class MySimpleDataObject < Wx::DataObjectSimpleBase
+    def initialize
+      super(MY_CUSTOM_TEXT)
+      @data = ''
+    end
+
+    def _get_data_size
+      @data.bytesize
+    end
+
+    def _get_data
+      @data
+    end
+
+    def _set_data(data)
+      @data = data ? data : ''
+      true
+    end
+  end
 
   class MyBasicDataObject < Wx::DataObject
     attr_reader :my_data
@@ -187,9 +310,9 @@ class TestDataObject < Test::Unit::TestCase
     def get_data_size(format)
       case format.get_type
       when Wx::DataFormatId::DF_TEXT
-        get_as_text.to_s.size
+        get_as_text.to_s.bytesize
       when MY_CUSTOM_FORMAT.get_type
-        get_formatted.to_s.size
+        get_formatted.to_s.bytesize
       else
         0
       end
@@ -208,17 +331,35 @@ class TestDataObject < Test::Unit::TestCase
     end
   end
 
+  def test_simple_data_obj
+    d_obj = MySimpleDataObject.new
+    d_obj.set_data('Simple Data')
+    assert_equal( 1, d_obj.get_format_count )
+    assert_equal('Simple Data', d_obj.get_data_here )
+
+    Wx::Clipboard.open do | clip |
+      clip.place d_obj
+    end
+
+    d_obj2 = MySimpleDataObject.new
+    Wx::Clipboard.open do | clip |
+      assert clip.supported?( d_obj2.get_format )
+      clip.fetch d_obj2
+    end
+    assert_equal('Simple Data', d_obj2.get_data_here )
+  end
+
   def test_data_obj
     d_obj = MyBasicDataObject.new
     d_obj.set_data(Wx::DF_TEXT, 'HELLO')
-    assert_equal( 2, d_obj.get_format_count(0) )
+    assert_equal( 2, d_obj.get_format_count(Wx::DataObject::Direction::Get) )
     assert_equal('HELLO', d_obj.get_data_here(Wx::DF_TEXT) )
     assert_equal('<b>HELLO</b>', d_obj.get_data_here(MY_CUSTOM_FORMAT) )
 
     Wx::Clipboard.open do | clip |
       clip.place d_obj
     end
-    
+
     d_obj_2 = MyBasicDataObject.new
     Wx::Clipboard.open do | clip |
       assert clip.supported?( Wx::DF_TEXT )
@@ -230,12 +371,3 @@ class TestDataObject < Test::Unit::TestCase
     assert_equal('HELLO', d_obj_2.get_data_here(Wx::DF_TEXT) )
   end
 end
-
-Wx::App.run do
-  # Must run whilst App is alive
-  Test::Unit::UI::Console::TestRunner.run(TestTextData)
-  Test::Unit::UI::Console::TestRunner.run(TestBitmapData)
-  Test::Unit::UI::Console::TestRunner.run(TestDataObjectComposite)
-  Test::Unit::UI::Console::TestRunner.run(TestDataObject)
-  false
-end