diff --git a/Examples/test-suite/ruby/abstract_inherit_ok_runme.rb b/Examples/test-suite/ruby/abstract_inherit_ok_runme.rb index 612ba59df..afc30e237 100644 --- a/Examples/test-suite/ruby/abstract_inherit_ok_runme.rb +++ b/Examples/test-suite/ruby/abstract_inherit_ok_runme.rb @@ -28,7 +28,7 @@ rescue TypeError # TypeError: allocator undefined for Abstract_inherit_ok::Foo exceptionRaised = true ensure - raise RuntimeError unless exceptionRaised + swig_assert( exceptionRaised, "for !exceptionRaised" ) end # @@ -43,6 +43,6 @@ begin rescue NameError exceptionRaised = true ensure - raise RuntimeError if exceptionRaised + swig_assert( !exceptionRaised, "for exceptionRaised" ) end diff --git a/Examples/test-suite/ruby/abstract_inherit_runme.rb b/Examples/test-suite/ruby/abstract_inherit_runme.rb index 164f7a952..f4d257133 100644 --- a/Examples/test-suite/ruby/abstract_inherit_runme.rb +++ b/Examples/test-suite/ruby/abstract_inherit_runme.rb @@ -29,7 +29,7 @@ rescue TypeError # TypeError: allocator undefined for Abstract_inherit::Foo exceptionRaised = true ensure - raise RuntimeError unless exceptionRaised + swig_assert( exceptionRaised, "exceptionRaised") end exceptionRaised = false @@ -42,7 +42,7 @@ rescue TypeError # TypeError: allocator undefined for Abstract_inherit::Bar exceptionRaised = true ensure - raise RuntimeError unless exceptionRaised + swig_assert( exceptionRaised, "exceptionRaised") end exceptionRaised = false @@ -55,6 +55,7 @@ rescue TypeError # TypeError: allocator undefined for Abstract_inherit::Spam exceptionRaised = true ensure - raise RuntimeError unless exceptionRaised + swig_assert( exceptionRaised, "exceptionRaised") end + diff --git a/Examples/test-suite/ruby/abstract_signature_runme.rb b/Examples/test-suite/ruby/abstract_signature_runme.rb index 55022237f..53a84dbc3 100644 --- a/Examples/test-suite/ruby/abstract_signature_runme.rb +++ b/Examples/test-suite/ruby/abstract_signature_runme.rb @@ -8,7 +8,6 @@ # require 'swig_assert' - require 'abstract_signature' include Abstract_signature @@ -34,7 +33,7 @@ rescue TypeError # TypeError: allocator undefined for Abstract_signature::Abstract_foo exceptionRaised = true ensure - raise RuntimeError unless exceptionRaised + swig_assert( exceptionRaised, "for exceptionRaised") end # @@ -58,6 +57,6 @@ rescue TypeError # TypeError: allocator undefined for Abstract_signature::Abstract_bar exceptionRaised = true ensure - raise RuntimeError unless exceptionRaised + swig_assert( exceptionRaised, "for exceptionRaised") end diff --git a/Examples/test-suite/ruby/abstract_typedef2_runme.rb b/Examples/test-suite/ruby/abstract_typedef2_runme.rb index 9d305b234..885a13e29 100644 --- a/Examples/test-suite/ruby/abstract_typedef2_runme.rb +++ b/Examples/test-suite/ruby/abstract_typedef2_runme.rb @@ -8,10 +8,10 @@ # require 'swig_assert' - require 'abstract_typedef2' include Abstract_typedef2 -a = A_UF.new +swig_assert( 'a = A_UF.new' ) + diff --git a/Examples/test-suite/ruby/abstract_typedef_runme.rb b/Examples/test-suite/ruby/abstract_typedef_runme.rb index fa9519d8c..3ede9da78 100644 --- a/Examples/test-suite/ruby/abstract_typedef_runme.rb +++ b/Examples/test-suite/ruby/abstract_typedef_runme.rb @@ -16,5 +16,5 @@ include Abstract_typedef e = Engine.new a = A.new -raise RuntimeError if a.write(e) != true +swig_assert( a.write(e), 'for a.write(e)' ) diff --git a/Examples/test-suite/ruby/abstract_virtual_runme.rb b/Examples/test-suite/ruby/abstract_virtual_runme.rb index fd7996772..b55a754d2 100644 --- a/Examples/test-suite/ruby/abstract_virtual_runme.rb +++ b/Examples/test-suite/ruby/abstract_virtual_runme.rb @@ -8,11 +8,9 @@ # require 'swig_assert' - require 'abstract_virtual' include Abstract_virtual -d = D.new -e = E.new - +swig_assert('d = D.new') +swig_assert('e = E.new')