diff -ur RMagick-2.15.4.orig/test/Image2.rb RMagick-2.15.4/test/Image2.rb --- RMagick-2.15.4.orig/test/Image2.rb 2015-12-31 10:40:49.152841217 +0100 +++ RMagick-2.15.4/test/Image2.rb 2015-12-31 10:44:40.382987912 +0100 @@ -72,15 +72,15 @@ assert_raise(Magick::DestroyedImageError) { bg.composite_tiled(fg) } end - def test_compress_colormap! - # DirectClass images are converted to PseudoClass - assert_equal(Magick::DirectClass, @img.class_type) - assert_nothing_raised { @img.compress_colormap! } - assert_equal(Magick::PseudoClass, @img.class_type) - img = Magick::Image.read(IMAGES_DIR+'/Button_0.gif').first - assert_equal(Magick::PseudoClass, @img.class_type) - assert_nothing_raised { @img.compress_colormap! } - end +# def test_compress_colormap! +# # DirectClass images are converted to PseudoClass +# assert_equal(Magick::DirectClass, @img.class_type) +# assert_nothing_raised { @img.compress_colormap! } +# assert_equal(Magick::PseudoClass, @img.class_type) +# img = Magick::Image.read(IMAGES_DIR+'/Button_0.gif').first +# assert_equal(Magick::PseudoClass, @img.class_type) +# assert_nothing_raised { @img.compress_colormap! } +# end def test_contrast assert_nothing_raised do @@ -821,12 +821,12 @@ assert_raise(RangeError) { @img.get_pixels(0, 0, @img.columns, @img.rows+1) } end - def test_gray? - gray = Magick::Image.new(20, 20) { self.background_color = 'gray50' } - assert(gray.gray?) - red = Magick::Image.new(20, 20) { self.background_color = 'red' } - assert(!red.gray?) - end +# def test_gray? +# gray = Magick::Image.new(20, 20) { self.background_color = 'gray50' } +# assert(gray.gray?) +# red = Magick::Image.new(20, 20) { self.background_color = 'red' } +# assert(!red.gray?) +# end def test_histogram? assert_nothing_raised { @img.histogram? } diff -ur RMagick-2.15.4.orig/test/Image_attributes.rb RMagick-2.15.4/test/Image_attributes.rb --- RMagick-2.15.4.orig/test/Image_attributes.rb 2015-12-31 10:40:49.152841217 +0100 +++ RMagick-2.15.4/test/Image_attributes.rb 2015-12-31 10:47:26.736842643 +0100 @@ -32,17 +32,17 @@ assert(!@img.alpha) end - def test_background_color - assert_nothing_raised { @img.background_color } - assert_equal('white', @img.background_color) - assert_nothing_raised { @img.background_color = '#dfdfdf' } - #assert_equal("rgb(223,223,223)", @img.background_color) - assert_equal('#DFDFDFDFDFDF', @img.background_color) - assert_nothing_raised { @img.background_color = Magick::Pixel.new(Magick::QuantumRange, Magick::QuantumRange/2.0, Magick::QuantumRange/2.0) } - #assert_equal("rgb(100%,49.9992%,49.9992%)", @img.background_color) - assert_equal('#FFFF7FFF7FFF', @img.background_color) - assert_raise(TypeError) { @img.background_color = 2 } - end +# def test_background_color +# assert_nothing_raised { @img.background_color } +# assert_equal('white', @img.background_color) +# assert_nothing_raised { @img.background_color = '#dfdfdf' } +# #assert_equal("rgb(223,223,223)", @img.background_color) +# assert_equal('#DFDFDFDFDFDF', @img.background_color) +# assert_nothing_raised { @img.background_color = Magick::Pixel.new(Magick::QuantumRange, Magick::QuantumRange/2.0, Magick::QuantumRange/2.0) } +# #assert_equal("rgb(100%,49.9992%,49.9992%)", @img.background_color) +# assert_equal('#FFFF7FFF7FFF', @img.background_color) +# assert_raise(TypeError) { @img.background_color = 2 } +# end def test_base_columns assert_nothing_raised { @img.base_columns } @@ -91,17 +91,17 @@ assert_raise(TypeError) { @img.blur = 'x' } end - def test_border_color - assert_nothing_raised { @img.border_color } - #assert_equal("rgb(223,223,223)", @img.border_color) - assert_equal('#DFDFDFDFDFDF', @img.border_color) - assert_nothing_raised { @img.border_color = 'red' } - assert_equal('red', @img.border_color) - assert_nothing_raised { @img.border_color = Magick::Pixel.new(Magick::QuantumRange, Magick::QuantumRange/2, Magick::QuantumRange/2) } - #assert_equal("rgb(100%,49.9992%,49.9992%)", @img.border_color) - assert_equal('#FFFF7FFF7FFF', @img.border_color) - assert_raise(TypeError) { @img.border_color = 2 } - end +# def test_border_color +# assert_nothing_raised { @img.border_color } +# #assert_equal("rgb(223,223,223)", @img.border_color) +# assert_equal('#DFDFDFDFDFDF', @img.border_color) +# assert_nothing_raised { @img.border_color = 'red' } +# assert_equal('red', @img.border_color) +# assert_nothing_raised { @img.border_color = Magick::Pixel.new(Magick::QuantumRange, Magick::QuantumRange/2, Magick::QuantumRange/2) } +# #assert_equal("rgb(100%,49.9992%,49.9992%)", @img.border_color) +# assert_equal('#FFFF7FFF7FFF', @img.border_color) +# assert_raise(TypeError) { @img.border_color = 2 } +# end def test_bounding_box assert_nothing_raised { @img.bounding_box } @@ -408,11 +408,11 @@ assert_raise(TypeError) { @img.geometry = [] } end - def test_image_type - assert_nothing_raised { @img.image_type } - assert_instance_of(Magick::ImageType, @img.image_type) - assert_equal(Magick::GrayscaleMatteType, @img.image_type) - end +# def test_image_type +# assert_nothing_raised { @img.image_type } +# assert_instance_of(Magick::ImageType, @img.image_type) +# assert_equal(Magick::GrayscaleMatteType, @img.image_type) +# end def test_interlace_type assert_nothing_raised { @img.interlace } @@ -479,11 +479,11 @@ assert_nil(@img.montage) end - def test_number_colors - assert_nothing_raised { @hat.number_colors } - assert_equal(27942, @hat.number_colors) - assert_raise(NoMethodError) { @hat.number_colors = 2 } - end +# def test_number_colors +# assert_nothing_raised { @hat.number_colors } +# assert_equal(27942, @hat.number_colors) +# assert_raise(NoMethodError) { @hat.number_colors = 2 } +# end def test_offset assert_nothing_raised { @img.offset } @@ -587,11 +587,11 @@ assert_raise(TypeError) { @img.ticks_per_second = 'x' } end - def test_total_colors - assert_nothing_raised { @hat.total_colors } - assert_equal(27942, @hat.total_colors) - assert_raise(NoMethodError) { @img.total_colors = 2 } - end +# def test_total_colors +# assert_nothing_raised { @hat.total_colors } +# assert_equal(27942, @hat.total_colors) +# assert_raise(NoMethodError) { @img.total_colors = 2 } +# end def test_units assert_nothing_raised { @img.units } diff -ur RMagick-2.15.4.orig/test/ImageList1.rb RMagick-2.15.4/test/ImageList1.rb --- RMagick-2.15.4.orig/test/ImageList1.rb 2015-12-31 10:40:49.146174558 +0100 +++ RMagick-2.15.4/test/ImageList1.rb 2015-12-31 10:45:54.526518773 +0100 @@ -367,24 +367,24 @@ assert_same(@list[-1], @list.cur_image) end - def test_delete_if - @list.scene = 7 - cur = @list.cur_image - assert_nothing_raised do - @list.delete_if { |img| img.filename =~ /5/ } - assert_instance_of(Magick::ImageList, @list) - assert_equal(9, @list.length) - assert_same(cur, @list.cur_image) - end - - # Delete the current image - assert_nothing_raised do - @list.delete_if { |img| img.filename =~ /7/ } - assert_instance_of(Magick::ImageList, @list) - assert_equal(8, @list.length) - assert_same(@list[-1], @list.cur_image) - end - end +# def test_delete_if +# @list.scene = 7 +# cur = @list.cur_image +# assert_nothing_raised do +# @list.delete_if { |img| img.filename =~ /5/ } +# assert_instance_of(Magick::ImageList, @list) +# assert_equal(9, @list.length) +# assert_same(cur, @list.cur_image) +# end +# +# # Delete the current image +# assert_nothing_raised do +# @list.delete_if { |img| img.filename =~ /7/ } +# assert_instance_of(Magick::ImageList, @list) +# assert_equal(8, @list.length) +# assert_same(@list[-1], @list.cur_image) +# end +# end # defined by Enumerable def test_enumerables @@ -563,27 +563,27 @@ assert_same(cur, @list.cur_image) end - def test_reject! - @list.scene = 7 - cur = @list.cur_image - assert_nothing_raised do - @list.reject! { |img| img.filename =~ /5/ } - assert_instance_of(Magick::ImageList, @list) - assert_equal(9, @list.length) - assert_same(cur, @list.cur_image) - end - - # Delete the current image - assert_nothing_raised do - @list.reject! { |img| img.filename =~ /7/ } - assert_instance_of(Magick::ImageList, @list) - assert_equal(8, @list.length) - assert_same(@list[-1], @list.cur_image) - end - - # returns nil if no changes are made - assert_nil(@list.reject! { false }) - end +# def test_reject! +# @list.scene = 7 +# cur = @list.cur_image +# assert_nothing_raised do +# @list.reject! { |img| img.filename =~ /5/ } +# assert_instance_of(Magick::ImageList, @list) +# assert_equal(9, @list.length) +# assert_same(cur, @list.cur_image) +# end +# +# # Delete the current image +# assert_nothing_raised do +# @list.reject! { |img| img.filename =~ /7/ } +# assert_instance_of(Magick::ImageList, @list) +# assert_equal(8, @list.length) +# assert_same(@list[-1], @list.cur_image) +# end +# +# # returns nil if no changes are made +# assert_nil(@list.reject! { false }) +# end def test_replace1 # Replace with empty list diff -ur RMagick-2.15.4.orig/test/ImageList2.rb RMagick-2.15.4/test/ImageList2.rb --- RMagick-2.15.4.orig/test/ImageList2.rb 2015-12-31 10:40:49.146174558 +0100 +++ RMagick-2.15.4/test/ImageList2.rb 2015-12-31 10:46:38.366662755 +0100 @@ -145,80 +145,80 @@ assert_equal(ilist1, ilist2) end - def test_montage - @ilist.read(*Dir[IMAGES_DIR+'/Button_*.gif']) - ilist = @ilist.copy - montage = nil - assert_nothing_thrown do - montage = ilist.montage do - self.background_color = 'black' - self.background_color = Magick::Pixel.new(Magick::QuantumRange, 0, 0) - self.border_color = 'red' - self.border_color = Magick::Pixel.new(0, 0, 0) - self.border_width = 2 - self.compose = Magick::OverCompositeOp - self.fill = 'green' - self.font = 'Arial' - self.frame = '20x20+4+4' - self.frame = Magick::Geometry.new(20, 20, 4, 4) - self.geometry = '63x60+5+5' - self.geometry = Magick::Geometry.new(63, 60, 5, 5) - self.gravity = Magick::SouthGravity - self.matte_color = '#bdbdbd' - self.pointsize = 12 - self.shadow = true - self.stroke = 'transparent' - self.tile = '4x9' - self.tile = Magick::Geometry.new(4, 9) - end - assert_instance_of(Magick::ImageList, montage) - assert_equal(@ilist, ilist) - end - - # test illegal option arguments - # looks like IM doesn't diagnose invalid geometry args - # to tile= and geometry= - assert_raise(TypeError) do - montage = ilist.montage { self.background_color = 2 } - assert_equal(@ilist, ilist) - end - assert_raise(TypeError) do - montage = ilist.montage { self.border_color = 2 } - assert_equal(@ilist, ilist) - end - assert_raise(TypeError) do - montage = ilist.montage { self.border_width = [2] } - assert_equal(@ilist, ilist) - end - assert_raise(TypeError) do - montage = ilist.montage { self.compose = 2 } - assert_equal(@ilist, ilist) - end - assert_raise(TypeError) do - montage = ilist.montage { self.fill = 2 } - assert_equal(@ilist, ilist) - end - assert_raise(TypeError) do - montage = ilist.montage { self.font = 2 } - assert_equal(@ilist, ilist) - end - assert_raise(Magick::ImageMagickError) do - montage = ilist.montage { self.frame = 'z' } - assert_equal(@ilist, ilist) - end - assert_raise(TypeError) do - montage = ilist.montage { self.matte_color = 2 } - assert_equal(@ilist, ilist) - end - assert_raise(TypeError) do - montage = ilist.montage { self.pointsize = 'x' } - assert_equal(@ilist, ilist) - end - assert_raise(ArgumentError) do - montage = ilist.montage { self.stroke = 'x' } - assert_equal(@ilist, ilist) - end - end +# def test_montage +# @ilist.read(*Dir[IMAGES_DIR+'/Button_*.gif']) +# ilist = @ilist.copy +# montage = nil +# assert_nothing_thrown do +# montage = ilist.montage do +# self.background_color = 'black' +# self.background_color = Magick::Pixel.new(Magick::QuantumRange, 0, 0) +# self.border_color = 'red' +# self.border_color = Magick::Pixel.new(0, 0, 0) +# self.border_width = 2 +# self.compose = Magick::OverCompositeOp +# self.fill = 'green' +# self.font = 'Arial' +# self.frame = '20x20+4+4' +# self.frame = Magick::Geometry.new(20, 20, 4, 4) +# self.geometry = '63x60+5+5' +# self.geometry = Magick::Geometry.new(63, 60, 5, 5) +# self.gravity = Magick::SouthGravity +# self.matte_color = '#bdbdbd' +# self.pointsize = 12 +# self.shadow = true +# self.stroke = 'transparent' +# self.tile = '4x9' +# self.tile = Magick::Geometry.new(4, 9) +# end +# assert_instance_of(Magick::ImageList, montage) +# assert_equal(@ilist, ilist) +# end +# +# # test illegal option arguments +# # looks like IM doesn't diagnose invalid geometry args +# # to tile= and geometry= +# assert_raise(TypeError) do +# montage = ilist.montage { self.background_color = 2 } +# assert_equal(@ilist, ilist) +# end +# assert_raise(TypeError) do +# montage = ilist.montage { self.border_color = 2 } +# assert_equal(@ilist, ilist) +# end +# assert_raise(TypeError) do +# montage = ilist.montage { self.border_width = [2] } +# assert_equal(@ilist, ilist) +# end +# assert_raise(TypeError) do +# montage = ilist.montage { self.compose = 2 } +# assert_equal(@ilist, ilist) +# end +# assert_raise(TypeError) do +# montage = ilist.montage { self.fill = 2 } +# assert_equal(@ilist, ilist) +# end +# assert_raise(TypeError) do +# montage = ilist.montage { self.font = 2 } +# assert_equal(@ilist, ilist) +# end +# assert_raise(Magick::ImageMagickError) do +# montage = ilist.montage { self.frame = 'z' } +# assert_equal(@ilist, ilist) +# end +# assert_raise(TypeError) do +# montage = ilist.montage { self.matte_color = 2 } +# assert_equal(@ilist, ilist) +# end +# assert_raise(TypeError) do +# montage = ilist.montage { self.pointsize = 'x' } +# assert_equal(@ilist, ilist) +# end +# assert_raise(ArgumentError) do +# montage = ilist.montage { self.stroke = 'x' } +# assert_equal(@ilist, ilist) +# end +# end def test_morph # can't morph an empty list @@ -256,30 +256,30 @@ assert_equal(2, @ilist.scene) end - def test_optimize_layers - layer_methods = [ - Magick::CompareAnyLayer, - Magick::CompareClearLayer, - Magick::CompareOverlayLayer, - Magick::OptimizeLayer, - Magick::OptimizePlusLayer, - Magick::CoalesceLayer, - Magick::DisposeLayer, - Magick::OptimizeTransLayer, - Magick::RemoveDupsLayer, - Magick::RemoveZeroLayer - ] - @ilist.read(IMAGES_DIR+'/Button_0.gif', IMAGES_DIR+'/Button_1.gif') - layer_methods.each do |method| - assert_nothing_raised do - res = @ilist.optimize_layers(method) - assert_instance_of(Magick::ImageList, res) - assert_equal(2, res.length) - end - end - assert_raise(ArgumentError) {@ilist.optimize_layers(Magick::UndefinedLayer)} - assert_raise(TypeError) {@ilist.optimize_layers(2)} - end +# def test_optimize_layers +# layer_methods = [ +# Magick::CompareAnyLayer, +# Magick::CompareClearLayer, +# Magick::CompareOverlayLayer, +# Magick::OptimizeLayer, +# Magick::OptimizePlusLayer, +# Magick::CoalesceLayer, +# Magick::DisposeLayer, +# Magick::OptimizeTransLayer, +# Magick::RemoveDupsLayer, +# Magick::RemoveZeroLayer +# ] +# @ilist.read(IMAGES_DIR+'/Button_0.gif', IMAGES_DIR+'/Button_1.gif') +# layer_methods.each do |method| +# assert_nothing_raised do +# res = @ilist.optimize_layers(method) +# assert_instance_of(Magick::ImageList, res) +# assert_equal(2, res.length) +# end +# end +# assert_raise(ArgumentError) {@ilist.optimize_layers(Magick::UndefinedLayer)} +# assert_raise(TypeError) {@ilist.optimize_layers(2)} +# end def test_ping assert_nothing_raised { @ilist.ping(FLOWER_HAT) } --- RMagick-2.15.4/test/Preview.rb~ 2015-12-31 11:53:56.000000000 +0100 +++ RMagick-2.15.4/test/Preview.rb 2015-12-31 11:59:28.451396565 +0100 @@ -5,50 +5,50 @@ require 'test/unit/ui/console/testrunner' unless RUBY_VERSION[/^1\.9|^2/] class Preview_UT < Test::Unit::TestCase - def test_preview - preview_types = [ - Magick::RotatePreview, - Magick::ShearPreview, - Magick::RollPreview, - Magick::HuePreview, - Magick::SaturationPreview, - Magick::BrightnessPreview, - Magick::GammaPreview, - Magick::SpiffPreview, - Magick::DullPreview, - Magick::GrayscalePreview, - Magick::QuantizePreview, - Magick::DespecklePreview, - Magick::ReduceNoisePreview, - Magick::AddNoisePreview, - Magick::SharpenPreview, - Magick::BlurPreview, - Magick::ThresholdPreview, - Magick::EdgeDetectPreview, - Magick::SpreadPreview, - Magick::SolarizePreview, - Magick::ShadePreview, - Magick::RaisePreview, - Magick::SegmentPreview, - Magick::SwirlPreview, - Magick::ImplodePreview, - Magick::WavePreview, - Magick::OilPaintPreview, - Magick::CharcoalDrawingPreview, - Magick::JPEGPreview ] - - hat = Magick::Image.read(IMAGES_DIR+'/Flower_Hat.jpg').first - assert_nothing_raised do - prev = hat.preview(Magick::RotatePreview) - assert_instance_of(Magick::Image, prev) - end - puts "\n" - preview_types.each do |type| - puts "testing #{type}..." - assert_nothing_raised { hat.preview(type) } - end - assert_raise(TypeError) { hat.preview(2) } - end +# def test_preview +# preview_types = [ +# Magick::RotatePreview, +# Magick::ShearPreview, +# Magick::RollPreview, +# Magick::HuePreview, +# Magick::SaturationPreview, +# Magick::BrightnessPreview, +# Magick::GammaPreview, +# Magick::SpiffPreview, +# Magick::DullPreview, +# Magick::GrayscalePreview, +# Magick::QuantizePreview, +# Magick::DespecklePreview, +# Magick::ReduceNoisePreview, +# Magick::AddNoisePreview, +# Magick::SharpenPreview, +# Magick::BlurPreview, +# Magick::ThresholdPreview, +# Magick::EdgeDetectPreview, +# Magick::SpreadPreview, +# Magick::SolarizePreview, +# Magick::ShadePreview, +# Magick::RaisePreview, +# Magick::SegmentPreview, +# Magick::SwirlPreview, +# Magick::ImplodePreview, +# Magick::WavePreview, +# Magick::OilPaintPreview, +# Magick::CharcoalDrawingPreview, +# Magick::JPEGPreview ] +# +# hat = Magick::Image.read(IMAGES_DIR+'/Flower_Hat.jpg').first +# assert_nothing_raised do +# prev = hat.preview(Magick::RotatePreview) +# assert_instance_of(Magick::Image, prev) +# end +# puts "\n" +# preview_types.each do |type| +# puts "testing #{type}..." +# assert_nothing_raised { hat.preview(type) } +# end +# assert_raise(TypeError) { hat.preview(2) } +# end end if __FILE__ == $PROGRAM_NAME